diff --git a/forms/other/regionalCapacityServicesReportV1.json b/forms/other/regionalCapacityServicesReportV1.json index 630d959cb..76a3dc96f 100644 --- a/forms/other/regionalCapacityServicesReportV1.json +++ b/forms/other/regionalCapacityServicesReportV1.json @@ -27,7 +27,12 @@ "target": "targetIndigenousParticipationPercentage", "source-path": "periodTargets.targetIndigenousParticipationPercentage" } - ] + ], + "merge": { + "targetIndigenousParticipationPercentage": { + "replaceExisting": true + } + } }, { "source": { @@ -38,7 +43,12 @@ "target": "targetIndigenousProcurementPercentage", "source-path": "periodTargets.targetIndigenousProcurementPercentage" } - ] + ], + "merge": { + "targetIndigenousProcurementPercentage": { + "replaceExisting": true + } + } }, { "source": { @@ -49,7 +59,12 @@ "target": "organisationPanelProjectValue", "source-path": "totalContractValue" } - ] + ], + "merge": { + "organisationPanelProjectValue": { + "replaceExisting": true + } + } } ], "dataModel": [ diff --git a/forms/other/regionalCapacityServicesReportV2.json b/forms/other/regionalCapacityServicesReportV2.json index 46c731990..e24968952 100644 --- a/forms/other/regionalCapacityServicesReportV2.json +++ b/forms/other/regionalCapacityServicesReportV2.json @@ -27,7 +27,12 @@ "target": "targetIndigenousParticipationPercentage", "source-path": "periodTargets.targetIndigenousParticipationPercentage" } - ] + ], + "merge": { + "targetIndigenousParticipationPercentage": { + "replaceExisting": true + } + } }, { "source": { @@ -38,7 +43,12 @@ "target": "targetIndigenousProcurementPercentage", "source-path": "periodTargets.targetIndigenousProcurementPercentage" } - ] + ], + "merge": { + "targetIndigenousProcurementPercentage": { + "replaceExisting": true + } + } }, { "source": { @@ -49,7 +59,12 @@ "target": "organisationPanelProjectValue", "source-path": "totalContractValue" } - ] + ], + "merge": { + "organisationPanelProjectValue": { + "replaceExisting": true + } + } } ], "dataModel": [ diff --git a/forms/other/regionalCapacityServicesReportV3.json b/forms/other/regionalCapacityServicesReportV3.json index 4ff490454..edf92a750 100644 --- a/forms/other/regionalCapacityServicesReportV3.json +++ b/forms/other/regionalCapacityServicesReportV3.json @@ -9,41 +9,56 @@ "collapsedByDefault": false, "templateName": "regionalCapacityServicesReport", "template": { - "pre-populate": [ - { - "source": { - "context-path": "owner" - }, - "mapping": [ - { - "target": "targetIndigenousParticipationPercentage", - "source-path": "periodTargets.targetIndigenousParticipationPercentage" - } - ] + "pre-populate": [ + { + "source": { + "context-path": "owner" }, - { - "source": { - "context-path": "owner" - }, - "mapping": [ - { - "target": "targetIndigenousProcurementPercentage", - "source-path": "periodTargets.targetIndigenousProcurementPercentage" - } - ] + "mapping": [ + { + "target": "targetIndigenousParticipationPercentage", + "source-path": "periodTargets.targetIndigenousParticipationPercentage" + } + ], + "merge": { + "targetIndigenousParticipationPercentage": { + "replaceExisting": true + } + } + }, + { + "source": { + "context-path": "owner" }, - { - "source": { - "context-path": "owner" - }, - "mapping": [ - { - "target": "organisationPanelProjectValue", - "source-path": "totalContractValue" - } - ] + "mapping": [ + { + "target": "targetIndigenousProcurementPercentage", + "source-path": "periodTargets.targetIndigenousProcurementPercentage" + } + ], + "merge": { + "targetIndigenousProcurementPercentage": { + "replaceExisting": true + } + } + }, + { + "source": { + "context-path": "owner" + }, + "mapping": [ + { + "target": "organisationPanelProjectValue", + "source-path": "totalContractValue" + } + ], + "merge": { + "organisationPanelProjectValue": { + "replaceExisting": true + } } - ], + } + ], "dataModel": [ { "name": "governanceAndFinancialFrameworksOnTrack",