request to remove invoiced fields

Author: salomon-j

forms/nht/grantsAndOthersProgressReport.json

@@ -5423,55 +5423,6 @@
                   }
                 ]
               },
-
-              {
-                "dataType": "number",
-                "name": "areaInvoicedHa",
-                "units": "ha",
-                "decimalPlaces": 3,
-                "validate": [
-                  {
-                    "rule": "required"
-                  },
-                  {
-                    "rule": "min[0]"
-                  },
-                  {
-                    "param": {
-                      "expression": "areaTreatedHa",
-                      "type": "computed"
-                    },
-                    "rule": "max"
-                  }
-                ]
-              },
-              {
-                "dataType": "text",
-                "name": "invoicedNotActualReason",
-                "behaviour": [
-                  {
-                    "condition": "roundTo(areaTreatedHa, 2) != roundTo(areaInvoicedHa, 2)",
-                    "type": "visible"
-                  }
-                ],
-                "constraints": [
-                  "Work was undertaken over a greater area than will be invoiced for",
-                  "Other"
-                ],
-                "validate": "required"
-              },
-              {
-                "dataType": "text",
-                "name": "invoicedNotActualComments",
-                "behaviour": [
-                  {
-                    "condition": "\"Other\" == invoicedNotActualReason",
-                    "type": "visible"
-                  }
-                ],
-                "validate": "required,maxSize[300]"
-              },
-
               {
                 "columns": [
                   {
@@ -5810,46 +5761,6 @@
                         ]
                       }
                     ]
-                  },
-                  {
-                    "type": "col",
-                    "css": "span3 col-border-right",
-                    "items": [
-                      {
-                        "type": "row",
-                        "items": [
-                          {
-                            "preLabel": "Invoiced area (ha) covered by the plan/s",
-                            "source": "areaInvoicedHa",
-                            "type": "number",
-                            "displayOptions": {
-                              "displayUnits": true
-                            }
-                          }
-                        ]
-                      },
-                      {
-                        "type": "row",
-                        "items": [
-                          {
-                            "preLabel": "Reason for invoiced amount being different to actual amount",
-                            "source": "invoicedNotActualReason",
-                            "type": "selectOne"
-                          }
-                        ]
-                      },
-                      {
-                        "type": "row",
-                        "items": [
-                          {
-                            "placeholder": "Please enter the reason/s the mapping didn't align with the invoiced amount",
-                            "source": "invoicedNotActualComments",
-                            "type": "textarea",
-                            "rows": 5
-                          }
-                        ]
-                      }
-                    ]
                   }
                 ]
               },
@@ -27209,18 +27120,6 @@
             ],
             "defaultValue": ""
           },
-          {
-            "dataType": "text",
-            "name": "totalInvoicedResearchAndDevelopmentMismatched",
-            "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": "+noDaysConductingResearchAndDevelopmentInvoiced < +noDaysConductingResearchAndDevelopment or +noHoursConductingResearchAndDevelopmentInvoiced < noHoursConductingResearchAndDevelopment",
-                "type": "enable"
-              }
-            ]
-          },
           {
             "dataType": "text",
             "name": "comments",
@@ -27342,16 +27241,6 @@
                         "type": "number"
                       }
                     ]
-                  },
-                  {
-                    "type": "row",
-                    "items": [
-                      {
-                        "preLabel": "(ii) Total number of days conducting research and/or development <u><i>invoiced</i></u> for this reporting period",
-                        "source": "noDaysConductingResearchAndDevelopmentInvoiced",
-                        "type": "number"
-                      }
-                    ]
                   }
                 ]
               },
@@ -27363,38 +27252,16 @@
                     "type": "row",
                     "items": [
                       {
-                        "preLabel": "(iii) Total number of hours conducting research and/or development for this reporting period",
+                        "preLabel": "(ii) Total number of hours conducting research and/or development for this reporting period",
                         "source": "noHoursConductingResearchAndDevelopment",
                         "type": "number"
                       }
                     ]
-                  },
-                  {
-                    "type": "row",
-                    "items": [
-                      {
-                        "preLabel": "(iv) Total number of hours conducting research and/or development <u><i>invoiced</i></u> for this reporting period",
-                        "source": "noHoursConductingResearchAndDevelopmentInvoiced",
-                        "type": "number"
-                      }
-                    ]
                   }
                 ]
               }
             ]
           },
-          {
-            "type": "row",
-            "items": [
-              {
-                "preLabel": "If the total invoiced is different to the total completed, please provide the reason",
-                "source": "totalInvoicedResearchAndDevelopmentMismatched",
-                "type": "textarea",
-                "rows": 4,
-                "placeholder": ""
-              }
-            ]
-          },
           {
             "addRowText": "Add a new research/development",
             "userAddedRows": true,