From 0603d6bbf0dad312b997a8551fb45173bc9b837e Mon Sep 17 00:00:00 2001
From: sal153 <joseph.salomon@csiro.au>
Date: Thu, 28 Nov 2024 13:32:57 +1100
Subject: [PATCH] commit new change requests #3335

---
 forms/nht/procurementsOutputReport.json | 23 ++++++++++++++---------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/forms/nht/procurementsOutputReport.json b/forms/nht/procurementsOutputReport.json
index b38986e99..693d9b10e 100644
--- a/forms/nht/procurementsOutputReport.json
+++ b/forms/nht/procurementsOutputReport.json
@@ -6345,6 +6345,7 @@
           {
             "dataType": "number",
             "name": "numberOfPlansDeveloped",
+            "description": "This field is not editable as it is auto populated from inputted data in the below section",
             "validate": "min[0]",
             "decimalPlaces": 0,
             "defaultValue": 1,
@@ -6377,7 +6378,8 @@
           },
           {
             "dataType": "number",
-            "name": "totalAreaDiseaseManagementFollowup",
+            "name": "totalAreaPlansDeveloped",
+            "description": "This field is not editable as it is auto populated from inputted data in the below section",
             "validate": "min[0]",
             "decimalPlaces": 3,
             "computed": {
@@ -6387,7 +6389,7 @@
           {
             "dataType": "number",
             "decimalPlaces": 3,
-            "name": "totalAreaDiseaseManagementInvoicedFollowup",
+            "name": "totalAreaPlansDevelopedInvoiced",
             "description": "Manually enter if values have decimal points e.g. 0.350 or 2.545",
             "validate": [
               {
@@ -6398,7 +6400,7 @@
               },
               {
                 "param": {
-                  "expression": "totalAreaDiseaseManagementFollowup",
+                  "expression": "totalAreaPlansDeveloped",
                   "type": "computed",
                   "decimalPlaces": 3
                 },
@@ -6409,12 +6411,12 @@
           },
           {
             "dataType": "text",
-            "name": "totalInvoicedDiseaseMismatched",
+            "name": "totalInvoicedPlansDevelopedMismatched",
             "description": "Please provide the reason/s why you are not invoicing for the same number that have been completed and delivered, e.g. the personnel and equipment were available to deliver more than was contracted.",
             "validate": "maxSize[400],required",
             "behaviour": [
               {
-                "condition": "+numberOfPlansDevelopedInvoiced < +numberOfPlansDeveloped",
+                "condition": "+numberOfPlansDevelopedInvoiced < +numberOfPlansDeveloped or +totalAreaPlansDevelopedInvoiced < totalAreaPlansDeveloped",
                 "type": "enable"
               }
             ]
@@ -6535,7 +6537,7 @@
                     "type": "row",
                     "items": [
                       {
-                        "preLabel": "(i) Ttotal number of management plans developed for this reporting period",
+                        "preLabel": "(i) Total number of management plans developed for this reporting period",
                         "source": "numberOfPlansDeveloped",
                         "type": "number"
                       }
@@ -6562,7 +6564,7 @@
                     "items": [
                       {
                         "preLabel": "(iii) Total area (ha) covered by management plan for this reporting period",
-                        "source": "totalAreaDiseaseManagementFollowup",
+                        "source": "totalAreaPlansDeveloped",
                         "type": "number"
                       }
                     ]
@@ -6572,7 +6574,7 @@
                     "items": [
                       {
                         "preLabel": "(iv) Total area (ha) covered by management plan <u><i>invoiced</i></u> for this reporting period",
-                        "source": "totalAreaDiseaseManagementInvoicedFollowup",
+                        "source": "totalAreaPlansDevelopedInvoiced",
                         "type": "number",
                         "displayOptions": {
                           "removeTrailingZeros": false
@@ -6589,7 +6591,7 @@
             "items": [
               {
                 "preLabel": "If the total invoiced is different to the total completed, please provide the reason",
-                "source": "totalInvoicedDiseaseMismatched",
+                "source": "totalInvoicedPlansDevelopedMismatched",
                 "type": "textarea",
                 "rows": 4,
                 "placeholder": ""
@@ -21611,6 +21613,7 @@
           {
             "dataType": "number",
             "name": "numberApprovalsObtained",
+            "description": "This field is not editable as it is auto populated from inputted data in the below section",
             "validate": "min[0]",
             "decimalPlaces": 0,
             "defaultValue": 1,
@@ -21621,6 +21624,7 @@
           {
             "dataType": "number",
             "name": "numberApprovalsObtainedInvoiced",
+            "description": "Manually enter if values have decimal points e.g. 0.350 or 2.545",
             "defaultValue": "",
             "validate": [
               {
@@ -28255,6 +28259,7 @@
           {
             "dataType": "number",
             "name": "noDaysConductingResearchAndDevelopment",
+            "description": "This field is not editable as it is auto populated from inputted data in the below section",
             "validate": "min[0]",
             "decimalPlaces": 0,
             "defaultValue": 1,