Skip to content

Commit b0ef778

Browse files
temitemi
committed
Merge remote-tracking branch 'origin/dev' into feature/issue269
2 parents 597b5b3 + 1728e83 commit b0ef778

File tree

8 files changed

+291
-140
lines changed

8 files changed

+291
-140
lines changed

‎forms/nht/grantsAndOthersFinalReport.json

+194-121
Large diffs are not rendered by default.

‎forms/other/regionalCapacityServicesReportV1.json

+5-5
Original file line numberDiff line numberDiff line change
@@ -298,8 +298,7 @@
298298
},
299299
{
300300
"dataType": "number",
301-
"name": "targetIndigenousProcurementPercentage",
302-
"description": "Target Indigenous Procurement Percentage for this reporting period"
301+
"name": "targetIndigenousProcurementPercentage"
303302
},
304303
{
305304
"name": "staffDevelopmentOpportunities",
@@ -769,9 +768,10 @@
769768
"items": [
770769
{
771770
"css": "span7",
772-
"preLabel": "Supply Chain Performance % this reporting period",
771+
"preLabel": "Supply Chain Performance to date",
773772
"source": "supplyChainPerformancePercentage",
774-
"type": "number"
773+
"type": "number",
774+
"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)"
775775
}
776776
]
777777
},
@@ -780,7 +780,7 @@
780780
"items": [
781781
{
782782
"css": "span7",
783-
"preLabel": "Target Supply Chain Performance % this reporting period",
783+
"preLabel": "Target supply chain performance at end of Deed period",
784784
"source": "targetIndigenousProcurementPercentage",
785785
"type": "number",
786786
"readonly": true

‎forms/other/regionalCapacityServicesReportV2.json

+5-5
Original file line numberDiff line numberDiff line change
@@ -297,8 +297,7 @@
297297
},
298298
{
299299
"dataType": "number",
300-
"name": "targetIndigenousProcurementPercentage",
301-
"description": "Target Indigenous Procurement Percentage for this reporting period"
300+
"name": "targetIndigenousProcurementPercentage"
302301
},
303302
{
304303
"name": "staffDevelopmentOpportunities",
@@ -719,9 +718,10 @@
719718
"items": [
720719
{
721720
"css": "span7",
722-
"preLabel": "Supply Chain Performance % this reporting period",
721+
"preLabel": "Supply Chain Performance to date",
723722
"source": "supplyChainPerformancePercentage",
724-
"type": "number"
723+
"type": "number",
724+
"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)"
725725
}
726726
]
727727
},
@@ -730,7 +730,7 @@
730730
"items": [
731731
{
732732
"css": "span7",
733-
"preLabel": "Target Supply Chain Performance % this reporting period",
733+
"preLabel": "Target supply chain performance at end of Deed period",
734734
"source": "targetIndigenousProcurementPercentage",
735735
"type": "number",
736736
"readonly": true

‎forms/other/regionalCapacityServicesReportV3.json

+5-5
Original file line numberDiff line numberDiff line change
@@ -279,8 +279,7 @@
279279
},
280280
{
281281
"dataType": "number",
282-
"name": "targetIndigenousProcurementPercentage",
283-
"description": "Target Indigenous Procurement Percentage for this reporting period"
282+
"name": "targetIndigenousProcurementPercentage"
284283
},
285284
{
286285
"name": "staffDevelopmentOpportunities",
@@ -680,9 +679,10 @@
680679
"items": [
681680
{
682681
"css": "span7",
683-
"preLabel": "Supply Chain Performance % this reporting period",
682+
"preLabel": "Supply Chain Performance to date",
684683
"source": "supplyChainPerformancePercentage",
685-
"type": "number"
684+
"type": "number",
685+
"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)"
686686
}
687687
]
688688
},
@@ -691,7 +691,7 @@
691691
"items": [
692692
{
693693
"css": "span7",
694-
"preLabel": "Target Supply Chain Performance % this reporting period",
694+
"preLabel": "Target supply chain performance at end of Deed period",
695695
"source": "targetIndigenousProcurementPercentage",
696696
"type": "number",
697697
"readonly": true

‎grails-app/views/project/meriPlan/_additionalOutcomes.gsp

+1-1
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
<tr>
5151
<td colspan="3">
5252
<button type="button" class="btn btn-sm"
53-
data-bind="disable: details.outcomes.secondaryOutcomes().length >= ${maxAdditonalOutcomes ?: 5} || isProjectDetailsLocked(), click: addSecondaryOutcome">
53+
data-bind="disable: details.outcomes.secondaryOutcomes().length >= ${maxAdditonalOutcomes ?: 15} || isProjectDetailsLocked(), click: addSecondaryOutcome">
5454
<i class="fa fa-plus"></i> Add a row</button></td>
5555
</tr>
5656
</tfoot>

‎grails-app/views/shared/_reports.gsp

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@
2020
<td><a data-bind="attr:{href:fcConfig.projectViewUrl+'/'+projectId}"><span data-bind="text:grantId"></span></a></td>
2121
<td data-bind="text:associatedProgram"></td>
2222
<td data-bind="text:associatedSubProgram"></td>
23-
<td><a data-bind="attr:{href:fcConfig.projectViewUrl+'/'+projectId}"><span data-bind="text:name"></span></a></td>
24-
<td>
23+
<td class="project"><a data-bind="attr:{href:fcConfig.projectViewUrl+'/'+projectId}"><span data-bind="text:name"></span></a></td>
24+
<td class="organisations">
2525
<!-- ko foreach:currentAssociatedOrgs -->
2626
<div class="organisationName">
2727
<a data-bind="visible:ko.utils.unwrapObservable($data.organisationId),attr:{href:fcConfig.organisationLinkBaseUrl+'/'+ko.utils.unwrapObservable($data.organisationId)}">

‎src/integration-test/groovy/pages/MyProjects.groovy

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ class MyProjects extends Page {
1717
}
1818

1919
List projectNames() {
20-
projectTable.find('td span[data-bind*=name]').collect{it.text()}
20+
projectTable.find('td.project [data-bind*=name]').collect{it.text()}
2121
}
2222
List managementUnitNames() {
2323
managementUnits.find('li>a').collect{it.text()}

‎src/main/scripts/releases/4.2/updateIPPRSScores.js

+78
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,78 @@
1+
load( "../../utils/audit.js");
2+
var adminUserId = 'system'
3+
var indigenousWorkforcePerformanceScoreId = '5d28e47f-5182-4ad7-91f7-074908fb66e4';
4+
var indigenousSupplyChainPerformanceScoreId = 'f7a537fd-cb38-4392-a0db-5e02beec6aa0';
5+
6+
var scores = [
7+
{
8+
"category": "Indigenous Procurement",
9+
"configuration": {
10+
"filter": {
11+
filterValue: "Regional capacity services - reporting",
12+
property: "name",
13+
type: "filter"
14+
},
15+
"childAggregations": [{
16+
"property": "data.workforcePerformancePercentage",
17+
"type": "AVERAGE"
18+
}]
19+
},
20+
"description": "",
21+
"displayType": "",
22+
"entity": "Activity",
23+
"entityTypes": [],
24+
"isOutputTarget": true,
25+
"label": "Indigenous workforce performance",
26+
"outputType": "Regional capacity services - reporting",
27+
"scoreId": indigenousWorkforcePerformanceScoreId,
28+
"status": "active",
29+
"name":"targetIndigenousParticipationPercentage"
30+
},
31+
{
32+
"category": "Indigenous Procurement",
33+
"configuration": {
34+
"filter": {
35+
filterValue: "Regional capacity services - reporting",
36+
property: "name",
37+
type: "filter"
38+
},
39+
"childAggregations": [{
40+
"property": "data.supplyChainPerformancePercentage",
41+
"type": "AVERAGE"
42+
}]
43+
},
44+
"description": "",
45+
"displayType": "",
46+
"entity": "Activity",
47+
"entityTypes": [],
48+
"isOutputTarget": true,
49+
"label": "Indigenous supply chain performance",
50+
"outputType": "Regional capacity services - reporting",
51+
"scoreId": indigenousSupplyChainPerformanceScoreId,
52+
"status": "active",
53+
"name":"targetIndigenousProcurementPercentage"
54+
}
55+
];
56+
57+
58+
var labelupdates = {
59+
'Indigenous workforce performance':'Indigenous workforce performance (% of Indigenous FTE achieved to date/% FTE target for Indigenous employment to date)',
60+
'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)'
61+
}
62+
for (var i=0; i<scores.length; i++) {
63+
var existing = db.score.find({label:scores[i].label});
64+
if (existing.hasNext()) {
65+
var existingScore = existing.next();
66+
existingScore.configuration = scores[i].configuration;
67+
existingScore.name = scores[i].name;
68+
existingScore.label = labelupdates[scores[i].label];
69+
db.score.replaceOne({label:scores[i].label}, existingScore);
70+
71+
audit(scores[i], scores[i].scoreId, 'au.org.ala.ecodata.Score', adminUserId, undefined, 'Update');
72+
73+
}
74+
else {
75+
print("Error updating score: "+scores[i].label);
76+
}
77+
78+
}

0 commit comments

Comments
 (0)