Skip to content

Commit 2e3f9fc

Browse files
chrisalachrisala
authored
Merge pull request #3179 from AtlasOfLivingAustralia/dev
MERIT 3.3. release branch
2 parents 3c8ec0e + d463766 commit 2e3f9fc

20 files changed

+66336
-456
lines changed

‎forms/nht/bushBlitzProgressReport.json

+51-132
Original file line numberDiff line numberDiff line change
@@ -116,23 +116,6 @@
116116
"No"
117117
]
118118
},
119-
{
120-
"dataType": "list",
121-
"description": "",
122-
"name": "goodNewsStories",
123-
"columns": [
124-
{
125-
"dataType": "text",
126-
"description": "",
127-
"name": "storyDetails",
128-
"validate": "required,maxSize[1250]"
129-
},
130-
{
131-
"dataType": "image",
132-
"name": "photo"
133-
}
134-
]
135-
},
136119
{
137120
"dataType": "text",
138121
"description": "",
@@ -181,7 +164,7 @@
181164
"items": [
182165
{
183166
"source": "projectContactDetailsChanged",
184-
"preLabel": "Has there been a change to key project contacts or their details?",
167+
"preLabel": "Has there been a change to key project contacts or their details and/or to your organisation’s details?",
185168
"type": "selectOne",
186169
"helpText": "(e.g. Name, position, role, email, telephone or address of key contacts)"
187170
}
@@ -308,7 +291,7 @@
308291
{
309292
"items": [
310293
{
311-
"source": "<h4>2. Good News Stories</h4>",
294+
"source": "<h4>2. Monitoring, Evaluation and Project Learnings</h3>",
312295
"type": "literal"
313296
}
314297
],
@@ -317,54 +300,7 @@
317300
{
318301
"items": [
319302
{
320-
"source": "2.1 <b>Please provide good news stories that highlight what the project is doing/achieving.</b> This information is intended for potential use by the Department in publicly promoting the program. Photos may be attached to this report via attachment to email however please ensure permissions of persons in the photos are obtained prior to the photos being attached and used for promotional purposes.",
321-
"type": "literal"
322-
}
323-
],
324-
"type": "row"
325-
},
326-
{
327-
"columns": [
328-
{
329-
"source": "",
330-
"type": "literal",
331-
"width": "5%",
332-
"preLabel": {
333-
"computed": "\\'No. \\' || (index + 1)"
334-
},
335-
"title": "Story No."
336-
},
337-
{
338-
"source": "storyDetails",
339-
"type": "textarea",
340-
"rows": 4,
341-
"title": "Good News Story Details",
342-
"width": "50%"
343-
},
344-
{
345-
"type": "image",
346-
"source": "photo",
347-
"title": "",
348-
"width": "45%"
349-
}
350-
],
351-
"userAddedRows": true,
352-
"source": "goodNewsStories",
353-
"type": "table"
354-
},
355-
{
356-
"items": [
357-
{
358-
"source": "<h4>3. Monitoring, Evaluation and Project Learnings</h3>",
359-
"type": "literal"
360-
}
361-
],
362-
"type": "row"
363-
},
364-
{
365-
"items": [
366-
{
367-
"preLabel": "3.1 Provide a summary of any monitoring or evaluation activities undertaken this period, and of any project learnings. Comment on key findings and any changes you have made in response to these (where required)",
303+
"preLabel": "2.1 Provide a summary of any monitoring or evaluation activities undertaken this period, and of any project learnings. Comment on key findings and any changes you have made in response to these (where required)",
368304
"source": "projectMonitoringAndLearnings",
369305
"type": "textarea",
370306
"rows": 5
@@ -394,7 +330,7 @@
394330
{
395331
"items": [
396332
{
397-
"source": "<h4>4. Activity Reporting</h4></br><b>Only selected services in the MERI Plan is auto-populated and viewed in the Progress Report/s.<br>Reported data from each of the Progress Report/s is aggregated into the Final Report.</b>",
333+
"source": "<h4>3. Activity Reporting</h4></br><b>Only selected services in the MERI Plan are auto-populated and viewed in the Progress Report/s.<br>Reported data from each of the Progress Report/s is aggregated into the Final Report.</b>",
398334
"type": "literal"
399335
}
400336
],
@@ -638,7 +574,8 @@
638574
"Conferences / seminars",
639575
"One-on-one technical advice interactions",
640576
"On-ground trials / demonstrations",
641-
"On-ground works"
577+
"On-ground works",
578+
"Scientific expedition"
642579
],
643580
"validate": "required"
644581
},
@@ -671,14 +608,16 @@
671608
"dataType": "stringList",
672609
"name": "industryType",
673610
"constraints": [
611+
"Academic/Research",
612+
"Aquaculture",
674613
"Cropping",
675614
"Dairy",
676615
"Dryland agriculture",
677-
"Horticulture",
678-
"Grazing",
616+
"Environmental",
679617
"Fisheries",
680-
"Aquaculture",
681-
"Environmental"
618+
"Grazing",
619+
"Horticulture",
620+
"Not applicable"
682621
],
683622
"validate": "required"
684623
},
@@ -12628,7 +12567,7 @@
1262812567
"id": null,
1262912568
"collapsedByDefault": false,
1263012569
"modelName": null,
12631-
"name": "",
12570+
"name": "Project Income And Expenditure",
1263212571
"optional": false,
1263312572
"optionalQuestionText": null,
1263412573
"template": {
@@ -12651,18 +12590,6 @@
1265112590
"No"
1265212591
]
1265312592
},
12654-
{
12655-
"dataType": "text",
12656-
"description": "",
12657-
"name": "reasonOfOverBudget",
12658-
"behaviour": [
12659-
{
12660-
"condition": "isExpenditureWithinBudget == \"No\" or ifBudgetBeenReceived == \"No\"",
12661-
"type": "enable"
12662-
}
12663-
],
12664-
"validate": "required,maxSize[1000]"
12665-
},
1266612593
{
1266712594
"dataType": "list",
1266812595
"description": "",
@@ -12719,7 +12646,7 @@
1271912646
{
1272012647
"items": [
1272112648
{
12722-
"source": "<h4>5. Project Income And Expenditure</h4>",
12649+
"source": "<h4>4. Project Income And Expenditure</h4>",
1272312650
"type": "literal"
1272412651
}
1272512652
],
@@ -12729,7 +12656,7 @@
1272912656
"items": [
1273012657
{
1273112658
"source": "isExpenditureWithinBudget",
12732-
"preLabel": "5.1 Is the project's expenditure proceeding in accordance with the budget, the expected rate of expenditure and within the total project budget?",
12659+
"preLabel": "4.1 Is the project's expenditure proceeding in accordance with the budget, the expected rate of expenditure and within the total project budget?",
1273312660
"type": "selectOne"
1273412661
}
1273512662
],
@@ -12739,67 +12666,59 @@
1273912666
"items": [
1274012667
{
1274112668
"source": "ifBudgetBeenReceived",
12742-
"preLabel": "5.2 If your project budget includes 'Recipient' or 'Other' cash contributions, have they been received and / or been contracted to be received?",
12669+
"preLabel": "4.2 If your project budget includes 'Recipient' or 'Other' cash contributions, have they been received and / or been contracted to be received?",
1274312670
"type": "selectOne"
1274412671
}
1274512672
],
1274612673
"type": "row"
1274712674
},
1274812675
{
12749-
"items": [
12676+
"type": "row",
12677+
"behaviour": [
1275012678
{
12751-
"preLabel": "5.3 If you answered 'No' to question 5.1 or 5.2, please explain here: a) the nature of the issues; b) how you are managing (or proposing to manage) the issues, and c) implications for the project.",
12752-
"source": "reasonOfOverBudget",
12753-
"type": "textarea",
12754-
"rows": 3
12679+
"condition": "isExpenditureWithinBudget == \"No\" or ifBudgetBeenReceived == \"No\"",
12680+
"type": "if_expression"
1275512681
}
1275612682
],
12757-
"type": "row"
12758-
},
12759-
{
1276012683
"items": [
1276112684
{
12762-
"source": "<b><i>Only complete if applicable. Note - cash contributions are expected to be provided in line with the MoU, otherwise it constitutes a variation.</b></i>",
12763-
"type": "literal"
12764-
}
12765-
],
12766-
"type": "row"
12767-
},
12768-
{
12769-
"columns": [
12770-
{
12771-
"source": "",
12772-
"type": "literal",
12773-
"preLabel": {
12774-
"computed": "\\'No. \\' || (index + 1)"
12775-
},
12776-
"title": "Issue No."
12777-
},
12778-
{
12779-
"source": "budgetIssueNature",
12780-
"type": "textarea",
12781-
"title": "Nature of the budget issue"
12782-
},
12783-
{
12784-
"source": "howTheIssueBeingManaged",
12785-
"type": "textarea",
12786-
"title": "How you are managing, or proposing to manage, the issue?"
12787-
},
12788-
{
12789-
"source": "projectImplications",
12790-
"type": "textarea",
12791-
"title": "Implications for the project"
12685+
"columns": [
12686+
{
12687+
"source": "",
12688+
"type": "literal",
12689+
"preLabel": {
12690+
"computed": "\\'No. \\' || (index + 1)"
12691+
},
12692+
"title": "Issue No."
12693+
},
12694+
{
12695+
"source": "budgetIssueNature",
12696+
"type": "textarea",
12697+
"title": "Nature of the budget issue"
12698+
},
12699+
{
12700+
"source": "howTheIssueBeingManaged",
12701+
"type": "textarea",
12702+
"title": "How you are managing, or proposing to manage, the issue?"
12703+
},
12704+
{
12705+
"source": "projectImplications",
12706+
"type": "textarea",
12707+
"title": "Implications for the project"
12708+
}
12709+
],
12710+
"userAddedRows": true,
12711+
"source": "budgetIssue",
12712+
"type": "table",
12713+
"title": "<b>4.3 If you answered 'No' to question 4.1 or 4.2, please explain here: a) the nature of the issues; b) how you are managing (or proposing to manage) the issues, and c) implications for the project.</b><br>Only complete if applicable. Note - cash contributions are expected to be provided in line with the MoU, otherwise it constitutes a variation."
1279212714
}
12793-
],
12794-
"userAddedRows": true,
12795-
"source": "budgetIssue",
12796-
"type": "table"
12715+
]
1279712716
},
1279812717
{
1279912718
"items": [
1280012719
{
1280112720
"source": "additionalComments",
12802-
"preLabel": "5.4 If you have additional comments on the project's income, expenditure or budget, please provide them here.",
12721+
"preLabel": "If you have additional comments on the project's income, expenditure or budget, please provide them here.",
1280312722
"type": "textarea"
1280412723
}
1280512724
],

0 commit comments

Comments
 (0)