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