From b93cf0315a9276f5a2353f95a3917728da11ab81 Mon Sep 17 00:00:00 2001 From: chrisala Date: Fri, 10 Jan 2025 11:55:55 +1100 Subject: [PATCH 1/5] Fixed functional test for #3408 --- grails-app/views/shared/_reports.gsp | 4 ++-- src/integration-test/groovy/pages/MyProjects.groovy | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/grails-app/views/shared/_reports.gsp b/grails-app/views/shared/_reports.gsp index fd27518e3..258681acb 100644 --- a/grails-app/views/shared/_reports.gsp +++ b/grails-app/views/shared/_reports.gsp @@ -20,8 +20,8 @@ - - + +
diff --git a/src/integration-test/groovy/pages/MyProjects.groovy b/src/integration-test/groovy/pages/MyProjects.groovy index 59fb47d05..cd7743b20 100644 --- a/src/integration-test/groovy/pages/MyProjects.groovy +++ b/src/integration-test/groovy/pages/MyProjects.groovy @@ -17,7 +17,7 @@ class MyProjects extends Page { } List projectNames() { - projectTable.find('td span[data-bind*=name]').collect{it.text()} + projectTable.find('td.project [data-bind*=name]').collect{it.text()} } List managementUnitNames() { managementUnits.find('li>a').collect{it.text()} From 795d5826d893aab1829c80293cc2209f81766a98 Mon Sep 17 00:00:00 2001 From: chrisala Date: Fri, 10 Jan 2025 15:57:46 +1100 Subject: [PATCH 2/5] Updates to RCS labels and target measure labels #3387 --- .../regionalCapacityServicesReportV1.json | 10 +-- .../regionalCapacityServicesReportV2.json | 10 +-- .../regionalCapacityServicesReportV3.json | 10 +-- .../scripts/releases/4.2/updateIPPRSScores.js | 78 +++++++++++++++++++ 4 files changed, 93 insertions(+), 15 deletions(-) create mode 100644 src/main/scripts/releases/4.2/updateIPPRSScores.js diff --git a/forms/other/regionalCapacityServicesReportV1.json b/forms/other/regionalCapacityServicesReportV1.json index 76a3dc96f..cbcdc1499 100644 --- a/forms/other/regionalCapacityServicesReportV1.json +++ b/forms/other/regionalCapacityServicesReportV1.json @@ -298,8 +298,7 @@ }, { "dataType": "number", - "name": "targetIndigenousProcurementPercentage", - "description": "Target Indigenous Procurement Percentage for this reporting period" + "name": "targetIndigenousProcurementPercentage" }, { "name": "staffDevelopmentOpportunities", @@ -769,9 +768,10 @@ "items": [ { "css": "span7", - "preLabel": "Supply Chain Performance % this reporting period", + "preLabel": "Supply Chain Performance to date", "source": "supplyChainPerformancePercentage", - "type": "number" + "type": "number", + "helpText": "Supply chain performance to date (note this is a cumulative measure over the life of the contract consistent with the approach used by NIAA measuring indigenous participation. Performance to date should meet or exceed target performance by the end of the Deed period)" } ] }, @@ -780,7 +780,7 @@ "items": [ { "css": "span7", - "preLabel": "Target Supply Chain Performance % this reporting period", + "preLabel": "Target supply chain performance at end of Deed period", "source": "targetIndigenousProcurementPercentage", "type": "number", "readonly": true diff --git a/forms/other/regionalCapacityServicesReportV2.json b/forms/other/regionalCapacityServicesReportV2.json index e24968952..a7430546a 100644 --- a/forms/other/regionalCapacityServicesReportV2.json +++ b/forms/other/regionalCapacityServicesReportV2.json @@ -297,8 +297,7 @@ }, { "dataType": "number", - "name": "targetIndigenousProcurementPercentage", - "description": "Target Indigenous Procurement Percentage for this reporting period" + "name": "targetIndigenousProcurementPercentage" }, { "name": "staffDevelopmentOpportunities", @@ -719,9 +718,10 @@ "items": [ { "css": "span7", - "preLabel": "Supply Chain Performance % this reporting period", + "preLabel": "Supply Chain Performance to date", "source": "supplyChainPerformancePercentage", - "type": "number" + "type": "number", + "helpText": "Supply chain performance to date (note this is a cumulative measure over the life of the contract consistent with the approach used by NIAA measuring indigenous participation. Performance to date should meet or exceed target performance by the end of the Deed period)" } ] }, @@ -730,7 +730,7 @@ "items": [ { "css": "span7", - "preLabel": "Target Supply Chain Performance % this reporting period", + "preLabel": "Target supply chain performance at end of Deed period", "source": "targetIndigenousProcurementPercentage", "type": "number", "readonly": true diff --git a/forms/other/regionalCapacityServicesReportV3.json b/forms/other/regionalCapacityServicesReportV3.json index edf92a750..f52811e6b 100644 --- a/forms/other/regionalCapacityServicesReportV3.json +++ b/forms/other/regionalCapacityServicesReportV3.json @@ -279,8 +279,7 @@ }, { "dataType": "number", - "name": "targetIndigenousProcurementPercentage", - "description": "Target Indigenous Procurement Percentage for this reporting period" + "name": "targetIndigenousProcurementPercentage" }, { "name": "staffDevelopmentOpportunities", @@ -680,9 +679,10 @@ "items": [ { "css": "span7", - "preLabel": "Supply Chain Performance % this reporting period", + "preLabel": "Supply Chain Performance to date", "source": "supplyChainPerformancePercentage", - "type": "number" + "type": "number", + "helpText": "Supply chain performance to date (note this is a cumulative measure over the life of the contract consistent with the approach used by NIAA measuring indigenous participation. Performance to date should meet or exceed target performance by the end of the Deed period)" } ] }, @@ -691,7 +691,7 @@ "items": [ { "css": "span7", - "preLabel": "Target Supply Chain Performance % this reporting period", + "preLabel": "Target supply chain performance at end of Deed period", "source": "targetIndigenousProcurementPercentage", "type": "number", "readonly": true diff --git a/src/main/scripts/releases/4.2/updateIPPRSScores.js b/src/main/scripts/releases/4.2/updateIPPRSScores.js new file mode 100644 index 000000000..0ec2ffb97 --- /dev/null +++ b/src/main/scripts/releases/4.2/updateIPPRSScores.js @@ -0,0 +1,78 @@ +load( "../../utils/audit.js"); +var adminUserId = 'system' +var indigenousWorkforcePerformanceScoreId = '5d28e47f-5182-4ad7-91f7-074908fb66e4'; +var indigenousSupplyChainPerformanceScoreId = 'f7a537fd-cb38-4392-a0db-5e02beec6aa0'; + +var scores = [ + { + "category": "Indigenous Procurement", + "configuration": { + "filter": { + filterValue: "Regional capacity services - reporting", + property: "name", + type: "filter" + }, + "childAggregations": [{ + "property": "data.workforcePerformancePercentage", + "type": "AVERAGE" + }] + }, + "description": "", + "displayType": "", + "entity": "Activity", + "entityTypes": [], + "isOutputTarget": true, + "label": "Indigenous workforce performance", + "outputType": "Regional capacity services - reporting", + "scoreId": indigenousWorkforcePerformanceScoreId, + "status": "active", + "name":"targetIndigenousParticipationPercentage" + }, + { + "category": "Indigenous Procurement", + "configuration": { + "filter": { + filterValue: "Regional capacity services - reporting", + property: "name", + type: "filter" + }, + "childAggregations": [{ + "property": "data.supplyChainPerformancePercentage", + "type": "AVERAGE" + }] + }, + "description": "", + "displayType": "", + "entity": "Activity", + "entityTypes": [], + "isOutputTarget": true, + "label": "Indigenous supply chain performance", + "outputType": "Regional capacity services - reporting", + "scoreId": indigenousSupplyChainPerformanceScoreId, + "status": "active", + "name":"targetIndigenousProcurementPercentage" + } +]; + + +var labelupdates = { + 'Indigenous workforce performance':'Indigenous workforce performance (% of Indigenous FTE achieved to date/% FTE target for Indigenous employment to date)', + 'Indigenous supply chain performance':'Indigenous supply chain performance (% of procurement from Indigenous suppliers achieved to date/% procurement target of procurement from Indigenous suppliers at end of Deed period)' +} +for (var i=0; i Date: Fri, 17 Jan 2025 15:15:48 +1100 Subject: [PATCH 3/5] commit new change requests #3359 --- forms/nht/grantsAndOthersFinalReport.json | 314 +++++++++++++--------- 1 file changed, 193 insertions(+), 121 deletions(-) diff --git a/forms/nht/grantsAndOthersFinalReport.json b/forms/nht/grantsAndOthersFinalReport.json index 3b51f033e..71fd8c065 100644 --- a/forms/nht/grantsAndOthersFinalReport.json +++ b/forms/nht/grantsAndOthersFinalReport.json @@ -11,10 +11,25 @@ "template": { "modelName": "Grants and Others Final Report", "dataModel": [ + { + "dataType": "text", + "name": "projectEffectiveness", + "validate": "required,maxSize[1000]" + }, + { + "dataType": "text", + "name": "projectImpact", + "validate": "required,maxSize[500]" + }, + { + "dataType": "text", + "name": "projectImplementationChanges", + "validate": "required,maxSize[1000]" + }, { "dataType": "list", "name": "projectOutcomes", - "allowRowDelete": true, + "allowRowDelete": "false", "columns": [ { "dataType": "text", @@ -60,7 +75,7 @@ "dataType": "stringList", "name": "achievementLevel", "validate": "required", - "description": "A measure of the extent to which a program, project or initiative has attained, or is expected to attain, its relevant objectives efficiently and in a sustainable way.", + "description": "Partially achieved’ means that the project delivered, on average, around 26-50% of the target set for each service and outcome rating (e.g., target was 10ha of revegetation, project achieved 5ha). If every activity targets/outcomes are met, select ‘Achieved 100%.", "constraints": [ "Achieved (100%)", "Significantly achieved (76-99%)", @@ -127,7 +142,7 @@ } ], "dataType": "list", - "allowRowDelete": true, + "allowRowDelete": "false", "name": "projectTargets" }, { @@ -185,135 +200,80 @@ ] }, { + "dataType": "text", + "name": "projectLearningsSummary", + "validate": "required,maxSize[1000]" + }, + { + "dataType": "text", + "name": "documentAdditionalInformation", + "validate": "required,maxSize[1000]" + }, + { + "dataType": "list", + "description": "", + "name": "goodNewsStories", "columns": [ - { - "dataType": "stringList", - "name": "summaryName", - "validate": "required", - "constraints": [ - "Monitoring", - "Evaluation", - "Activity changes", - "Risk management", - "Lesson/s learnt" - ] - }, { "dataType": "text", - "name": "summaryProgress", "description": "", - "validate": "required,maxSize[1250]" + "name": "storyDetails", + "validate": "required,maxSize[5000]" + }, + { + "dataType": "image", + "name": "photo" } - ], - "dataType": "list", - "allowRowDelete": true, - "name": "projectLearningsSummary" - }, - { - "dataType": "text", - "name": "documentAdditionalInformation", - "validate": "required,maxSize[1250]" + ] } ], "viewModel": [ { "items": [ { - "source": "achievementLevel", - "preLabel": "1. To what extent did you achieve your project outcomes and project services?
Please select the one of the levels of achievement you have reached e.g. Achieved (100%), Partially achieved (26-50%)", - "type": "selectOne" - } - ], - "type": "row" - }, - { - "items": [ - { - "source": "

2. Project Outputs

", + "source": "

1. Project Outcomes

", "type": "literal" } ], "type": "row" }, { + "type": "row", "items": [ { - "source": "isTargetAchieved", - "preLabel": "2.1 Did you achieve the target for each activity listed in the MERI Plan?", - "type": "selectOne" + "source": "projectEffectiveness", + "type": "textarea", + "rows": 5, + "preLabel": "1.1 Describe the effectiveness of the project and whether it delivered what was intended." } - ], - "type": "row" + ] }, { - "disableTableUpload": true, - "columns": [ - { - "source": "", - "type": "literal", - "width": "5%", - "preLabel": { - "computed": "\\'No. \\' || (index + 1)" - }, - "title": "Activity No." - }, - { - "readonly": true, - "width": "20%", - "source": "serviceName", - "type": "textarea", - "rows": 3, - "title": "Activity" - }, - { - "readonly": true, - "width": "20%", - "source": "targetMeasure", - "type": "textarea", - "rows": 3, - "title": "Target measure" - }, - { - "readonly": true, - "width": "15%", - "source": "projectTarget", - "type": "text", - "title": "Total to be delivered" - }, - { - "readonly": true, - "width": "15%", - "source": "delivered", - "type": "text", - "title": "Total delivered", - "helpText": "please refer to the Dashboard for your project for this figure. The dashboard automatically adds the figures from each of your progress reports (as a cumulative figure)." - }, + "type": "row", + "items": [ { - "width": "25%", - "source": "reasonTargetNotMet", + "source": "projectImpact", "type": "textarea", - "rows": 3, - "title": "Explain why the target measure was not fully delivered or over delivered. (500 characters [approx. 100 words] limit)" + "rows": 5, + "preLabel": "1.2 What impact has the project had?" } - ], - "userAddedRows": false, - "source": "projectTargets", - "title": "2.2 Report on and explain any activities that have been under or significantly over delivered (50% above target)", - "type": "table" + ] }, { + "type": "row", "items": [ { - "source": "

3. Project Outcomes

", - "type": "literal" + "source": "projectImplementationChanges", + "type": "textarea", + "rows": 5, + "preLabel": "1.3 Describe any changes to the project implementation and why these were necessary." } - ], - "type": "row" + ] }, { "items": [ { - "source": "3.1 Briefly describe the achievements that have been made against each outcome statement in the MERI Plan including details of any enablers and/or barriers throughout the life of the project.

Please provide supporting information (e.g. report, photos), where this has not been previously supplied, as attachments to this report via the Admin tab > Documents sub-tab of MERIT. Where supporting evidence contains sensitive or confidential information, please send to the department Project Manager (DCCEW) by email.", + "source": "1.4 Briefly describe the achievements that have been made against each outcome statement in the MERI Plan including details of any enablers and/or barriers throughout the life of the project.", "type": "literal" } ], @@ -321,8 +281,8 @@ }, { "source": "projectOutcomes", + "title": "Please provide supporting information (e.g. report, photos), where this has not been previously supplied, as attachments to this report via the Admin tab > Documents sub-tab of MERIT. Where supporting evidence contains sensitive or confidential information, please send to the departmental Project Manager by email.", "type": "table", - "userAddedRows": true, "disableTableUpload": true, "columns": [ { @@ -348,7 +308,7 @@ { "width": "25%", "source": "basedRating", - "title": "Rating based on the effectiveness evaluation criteria", + "title": "Rating based on the achievement of the outcome statement", "type": "select2" } ] @@ -357,7 +317,7 @@ "items": [ { "source": "projectEngagement", - "preLabel": "3.2 Did your project engage with traditional owners, landholders and local community?", + "preLabel": "1.5 Did your project engage with First Nations people (including traditional owners, indigenous organisations/rangers), landholders and local community?", "type": "selectOne" } ], @@ -370,7 +330,7 @@ "source": "yesProjectEngagement", "type": "textarea", "rows": 5, - "preLabel": "3.2.1 If yes, which group/s and how?" + "preLabel": "1.5.1 If yes, which group/s and how?" } ] }, @@ -378,7 +338,7 @@ "items": [ { "source": "unexpectedChanges", - "preLabel": "3.3 Were there any unexpected or unintended (positive or negative) changes or other outcomes delivered by this project?", + "preLabel": "1.6 Were there any unexpected or unintended (positive or negative) changes or other outcomes delivered by this project including environmental, social and economic impacts?", "type": "selectOne" } ], @@ -391,7 +351,7 @@ "source": "yesUnexpectedChanges", "type": "textarea", "rows": 5, - "preLabel": "3.3.1 If yes, what were they?" + "preLabel": "1.6.1 If yes, what were they?" } ] }, @@ -399,7 +359,7 @@ "items": [ { "source": "outcomesMaintenance", - "preLabel": "3.4 To what extent will the outcomes achieved by this project be maintained after the project has been completed?", + "preLabel": "1.7 To what extent will the outcomes achieved by this project be maintained after the project has been completed?", "type": "selectOne" } ], @@ -412,14 +372,14 @@ "source": "howOutcomesMaintain", "type": "textarea", "rows": 5, - "preLabel": "3.5 If they will be maintained, how and who will do this?" + "preLabel": "1.7.1 If they will be maintained, how and who will do this?" } ] }, { "items": [ { - "source": "

4. Monitoring, Evaluation and Project Learnings

", + "source": "

2. Project Outputs

", "type": "literal" } ], @@ -428,8 +388,9 @@ { "items": [ { - "source": "4.1 Summarise how the project progressed in the areas of Monitoring, Evaluation, Activity changes, Risk management and lessons learnt in project delivery towards the investment priority.", - "type": "literal" + "source": "isTargetAchieved", + "preLabel": "2.1 Did you achieve the target for each activity listed in the MERI Plan?", + "type": "selectOne" } ], "type": "row" @@ -438,24 +399,78 @@ "disableTableUpload": true, "columns": [ { - "width": "25%", - "source": "summaryName", - "type": "selectOne", - "title": "Name" + "source": "", + "type": "literal", + "width": "5%", + "preLabel": { + "computed": "\\'No. \\' || (index + 1)" + }, + "title": "Activity No." + }, + { + "readonly": true, + "width": "20%", + "source": "serviceName", + "type": "textarea", + "rows": 3, + "title": "Activity" + }, + { + "readonly": true, + "width": "20%", + "source": "targetMeasure", + "type": "textarea", + "rows": 3, + "title": "Target measure" + }, + { + "readonly": true, + "width": "15%", + "source": "projectTarget", + "type": "text", + "title": "Total to be delivered" }, { - "width": "75%", - "source": "summaryProgress", + "readonly": true, + "width": "15%", + "source": "delivered", "type": "text", - "title": "Summarised progress", - "helpText": "" + "title": "Total delivered", + "helpText": "please refer to the Dashboard for your project for this figure. The dashboard automatically adds the figures from each of your progress reports (as a cumulative figure)." + }, + { + "width": "25%", + "source": "reasonTargetNotMet", + "type": "textarea", + "rows": 3, + "title": "Explain why the target measure was not fully delivered or over delivered. (500 characters [approx. 100 words] limit)" } ], - "userAddedRows": true, - "source": "projectLearningsSummary", - "title": "Monitoring/Evaluation/Activity changes/Risk management/Lesson/s learnt", + "userAddedRows": false, + "source": "projectTargets", + "title": "2.2 Report on and explain any activities that have been under delivered (below target) or over delivered (above target)", "type": "table" }, + { + "items": [ + { + "source": "

3. Monitoring, Evaluation and Lessons Learnt

", + "type": "literal" + } + ], + "type": "row" + }, + { + "type": "row", + "items": [ + { + "source": "projectLearningsSummary", + "type": "textarea", + "rows": 5, + "preLabel": "3.1 Summarise the lessons learnt in project delivery. This may include monitoring, evaluation, activity changes and risk management." + } + ] + }, { "type": "row", "items": [ @@ -463,9 +478,66 @@ "source": "documentAdditionalInformation", "type": "textarea", "rows": 5, - "preLabel": "5. Please document any additional information relating to the project." + "preLabel": "4. Please document any additional information relating to the project." } ] + }, + { + "items": [ + { + "source": "achievementLevel", + "preLabel": "5. To what extent did you achieve your project outcomes and project services?
Please select the one of the levels of achievement you have reached e.g. Achieved (100%), Partially achieved (26-50%)", + "type": "selectOne" + } + ], + "type": "row" + }, + { + "items": [ + { + "source": "

6. Good News Stories

", + "type": "literal" + } + ], + "type": "row" + }, + { + "items": [ + { + "source": "6.1 Please provide good news stories that highlight what the project achieved in the final period.", + "type": "literal" + } + ], + "type": "row" + }, + { + "columns": [ + { + "source": "", + "type": "literal", + "width": "5%", + "preLabel": { + "computed": "\\'No. \\' || (index + 1)" + }, + "title": "Story No." + }, + { + "source": "storyDetails", + "type": "textarea", + "rows": 4, + "title": "Good News Story Details", + "width": "50%" + }, + { + "type": "image", + "source": "photo", + "title": "", + "width": "45%" + } + ], + "userAddedRows": true, + "source": "goodNewsStories", + "type": "table" } ], "pre-populate": [ From 1e6a0355faa0f74f4cdc6525eae80a54a3bf6e2a Mon Sep 17 00:00:00 2001 From: sal153 Date: Fri, 17 Jan 2025 16:42:58 +1100 Subject: [PATCH 4/5] commit updates #3359 --- forms/nht/grantsAndOthersFinalReport.json | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/forms/nht/grantsAndOthersFinalReport.json b/forms/nht/grantsAndOthersFinalReport.json index 71fd8c065..34e8db591 100644 --- a/forms/nht/grantsAndOthersFinalReport.json +++ b/forms/nht/grantsAndOthersFinalReport.json @@ -207,6 +207,7 @@ { "dataType": "text", "name": "documentAdditionalInformation", + "description": "Provide details of specific program information relating to your project.", "validate": "required,maxSize[1000]" }, { @@ -428,14 +429,14 @@ "width": "15%", "source": "projectTarget", "type": "text", - "title": "Total to be delivered" + "title": "Total to be delivered (Targets from MERI Plan)" }, { "readonly": true, "width": "15%", "source": "delivered", "type": "text", - "title": "Total delivered", + "title": "Total delivered (collated from Progress Reports)", "helpText": "please refer to the Dashboard for your project for this figure. The dashboard automatically adds the figures from each of your progress reports (as a cumulative figure)." }, { @@ -467,7 +468,7 @@ "source": "projectLearningsSummary", "type": "textarea", "rows": 5, - "preLabel": "3.1 Summarise the lessons learnt in project delivery. This may include monitoring, evaluation, activity changes and risk management." + "preLabel": "3.1 Summarise the lessons learnt in the project delivery. This may include monitoring, evaluation, activity changes and risk management." } ] }, @@ -504,7 +505,7 @@ { "items": [ { - "source": "6.1 Please provide good news stories that highlight what the project achieved in the final period.", + "source": "6.1 Please provide good news stories that highlight what the project achieved in the final period.

This information is intended for potential use by the Department in publicly promoting the program. Photos may be attached to the report via attachment to email however please ensure permissions of persons in the photos being attached and used for promotional purposes.

", "type": "literal" } ], From 8ae876ba2d9b8a7dd398126318616e4f8bd5164e Mon Sep 17 00:00:00 2001 From: chrisala Date: Tue, 21 Jan 2025 14:08:09 +1100 Subject: [PATCH 5/5] Increased default additional outcomes to 15 #3413 --- grails-app/views/project/meriPlan/_additionalOutcomes.gsp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/grails-app/views/project/meriPlan/_additionalOutcomes.gsp b/grails-app/views/project/meriPlan/_additionalOutcomes.gsp index 0a78c5e22..40c252db6 100644 --- a/grails-app/views/project/meriPlan/_additionalOutcomes.gsp +++ b/grails-app/views/project/meriPlan/_additionalOutcomes.gsp @@ -50,7 +50,7 @@