Modifies reports MIFOSX-1939

2015-05-29 11:11:31 +05:30
parent a59ebad2bf
commit 66876c0859
5 changed files with 9 additions and 1 deletions
@@ -326,7 +326,7 @@ public class ReadReportingServiceImpl implements ReadReportingService {
            for (final ParameterDefinitionEntry paramDefEntry : paramsDefinition.getParameterDefinitions()) {
                final String paramName = paramDefEntry.getName();
                if (!((paramName.equals("tenantUrl")) || (paramName.equals("userhierarchy") || (paramName.equals("username")) || (paramName
-                        .equals("password"))))) {
+                        .equals("password") || (paramName.equals("userid")))))) {
                    logger.info("paramName:" + paramName);
                    final String pValue = queryParams.get(paramName);
                    if (StringUtils.isBlank(pValue)) { throw new PlatformDataIntegrityException("error.msg.reporting.error",
@@ -361,6 +361,10 @@ public class ReadReportingServiceImpl implements ReadReportingService {
            final String userhierarchy = currentUser.getOffice().getHierarchy();
            logger.info("db URL:" + tenantUrl + "      userhierarchy:" + userhierarchy);
            rptParamValues.put("userhierarchy", userhierarchy);
+			
+            final String userid = currentUser.getId().toString();
+            logger.info("db URL:" + tenantUrl + "      userid:" + userid);
+            rptParamValues.put("userid", userid);

            final MifosPlatformTenant tenant = ThreadLocalContextUtil.getTenant();

@@ -14,4 +14,6 @@ lable.title.Branch=Branch
 lable.title.Staff=Staff
 lable.title.Interest=Interest Rate
 lable.title.Balance=Balance
+PrintedBy\:=Printed by:
+On\:=On:

@@ -13,4 +13,6 @@ lable.title.Branch=Branch
 lable.title.Staff=Staff
 lable.title.Interest=Interest Rate
 lable.title.Balance=Balance
+PrintedBy\:=Printed by:
+On\:=On: