commit WIP #2970

Author: salomon-j

grails-app/controllers/au/org/ala/merit/ManagementUnitController.groovy

@@ -1,22 +1,15 @@
 package au.org.ala.merit
 
 import au.org.ala.merit.command.EditManagementUnitReportCommand
-import au.org.ala.merit.command.ManagementUnitReportCommand
 import au.org.ala.merit.command.PrintManagementUnitReportCommand
 import au.org.ala.merit.command.SaveReportDataCommand
 import au.org.ala.merit.command.ViewManagementUnitReportCommand
 import au.org.ala.merit.util.ProjectGroupingHelper
 import grails.converters.JSON
 import grails.core.GrailsApplication
-import grails.plugin.cache.Cacheable
 import grails.web.mapping.LinkGenerator
 import org.apache.http.HttpStatus
-
-import java.text.DateFormat
 import java.text.ParseException
-import java.text.SimpleDateFormat
-
-import static ReportService.ReportMode
 
 /**
  * Processes requests relating to MUs
@@ -29,7 +22,6 @@ class ManagementUnitController {
 
     ReportService reportService
     ActivityService activityService
-    PdfGenerationService pdfGenerationService
     ProjectService projectService
     ProjectGroupingHelper projectGroupingHelper
 
@@ -239,19 +231,6 @@ class ManagementUnitController {
         chain(action:'editReport', id:id, params:[reportId:reportId])
     }
 
-    private Map activityReportModel(String managementUnitId, String reportId, ReportMode mode, Integer formVersion = null) {
-        Map mu = managementUnitService.get(managementUnitId)
-        Map config = mu.config
-        Map model = reportService.activityReportModel(reportId, mode, formVersion)
-
-        model.context = mu
-        model.returnTo = createLink(action:'index', id:managementUnitId)
-        model.contextViewUrl = model.returnTo
-        model.reportHeaderTemplate = '/managementUnit/managementUnitReportHeader'
-        model.config = config
-        model
-    }
-
     @PreAuthorise(accessLevel = 'readOnly', redirectController = 'managementUnit')
     def viewReport(ViewManagementUnitReportCommand cmd) {
         if (cmd.hasErrors()) {
@@ -263,29 +242,14 @@ class ManagementUnitController {
     }
 
     @PreAuthorise(accessLevel = 'readOnly')
-    def printableReport(String id, String reportId) {
-        if (!id || !reportId) {
-            error('An invalid report was selected for download', id)
+    def printManagementUnitReport(PrintManagementUnitReportCommand cmd) {
+        if (cmd.hasErrors()) {
+            error(cmd.errors.toString(), cmd.id)
             return
         }
-        Map model = activityReportModel(id, reportId, ReportMode.PRINT)
 
-        render view:'/activity/activityReportView', model:model
-    }
-
-    /**
-     * This is designed as a callback from the PDF generation service.  It produces a HTML report that will
-     * be converted into PDF.
-     * @param id the project id
-     */
-    def viewReportCallback(PrintManagementUnitReportCommand cmd) {
+        render model:cmd.model, view:'/activity/activityReportView'
 
-        if (pdfGenerationService.authorizePDF(request)) {
-            render view:'/activity/activityReportView', model:cmd.model
-        }
-        else {
-            render status:HttpStatus.SC_UNAUTHORIZED
-        }
     }
 
     @PreAuthorise(accessLevel = 'editor')

grails-app/controllers/au/org/ala/merit/OrganisationController.groovy

@@ -584,30 +584,6 @@ class OrganisationController {
         }
     }
 
-    private Map performanceReportModel(String organisationId, Map report, ReportService.ReportMode mode, Integer formVersion = null) {
-        Map organisation = organisationService.get(organisationId)
-        int version = report.toDate < "2017-01-01T00:00:00Z" ? 1 : 2
-        Map model = reportService.performanceReportModel(report.reportId, version)
-        model.state = organisation.state ?: 'Unknown'
-        model.organisation = organisation
-        model.printView = true
-        model.view = '/report/performanceReportView'
-        model
-    }
-
-    private Map activityReportModel(String organisationId, String reportId, ReportService.ReportMode mode, Integer formVersion = null) {
-        Map organisation = organisationService.get(organisationId)
-        Map model = reportService.activityReportModel(reportId, mode, formVersion)
-        model.context = organisation
-        model.returnTo = createLink(action:'index', id:organisationId)
-        model.contextViewUrl = model.returnTo
-        model.reportHeaderTemplate = '/organisation/organisationReportHeader'
-        model.config = organisation.config
-        model.view = '/activity/activityReportView'
-        model
-    }
-
-
     @PreAuthorise(accessLevel = 'admin')
     def createAdHocReport(String id) {
 

grails-app/controllers/au/org/ala/merit/ProgramController.groovy

@@ -1,5 +1,6 @@
 package au.org.ala.merit
 
+import au.org.ala.merit.command.PrintProgramReportCommand
 import au.org.ala.merit.command.SaveReportDataCommand
 import grails.converters.JSON
 import org.apache.http.HttpStatus
@@ -15,7 +16,6 @@ class ProgramController {
     def programService, documentService, userService, roleService, commonService, webService, siteService
     ReportService reportService
     ActivityService activityService
-    PdfGenerationService pdfGenerationService
     BlogService blogService
     ManagementUnitService managementUnitService
 
@@ -337,30 +337,14 @@ class ProgramController {
     }
 
     @PreAuthorise(accessLevel = 'readOnly')
-    def printableReport(String id, String reportId) {
-        if (!id || !reportId) {
-            error('An invalid report was selected for download', id)
+    def printProgramReport(PrintProgramReportCommand cmd) {
+        if (cmd.hasErrors()) {
+            error(cmd.errors.toString(), cmd.id)
             return
         }
-        Map model = activityReportModel(id, reportId, ReportMode.PRINT)
-
-        render view:'/activity/activityReportView', model:model
-    }
 
-    /**
-     * This is designed as a callback from the PDF generation service.  It produces a HTML report that will
-     * be converted into PDF.
-     * @param id the project id
-     */
-    def viewReportCallback(String id, String reportId) {
+        render model:cmd.model, view:'/activity/activityReportView'
 
-        if (pdfGenerationService.authorizePDF(request)) {
-            Map model = activityReportModel(id, reportId, ReportMode.PRINT)
-            render view:'/activity/activityReportView', model:model
-        }
-        else {
-            render status:HttpStatus.SC_UNAUTHORIZED
-        }
     }
 
     @PreAuthorise(accessLevel = 'editor')

grails-app/views/managementUnit/index.gsp

@@ -12,7 +12,7 @@
             viewReportUrl: '${createLink(action:"viewReport", id:managementUnit.managementUnitId)}',
             editReportUrl: "${createLink(action:"editReport", id:managementUnit.managementUnitId)}",
             resetReportUrl: "${createLink(action:'resetReport', id:managementUnit.managementUnitId)}",
-            reportPDFUrl: "${createLink(action:"printableReport", id:managementUnit.managementUnitId)}",
+            reportPDFUrl: "${createLink(action:"printManagementUnitReport", id:managementUnit.managementUnitId)}",
             approveReportUrl: "${createLink(action:"ajaxApproveReport", id:managementUnit.managementUnitId)}",
             submitReportUrl: "${createLink(action:"ajaxSubmitReport", id:managementUnit.managementUnitId)}",
             rejectReportUrl: "${createLink(action:"ajaxRejectReport", id:managementUnit.managementUnitId)}",

grails-app/views/program/index.gsp

@@ -13,7 +13,7 @@
             viewReportUrl: '${createLink(action:"viewReport", id:program.programId)}',
             editReportUrl: "${createLink(action:"editReport", id:program.programId)}",
             resetReportUrl: "${createLink(action:'resetReport', id:program.programId)}",
-            reportPDFUrl: "${createLink(action:"printableReport", id:program.programId)}",
+            reportPDFUrl: "${createLink(action:"printProgramReport", id:program.programId)}",
             approveReportUrl: "${createLink(action:"ajaxApproveReport", id:program.programId)}",
             submitReportUrl: "${createLink(action:"ajaxSubmitReport", id:program.programId)}",
             rejectReportUrl: "${createLink(action:"ajaxRejectReport", id:program.programId)}",

package.json

@@ -11,7 +11,7 @@
   },
   "devDependencies": {
     "@metahub/karma-jasmine-jquery": "^2.0.1",
-    "chromedriver": "114.0.1",
+    "chromedriver": "116.0.0",
     "jasmine-core": "^3.5.0",
     "jasmine-jquery": "^2.0.0",
     "jquery": "3.6.2",

src/main/groovy/au/org/ala/merit/command/PrintProgramReportCommand.groovy

@@ -0,0 +1,11 @@
+package au.org.ala.merit.command
+
+import au.org.ala.merit.ReportService
+
+class PrintProgramReportCommand extends OrganisationReportCommand {
+
+    @Override
+    ReportService.ReportMode getMode() {
+        return ReportService.ReportMode.PRINT
+    }
+}