Fixed paths for context data #3369

AtlasOfLivingAustralia · Dec 9, 2024 · 3dac5be · 3dac5be
1 parent 22fb5df
commit 3dac5be
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/forms/other/regionalCapacityServicesReport.json b/forms/other/regionalCapacityServicesReport.json
@@ -12,12 +12,12 @@
           "pre-populate": [
             {
               "source": {
-                "context-path": ""
+                "context-path": "owner"
               },
               "mapping": [
                 {
                   "target": "targetIndigenousParticipationPercentage",
-                  "source-path": "targetIndigenousParticipationPercentage"
+                  "source-path": "periodTargets.targetIndigenousParticipationPercentage"
                 }
               ]
             }

diff --git a/src/main/groovy/au/org/ala/merit/command/EditOrViewReportCommand.groovy b/src/main/groovy/au/org/ala/merit/command/EditOrViewReportCommand.groovy
@@ -44,7 +44,7 @@ abstract class EditOrViewReportCommand implements Validateable {
 
             ReportLifecycleListener listener = reportService.reportLifeCycleListener(model.report)
             if (listener) {
-                model.putAll(listener.getContextData(entity, model.report))
+                model.context.putAll(listener.getContextData(entity, model.report))
             }
         }
     }

diff --git a/...in/groovy/au/org/ala/merit/reports/RegionalCapacityServicesReportLifecycleListener.groovy b/...in/groovy/au/org/ala/merit/reports/RegionalCapacityServicesReportLifecycleListener.groovy
@@ -13,7 +13,7 @@ class RegionalCapacityServicesReportLifecycleListener extends ReportLifecycleLis
     Map getContextData(Map organisation, Map report) {
         List outputTargets = organisation.custom?.details?.services?.targets
         Map periodTargets = getTargetsForReportPeriod(report, outputTargets)
-        BigDecimal budget = new BigDecimal(0) // TODO get budget from the correct period of the budget table
-        [periodTargets:periodTargets, budget:budget]
+        BigDecimal funding = new BigDecimal(0) // TODO get budget from the correct period of the budget table
+        [periodTargets:periodTargets, totalContractValue:funding]
     }
 }