Merge pull request #1801 from ORNL-AMO/issue-1790-b

fix fontawesome exclamation point
ORNL-AMO · Jan 31, 2025 · a884de5 · a884de5
2 parents b15856a + e649850
commit a884de5
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 29 deletions.
diff --git a/src/app/account/account-home/account-home-summary/account-home-summary.component.html b/src/app/account/account-home/account-home-summary/account-home-summary.component.html
@@ -26,7 +26,7 @@ <h1 class="card-title"><span class="fa fa-building"></span> {{account.name}}</h1
                             <span
                                 class="position-absolute top-0 start-100 translate-middle badge rounded-pill bg-danger"
                                 *ngIf="energyAnalysisNeeded || waterAnalysisNeeded">
-                                <span class="fa-exclamation white"></span>
+                                <span class="fa fa-exclamation white"></span>
                             </span>
                         </button>
                     </div>
@@ -67,7 +67,7 @@ <h1 class="card-title"><span class="fa fa-building"></span> {{account.name}}</h1
                         <li class="list-group-item" *ngIf="energyAnalysisNeeded">
                             <a class="nav-link" routerLink="/account/analysis/dashboard/energy">
                                 <span class="badge rounded-pill bg-danger">
-                                    <span class="fa-exclamation white"></span>
+                                    <span class="fa fa-exclamation white"></span>
                                 </span>
                                 Energy analysis needed. <ng-container *ngIf="latestEnergyAnalysisItem">Latest energy
                                     analysis conducted for
@@ -78,7 +78,7 @@ <h1 class="card-title"><span class="fa fa-building"></span> {{account.name}}</h1
                         <li class="list-group-item" *ngIf="waterAnalysisNeeded">
                             <a class="nav-link" routerLink="/account/analysis/dashboard/water">
                                 <span class="badge rounded-pill bg-danger">
-                                    <span class="fa-exclamation white"></span>
+                                    <span class="fa fa-exclamation white"></span>
                                 </span>
                                 Water analysis needed. <ng-container *ngIf="latestWaterAnalysisItem">Latest water
                                     analysis conducted for

diff --git a/src/app/app.component.ts b/src/app/app.component.ts
@@ -51,10 +51,10 @@ import { ApplicationInstanceDbService } from './indexedDB/application-instance-d
 declare let gtag: Function;
 
 @Component({
-    selector: 'app-root',
-    templateUrl: './app.component.html',
-    styleUrls: ['./app.component.css'],
-    standalone: false
+  selector: 'app-root',
+  templateUrl: './app.component.html',
+  styleUrls: ['./app.component.css'],
+  standalone: false
 })
 export class AppComponent {
 
@@ -170,7 +170,7 @@ export class AppComponent {
         this.dataInitialized = true;
         this.router.navigateByUrl('setup-wizard');
       }
-      
+
     } catch (err) {
       console.log(err);
       await this.eGridService.parseEGridData();
@@ -346,26 +346,28 @@ export class AppComponent {
   }
 
   async setAppOpenNotifications() {
-    let applicationData: ApplicationInstanceData = this.applicationInstanceDbService.applicationInstanceData.getValue();
-    if (!applicationData.isSurveyDone) {
-      if (applicationData.doSurveyReminder) {
-        setTimeout(() => {
-          this.surveyService.showSurveyModal.next(true);
-        }, 5000);
-        await firstValueFrom(this.applicationInstanceDbService.setSurveyDone());
-      } else {
-        let hasMetUsageRequirement: boolean = this.surveyService.getHasMetUsageRequirements(applicationData);
-        let showModalToExistingUser: boolean = this.surveyService.checkIsExistingUser();
-        let showModal: boolean = showModalToExistingUser || hasMetUsageRequirement;
-
-        setTimeout(() => {
-          this.surveyService.showSurveyModal.next(showModal);
-        }, 5000);
+    if (environment.production) {
+      let applicationData: ApplicationInstanceData = this.applicationInstanceDbService.applicationInstanceData.getValue();
+      if (!applicationData.isSurveyDone) {
+        if (applicationData.doSurveyReminder) {
+          setTimeout(() => {
+            this.surveyService.showSurveyModal.next(true);
+          }, 5000);
+          await firstValueFrom(this.applicationInstanceDbService.setSurveyDone());
+        } else {
+          let hasMetUsageRequirement: boolean = this.surveyService.getHasMetUsageRequirements(applicationData);
+          let showModalToExistingUser: boolean = this.surveyService.checkIsExistingUser();
+          let showModal: boolean = showModalToExistingUser || hasMetUsageRequirement;
 
-        if (!applicationData.isSurveyToastDone && !showModalToExistingUser) {
           setTimeout(() => {
-            this.surveyService.showSurveyToast.next(true);
+            this.surveyService.showSurveyModal.next(showModal);
           }, 5000);
+
+          if (!applicationData.isSurveyToastDone && !showModalToExistingUser) {
+            setTimeout(() => {
+              this.surveyService.showSurveyToast.next(true);
+            }, 5000);
+          }
         }
       }
     }

diff --git a/src/app/facility/facility-home/facility-home-summary/facility-home-summary.component.html b/src/app/facility/facility-home/facility-home-summary/facility-home-summary.component.html
@@ -62,7 +62,7 @@ <h1 class="card-title"><span class="fa fa-industry" [ngStyle]="{color: facility.
                             <span
                                 class="position-absolute top-0 start-100 translate-middle badge rounded-pill bg-danger"
                                 *ngIf="energyAnalysisNeeded || waterAnalysisNeeded">
-                                <span class="fa-exclamation white"></span>
+                                <span class="fa fa-exclamation white"></span>
                             </span>
                         </button>
                     </div>
@@ -93,7 +93,7 @@ <h1 class="card-title"><span class="fa fa-industry" [ngStyle]="{color: facility.
                         <li class="list-group-item" *ngIf="meterReadingsNeeded">
                             <a class="nav-link" routerLink="/facility/{{facility.id}}/utility">
                                 <span class="badge rounded-pill bg-danger">
-                                    <span class="fa-exclamation white"></span>
+                                    <span class="fa fa-exclamation white"></span>
                                 </span>
                                 Meter readings needed. <span *ngIf="lastBill">Latest entry {{lastBill.readDate |
                                     date}}.</span>
@@ -103,7 +103,7 @@ <h1 class="card-title"><span class="fa fa-industry" [ngStyle]="{color: facility.
                             <a class="nav-link"
                                 routerLink="/facility/{{facility.id}}/analysis/analysis-dashboard/energy">
                                 <span class="badge rounded-pill bg-danger">
-                                    <span class="fa-exclamation white"></span>
+                                    <span class="fa fa-exclamation white"></span>
                                 </span>
                                 Energy analysis needed. <ng-container *ngIf="latestEnergyAnalysisItem">Latest energy
                                     analysis conducted for
@@ -115,7 +115,7 @@ <h1 class="card-title"><span class="fa fa-industry" [ngStyle]="{color: facility.
                             <a class="nav-link"
                                 routerLink="/facility/{{facility.id}}/analysis/analysis-dashboard/water">
                                 <span class="badge rounded-pill bg-danger">
-                                    <span class="fa-exclamation white"></span>
+                                    <span class="fa fa-exclamation white"></span>
                                 </span>
                                 Water analysis needed. <ng-container *ngIf="latestWaterAnalysisItem">Latest water
                                     analysis conducted for