CBSNexora/cbsnexora-backend
4
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

FINERACT-1345: Fixing support for parameterType reports

Browse Source
This commit is contained in:
Petri Tuomola
2021-05-16 15:57:02 +08:00
committed by Petri Tuomola
parent bd177bd206
commit f87b66d4e1
4 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
fineract-provider/src/main/java/org/apache/fineract/infrastructure/dataqueries/api/RunreportsApiResource.java
+1 -1
View File
@@ -105,7 +105,7 @@ public class RunreportsApiResource {
// Pass through isSelfServiceUserReport so that ReportingProcessService implementations can use it // Pass through isSelfServiceUserReport so that ReportingProcessService implementations can use it
queryParams.putSingle(IS_SELF_SERVICE_USER_REPORT_PARAMETER, Boolean.toString(isSelfServiceUserReport)); queryParams.putSingle(IS_SELF_SERVICE_USER_REPORT_PARAMETER, Boolean.toString(isSelfServiceUserReport));
String reportType = this.readExtraDataAndReportingService.getReportType(reportName, isSelfServiceUserReport); String reportType = this.readExtraDataAndReportingService.getReportType(reportName, isSelfServiceUserReport, parameterType);
ReportingProcessService reportingProcessService = this.reportingProcessServiceProvider.findReportingProcessService(reportType); ReportingProcessService reportingProcessService = this.reportingProcessServiceProvider.findReportingProcessService(reportType);
if (reportingProcessService == null) { if (reportingProcessService == null) {
throw new PlatformServiceUnavailableException("err.msg.report.service.implementation.missing", throw new PlatformServiceUnavailableException("err.msg.report.service.implementation.missing",
fineract-provider/src/main/java/org/apache/fineract/infrastructure/dataqueries/service/ReadReportingService.java
+1 -1
View File
@@ -34,7 +34,7 @@ public interface ReadReportingService {
ReportData retrieveReport(Long id); ReportData retrieveReport(Long id);
String getReportType(String reportName, boolean isSelfServiceUserReport); String getReportType(String reportName, boolean isSelfServiceUserReport, boolean isParameterType);
Collection<ReportParameterData> getAllowedParameters(); Collection<ReportParameterData> getAllowedParameters();
fineract-provider/src/main/java/org/apache/fineract/infrastructure/dataqueries/service/ReadReportingServiceImpl.java
+5 -1
View File
@@ -212,7 +212,11 @@ public class ReadReportingServiceImpl implements ReadReportingService {
} }
@Override @Override
public String getReportType(final String reportName, final boolean isSelfServiceUserReport) { public String getReportType(final String reportName, final boolean isSelfServiceUserReport, final boolean isParameterType) {
if (isParameterType) {
return "Table";
}
final String sql = "SELECT ifNull(report_type,'') AS report_type FROM `stretchy_report` WHERE report_name = ? AND self_service_user_report = ?"; final String sql = "SELECT ifNull(report_type,'') AS report_type FROM `stretchy_report` WHERE report_name = ? AND self_service_user_report = ?";
final String sqlWrapped = this.genericDataService.wrapSQL(sql); final String sqlWrapped = this.genericDataService.wrapSQL(sql);
fineract-provider/src/main/java/org/apache/fineract/infrastructure/reportmailingjob/service/ReportMailingJobWritePlatformServiceImpl.java
+1 -1
View File
@@ -441,7 +441,7 @@ public class ReportMailingJobWritePlatformServiceImpl implements ReportMailingJo
try { try {
final boolean isSelfServiceUserReport = false; final boolean isSelfServiceUserReport = false;
final String reportType = this.readReportingService.getReportType(reportName, isSelfServiceUserReport); final String reportType = this.readReportingService.getReportType(reportName, isSelfServiceUserReport, false);
final ReportingProcessService reportingProcessService = this.reportingProcessServiceProvider final ReportingProcessService reportingProcessService = this.reportingProcessServiceProvider
.findReportingProcessService(reportType); .findReportingProcessService(reportType);