update RCS Annual section name and score config #3146

AtlasOfLivingAustralia · Jun 26, 2024 · 12766f6 · 12766f6
1 parent f1d768f
commit 12766f6
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 21 deletions.
diff --git a/forms/other/regionalCapacityServicesAnnualReport.json b/forms/other/regionalCapacityServicesAnnualReport.json
@@ -3,13 +3,13 @@
   "type": "Report",
   "sections": [
     {
-      "name": "Regional capacity services - reporting",
+      "name": "Regional capacity services - annual reporting",
       "optionalQuestionText": null,
       "optional": false,
       "collapsedByDefault": false,
       "templateName": "regionalCapacityServicesReport",
       "template": {
-        "modelName": "Regional capacity services - reporting",
+        "modelName": "Regional capacity services - annual reporting",
         "dataModel": [
           {
             "dataType": "text",
@@ -473,7 +473,7 @@
           }
         ],
         "name": "Regional Capacity Services Annual Report",
-        "title": "Regional Capacity Services – Reporting",
+        "title": "Regional Capacity Services Annual Report",
         "viewModel": [
           {
             "type": "row",

diff --git a/src/main/scripts/releases/3.4/createRCSReportScores.js b/src/main/scripts/releases/3.4/createRCSReportScores.js
@@ -13,18 +13,21 @@ let scores = [
         label: 'Total project design requested',
         description: 'An aggregate of the values reported in the RCS quarterly question number 11',
         configuration: {
-            filter: {
-                filterValue: 'Regional capacity services - reporting',
-                type: 'filter',
-                property: 'name'
-            },
             childAggregations: [
                 {
                     filter: {
-                        type: 'SUM',
-                        property: 'data.projectDesignRequested'
-                    }
-                }]
+                        filterValue: "Regional capacity services - reporting",
+                        property: "name",
+                        type: "filter"
+                    },
+                    childAggregations: [
+                        {
+                            property: "data.projectDesignRequested",
+                            type: "SUM"
+                        }
+                    ]
+                }
+            ]
         }
     },
 
@@ -41,18 +44,21 @@ let scores = [
         label: 'Total work order executed',
         description: 'An aggregate of the values reported in the RCS quarterly question number 12',
         configuration: {
-            filter: {
-                filterValue: 'Regional capacity services - reporting',
-                type: 'filter',
-                property: 'name'
-            },
             childAggregations: [
                 {
                     filter: {
-                        type: 'SUM',
-                        property: 'data.workOrderExecuted'
-                    }
-                }]
+                        filterValue: "Regional capacity services - reporting",
+                        property: "name",
+                        type: "filter"
+                    },
+                    childAggregations: [
+                        {
+                            property: "data.workOrderExecuted",
+                            type: "SUM"
+                        }
+                    ]
+                }
+            ]
         }
     }
 ];