diff --git a/src/app/shared/helper-services/backup-data.service.ts b/src/app/shared/helper-services/backup-data.service.ts index 1b181d15e..db84e5176 100644 --- a/src/app/shared/helper-services/backup-data.service.ts +++ b/src/app/shared/helper-services/backup-data.service.ts @@ -329,6 +329,7 @@ export class BackupDataService { this.loadingService.setLoadingMessage('Adding Facility Analysis Items...'); let facilityAnalysisGUIDs: Array<{ oldId: string, newId: string }> = new Array(); + let bankedItems: Array = new Array(); for (let i = 0; i < backupFile.facilityAnalysisItems.length; i++) { let facilityAnalysisItem: IdbAnalysisItem = backupFile.facilityAnalysisItems[i]; let newGUID: string = this.getGUID(); @@ -351,9 +352,19 @@ export class BackupDataService { variable.id = this.getNewId(variable.id, predictorGUIDs); }); }); - await firstValueFrom(this.analysisDbService.addWithObservable(facilityAnalysisItem)); + facilityAnalysisItem = await firstValueFrom(this.analysisDbService.addWithObservable(facilityAnalysisItem)); + if (facilityAnalysisItem.hasBanking) { + bankedItems.push(facilityAnalysisItem); + } } + for (let i = 0; i < bankedItems.length; i++) { + let facilityAnalysisItem: IdbAnalysisItem = bankedItems[i]; + if (facilityAnalysisItem.hasBanking) { + facilityAnalysisItem.bankedAnalysisItemId = this.getNewId(facilityAnalysisItem.bankedAnalysisItemId, facilityAnalysisGUIDs); + await firstValueFrom(this.analysisDbService.updateWithObservable(facilityAnalysisItem)); + } + } this.loadingService.setLoadingMessage('Adding Account Analysis Items...'); let accountAnalysisGUIDs: Array<{ oldId: string, newId: string }> = new Array(); @@ -661,7 +672,7 @@ export class BackupDataService { included: false, includedGroups: backupFile.groups.map(group => { return { - groupId: this.getNewId(group.guid, meterGroupGUIDs), + groupId: this.getNewId(group.guid, meterGroupGUIDs), include: true } })