Skip to content

Commit

Permalink
Merge pull request #3378 from AtlasOfLivingAustralia/feature/issue3369
Browse files Browse the repository at this point in the history 
RCS / IPPRS org changes
  • Loading branch information
@salomon-j
salomon-j authored Dec 12, 2024
2 parents 1c2d59a + 08d0e57 commit d76a959
Show file tree
Hide file tree
Showing 34 changed files with 3,172 additions and 176 deletions.
1,037 changes: 1,037 additions & 0 deletions forms/other/regionalCapacityServicesReportV1.json
View file

Large diffs are not rendered by default.

953 changes: 953 additions & 0 deletions forms/other/regionalCapacityServicesReportV2.json
View file

Large diffs are not rendered by default.

162 changes: 132 additions & 30 deletions ...other/regionalCapacityServicesReport.json → ...her/regionalCapacityServicesReportV3.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,41 @@
"collapsedByDefault": false,
"templateName": "regionalCapacityServicesReport",
"template": {
"pre-populate": [
{
"source": {
"context-path": "owner"
},
"mapping": [
{
"target": "targetIndigenousParticipationPercentage",
"source-path": "periodTargets.targetIndigenousParticipationPercentage"
}
]
},
{
"source": {
"context-path": "owner"
},
"mapping": [
{
"target": "targetIndigenousProcurementPercentage",
"source-path": "periodTargets.targetIndigenousProcurementPercentage"
}
]
},
{
"source": {
"context-path": "owner"
},
"mapping": [
{
"target": "organisationPanelProjectValue",
"source-path": "totalContractValue"
}
]
}
],
"dataModel": [
{
"name": "governanceAndFinancialFrameworksOnTrack",
Expand Down Expand Up @@ -137,20 +172,10 @@
}
]
},
{
"dataType": "boolean",
"name": "reportedToIpprs",
"description": ""
},
{
"dataType": "document",
"name": "ipprsReport",
"description": ""
},
{
"dataType": "number",
"name": "organisationFteWorkforce",
"description": "Enter total RDP staff (full time equivalent) deployed on Services for the Deed and all Contracts (including non-DCCEEW Contracts) during this reporting period.",
"description": "Enter total RDP staff (full time equivalent) deployed on Services for the Deed and all Contracts (including <span style='white-space: nowrap;'>non-DCCEEW</span> Contracts) during this reporting period.",
"validate": [
{
"rule": "required"
Expand All @@ -164,14 +189,14 @@
"type": "computed"
},
"rule": "min",
"message": "numeric value must be higher or equal to the numeric value entered for 'What was your organisation’s full time equivalent Indigenous workforce deployed on the Services this reporting period?'"
"message": "Numeric value must be higher or equal to the numeric value entered for 'What was your organisation’s full time equivalent Indigenous workforce deployed on the Services this reporting period?'"
}
]
},
{
"dataType": "number",
"name": "organisationFteIndigenousWorkforce",
"description": "Enter total RDP Indigenous staff (full time equivalent) deployed on Services for the Deed and all Contracts (including non-DCCEEW Contracts) during this reporting period.",
"description": "Enter total RDP Indigenous staff (full time equivalent) deployed on Services for the Deed and all Contracts (including <span style='white-space: nowrap;'>non-DCCEEW</span> Contracts) during this reporting period.",
"validate": [
{
"rule": "required"
Expand All @@ -185,23 +210,63 @@
"type": "computed"
},
"rule": "max",
"message": "numeric value must be less than or equal to the numeric value entered for 'What was your organisation’s full time equivalent workforce deployed on the Services this reporting period?'"
"message": "Numeric value must be less than or equal to the numeric value entered for 'What was your organisation’s full time equivalent workforce deployed on the Services this reporting period?'"
}
]
},
{
"dataType": "number",
"name": "servicesContractedValueFirstNations",
"description": "Enter total dollar value (GST inclusive) of goods and services contracted to First Nations people/Indigenous enterprises, during this reporting period, for the Deed and all Contracts (including non-DCCEEW Contracts).",
"description": "Enter total dollar value (GST inclusive) of goods and services contracted to First Nations people/Indigenous enterprises, during this reporting period, for the Deed and all Contracts (including <span style='white-space: nowrap;'>non-DCCEEW</span> Contracts).",
"validate": [
{
"rule": "required"
},
{
"rule": "min[0]"
},
{
"param": {
"expression": "organisationPanelProjectValue",
"type": "computed"
},
"rule": "max",
"message": "The sum of the value of Services contracted to First Nations people/Indigenous enterprises for all reporting periods can not exceed the total $ value (GST inclusive) of the Deed and all Contracts (including <span style='white-space: nowrap;'>non-DCCEEW</span> Contracts)"
}
]
},
{
"dataType": "number",
"name": "organisationPanelProjectValue",
"description": "Total dollar value (GST inclusive) for the Deed and all Contracts (including <span style='white-space: nowrap;'>non-DCCEEW</span> Contracts).",
"validate": "required,min[0]"
},
{
"dataType": "number",
"name": "supplyChainPerformancePercentage",
"description": "Calculated using value of Services contracted to First Nations people/Indigenous enterprises ÷ stored Total Organisation Panel/Project Value $ x 100",
"computed": {
"expression": "servicesContractedValueFirstNations / organisationPanelProjectValue * 100"
}
},
{
"dataType": "number",
"name": "workforcePerformancePercentage",
"description": "Calculated using FTE Indigenous workforce ÷ FTE workforce x 100",
"computed": {
"expression": "organisationFteIndigenousWorkforce / organisationFteWorkforce * 100"
}
},
{
"dataType": "number",
"name": "targetIndigenousParticipationPercentage",
"description": "Target Indigenous Participation Percentage for this reporting period"
},
{
"dataType": "number",
"name": "targetIndigenousProcurementPercentage",
"description": "Target Indigenous Procurement Percentage for this reporting period"
},
{
"name": "staffDevelopmentOpportunities",
"description": "This includes on-the-job, informal, and formal training. If no activities were undertaken, enter ‘Nil’.",
Expand Down Expand Up @@ -518,33 +583,45 @@
}
]
},
{
"type": "row",
"items": [
{
"type": "literal",
"source": "<b>Q5(b). Please complete workforce and supply chain data (Deed of Standing Offer Clause 38 Indigenous Procurement Policy). Please do not provide personal or <span style='white-space: nowrap;'>commercial-in-confidence</span> information when answering this question. Please retain documentation as evidence to support assurance activities undertaken to verify the reported information.</b>"
}
]
},
{
"type": "row",
"items": [
{
"css": "span7",
"preLabel": "Q5(b). Please confirm that your organisation has reported via the IPPRS this period (Clause 38 Indigenous Procurement Policy), and that this report has been uploaded to the documents tab in MERIT.",
"source": "reportedToIpprs",
"type": "boolean"
"preLabel": "What was your organisation’s full time equivalent workforce deployed on the Services this reporting period?",
"source": "organisationFteWorkforce",
"type": "number"
}
]
},
{
"type": "row",
"items": [
{
"type": "document",
"source": "ipprsReport",
"preLabel": "Please attach the document here."
"css": "span7",
"preLabel": "What was your organisation’s full time equivalent Indigenous workforce deployed on the Services this reporting period?",
"source": "organisationFteIndigenousWorkforce",
"type": "number"
}
]
},
{
"type": "row",
"items": [
{
"type": "literal",
"source": "<b>Q5(c). Please complete workforce and supply chain data (Deed of Standing Offer Clause 38 Indigenous Procurement Policy). Please do not provide personal or commercial-in-confidence information when answering this question. Please retain documentation as evidence to support assurance activities undertaken to verify the reported information.</b>"
"css": "span7",
"preLabel": "Workforce Performance % this reporting period",
"source": "workforcePerformancePercentage",
"type": "number"
}
]
},
Expand All @@ -553,8 +630,32 @@
"items": [
{
"css": "span7",
"preLabel": "What was your organisation’s full time equivalent workforce deployed on the Services this reporting period?",
"source": "organisationFteWorkforce",
"preLabel": "Target Workforce Performance % this reporting period",
"source": "targetIndigenousParticipationPercentage",
"type": "number",
"readonly": true
}
]
},
{
"type": "row",
"items": [
{
"css": "span7",
"preLabel": "Your total organisation panel/project $ value (GST inclusive).",
"source": "organisationPanelProjectValue",
"type": "number",
"readonly": true
}
]
},
{
"type": "row",
"items": [
{
"css": "span7",
"preLabel": "What was the dollar value (GST inclusive) of Services contracted to First Nations people/Indigenous enterprises during this reporting period?",
"source": "servicesContractedValueFirstNations",
"type": "number"
}
]
Expand All @@ -564,8 +665,8 @@
"items": [
{
"css": "span7",
"preLabel": "What was your organisation’s full time equivalent Indigenous workforce deployed on the Services this reporting period?",
"source": "organisationFteIndigenousWorkforce",
"preLabel": "Supply Chain Performance % this reporting period",
"source": "supplyChainPerformancePercentage",
"type": "number"
}
]
Expand All @@ -575,9 +676,10 @@
"items": [
{
"css": "span7",
"preLabel": "What was the dollar value of Services contracted to First Nations people/Indigenous enterprises during this reporting period?",
"source": "servicesContractedValueFirstNations",
"type": "currency"
"preLabel": "Target Supply Chain Performance % this reporting period",
"source": "targetIndigenousProcurementPercentage",
"type": "number",
"readonly": true
}
]
},
Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,4 @@ org.gradle.jvmargs=-Xmx2048M
seleniumVersion=3.12.0
seleniumSafariDriverVersion=3.14.0
snapshotCacheTime=1800
alaSecurityLibsVersion=6.3.0-SNAPSHOT
alaSecurityLibsVersion=6.3.0
37 changes: 23 additions & 14 deletions grails-app/assets/components/javascript/associated-orgs.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,24 +58,33 @@ ko.components.register('associated-orgs', {
this.toDate = ko.observable(associatedOrg.toDate).extend({simpleDate:false});
this.label = ko.observable(this.name());

this.updateLabel = function() {
if (this.organisationId) {
var self = this;
findMatchingOrganisation(self.organisationId(), function(matchingOrg) {
if (matchingOrg && matchingOrg._source) {
if (matchingOrg._source.name && matchingOrg._source.name != self.name()) {
self.label(self.name() + ' (' + matchingOrg._source.name + ')');
}
}
});
var previousOrganisationId = null;
var organisationName = null;
var queryInProgress = false;
var self = this;
function setLabel() {
if (organisationName && organisationName != self.name()) {
self.label(self.name() + ' (' + organisationName + ')');
}
else {
this.label(this.name());
self.label(self.name());
}
}
function updateLabel() {
if (!queryInProgress && self.organisationId() && self.organisationId() != previousOrganisationId) {
queryInProgress = true;
findMatchingOrganisation(self.organisationId(), function(matchingOrg) {
previousOrganisationId = self.organisationId();
organisationName = matchingOrg && matchingOrg._source ? matchingOrg._source.name : null;
setLabel();
queryInProgress = false;
});
}
setLabel();
}
this.organisationId.subscribe(this.updateLabel, this);
this.name.subscribe(this.updateLabel, this);
this.updateLabel();
this.organisationId.subscribe(updateLabel, this);
this.name.subscribe(setLabel, this);
updateLabel();


this.toJSON = function() {
Expand Down
Loading

0 comments on commit d76a959

Please sign in to comment.