Merge pull request #3448 from AtlasOfLivingAustralia/feature/issue3429

salomon-j · web-flow · commit 5e0c5a86ff2e · 2025-02-17T10:39:06.000+11:00
Fixed type error on costing amount #3429
diff --git a/grails-app/services/au/org/ala/merit/OrganisationService.groovy b/grails-app/services/au/org/ala/merit/OrganisationService.groovy
@@ -147,7 +147,7 @@ class OrganisationService {
         reportService.generateTargetPeriods(targetsReportConfig, owner, targetsConfig.periodLabelFormat)
     }
 
-    double getRcsFundingForPeriod(Map organisation, String periodEndDate) {
+    String getRcsFundingForPeriod(Map organisation, String periodEndDate) {
 
         int index = findIndexOfPeriod(organisation, periodEndDate)
         def result = 0
diff --git a/src/main/groovy/au/org/ala/merit/reports/RegionalCapacityServicesReportLifecycleListener.groovy b/src/main/groovy/au/org/ala/merit/reports/RegionalCapacityServicesReportLifecycleListener.groovy
@@ -24,7 +24,7 @@ class RegionalCapacityServicesReportLifecycleListener extends ReportLifecycleLis
         [periodTargets:periodTargets, totalContractValue:funding, reportedFundingExcludingThisReport:reportedFundingExcludingThisReport]
     }
 
-    private double getFundingForPeriod(Map organisation, Map report) {
+    private def getFundingForPeriod(Map organisation, Map report) {
         String endDate = report.toDate
         organisationService.getRcsFundingForPeriod(organisation, endDate)
 

Original file line number	Diff line number	Diff line change
`@@ -147,7 +147,7 @@ class OrganisationService {`
`147`	`147`	`reportService.generateTargetPeriods(targetsReportConfig, owner, targetsConfig.periodLabelFormat)`
`148`	`148`	`}`
`149`	`149`
`150`		`- double getRcsFundingForPeriod(Map organisation, String periodEndDate) {`
	`150`	`+ String getRcsFundingForPeriod(Map organisation, String periodEndDate) {`
`151`	`151`
`152`	`152`	`int index = findIndexOfPeriod(organisation, periodEndDate)`
`153`	`153`	`def result = 0`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ class RegionalCapacityServicesReportLifecycleListener extends ReportLifecycleLis`
`24`	`24`	`[periodTargets:periodTargets, totalContractValue:funding, reportedFundingExcludingThisReport:reportedFundingExcludingThisReport]`
`25`	`25`	`}`
`26`	`26`
`27`		`- private double getFundingForPeriod(Map organisation, Map report) {`
	`27`	`+ private def getFundingForPeriod(Map organisation, Map report) {`
`28`	`28`	`String endDate = report.toDate`
`29`	`29`	`organisationService.getRcsFundingForPeriod(organisation, endDate)`
`30`	`30`