Merge pull request #2243 from ORNL-AMO/epic-2200

Epic 2200: v0.14.7-beta

Author: rmroot

package-lock.json

@@ -1,7 +1,7 @@
 {
   "name": "verifi",
   "description": "Application for analyzing utility usage",
-  "version": "0.14.6-beta",
+  "version": "0.14.7-beta",
   "main": "main.js",
   "author": "Advanced Manufacturing Office",
   "repository": "https://github.com/ORNL-AMO/VERIFI.git",

package.json

@@ -120,7 +120,7 @@ export class AppComponent {
     });
     this.inDataManagement = this.router.url.includes('data-management');
   }
-  
+
   async initializeData() {
     try {
       let accounts: Array<IdbAccount> = await firstValueFrom(this.accountDbService.getAll());
@@ -277,12 +277,15 @@ export class AppComponent {
     this.loadingMessage = "Loading Predictor Data..";
     //set predictor data (V2)
     let predictorData: Array<IdbPredictorData> = await this.predictorDataDbService.getAllAccountPredictorData(account.guid);
-    for (let i = 0; i < predictorData.length; i++) {
-      if (!predictorData[i].migratedDates) {
-        predictorData[i].month = new Date(predictorData[i]['date']).getMonth() + 1;
-        predictorData[i].year = new Date(predictorData[i]['date']).getFullYear();
-        predictorData[i].migratedDates = true;
-        await firstValueFrom(this.predictorDataDbService.updateWithObservable(predictorData[i]));
+    let needsMigration: boolean = predictorData.some(item => { return !item.migratedDates });
+    if (needsMigration) {
+      for (let i = 0; i < predictorData.length; i++) {
+        if (!predictorData[i].migratedDates) {
+          predictorData[i].month = new Date(predictorData[i]['date']).getMonth() + 1;
+          predictorData[i].year = new Date(predictorData[i]['date']).getFullYear();
+          predictorData[i].migratedDates = true;
+          await firstValueFrom(this.predictorDataDbService.updateWithObservable(predictorData[i]));
+        }
       }
     }
     this.predictorDataDbService.accountPredictorData.next(predictorData);
@@ -312,13 +315,16 @@ export class AppComponent {
     //set meter data
     this.loadingMessage = "Loading Meter Data..";
     let accountMeterData: Array<IdbUtilityMeterData> = await this.utilityMeterDataDbService.getAllAccountMeterData(account.guid);
-    for (let meterData of accountMeterData) {
-      if (!meterData.migratedDates) {
-        meterData.month = new Date(meterData['readDate']).getMonth() + 1;
-        meterData.year = new Date(meterData['readDate']).getFullYear();
-        meterData.day = new Date(meterData['readDate']).getDate();
-        meterData.migratedDates = true;
-        await firstValueFrom(this.utilityMeterDataDbService.updateWithObservable(meterData));
+    let needsMigration: boolean = accountMeterData.some(item => { return !item.migratedDates });
+    if (needsMigration) {
+      for (let meterData of accountMeterData) {
+        if (!meterData.migratedDates) {
+          meterData.month = new Date(meterData['readDate']).getMonth() + 1;
+          meterData.year = new Date(meterData['readDate']).getFullYear();
+          meterData.day = new Date(meterData['readDate']).getDate();
+          meterData.migratedDates = true;
+          await firstValueFrom(this.utilityMeterDataDbService.updateWithObservable(meterData));
+        }
       }
     }
     this.utilityMeterDataDbService.accountMeterData.next(accountMeterData)

src/app/app.component.ts

@@ -108,12 +108,18 @@ export class HomePageComponent {
   }
 
   async goToAccountHome(account: IdbAccount) {
+    this.loadingService.setLoadingMessage('Loading Account...');
+    this.loadingService.setLoadingStatus(true);
     await this.dbChangesService.selectAccount(account, false);
+    this.loadingService.setLoadingStatus(false);
     this.router.navigateByUrl('/data-evaluation/account/home');
   }
 
   async goToDataWizard(account: IdbAccount) {
+    this.loadingService.setLoadingMessage('Loading Account...');
+    this.loadingService.setLoadingStatus(true);
     await this.dbChangesService.selectAccount(account, false);
+    this.loadingService.setLoadingStatus(false);
     this.router.navigateByUrl('/data-management/' + account.guid);
   }
 }

src/app/core-components/home-page/home-page.component.ts

@@ -253,12 +253,16 @@ export class DbChangesService {
   async setPredictorDataV2(account: IdbAccount, skipUpdates: boolean, facility?: IdbFacility) {
     let predictorData: Array<IdbPredictorData> = await this.predictorDataDbService.getAllAccountPredictorData(account.guid);
     if (!skipUpdates) {
-      for (let i = 0; i < predictorData.length; i++) {
-        if (!predictorData[i].migratedDates) {
-          predictorData[i].month = predictorData[i]['date'].getMonth() + 1;
-          predictorData[i].year = predictorData[i]['date'].getFullYear();
-          predictorData[i].migratedDates = true;
-          await firstValueFrom(this.predictorDataDbService.updateWithObservable(predictorData[i]));
+      let needsMigration: boolean = predictorData.some(item => { return !item.migratedDates });
+      if (needsMigration) {
+        this.loadingService.setLoadingMessage('Updating predictor data dates for a consistent experience across timezones. This may take a moment...');
+        for (let i = 0; i < predictorData.length; i++) {
+          if (!predictorData[i].migratedDates) {
+            predictorData[i].month = predictorData[i]['date'].getMonth() + 1;
+            predictorData[i].year = predictorData[i]['date'].getFullYear();
+            predictorData[i].migratedDates = true;
+            await firstValueFrom(this.predictorDataDbService.updateWithObservable(predictorData[i]));
+          }
         }
       }
     }
@@ -304,13 +308,17 @@ export class DbChangesService {
   async setMeterData(account: IdbAccount, skipUpdates: boolean, facility?: IdbFacility) {
     let accountMeterData: Array<IdbUtilityMeterData> = await this.utilityMeterDataDbService.getAllAccountMeterData(account.guid);
     if (!skipUpdates) {
-      for (let meterData of accountMeterData) {
-        if (meterData['readDate'] && !meterData.migratedDates) {
-          meterData.month = meterData['readDate'].getMonth() + 1;
-          meterData.year = meterData['readDate'].getFullYear();
-          meterData.day = meterData['readDate'].getDate();
-          meterData.migratedDates = true;
-          await firstValueFrom(this.utilityMeterDataDbService.updateWithObservable(meterData));
+      let needsMigration: boolean = accountMeterData.some(item => { return !item.migratedDates });
+      if (needsMigration) {
+        this.loadingService.setLoadingMessage('Updating meter data dates for a consistent experience across timezones. This may take a moment...');
+        for (let meterData of accountMeterData) {
+          if (meterData['readDate'] && !meterData.migratedDates) {
+            meterData.month = meterData['readDate'].getMonth() + 1;
+            meterData.year = meterData['readDate'].getFullYear();
+            meterData.day = meterData['readDate'].getDate();
+            meterData.migratedDates = true;
+            await firstValueFrom(this.utilityMeterDataDbService.updateWithObservable(meterData));
+          }
         }
       }
     }