Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/dev' into feature/issue269
Browse files Browse the repository at this point in the history
  • Loading branch information
temi committed Jan 21, 2025
2 parents 597b5b3 + 1728e83 commit b0ef778
Show file tree
Hide file tree
Showing 8 changed files with 291 additions and 140 deletions.
315 changes: 194 additions & 121 deletions forms/nht/grantsAndOthersFinalReport.json

Large diffs are not rendered by default.

10 changes: 5 additions & 5 deletions forms/other/regionalCapacityServicesReportV1.json
Original file line number Diff line number Diff line change
Expand Up @@ -298,8 +298,7 @@
},
{
"dataType": "number",
"name": "targetIndigenousProcurementPercentage",
"description": "Target Indigenous Procurement Percentage for this reporting period"
"name": "targetIndigenousProcurementPercentage"
},
{
"name": "staffDevelopmentOpportunities",
Expand Down Expand Up @@ -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)"
}
]
},
Expand All @@ -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
Expand Down
10 changes: 5 additions & 5 deletions forms/other/regionalCapacityServicesReportV2.json
Original file line number Diff line number Diff line change
Expand Up @@ -297,8 +297,7 @@
},
{
"dataType": "number",
"name": "targetIndigenousProcurementPercentage",
"description": "Target Indigenous Procurement Percentage for this reporting period"
"name": "targetIndigenousProcurementPercentage"
},
{
"name": "staffDevelopmentOpportunities",
Expand Down Expand Up @@ -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)"
}
]
},
Expand All @@ -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
Expand Down
10 changes: 5 additions & 5 deletions forms/other/regionalCapacityServicesReportV3.json
Original file line number Diff line number Diff line change
Expand Up @@ -279,8 +279,7 @@
},
{
"dataType": "number",
"name": "targetIndigenousProcurementPercentage",
"description": "Target Indigenous Procurement Percentage for this reporting period"
"name": "targetIndigenousProcurementPercentage"
},
{
"name": "staffDevelopmentOpportunities",
Expand Down Expand Up @@ -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)"
}
]
},
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion grails-app/views/project/meriPlan/_additionalOutcomes.gsp
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
<tr>
<td colspan="3">
<button type="button" class="btn btn-sm"
data-bind="disable: details.outcomes.secondaryOutcomes().length >= ${maxAdditonalOutcomes ?: 5} || isProjectDetailsLocked(), click: addSecondaryOutcome">
data-bind="disable: details.outcomes.secondaryOutcomes().length >= ${maxAdditonalOutcomes ?: 15} || isProjectDetailsLocked(), click: addSecondaryOutcome">
<i class="fa fa-plus"></i> Add a row</button></td>
</tr>
</tfoot>
Expand Down
4 changes: 2 additions & 2 deletions grails-app/views/shared/_reports.gsp
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@
<td><a data-bind="attr:{href:fcConfig.projectViewUrl+'/'+projectId}"><span data-bind="text:grantId"></span></a></td>
<td data-bind="text:associatedProgram"></td>
<td data-bind="text:associatedSubProgram"></td>
<td><a data-bind="attr:{href:fcConfig.projectViewUrl+'/'+projectId}"><span data-bind="text:name"></span></a></td>
<td>
<td class="project"><a data-bind="attr:{href:fcConfig.projectViewUrl+'/'+projectId}"><span data-bind="text:name"></span></a></td>
<td class="organisations">
<!-- ko foreach:currentAssociatedOrgs -->
<div class="organisationName">
<a data-bind="visible:ko.utils.unwrapObservable($data.organisationId),attr:{href:fcConfig.organisationLinkBaseUrl+'/'+ko.utils.unwrapObservable($data.organisationId)}">
Expand Down
2 changes: 1 addition & 1 deletion src/integration-test/groovy/pages/MyProjects.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -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()}
Expand Down
78 changes: 78 additions & 0 deletions src/main/scripts/releases/4.2/updateIPPRSScores.js
Original file line number Diff line number Diff line change
@@ -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<scores.length; i++) {
var existing = db.score.find({label:scores[i].label});
if (existing.hasNext()) {
var existingScore = existing.next();
existingScore.configuration = scores[i].configuration;
existingScore.name = scores[i].name;
existingScore.label = labelupdates[scores[i].label];
db.score.replaceOne({label:scores[i].label}, existingScore);

audit(scores[i], scores[i].scoreId, 'au.org.ala.ecodata.Score', adminUserId, undefined, 'Update');

}
else {
print("Error updating score: "+scores[i].label);
}

}

0 comments on commit b0ef778

Please sign in to comment.