Skip to content

Commit

Permalink
commit change requests #3355
Browse files Browse the repository at this point in the history
  • Loading branch information
@salomon-j
salomon-j committed Nov 6, 2024
1 parent 6be345f commit b144350
Showing 1 changed file with 120 additions and 61 deletions.
181 changes: 120 additions & 61 deletions forms/nht/procurementsOutputReport.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6161,7 +6161,8 @@
{
"dataType": "feature",
"name": "sitesDevelopingManagementPlans",
"description": "Mapping field to be done and Area (ha)/length (km) field be auto-calculated from mapping."
"description": "Mapping field to be done and Area (ha)/length (km) field be auto-calculated from mapping.",
"validate": "required"
},
{
"computed": {
Expand All @@ -6172,25 +6173,6 @@
"units": "ha",
"decimalPlaces": 3
},
{
"computed": {
"expression": "$geom.lengthKm(sitesDevelopingManagementPlans)"
},
"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",
Expand All @@ -6213,7 +6195,7 @@
"validate": "required",
"behaviour": [
{
"condition": "not (within(areaTreatedHa, calculatedAreaTreatedHa, 0.1) and within(lengthTreatedKm, calculatedLengthTreatedKm, 0.1))",
"condition": "not (within(areaTreatedHa, calculatedAreaTreatedHa, 0.1))",
"type": "if"
}
]
Expand All @@ -6236,21 +6218,60 @@
"description": "Please fill in the Mapped/Actual/Invoice fields before attaching a document here. If those fields match this field will be void. <br/>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))",
"condition": "not (within(areaTreatedHa, calculatedAreaTreatedHa, 0.1))",
"type": "if"
}
]
},

{
"defaultValue": {
"type": "computed",
"expression": "calculatedLengthTreatedKm"
},
"dataType": "number",
"name": "lengthTreatedKm",
"units": "km",
"decimalPlaces": 3
"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": [
{
Expand Down Expand Up @@ -6305,7 +6326,7 @@
{
"dataType": "text",
"name": "speciesSiteCovered",
"description": "",
"description": "This free text field allows multiple species and/or TECs to be entered. For Species: Use Scientific names with (common name in brackets), TECs should be written as listed in EPBC. Species or TECs should be separated by commas.",
"validate": "required,maxSize[300]"
}
],
Expand Down Expand Up @@ -6668,19 +6689,6 @@
}
]
},
{
"type": "row",
"items": [
{
"source": "calculatedLengthTreatedKm",
"type": "number",
"displayOptions": {
"displayUnits": true
},
"readonly": "readonly"
}
]
},
{
"type": "row",
"items": [
Expand Down Expand Up @@ -6714,7 +6722,35 @@
"type": "row",
"items": [
{
"source": "lengthTreatedKm",
"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
}
]
}
]
},
{
"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
Expand All @@ -6726,8 +6762,8 @@
"type": "row",
"items": [
{
"preLabel": "Reason for actual being different to mapped amount",
"source": "mappingNotAlignedReason",
"preLabel": "Reason for invoiced amount being different to actual amount",
"source": "invoicedNotActualReason",
"type": "selectOne"
}
]
Expand All @@ -6737,7 +6773,7 @@
"items": [
{
"placeholder": "Please enter the reason/s the mapping didn't align with the invoiced amount",
"source": "mappingNotAlignedComments",
"source": "invoicedNotActualComments",
"type": "textarea",
"rows": 5
}
Expand All @@ -6763,7 +6799,7 @@
},
{
"width": "25%",
"title": "Type of management plan",
"title": "Type of management plan<b style=\"color:red\">*</b>",
"type": "col",
"items": [
{
Expand Down Expand Up @@ -6801,7 +6837,7 @@
}
],
"userAddedRows": true,
"addRowText": "Add a new disease being managed in this area",
"addRowText": "Add a new management plan",
"source": "managementPlansDetails",
"type": "table"
}
Expand Down Expand Up @@ -21532,6 +21568,12 @@
],
"validate": "required,maxSize[100]"
},
{
"dataType": "text",
"name": "approvalPurpose",
"validate": "required,maxSize[200]",
"description": ""
},
{
"dataType": "date",
"name": "approvalValidateDateFrom",
Expand All @@ -21540,7 +21582,18 @@
{
"dataType": "date",
"name": "approvalValidateDateTo",
"validate": "required"
"validate": [
{
"rule": "required"
},
{
"rule": "future",
"param": {
"expression": "formatDateForValidation(approvalValidateDateFrom)",
"type": "computed"
}
}
]
}
],
"dataType": "list",
Expand Down Expand Up @@ -21817,13 +21870,13 @@
{
"columns": [
{
"width": "15%",
"width": "10%",
"source": "approvalGivenDate",
"title": "Date approval given",
"type": "date"
},
{
"width": "15%",
"width": "10%",
"source": "approvalId",
"title": "Approval ID reference",
"type": "text"
Expand All @@ -21836,7 +21889,7 @@
},
{
"width": "20%",
"title": "Type of approval",
"title": "Type of approval<b style=\"color:red\">*</b>",
"type": "col",
"items": [
{
Expand All @@ -21861,13 +21914,19 @@
]
},
{
"width": "15%",
"width": "20%",
"source": "approvalPurpose",
"title": "Purpose of approval",
"type": "textarea"
},
{
"width": "10%",
"source": "approvalValidateDateFrom",
"title": "Date approval validate from",
"type": "date"
},
{
"width": "15%",
"width": "10%",
"source": "approvalValidateDateTo",
"title": "Date approval validate to",
"type": "date"
Expand Down Expand Up @@ -24813,7 +24872,7 @@
},
{
"dataType": "number",
"name": "totalNumberOfResearchAndDevelopment",
"name": "noDaysConductingResearchAndDevelopment",
"validate": "min[0]",
"decimalPlaces": 0,
"defaultValue": 1,
Expand All @@ -24824,7 +24883,7 @@
{
"dataType": "number",
"decimalPlaces": 3,
"name": "totalNumberOfResearchAndDevelopmentInvoiced",
"name": "noDaysConductingResearchAndDevelopmentInvoiced",
"description": "Manually enter if values have decimal points e.g. 0.350 or 2.545",
"validate": [
{
Expand All @@ -24835,7 +24894,7 @@
},
{
"param": {
"expression": "totalNumberOfResearchAndDevelopment",
"expression": "noDaysConductingResearchAndDevelopment",
"type": "computed",
"decimalPlaces": 3
},
Expand All @@ -24851,7 +24910,7 @@
"validate": "maxSize[400],required",
"behaviour": [
{
"condition": "+totalNumberOfResearchAndDevelopmentInvoiced < +totalNumberOfResearchAndDevelopment",
"condition": "+noDaysConductingResearchAndDevelopmentInvoiced < +noDaysConductingResearchAndDevelopment",
"type": "enable"
}
]
Expand Down Expand Up @@ -24973,7 +25032,7 @@
"items": [
{
"preLabel": "(i) Total number of days conducting research and development for this reporting period",
"source": "totalNumberOfResearchAndDevelopment",
"source": "noDaysConductingResearchAndDevelopment",
"type": "number"
}
]
Expand All @@ -24983,7 +25042,7 @@
"items": [
{
"preLabel": "(ii) Total number of days conducting research and development <u><i>invoiced</i></u> for this reporting period",
"source": "totalNumberOfResearchAndDevelopmentInvoiced",
"source": "noDaysConductingResearchAndDevelopmentInvoiced",
"type": "number"
}
]
Expand Down

0 comments on commit b144350

Please sign in to comment.