commit updates #3468

Author: salomon-j

forms/nht/grantsAndOthersProgressReport.json

@@ -8777,7 +8777,7 @@
                 "name": "rowCount",
                 "decimalPlaces": 0,
                 "computed": {
-                  "expression": "sum(agreementsTable, \"numberOfAgreements\")"
+                  "expression": "sum(agreementsTable, \"agreementType ? 1 : 0\")"
                 }
               }
             ],
@@ -9078,33 +9078,28 @@
                           }
                         ]
                       },
-                      {
-                        "width": "10%",
-                        "source": "numberOfAgreements",
-                        "type": "number",
-                        "title": "Number of agreements established"
-                      },
                       {
                         "width": "10%",
                         "source": "yearsOfTheAgreement",
                         "type": "number",
                         "title": "Length (years of the agreement)"
                       },
                       {
-                        "width": "25%",
+                        "width": "30%",
                         "source": "agreementPurpose",
                         "title": "Purpose of agreement",
                         "type": "textarea"
                       },
                       {
-                        "width": "25%",
+                        "width": "30%",
                         "source": "agreementMadeWith",
                         "title": "Who the agreement was made with?",
                         "type": "textarea"
                       }
                     ],
                     "userAddedRows": true,
                     "source": "agreementsTable",
+                    "title": "<b>Please report on each agreement in a separate row using the ‘+Add a row’ button</b>",
                     "type": "table"
                   }
                 ]

forms/nht/procurementsOutputReport.json

@@ -10208,17 +10208,6 @@
                     ],
                     "validate": "required,maxSize[300]"
                   },
-                  {
-                    "dataType": "number",
-                    "name": "numberOfAgreements",
-                    "validate": "required,min[0]"
-                  },
-                  {
-                    "dataType": "number",
-                    "name": "numberOfDaysMaintainingAgreements",
-                    "description": "Number of days should be calculated as number of days by number of people (eg. 4.5 days by 3 people is 13.5 days).",
-                    "validate": "required,min[0]"
-                  },
                   {
                     "dataType": "number",
                     "name": "yearsOfTheAgreement",
@@ -10243,7 +10232,7 @@
                 "name": "rowCount",
                 "decimalPlaces": 0,
                 "computed": {
-                  "expression": "sum(agreementsTable, \"numberOfAgreements\")"
+                  "expression": "sum(agreementsTable, \"agreementType ? 1 : 0\")"
                 }
               }
             ],
@@ -10623,33 +10612,28 @@
                           }
                         ]
                       },
-                      {
-                        "width": "10%",
-                        "source": "numberOfAgreements",
-                        "type": "number",
-                        "title": "Number of agreements established"
-                      },
                       {
                         "width": "10%",
                         "source": "yearsOfTheAgreement",
                         "type": "number",
                         "title": "Length (years of the agreement)"
                       },
                       {
-                        "width": "25%",
+                        "width": "30%",
                         "source": "agreementPurpose",
                         "title": "Purpose of agreement",
                         "type": "textarea"
                       },
                       {
-                        "width": "25%",
+                        "width": "30%",
                         "source": "agreementMadeWith",
                         "title": "Who the agreement was made with?",
                         "type": "textarea"
                       }
                     ],
                     "userAddedRows": true,
                     "source": "agreementsTable",
+                    "title": "<b>Please report on each agreement in a separate row using the ‘+Add a row’ button</b>",
                     "type": "table"
                   }
                 ]