diff --git a/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/dataqueries/service/ReadReportingServiceImpl.java b/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/dataqueries/service/ReadReportingServiceImpl.java index 8c04afc36..783f89fe0 100644 --- a/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/dataqueries/service/ReadReportingServiceImpl.java +++ b/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/dataqueries/service/ReadReportingServiceImpl.java @@ -29,8 +29,10 @@ import javax.ws.rs.core.StreamingOutput; import org.apache.commons.lang.StringUtils; import org.mifosplatform.infrastructure.core.domain.JdbcSupport; +import org.mifosplatform.infrastructure.core.domain.MifosPlatformTenant; import org.mifosplatform.infrastructure.core.exception.PlatformDataIntegrityException; import org.mifosplatform.infrastructure.core.service.RoutingDataSource; +import org.mifosplatform.infrastructure.core.service.ThreadLocalContextUtil; import org.mifosplatform.infrastructure.dataqueries.data.GenericResultsetData; import org.mifosplatform.infrastructure.dataqueries.data.ReportData; import org.mifosplatform.infrastructure.dataqueries.data.ReportParameterData; @@ -323,7 +325,8 @@ public class ReadReportingServiceImpl implements ReadReportingService { */ for (final ParameterDefinitionEntry paramDefEntry : paramsDefinition.getParameterDefinitions()) { final String paramName = paramDefEntry.getName(); - if (!((paramName.equals("tenantdb")) || (paramName.equals("userhierarchy")))) { + if (!((paramName.equals("tenantUrl")) || (paramName.equals("userhierarchy") || (paramName.equals("username")) || (paramName + .equals("password"))))) { logger.info("paramName:" + paramName); final String pValue = queryParams.get(paramName); if (StringUtils.isBlank(pValue)) { throw new PlatformDataIntegrityException("error.msg.reporting.error", @@ -349,16 +352,21 @@ public class ReadReportingServiceImpl implements ReadReportingService { // and // data scoping final Connection connection = this.dataSource.getConnection(); - String tenantdb; + String tenantUrl; try { - tenantdb = connection.getCatalog(); + tenantUrl = connection.getMetaData().getURL(); } finally { connection.close(); } final String userhierarchy = currentUser.getOffice().getHierarchy(); - logger.info("db name:" + tenantdb + " userhierarchy:" + userhierarchy); - rptParamValues.put("tenantdb", tenantdb); + logger.info("db URL:" + tenantUrl + " userhierarchy:" + userhierarchy); rptParamValues.put("userhierarchy", userhierarchy); + + final MifosPlatformTenant tenant = ThreadLocalContextUtil.getTenant(); + + rptParamValues.put("tenantUrl", tenantUrl); + rptParamValues.put("username", tenant.getSchemaUsername()); + rptParamValues.put("password", tenant.getSchemaPassword()); } catch (final Exception e) { logger.error("error.msg.reporting.error:" + e.getMessage()); throw new PlatformDataIntegrityException("error.msg.reporting.error", e.getMessage()); diff --git a/mifosng-provider/src/main/pentahoReports/Active Loans - Details(Pentaho).prpt b/mifosng-provider/src/main/pentahoReports/Active Loans - Details(Pentaho).prpt index fafe3f279..fbc2bf90c 100644 Binary files a/mifosng-provider/src/main/pentahoReports/Active Loans - Details(Pentaho).prpt and b/mifosng-provider/src/main/pentahoReports/Active Loans - Details(Pentaho).prpt differ diff --git a/mifosng-provider/src/main/pentahoReports/Active Loans - Summary(Pentaho).prpt b/mifosng-provider/src/main/pentahoReports/Active Loans - Summary(Pentaho).prpt index e6c9d9e69..87f461b55 100644 Binary files a/mifosng-provider/src/main/pentahoReports/Active Loans - Summary(Pentaho).prpt and b/mifosng-provider/src/main/pentahoReports/Active Loans - Summary(Pentaho).prpt differ diff --git a/mifosng-provider/src/main/pentahoReports/Active Loans Passed Final Maturity Summary(Pentaho).prpt b/mifosng-provider/src/main/pentahoReports/Active Loans Passed Final Maturity Summary(Pentaho).prpt index 9753665a0..81fce04f7 100644 Binary files a/mifosng-provider/src/main/pentahoReports/Active Loans Passed Final Maturity Summary(Pentaho).prpt and b/mifosng-provider/src/main/pentahoReports/Active Loans Passed Final Maturity Summary(Pentaho).prpt differ diff --git a/mifosng-provider/src/main/pentahoReports/Active Loans Passed Final Maturity(Pentaho).prpt b/mifosng-provider/src/main/pentahoReports/Active Loans Passed Final Maturity(Pentaho).prpt index f0ec12392..f88606690 100644 Binary files a/mifosng-provider/src/main/pentahoReports/Active Loans Passed Final Maturity(Pentaho).prpt and b/mifosng-provider/src/main/pentahoReports/Active Loans Passed Final Maturity(Pentaho).prpt differ diff --git a/mifosng-provider/src/main/pentahoReports/Active Loans by Disbursal Period(Pentaho).prpt b/mifosng-provider/src/main/pentahoReports/Active Loans by Disbursal Period(Pentaho).prpt index cc64e972b..e1a972b6a 100644 Binary files a/mifosng-provider/src/main/pentahoReports/Active Loans by Disbursal Period(Pentaho).prpt and b/mifosng-provider/src/main/pentahoReports/Active Loans by Disbursal Period(Pentaho).prpt differ diff --git a/mifosng-provider/src/main/pentahoReports/Active Loans in last installment Summary(Pentaho).prpt b/mifosng-provider/src/main/pentahoReports/Active Loans in last installment Summary(Pentaho).prpt index f7032d7ef..f67ff3107 100644 Binary files a/mifosng-provider/src/main/pentahoReports/Active Loans in last installment Summary(Pentaho).prpt and b/mifosng-provider/src/main/pentahoReports/Active Loans in last installment Summary(Pentaho).prpt differ diff --git a/mifosng-provider/src/main/pentahoReports/Active Loans in last installment(Pentaho).prpt b/mifosng-provider/src/main/pentahoReports/Active Loans in last installment(Pentaho).prpt index 08353c637..93df7c18d 100644 Binary files a/mifosng-provider/src/main/pentahoReports/Active Loans in last installment(Pentaho).prpt and b/mifosng-provider/src/main/pentahoReports/Active Loans in last installment(Pentaho).prpt differ diff --git a/mifosng-provider/src/main/pentahoReports/Aging Detail(Pentaho).prpt b/mifosng-provider/src/main/pentahoReports/Aging Detail(Pentaho).prpt index f6c11d080..225f0b3ae 100644 Binary files a/mifosng-provider/src/main/pentahoReports/Aging Detail(Pentaho).prpt and b/mifosng-provider/src/main/pentahoReports/Aging Detail(Pentaho).prpt differ diff --git a/mifosng-provider/src/main/pentahoReports/Aging Summary (Arrears in Months)(Pentaho).prpt b/mifosng-provider/src/main/pentahoReports/Aging Summary (Arrears in Months)(Pentaho).prpt index f0185b22b..1415077b4 100644 Binary files a/mifosng-provider/src/main/pentahoReports/Aging Summary (Arrears in Months)(Pentaho).prpt and b/mifosng-provider/src/main/pentahoReports/Aging Summary (Arrears in Months)(Pentaho).prpt differ diff --git a/mifosng-provider/src/main/pentahoReports/Aging Summary (Arrears in Weeks)(Pentaho).prpt b/mifosng-provider/src/main/pentahoReports/Aging Summary (Arrears in Weeks)(Pentaho).prpt index cd514f2fd..c298c5101 100644 Binary files a/mifosng-provider/src/main/pentahoReports/Aging Summary (Arrears in Weeks)(Pentaho).prpt and b/mifosng-provider/src/main/pentahoReports/Aging Summary (Arrears in Weeks)(Pentaho).prpt differ diff --git a/mifosng-provider/src/main/pentahoReports/Balance Sheet.prpt b/mifosng-provider/src/main/pentahoReports/Balance Sheet.prpt index 5511e41c5..eb5ed8665 100644 Binary files a/mifosng-provider/src/main/pentahoReports/Balance Sheet.prpt and b/mifosng-provider/src/main/pentahoReports/Balance Sheet.prpt differ diff --git a/mifosng-provider/src/main/pentahoReports/Branch Expected Cash Flow.prpt b/mifosng-provider/src/main/pentahoReports/Branch Expected Cash Flow.prpt index 5f17e6ab7..113980aa7 100644 Binary files a/mifosng-provider/src/main/pentahoReports/Branch Expected Cash Flow.prpt and b/mifosng-provider/src/main/pentahoReports/Branch Expected Cash Flow.prpt differ diff --git a/mifosng-provider/src/main/pentahoReports/Client Listing(Pentaho).prpt b/mifosng-provider/src/main/pentahoReports/Client Listing(Pentaho).prpt index aecbfd131..c09145276 100644 Binary files a/mifosng-provider/src/main/pentahoReports/Client Listing(Pentaho).prpt and b/mifosng-provider/src/main/pentahoReports/Client Listing(Pentaho).prpt differ diff --git a/mifosng-provider/src/main/pentahoReports/Client Loan Account Schedule.prpt b/mifosng-provider/src/main/pentahoReports/Client Loan Account Schedule.prpt index a0b674938..ba36be634 100644 Binary files a/mifosng-provider/src/main/pentahoReports/Client Loan Account Schedule.prpt and b/mifosng-provider/src/main/pentahoReports/Client Loan Account Schedule.prpt differ diff --git a/mifosng-provider/src/main/pentahoReports/Client Loans Listing(Pentaho).prpt b/mifosng-provider/src/main/pentahoReports/Client Loans Listing(Pentaho).prpt index a47e5a0f0..4075d3c55 100644 Binary files a/mifosng-provider/src/main/pentahoReports/Client Loans Listing(Pentaho).prpt and b/mifosng-provider/src/main/pentahoReports/Client Loans Listing(Pentaho).prpt differ diff --git a/mifosng-provider/src/main/pentahoReports/Client Saving Transactions.prpt b/mifosng-provider/src/main/pentahoReports/Client Saving Transactions.prpt index ad0e94bc1..a3d8ffbb3 100644 Binary files a/mifosng-provider/src/main/pentahoReports/Client Saving Transactions.prpt and b/mifosng-provider/src/main/pentahoReports/Client Saving Transactions.prpt differ diff --git a/mifosng-provider/src/main/pentahoReports/Client Savings Summary.prpt b/mifosng-provider/src/main/pentahoReports/Client Savings Summary.prpt index 5167ce7c8..44265e54c 100755 Binary files a/mifosng-provider/src/main/pentahoReports/Client Savings Summary.prpt and b/mifosng-provider/src/main/pentahoReports/Client Savings Summary.prpt differ diff --git a/mifosng-provider/src/main/pentahoReports/Expected Payments By Date - Basic(Pentaho).prpt b/mifosng-provider/src/main/pentahoReports/Expected Payments By Date - Basic(Pentaho).prpt index aed876889..6366070b2 100644 Binary files a/mifosng-provider/src/main/pentahoReports/Expected Payments By Date - Basic(Pentaho).prpt and b/mifosng-provider/src/main/pentahoReports/Expected Payments By Date - Basic(Pentaho).prpt differ diff --git a/mifosng-provider/src/main/pentahoReports/Expected Payments By Date - Formatted.prpt b/mifosng-provider/src/main/pentahoReports/Expected Payments By Date - Formatted.prpt index 96f29b06d..db0e39fc9 100644 Binary files a/mifosng-provider/src/main/pentahoReports/Expected Payments By Date - Formatted.prpt and b/mifosng-provider/src/main/pentahoReports/Expected Payments By Date - Formatted.prpt differ diff --git a/mifosng-provider/src/main/pentahoReports/Funds Disbursed Between Dates Summary by Office(Pentaho).prpt b/mifosng-provider/src/main/pentahoReports/Funds Disbursed Between Dates Summary by Office(Pentaho).prpt index 296a2206d..0c69acbde 100644 Binary files a/mifosng-provider/src/main/pentahoReports/Funds Disbursed Between Dates Summary by Office(Pentaho).prpt and b/mifosng-provider/src/main/pentahoReports/Funds Disbursed Between Dates Summary by Office(Pentaho).prpt differ diff --git a/mifosng-provider/src/main/pentahoReports/Funds Disbursed Between Dates Summary(Pentaho).prpt b/mifosng-provider/src/main/pentahoReports/Funds Disbursed Between Dates Summary(Pentaho).prpt index 11f2ce6b5..051cf99b5 100644 Binary files a/mifosng-provider/src/main/pentahoReports/Funds Disbursed Between Dates Summary(Pentaho).prpt and b/mifosng-provider/src/main/pentahoReports/Funds Disbursed Between Dates Summary(Pentaho).prpt differ diff --git a/mifosng-provider/src/main/pentahoReports/Income Statement.prpt b/mifosng-provider/src/main/pentahoReports/Income Statement.prpt index 464508a77..22f2e9b63 100644 Binary files a/mifosng-provider/src/main/pentahoReports/Income Statement.prpt and b/mifosng-provider/src/main/pentahoReports/Income Statement.prpt differ diff --git a/mifosng-provider/src/main/pentahoReports/Loans Awaiting Disbursal Summary by Month(Pentaho).prpt b/mifosng-provider/src/main/pentahoReports/Loans Awaiting Disbursal Summary by Month(Pentaho).prpt index 38803711f..dd8d0786c 100644 Binary files a/mifosng-provider/src/main/pentahoReports/Loans Awaiting Disbursal Summary by Month(Pentaho).prpt and b/mifosng-provider/src/main/pentahoReports/Loans Awaiting Disbursal Summary by Month(Pentaho).prpt differ diff --git a/mifosng-provider/src/main/pentahoReports/Loans Awaiting Disbursal Summary(Pentaho).prpt b/mifosng-provider/src/main/pentahoReports/Loans Awaiting Disbursal Summary(Pentaho).prpt index 469b0d71f..a3dfef7f5 100644 Binary files a/mifosng-provider/src/main/pentahoReports/Loans Awaiting Disbursal Summary(Pentaho).prpt and b/mifosng-provider/src/main/pentahoReports/Loans Awaiting Disbursal Summary(Pentaho).prpt differ diff --git a/mifosng-provider/src/main/pentahoReports/Loans Awaiting Disbursal(Pentaho).prpt b/mifosng-provider/src/main/pentahoReports/Loans Awaiting Disbursal(Pentaho).prpt index 8ccd96bf7..f801d3dc2 100644 Binary files a/mifosng-provider/src/main/pentahoReports/Loans Awaiting Disbursal(Pentaho).prpt and b/mifosng-provider/src/main/pentahoReports/Loans Awaiting Disbursal(Pentaho).prpt differ diff --git a/mifosng-provider/src/main/pentahoReports/Loans Pending Approval(Pentaho).prpt b/mifosng-provider/src/main/pentahoReports/Loans Pending Approval(Pentaho).prpt index 8767c7adf..280a15ea7 100644 Binary files a/mifosng-provider/src/main/pentahoReports/Loans Pending Approval(Pentaho).prpt and b/mifosng-provider/src/main/pentahoReports/Loans Pending Approval(Pentaho).prpt differ diff --git a/mifosng-provider/src/main/pentahoReports/Obligation Met Loans Details(Pentaho).prpt b/mifosng-provider/src/main/pentahoReports/Obligation Met Loans Details(Pentaho).prpt index fb3e83a84..a6f870030 100644 Binary files a/mifosng-provider/src/main/pentahoReports/Obligation Met Loans Details(Pentaho).prpt and b/mifosng-provider/src/main/pentahoReports/Obligation Met Loans Details(Pentaho).prpt differ diff --git a/mifosng-provider/src/main/pentahoReports/Obligation Met Loans Summary(Pentaho).prpt b/mifosng-provider/src/main/pentahoReports/Obligation Met Loans Summary(Pentaho).prpt index b0158b3d1..06c0114a3 100644 Binary files a/mifosng-provider/src/main/pentahoReports/Obligation Met Loans Summary(Pentaho).prpt and b/mifosng-provider/src/main/pentahoReports/Obligation Met Loans Summary(Pentaho).prpt differ diff --git a/mifosng-provider/src/main/pentahoReports/Portfolio at Risk by Branch(Pentaho).prpt b/mifosng-provider/src/main/pentahoReports/Portfolio at Risk by Branch(Pentaho).prpt index 86da1ce69..bbe7de5e8 100644 Binary files a/mifosng-provider/src/main/pentahoReports/Portfolio at Risk by Branch(Pentaho).prpt and b/mifosng-provider/src/main/pentahoReports/Portfolio at Risk by Branch(Pentaho).prpt differ diff --git a/mifosng-provider/src/main/pentahoReports/Portfolio at Risk(Pentaho).prpt b/mifosng-provider/src/main/pentahoReports/Portfolio at Risk(Pentaho).prpt index 0ea1b271d..33cb78bf8 100644 Binary files a/mifosng-provider/src/main/pentahoReports/Portfolio at Risk(Pentaho).prpt and b/mifosng-provider/src/main/pentahoReports/Portfolio at Risk(Pentaho).prpt differ diff --git a/mifosng-provider/src/main/pentahoReports/Rescheduled Loans(Pentaho).prpt b/mifosng-provider/src/main/pentahoReports/Rescheduled Loans(Pentaho).prpt index 609cb12a0..bd9901ceb 100644 Binary files a/mifosng-provider/src/main/pentahoReports/Rescheduled Loans(Pentaho).prpt and b/mifosng-provider/src/main/pentahoReports/Rescheduled Loans(Pentaho).prpt differ diff --git a/mifosng-provider/src/main/pentahoReports/Savings Transactions.prpt b/mifosng-provider/src/main/pentahoReports/Savings Transactions.prpt index f02fb939a..fd3eef1f1 100755 Binary files a/mifosng-provider/src/main/pentahoReports/Savings Transactions.prpt and b/mifosng-provider/src/main/pentahoReports/Savings Transactions.prpt differ diff --git a/mifosng-provider/src/main/pentahoReports/Trial Balance.prpt b/mifosng-provider/src/main/pentahoReports/Trial Balance.prpt index 5ffa662a1..a04448c07 100644 Binary files a/mifosng-provider/src/main/pentahoReports/Trial Balance.prpt and b/mifosng-provider/src/main/pentahoReports/Trial Balance.prpt differ diff --git a/mifosng-provider/src/main/pentahoReports/TxnRunningBalances(Pentaho).prpt b/mifosng-provider/src/main/pentahoReports/TxnRunningBalances(Pentaho).prpt index 8f03b9dc3..2aea6c425 100644 Binary files a/mifosng-provider/src/main/pentahoReports/TxnRunningBalances(Pentaho).prpt and b/mifosng-provider/src/main/pentahoReports/TxnRunningBalances(Pentaho).prpt differ diff --git a/mifosng-provider/src/main/pentahoReports/Written-Off Loans(Pentaho).prpt b/mifosng-provider/src/main/pentahoReports/Written-Off Loans(Pentaho).prpt index 10c205492..69844750e 100644 Binary files a/mifosng-provider/src/main/pentahoReports/Written-Off Loans(Pentaho).prpt and b/mifosng-provider/src/main/pentahoReports/Written-Off Loans(Pentaho).prpt differ