diff --git a/forms/nht/procurementsOutputReport.json b/forms/nht/procurementsOutputReport.json
index 199b7e69e..e88998897 100644
--- a/forms/nht/procurementsOutputReport.json
+++ b/forms/nht/procurementsOutputReport.json
@@ -5992,7 +5992,6 @@
"name": "NHT - Debris removal",
"description": null
},
-
{
"collapsedByDefault": false,
"template": {
@@ -6881,7 +6880,6 @@
"name": "NHT - Management plan development",
"description": null
},
-
{
"collapsedByDefault": false,
"template": {
@@ -24447,6 +24445,937 @@
"name": "NHT - Remediating riparian and aquatic areas",
"description": null
},
+
+ {
+ "collapsedByDefault": false,
+ "template": {
+ "dataModel": [
+ {
+ "allowRowDelete": "false",
+ "columns": [
+ {
+ "dataType": "text",
+ "name": "participationIndividualsOrGroups",
+ "description": "Once Individuals or groups is selected, the related number field in the next two columns will become editable to report.",
+ "constraints": [
+ "Individuals",
+ "Groups"
+ ],
+ "validate": "required"
+ },
+ {
+ "dataType": "number",
+ "name": "participationIndividualNumber",
+ "defaultValue": 0,
+ "behaviour": [
+ {
+ "condition": "participationIndividualsOrGroups == \"Individuals\"",
+ "type": "enable"
+ }
+ ],
+ "validate": "required,min[0]"
+ },
+ {
+ "dataType": "text",
+ "name": "participationGroupNumber",
+ "behaviour": [
+ {
+ "condition": "participationIndividualsOrGroups == \"Groups\"",
+ "type": "enable"
+ }
+ ],
+ "constraints": [
+ "0",
+ "1-10",
+ "11-20",
+ "21-30",
+ "31-40",
+ "41-50"
+ ]
+ },
+ {
+ "dataType": "number",
+ "name": "firstNationIndividualNumber",
+ "defaultValue": 0,
+ "behaviour": [
+ {
+ "condition": "participationIndividualsOrGroups == \"Individuals\"",
+ "type": "enable"
+ }
+ ],
+ "validate": [
+ {
+ "rule": "required"
+ },
+ {
+ "rule": "min[0]"
+ },
+ {
+ "param": {
+ "expression": "participationIndividualNumber",
+ "type": "computed"
+ },
+ "rule": "max"
+ }
+ ]
+ },
+ {
+ "dataType": "text",
+ "name": "firstNationGroupNumber",
+ "behaviour": [
+ {
+ "condition": "participationIndividualsOrGroups == \"Groups\"",
+ "type": "enable"
+ }
+ ],
+ "constraints": [
+ "0",
+ "1-10",
+ "11-20",
+ "21-30",
+ "31-40",
+ "41-50"
+ ],
+ "validate": [
+ {
+ "rule": "required"
+ },
+ {
+ "param": {
+ "expression": "participationGroupNumber",
+ "type": "computed"
+ },
+ "rule": "max",
+ "message": "The number of first nation participants cannot be greater than the total number of participants"
+ }
+ ]
+ },
+ {
+ "dataType": "text",
+ "name": "participationDetails",
+ "validate": "required, maxSize[3000]"
+ }
+ ],
+ "dataType": "list",
+ "name": "participationInformationTableDmp"
+ },
+ {
+ "columns": [
+ {
+ "name": "relatedOutcomes",
+ "dataType": "text",
+ "description": "Select the outcome/s as defined in your MERI plan that this service was delivered to achieve.",
+ "validate": "required",
+ "constraints": {
+ "textProperty": "label",
+ "valueProperty": "value",
+ "type": "pre-populated",
+ "config": {
+ "source": {
+ "context-path": "outcomes"
+ }
+ }
+ }
+ },
+ {
+ "name": "investmentPriorities2",
+ "dataType": "text",
+ "description": "",
+ "validate": "required",
+ "constraints": {
+ "textProperty": "label",
+ "valueProperty": "value",
+ "type": "pre-populated",
+ "config": {
+ "source": {
+ "context-path": "owner.investmentPriorities"
+ }
+ }
+ }
+ },
+ {
+ "dataType": "text",
+ "name": "otherInvestmentPriority",
+ "behaviour": [
+ {
+ "type": "enable",
+ "condition": "\"Other\" in investmentPriorities2"
+ }
+ ]
+ },
+ {
+ "dataType": "text",
+ "name": "invoicingThisActivity",
+ "constraints": [
+ "Yes",
+ "No"
+ ],
+ "validate": "required"
+ },
+ {
+ "dataType": "feature",
+ "name": "sitesResearchAndDevelopment",
+ "description": "Mapping field to be done and Area (ha)/length (km) field be auto-calculated from mapping."
+ },
+ {
+ "computed": {
+ "expression": "$geom.areaHa(sitesResearchAndDevelopment)"
+ },
+ "dataType": "number",
+ "name": "calculatedAreaTreatedHa",
+ "units": "ha",
+ "decimalPlaces": 3
+ },
+ {
+ "computed": {
+ "expression": "$geom.lengthKm(sitesResearchAndDevelopment)"
+ },
+ "dataType": "number",
+ "name": "calculatedLengthTreatedKm",
+ "units": "km",
+ "decimalPlaces": 3,
+ "behaviour": [
+ {
+ "condition": "lengthTreatedKm > 0",
+ "type": "conditional_validation",
+ "value": {
+ "message": "The managed length must be mapped",
+ "validate": "required,min[0.0001]"
+ }
+ }
+ ]
+ },
+ {
+ "defaultValue": {
+ "type": "computed",
+ "expression": "calculatedAreaTreatedHa"
+ },
+ "dataType": "number",
+ "name": "areaTreatedHa",
+ "description": "Manually enter correct figure for this reporting period if different to mapped value.",
+ "units": "ha",
+ "decimalPlaces": 3,
+ "validate": "required,min[0]"
+ },
+ {
+ "dataType": "text",
+ "name": "mappingNotAlignedReason",
+ "constraints": [
+ "Mapped area simplifies more complex area/s where work was undertaken during this period",
+ "Other"
+ ],
+ "validate": "required",
+ "behaviour": [
+ {
+ "condition": "not (within(areaTreatedHa, calculatedAreaTreatedHa, 0.1) and within(lengthTreatedKm, calculatedLengthTreatedKm, 0.1))",
+ "type": "if"
+ }
+ ]
+ },
+ {
+ "dataType": "text",
+ "name": "mappingNotAlignedComments",
+ "validate": "required,maxSize[100]",
+ "behaviour": [
+ {
+ "type": "visible",
+ "condition": "\"Other\" == mappingNotAlignedReason"
+ }
+ ]
+ },
+ {
+ "dataType": "document",
+ "name": "extraMappingDetails",
+ "validate": "required",
+ "description": "Please fill in the Mapped/Actual/Invoice fields before attaching a document here. If those fields match this field will be void.
If any of these fields differ please attach your organisation's detailed map for the area, covered by this project service - during reporting period (include the scale measure for each map).",
+ "behaviour": [
+ {
+ "condition": "not (within(areaTreatedHa, calculatedAreaTreatedHa, 0.1) and within(lengthTreatedKm, calculatedLengthTreatedKm, 0.1))",
+ "type": "if"
+ }
+ ]
+ },
+ {
+ "defaultValue": {
+ "type": "computed",
+ "expression": "calculatedLengthTreatedKm"
+ },
+ "dataType": "number",
+ "name": "lengthTreatedKm",
+ "units": "km",
+ "decimalPlaces": 3
+ },
+ {
+ "dataType": "text",
+ "name": "researchOrDevelopment",
+ "constraints": [
+ "Research",
+ "Development",
+ "Both"
+ ],
+ "validate": "required"
+ },
+ {
+ "dataType": "number",
+ "name": "numberOfDaysConducted",
+ "validate": "required,min[0]"
+ },
+ {
+ "dataType": "text",
+ "name": "newOrContinuingResearch",
+ "constraints": [
+ "New",
+ "Continuing research ",
+ "Development",
+ "Continuing Research and/or Development"
+ ],
+ "validate": "required"
+ },
+ {
+ "columns": [
+ {
+ "dataType": "date",
+ "name": "resAndDevStartDate",
+ "description": "Specific the dates these events were held on.",
+ "validate": "required"
+ },
+ {
+ "dataType": "date",
+ "name": "resAndDevFinishDate",
+ "description": "Specific the dates these events were held on.",
+ "validate": [
+ {
+ "rule": "required"
+ },
+ {
+ "rule": "future",
+ "param": {
+ "expression": "formatDateForValidation(resAndDevStartDate)",
+ "type": "computed"
+ }
+ }
+ ]
+ },
+ {
+ "dataType": "text",
+ "name": "anzsrcDivision",
+ "constraints": [
+ "tbd",
+ "other"
+ ],
+ "validate": "required"
+ },
+ {
+ "dataType": "text",
+ "name": "anzsrcGroup",
+ "constraints": [
+ "tbd",
+ "other"
+ ],
+ "validate": "required"
+ },
+ {
+ "dataType": "text",
+ "name": "anzsrcFields",
+ "constraints": [
+ "tbd",
+ "other"
+ ],
+ "validate": "required"
+ },
+ {
+ "dataType": "text",
+ "name": "willProjectContinue",
+ "constraints": [
+ "New",
+ "Revised"
+ ],
+ "validate": "required"
+ },
+ {
+ "dataType": "text",
+ "name": "speciesSiteCovered",
+ "description": "",
+ "validate": "required,maxSize[300]"
+ }
+ ],
+ "dataType": "list",
+ "name": "researchAndDevelopmentDetails"
+ },
+ {
+ "dataType": "text",
+ "name": "conclusionsAndFutureDirections",
+ "validate": "maxSize[400]"
+ }
+ ],
+ "dataType": "list",
+ "name": "researchAndDevelopmentByOutcome"
+ },
+ {
+ "dataType": "number",
+ "name": "totalNumberOfResearchAndDevelopment",
+ "validate": "min[0]",
+ "decimalPlaces": 0,
+ "defaultValue": 1,
+ "computed": {
+ "expression": "sum(researchAndDevelopmentByOutcome, \"numberOfDaysConducted\")"
+ }
+ },
+ {
+ "dataType": "number",
+ "decimalPlaces": 3,
+ "name": "totalNumberOfResearchAndDevelopmentInvoiced",
+ "description": "Manually enter if values have decimal points e.g. 0.350 or 2.545",
+ "validate": [
+ {
+ "rule": "required"
+ },
+ {
+ "rule": "min[0]"
+ },
+ {
+ "param": {
+ "expression": "totalNumberOfResearchAndDevelopment",
+ "type": "computed",
+ "decimalPlaces": 3
+ },
+ "rule": "max"
+ }
+ ],
+ "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": "+totalNumberOfResearchAndDevelopmentInvoiced < +totalNumberOfResearchAndDevelopment",
+ "type": "enable"
+ }
+ ]
+ },
+ {
+ "dataType": "text",
+ "name": "comments",
+ "validate": "maxSize[1500]"
+ },
+ {
+ "dataType": "image",
+ "name": "photographicEvidence"
+ },
+ {
+ "dataType": "boolean",
+ "name": "dataUploaded",
+ "description": "- Tick box to confirm data has been uploaded
- URL Link (mandatory if below is ticked) in available evidence
"
+ },
+ {
+ "name": "projectAssuranceDetails",
+ "dataType": "text",
+ "validate": "required,maxSize[5000]"
+ },
+ {
+ "dataType": "list",
+ "name": "assuranceDocuments",
+ "columns": [
+ {
+ "dataType": "document",
+ "name": "attachments",
+ "description": "Please attach any Evidence of Service Delivery here."
+ }
+ ]
+ }
+ ],
+ "modelName": "NHT - Research and development",
+ "title": "Research and/or Development",
+ "viewModel": [
+ {
+ "type": "row",
+ "items": [
+ {
+ "type": "literal",
+ "source": "Participation information
"
+ }
+ ]
+ },
+ {
+ "disableTableUpload": true,
+ "columns": [
+ {
+ "width": "10%",
+ "source": "participationIndividualsOrGroups",
+ "title": "Are individuals or groups delivering this service?",
+ "type": "selectOne"
+ },
+ {
+ "width": "20%",
+ "type": "col",
+ "title": "Total number of people participating in the delivery of this service
(including First Nations people, paid employees, unpaid employees, and volunteers)*",
+ "helpText": "Please record either the total number of individuals or the number of individuals in the group that delivered this service. If you have a mix of Individuals and groups, you should report them separately by adding a row.",
+ "items": [
+ {
+ "source": "participationIndividualNumber",
+ "type": "number"
+ },
+ {
+ "source": "participationGroupNumber",
+ "type": "selectOne"
+ }
+ ]
+ },
+ {
+ "type": "col",
+ "width": "20%",
+ "title": "Total number of First Nations people participating in the delivery of this service, including paid employees, unpaid employees and volunteers*",
+ "helpText": "Please record either the total number of individuals or the number of individuals in the group that delivered this service. If you have a mix of Individuals and groups, you should report them separately by adding a row.",
+ "items": [
+ {
+ "source": "firstNationIndividualNumber",
+ "type": "number"
+ },
+ {
+ "source": "firstNationGroupNumber",
+ "type": "selectOne"
+ }
+ ]
+ },
+ {
+ "width": "20%",
+ "source": "participationDetails",
+ "rows": 4,
+ "title": "If no First Nations people participated in the delivery of this service,
what are the reasons? If there was participation, please provide details.",
+ "helpText": "If there were no First Nations people participating in the delivery of this service, please explain the reasons. If there were First Nations people involved, please outline how they were involved.",
+ "type": "textarea"
+ }
+ ],
+ "source": "participationInformationTableDmp",
+ "type": "table"
+ },
+ {
+ "type": "row",
+ "items": [
+ {
+ "type": "literal",
+ "source": "Totals Summary
"
+ }
+ ]
+ },
+ {
+ "type": "row",
+ "items": [
+ {
+ "type": "col",
+ "css": "span4 col-border-right",
+ "items": [
+ {
+ "type": "row",
+ "items": [
+ {
+ "preLabel": "(i) Total number of days conducting research and development for this reporting period",
+ "source": "totalNumberOfResearchAndDevelopment",
+ "type": "number"
+ }
+ ]
+ },
+ {
+ "type": "row",
+ "items": [
+ {
+ "preLabel": "(ii) Total number of days conducting research and development invoiced for this reporting period",
+ "source": "totalNumberOfResearchAndDevelopmentInvoiced",
+ "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 outcome",
+ "userAddedRows": true,
+ "source": "researchAndDevelopmentByOutcome",
+ "type": "repeat",
+ "items": [
+ {
+ "type": "row",
+ "items": [
+ {
+ "css": "span3",
+ "type": "col",
+ "items": [
+ {
+ "type": "row",
+ "items": [
+ {
+ "source": "relatedOutcomes",
+ "type": "selectOne",
+ "preLabel": "Which outcome statement/s does this activity relate to?"
+ }
+ ]
+ }
+ ]
+ },
+ {
+ "type": "col",
+ "css": "span3 col-border-right",
+ "items": [
+ {
+ "type": "row",
+ "items": [
+ {
+ "source": "investmentPriorities2",
+ "preLabel": "Which investment priority does this activity relate to?",
+ "type": "select2Many"
+ }
+ ]
+ }
+ ]
+ },
+ {
+ "css": "span3",
+ "type": "col",
+ "items": [
+ {
+ "type": "row",
+ "items": [
+ {
+ "source": "invoicingThisActivity",
+ "preLabel": "Are you invoicing for this activity in this reporting period?",
+ "type": "selectOne"
+ }
+ ]
+ }
+ ]
+ }
+ ]
+ },
+ {
+ "type": "row",
+ "css": "border-bottom",
+ "items": [
+ {
+ "css": "span3",
+ "type": "col",
+ "items": [
+ {
+ "type": "row",
+ "items": [
+ {
+ "source": "researchOrDevelopment",
+ "type": "selectOne",
+ "preLabel": "Research/Development/Both"
+ }
+ ]
+ }
+ ]
+ },
+ {
+ "css": "span3",
+ "type": "col",
+ "items": [
+ {
+ "type": "row",
+ "items": [
+ {
+ "source": "numberOfDaysConducted",
+ "type": "number",
+ "preLabel": "Number of days conducting research and development"
+ }
+ ]
+ }
+ ]
+ },
+ {
+ "css": "span3",
+ "type": "col",
+ "items": [
+ {
+ "type": "row",
+ "items": [
+ {
+ "source": "newOrContinuingResearch",
+ "type": "selectOne",
+ "preLabel": "New or Continuing Research and/or Development"
+ }
+ ]
+ }
+ ]
+ }
+ ]
+ },
+ {
+ "type": "row",
+ "items": [
+ {
+ "type": "col",
+ "css": "span3 col-border-right",
+ "items": [
+ {
+ "type": "row",
+ "items": [
+ {
+ "preLabel": "Where research has been undertaken (if applicable)",
+ "source": "sitesResearchAndDevelopment",
+ "type": "feature"
+ }
+ ]
+ },
+ {
+ "type": "row",
+ "items": [
+ {
+ "source": "calculatedAreaTreatedHa",
+ "type": "number",
+ "displayOptions": {
+ "displayUnits": true
+ },
+ "readonly": "readonly"
+ }
+ ]
+ },
+ {
+ "type": "row",
+ "items": [
+ {
+ "source": "calculatedLengthTreatedKm",
+ "type": "number",
+ "displayOptions": {
+ "displayUnits": true
+ },
+ "readonly": "readonly"
+ }
+ ]
+ },
+ {
+ "type": "row",
+ "items": [
+ {
+ "preLabel": "Please attach mapping details",
+ "source": "extraMappingDetails",
+ "type": "document"
+ }
+ ]
+ }
+ ]
+ },
+ {
+ "type": "col",
+ "css": "span3 col-border-right",
+ "items": [
+ {
+ "type": "row",
+ "items": [
+ {
+ "preLabel": "Actual research area (ha) undertaken",
+ "source": "areaTreatedHa",
+ "type": "number",
+ "displayOptions": {
+ "displayUnits": true
+ }
+ }
+ ]
+ },
+ {
+ "type": "row",
+ "items": [
+ {
+ "source": "lengthTreatedKm",
+ "type": "number",
+ "displayOptions": {
+ "displayUnits": true
+ }
+ }
+ ]
+ },
+ {
+ "type": "row",
+ "items": [
+ {
+ "preLabel": "Reason for actual being different to mapped amount",
+ "source": "mappingNotAlignedReason",
+ "type": "selectOne"
+ }
+ ]
+ },
+ {
+ "type": "row",
+ "items": [
+ {
+ "placeholder": "Please enter the reason/s the mapping didn't align with the invoiced amount",
+ "source": "mappingNotAlignedComments",
+ "type": "textarea",
+ "rows": 5
+ }
+ ]
+ }
+ ]
+ }
+ ]
+ },
+ {
+ "columns": [
+ {
+ "width": "10%",
+ "title": "Date research and development started",
+ "source": "resAndDevStartDate",
+ "type": "date"
+ },
+ {
+ "width": "10%",
+ "title": "Date research and development finished",
+ "source": "resAndDevFinishDate",
+ "type": "date"
+ },
+ {
+ "width": "10%",
+ "source": "anzsrcDivision",
+ "title": "ANZSRC Classification – Division",
+ "type": "selectOne"
+ },
+ {
+ "width": "10%",
+ "source": "anzsrcGroup",
+ "title": "ANZSRC Classification – Group",
+ "type": "selectOne"
+ },
+ {
+ "width": "10%",
+ "source": "anzsrcFields",
+ "title": "ANZSRC Classification – Fields",
+ "type": "selectOne"
+ },
+ {
+ "width": "15%",
+ "source": "speciesSiteCovered",
+ "title": "Summary of activities and research outputs delivered in this reporting period",
+ "type": "textarea"
+ },
+ {
+ "width": "15%",
+ "source": "speciesSiteCovered",
+ "title": "Summary of successes or failures",
+ "type": "textarea"
+ },
+ {
+ "width": "15%",
+ "source": "speciesSiteCovered",
+ "title": "Summary of any changes to the research approach resulting from successes/failures",
+ "type": "textarea"
+ },
+ {
+ "width": "5%",
+ "source": "willProjectContinue",
+ "title": "Will this research and development project continue?",
+ "type": "selectOne"
+ }
+ ],
+ "userAddedRows": true,
+ "addRowText": "Add a new disease being managed in this area",
+ "source": "researchAndDevelopmentDetails",
+ "type": "table"
+ },
+ {
+ "type": "row",
+ "items": [
+ {
+ "preLabel": "Conclusions and future directions ",
+ "type": "textarea",
+ "rows": 4,
+ "css": "span8",
+ "source": "conclusionsAndFutureDirections"
+ }
+ ]
+ }
+ ]
+ },
+ {
+ "type": "row",
+ "items": [
+ {
+ "preLabel": "Optionally attach photos",
+ "source": "photographicEvidence",
+ "type": "image"
+ }
+ ]
+ },
+ {
+ "type": "row",
+ "items": [
+ {
+ "preLabel": "Clarification, if needed",
+ "type": "textarea",
+ "rows": 4,
+ "css": "span8",
+ "source": "comments",
+ "placeholder": "Clarification comments include information for your project manager about the service like:\n • any reported items that are not being invoiced (eg, over-achievement) \n • any extraneous circumstances that affected delivery of the service \n"
+ }
+ ]
+ },
+ {
+ "type": "row",
+ "items": [
+ {
+ "type": "literal",
+ "source": "Available Evidence
This field is mandatory for all projects as part of the invoicing process. Please list evidence you have retained for this service and provide information to where the evidence is stored (links/file location data). Refer to the Project Service Evidence Guide and the Project Service Summaries for information on the evidence requirements.*"
+ },
+ {
+ "preLabel": "Data have been uploaded",
+ "source": "dataUploaded",
+ "type": "boolean"
+ }
+ ]
+ },
+ {
+ "type": "row",
+ "items": [
+ {
+ "preLabel": "",
+ "source": "projectAssuranceDetails",
+ "type": "textarea",
+ "rows": 4,
+ "placeholder": "List the documentary evidence you have available for this project service. Include specifically, the document titles and location (e.g. internal IT network pathway, URLs) to assist with locating this material for future audits/assurance purposes."
+ }
+ ]
+ },
+ {
+ "type": "table",
+ "source": "assuranceDocuments",
+ "userAddedRows": true,
+ "disableTableUpload": true,
+ "columns": [
+ {
+ "title": "Attached documents",
+ "source": "attachments",
+ "type": "document"
+ }
+ ]
+ }
+ ]
+ },
+ "modelName": null,
+ "templateName": "nhtReasearchAndDevelopment",
+ "optional": true,
+ "optionalQuestionText": null,
+ "title": null,
+ "collapsibleHeading": null,
+ "name": "NHT - Research and development",
+ "description": null
+ },
+
{
"collapsedByDefault": false,
"template": {