Updates v1 and v2 of RCS to include v3 changes. Fixed phrasing in v3 #…

…3429
AtlasOfLivingAustralia · Feb 19, 2025 · 802f17a · 802f17a
1 parent 3a7e522
commit 802f17a
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 59 deletions.
diff --git a/forms/other/regionalCapacityServicesReportV1.json b/forms/other/regionalCapacityServicesReportV1.json
@@ -728,18 +728,6 @@
               }
             ]
           },
-          {
-            "type": "row",
-            "items": [
-              {
-                "css": "span7",
-                "preLabel": "Target Workforce Performance % this reporting period",
-                "source": "targetIndigenousParticipationPercentage",
-                "type": "number",
-                "readonly": true
-              }
-            ]
-          },
           {
             "type": "row",
             "items": [
@@ -768,22 +756,8 @@
             "items": [
               {
                 "css": "span7",
-                "preLabel": "Supply Chain Performance to date",
-                "source": "supplyChainPerformancePercentage",
-                "type": "number",
-                "helpText": "Supply chain performance to date (note this is a cumulative measure over the life of the contract consistent with the approach used by NIAA measuring indigenous participation. Performance to date should meet or exceed target performance by the end of the Deed period)"
-              }
-            ]
-          },
-          {
-            "type": "row",
-            "items": [
-              {
-                "css": "span7",
-                "preLabel": "Target supply chain performance at end of Deed period",
-                "source": "targetIndigenousProcurementPercentage",
-                "type": "number",
-                "readonly": true
+                "source": "To check your performance to date against the agreed targets, please click on the dashboard tab after closing the report",
+                "type": "literal"
               }
             ]
           },

diff --git a/forms/other/regionalCapacityServicesReportV2.json b/forms/other/regionalCapacityServicesReportV2.json
@@ -42,11 +42,18 @@
               {
                 "target": "targetIndigenousProcurementPercentage",
                 "source-path": "periodTargets.targetIndigenousProcurementPercentage"
+              },
+              {
+                "target": "reportedFundingExcludingThisReport",
+                "source-path": "reportedFundingExcludingThisReport"
               }
             ],
             "merge": {
               "targetIndigenousProcurementPercentage": {
                 "replaceExisting": true
+              },
+              "reportedFundingExcludingThisReport": {
+                "replaceExisting": true
               }
             }
           },
@@ -68,6 +75,10 @@
           }
         ],
         "dataModel": [
+          {
+            "name": "reportedFundingExcludingThisReport",
+            "dataType": "number"
+          },
           {
             "name": "governanceAndFinancialFrameworksOnTrack",
             "dataType": "text",
@@ -260,7 +271,7 @@
               },
               {
                 "param": {
-                  "expression": "organisationPanelProjectValue",
+                  "expression": "organisationPanelProjectValue-reportedFundingExcludingThisReport",
                   "type": "computed"
                 },
                 "rule": "max",
@@ -271,7 +282,7 @@
           {
             "dataType": "number",
             "name": "organisationPanelProjectValue",
-            "description": "Total dollar value (GST inclusive) for the Deed and all active contracts (including <span style='white-space: nowrap;'>non-DCCEEW</span> contracts) as reported on AusTender.",
+            "description": "Total dollar value (GST inclusive) for the Deed and all Contracts (including <span style='white-space: nowrap;'>non-DCCEEW</span> contracts) as reported on AusTender.",
             "validate": "required,min[0]"
           },
           {
@@ -678,18 +689,6 @@
               }
             ]
           },
-          {
-            "type": "row",
-            "items": [
-              {
-                "css": "span7",
-                "preLabel": "Target Workforce Performance % this reporting period",
-                "source": "targetIndigenousParticipationPercentage",
-                "type": "number",
-                "readonly": true
-              }
-            ]
-          },
           {
             "type": "row",
             "items": [
@@ -718,22 +717,8 @@
             "items": [
               {
                 "css": "span7",
-                "preLabel": "Supply Chain Performance to date",
-                "source": "supplyChainPerformancePercentage",
-                "type": "number",
-                "helpText": "Supply chain performance to date (note this is a cumulative measure over the life of the contract consistent with the approach used by NIAA measuring indigenous participation. Performance to date should meet or exceed target performance by the end of the Deed period)"
-              }
-            ]
-          },
-          {
-            "type": "row",
-            "items": [
-              {
-                "css": "span7",
-                "preLabel": "Target supply chain performance at end of Deed period",
-                "source": "targetIndigenousProcurementPercentage",
-                "type": "number",
-                "readonly": true
+                "source": "To check your performance to date against the agreed targets, please click on the dashboard tab after closing the report",
+                "type": "literal"
               }
             ]
           },

diff --git a/forms/other/regionalCapacityServicesReportV3.json b/forms/other/regionalCapacityServicesReportV3.json
@@ -678,7 +678,7 @@
             "items": [
               {
                 "css": "span7",
-                "source": "To check how your performance to date against the agreed targets, please click on the dashboard tab after closing the report",
+                "source": "To check your performance to date against the agreed targets, please click on the dashboard tab after closing the report",
                 "type": "literal"
               }
             ]