Skip to content

Commit

Permalink
commit progress #3335
Browse files Browse the repository at this point in the history
  • Loading branch information
@salomon-j
salomon-j committed Dec 17, 2024
1 parent e126ed4 commit 2b7107e
Showing 1 changed file with 190 additions and 11 deletions.
201 changes: 190 additions & 11 deletions forms/nht/procurementsOutputReport.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15880,7 +15880,8 @@
]
},
{
"dataType": "lookupTable",
"dataType": "",

"name": "baselineIndicatorMapping",
"config": {
"source": {
Expand Down Expand Up @@ -24720,7 +24721,7 @@
"description": "Manually enter correct figure for this reporting period if different to mapped value.",
"units": "ha",
"decimalPlaces": 3,
"validate": "required,min[0]"
"validate": "min[0]"
},
{
"dataType": "text",
Expand Down Expand Up @@ -24783,10 +24784,39 @@
],
"validate": "required"
},
{
"dataType": "text",
"name": "daysOrHours",
"description": "Only one of these targets could be invoiced for this reporting period.",
"constraints": [
"Days",
"Hours"
],
"validate": "required"
},
{
"dataType": "number",
"name": "numberOfDaysConducted",
"validate": "required,min[0]"
"description": "Only one of these targets could be invoiced for this reporting period.",
"validate": "required,min[0]",
"behaviour": [
{
"condition": "daysOrHours == \"Days\"",
"type": "enable_and_clear"
}
]
},
{
"dataType": "number",
"name": "numberOfHoursConducted",
"description": "Only one of these targets could be invoiced for this reporting period.",
"validate": "required,min[0]",
"behaviour": [
{
"condition": "daysOrHours == \"Hours\"",
"type": "enable_and_clear"
}
]
},
{
"columns": [
Expand Down Expand Up @@ -24848,7 +24878,6 @@
"name": "anzsrcGroup",
"validate": "required",
"constraints": {
"default": [],
"options": [
{
"condition": "anzsrcDivision == \"AGRICULTURAL, VETERINARY AND FOOD SCIENCES\"",
Expand Down Expand Up @@ -28217,6 +28246,63 @@
"type": "computed"
}
},
{
"dataType": "lookupTable",
"name": "lookupMap",
"config": {
"source": {
"literal": {
"Agricultural biotechnology diagnostics (incl. biosensors)": 300101,
"Agricultural marine biotechnology": 300102,
"Agricultural molecular engineering of nucleic acids and proteins": 300103,
"Genetically modified animals": 300104,
"Genetically modified field crops and pasture": 300105,
"Genetically modified horticulture plants": 300106,
"Genetically modified trees": 300107,
"Livestock cloning": 300108,
"Non-genetically modified uses of biotechnology": 300109,
"Transgenesis": 300110,
"Agricultural biotechnology not elsewhere classified": 300199,
"Agricultural hydrology": 300201,
"Agricultural land management": 300202,
"Agricultural land planning": 300203,
"Agricultural management of nutrients": 300204,
"Agricultural production systems simulation": 300205,
"Agricultural spatial analysis and modelling": 300206,
"Agricultural systems analysis and modelling": 300207,
"Farm management, rural management and agribusiness": 300208,
"Germplasm management": 300209,
"Sustainable agricultural development": 300210,
"Agriculture, land and farm management not elsewhere classified": 300299,
"Animal growth and development": 300301,
"Animal management": 300302,
"Animal nutrition": 300303,
"Animal protection (incl. pests and pathogens)": 300304,
"Animal reproduction and breeding": 300305,
"Animal welfare": 300305
}
}
}
},
{
"dataType": "text",
"name": "selectDropdown",
"description": "",
"constraints": [
"Nil",
"1 - 5",
"6 - 20",
"20 +"
]
},
{
"decimalPlaces": 0,
"computed": {
"expression": "lookupMap.lookupValue(anzsrcFields)"
},
"dataType": "number",
"name": "computedValue"
},
{
"dataType": "text",
"name": "willProjectContinue",
Expand Down Expand Up @@ -28291,14 +28377,48 @@
],
"defaultValue": ""
},
{
"dataType": "number",
"name": "noHoursConductingResearchAndDevelopment",
"description": "This field is not editable as it is auto populated from inputted data in the section below",
"validate": "min[0]",
"decimalPlaces": 0,
"defaultValue": 1,
"computed": {
"expression": "sum(researchAndDevelopmentByOutcome, \"numberOfDaysConducted\")"
}
},
{
"dataType": "number",
"decimalPlaces": 3,
"name": "noHoursConductingResearchAndDevelopmentInvoiced",
"description": "Manually enter if values have decimal points e.g. 0.350 or 2.545",
"validate": [
{
"rule": "required"
},
{
"rule": "min[0]"
},
{
"param": {
"expression": "noHoursConductingResearchAndDevelopment",
"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": "+noDaysConductingResearchAndDevelopmentInvoiced < +noDaysConductingResearchAndDevelopment",
"condition": "+noDaysConductingResearchAndDevelopmentInvoiced < +noDaysConductingResearchAndDevelopment or +noHoursConductingResearchAndDevelopmentInvoiced < noHoursConductingResearchAndDevelopment",
"type": "enable"
}
]
Expand Down Expand Up @@ -28419,11 +28539,21 @@
"type": "row",
"items": [
{
"preLabel": "(i) Total number of days conducting research and development for this reporting period",
"preLabel": "(i) Total number of days conducting research and/or development for this reporting period",
"source": "noDaysConductingResearchAndDevelopment",
"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"
}
]
}
]
},
Expand All @@ -28435,8 +28565,18 @@
"type": "row",
"items": [
{
"preLabel": "(ii) Total number of days conducting research and development <u><i>invoiced</i></u> for this reporting period",
"source": "noDaysConductingResearchAndDevelopmentInvoiced",
"preLabel": "(iii) 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"
}
]
Expand Down Expand Up @@ -28513,6 +28653,22 @@
]
}
]
},
{
"css": "span3",
"type": "col",
"items": [
{
"type": "row",
"items": [
{
"source": "researchOrDevelopment",
"type": "selectOne",
"preLabel": "Research and/or Development"
}
]
}
]
}
]
},
Expand All @@ -28528,9 +28684,9 @@
"type": "row",
"items": [
{
"source": "researchOrDevelopment",
"source": "daysOrHours",
"type": "selectOne",
"preLabel": "Research and/or Development"
"preLabel": "Days or Hours"
}
]
}
Expand All @@ -28546,7 +28702,23 @@
{
"source": "numberOfDaysConducted",
"type": "number",
"preLabel": "Number of days conducting research and development"
"preLabel": "Number of days conducting research and/or development"
}
]
}
]
},
{
"css": "span3",
"type": "col",
"items": [
{
"type": "row",
"items": [
{
"source": "numberOfHoursConducted",
"type": "number",
"preLabel": "Number of hours conducting research and/or development"
}
]
}
Expand Down Expand Up @@ -28698,6 +28870,13 @@
"title": "ANZSRC Classification – Fields",
"type": "selectOne"
},
{
"width": "10%",
"title": "ANZSRC Classification - Code",
"readonly": true,
"source": "computedValue",
"type": "text"
},
{
"width": "15%",
"source": "summaryOfActivities",
Expand Down

0 comments on commit 2b7107e

Please sign in to comment.