Minor label changes for #3369

AtlasOfLivingAustralia · Dec 12, 2024 · 129207c · 129207c
1 parent f036ca9
commit 129207c
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 9 deletions.
diff --git a/forms/other/regionalCapacityServicesReportV1.json b/forms/other/regionalCapacityServicesReportV1.json
@@ -257,7 +257,7 @@
           {
             "dataType": "number",
             "name": "organisationPanelProjectValue",
-            "description": "Enter the total dollar value (GST inclusive) for the Deed and all Contracts (including <span style='white-space: nowrap;'>non-DCCEEW</span> Contracts).",
+            "description": "Total dollar value (GST inclusive) for the Deed and all Contracts (including <span style='white-space: nowrap;'>non-DCCEEW</span> Contracts).",
             "validate": "required,min[0]"
           },
           {
@@ -731,7 +731,7 @@
             "items": [
               {
                 "css": "span7",
-                "preLabel": "What is your total organisation panel/project $ value (GST inclusive)?",
+                "preLabel": "Your total organisation panel/project $ value (GST inclusive).",
                 "source": "organisationPanelProjectValue",
                 "type": "number",
                 "readonly": true

diff --git a/forms/other/regionalCapacityServicesReportV2.json b/forms/other/regionalCapacityServicesReportV2.json
@@ -256,7 +256,7 @@
           {
             "dataType": "number",
             "name": "organisationPanelProjectValue",
-            "description": "Enter the total dollar value (GST inclusive) for the Deed and all Contracts (including <span style='white-space: nowrap;'>non-DCCEEW</span> Contracts).",
+            "description": "Total dollar value (GST inclusive) for the Deed and all Contracts (including <span style='white-space: nowrap;'>non-DCCEEW</span> Contracts).",
             "validate": "required,min[0]"
           },
           {
@@ -681,7 +681,7 @@
             "items": [
               {
                 "css": "span7",
-                "preLabel": "What is your total organisation panel/project $ value (GST inclusive)?",
+                "preLabel": "Your total organisation panel/project $ value (GST inclusive).",
                 "source": "organisationPanelProjectValue",
                 "type": "number",
                 "readonly": true

diff --git a/forms/other/regionalCapacityServicesReportV3.json b/forms/other/regionalCapacityServicesReportV3.json
@@ -238,7 +238,7 @@
           {
             "dataType": "number",
             "name": "organisationPanelProjectValue",
-            "description": "Enter the total dollar value (GST inclusive) for the Deed and all Contracts (including <span style='white-space: nowrap;'>non-DCCEEW</span> Contracts).",
+            "description": "Total dollar value (GST inclusive) for the Deed and all Contracts (including <span style='white-space: nowrap;'>non-DCCEEW</span> Contracts).",
             "validate": "required,min[0]"
           },
           {
@@ -642,7 +642,7 @@
             "items": [
               {
                 "css": "span7",
-                "preLabel": "What is your total organisation panel/project $ value (GST inclusive)?",
+                "preLabel": "Your total organisation panel/project $ value (GST inclusive).",
                 "source": "organisationPanelProjectValue",
                 "type": "number",
                 "readonly": true

diff --git a/grails-app/views/organisation/_serviceTargets.gsp b/grails-app/views/organisation/_serviceTargets.gsp
@@ -1,5 +1,5 @@
 <!-- ko with:reportingTargetsAndFunding() -->
-<h4>${title ?: "Organisation services and minimum targets"}</h4>
+<h4>${title ?: "Organisation targets"}</h4>
 <!-- ko with: services -->
 <table class="table service-targets">
     <thead>

diff --git a/src/main/scripts/releases/4.1/configureIPPRS.js b/src/main/scripts/releases/4.1/configureIPPRS.js
@@ -20,7 +20,7 @@ var scores = [
                 type: "filter"
             },
             "childAggregations": [{
-                "property": "data.workforcePerformancePercentage",
+                "property": "data.tmp.workforcePerformancePercentage",
                     "type": "AVERAGE"
             }]
         },
@@ -44,7 +44,7 @@ var scores = [
                 type: "filter"
             },
             "childAggregations": [{
-                "property": "data.workforcePerformancePercentage",
+                "property": "data.tmp.supplyChainPerformancePercentage",
                 "type": "AVERAGE"
             }]
         },