From 9ab70d867ad7e6359e01d0117a88c4b24180aac4 Mon Sep 17 00:00:00 2001
From: rmroot <rootrm@ornl.gov>
Date: Tue, 21 Jan 2025 11:09:14 -0600
Subject: [PATCH 1/2] updated list ordering for KPIs based off feedback

---
 .../keyPerformanceIndicatorOptions.ts         | 84 ++++++++++---------
 .../helper-pipes/kpi-list-filter.pipe.ts      | 21 ++++-
 2 files changed, 63 insertions(+), 42 deletions(-)

diff --git a/src/app/shared/constants/keyPerformanceIndicatorOptions.ts b/src/app/shared/constants/keyPerformanceIndicatorOptions.ts
index 97f52a7f..0e20110f 100644
--- a/src/app/shared/constants/keyPerformanceIndicatorOptions.ts
+++ b/src/app/shared/constants/keyPerformanceIndicatorOptions.ts
@@ -32,12 +32,7 @@ export interface KeyPerformanceIndicatorOption {
 };
 
 export const KeyPerformanceIndicatorOptions: Array<KeyPerformanceIndicatorOption> = [
-    {
-        primaryKPI: 'Strategic Relationship Impact',
-        label: 'Strategic Relationship Impact',
-        htmlLabel: 'Strategic Relationship Impact',
-        optionValue: 'strategicRelationshipImpact'
-    },
+    //operations
     {
         primaryKPI: 'Operations',
         label: 'Productivity',
@@ -46,9 +41,9 @@ export const KeyPerformanceIndicatorOptions: Array<KeyPerformanceIndicatorOption
     },
     {
         primaryKPI: 'Operations',
-        label: 'Machine Utilization',
-        htmlLabel: 'Machine Utilization',
-        optionValue: 'machineUtilization'
+        label: 'Expense Cost',
+        htmlLabel: 'Expense Cost',
+        optionValue: 'reduceExpenseCost'
     },
     {
         primaryKPI: 'Operations',
@@ -56,6 +51,12 @@ export const KeyPerformanceIndicatorOptions: Array<KeyPerformanceIndicatorOption
         htmlLabel: 'Quality',
         optionValue: 'quality'
     },
+    {
+        primaryKPI: 'Operations',
+        label: 'Machine Utilization',
+        htmlLabel: 'Machine Utilization',
+        optionValue: 'machineUtilization'
+    },
     {
         primaryKPI: 'Operations',
         label: 'Material Utilization',
@@ -70,9 +71,35 @@ export const KeyPerformanceIndicatorOptions: Array<KeyPerformanceIndicatorOption
     },
     {
         primaryKPI: 'Operations',
-        label: 'Expense Cost',
-        htmlLabel: 'Expense Cost',
-        optionValue: 'reduceExpenseCost'
+        label: 'Maintenance Expense',
+        htmlLabel: 'Maintenance Expense',
+        optionValue: 'maintenanceExpense'
+    },
+    //Employee and workplace environment
+    {
+        primaryKPI: 'Employee and Workplace Environment',
+        label: 'Safety',
+        htmlLabel: 'Safety',
+        optionValue: 'safety'
+    },
+    {
+        primaryKPI: 'Employee and Workplace Environment',
+        label: 'Employee Engagement - Workforce Development',
+        htmlLabel: 'Employee Engagement - Workforce Development',
+        optionValue: 'employeeEngagementWorkforceDevelopment'
+    },
+    {
+        primaryKPI: 'Employee and Workplace Environment',
+        label: 'Employee Engagement - Working Environment',
+        htmlLabel: 'Employee Engagement - Working Environment',
+        optionValue: 'employeeEngagementWorkingEnvironment'
+    },
+    //Sustainability (Environmental Impact)
+    {
+        primaryKPI: 'Sustainability (Environmental Impact)',
+        label: 'GHG Emissions',
+        htmlLabel: 'GHG Emissions',
+        optionValue: 'chemicalEmissions'
     },
     {
         primaryKPI: 'Sustainability (Environmental Impact)',
@@ -110,12 +137,6 @@ export const KeyPerformanceIndicatorOptions: Array<KeyPerformanceIndicatorOption
         htmlLabel: 'Dust Emissions',
         optionValue: 'dustEmissions'
     },
-    {
-        primaryKPI: 'Sustainability (Environmental Impact)',
-        label: 'GHG Emissions',
-        htmlLabel: 'GHG Emissions',
-        optionValue: 'chemicalEmissions'
-    },
     {
         primaryKPI: 'Sustainability (Environmental Impact)',
         label: 'Air Pollutant Emissions',
@@ -134,28 +155,11 @@ export const KeyPerformanceIndicatorOptions: Array<KeyPerformanceIndicatorOption
         htmlLabel: 'Reduce Refrigerant Gas Emissions',
         optionValue: 'reduceRefrigerantGasEmissions'
     },
+    //Strategic relationship impact
     {
-        primaryKPI: 'Employee and Workplace Environment',
-        label: 'Safety',
-        htmlLabel: 'Safety',
-        optionValue: 'safety'
-    },
-    {
-        primaryKPI: 'Employee and Workplace Environment',
-        label: 'Employee Engagement - Working Environment',
-        htmlLabel: 'Employee Engagement - Working Environment',
-        optionValue: 'employeeEngagementWorkingEnvironment'
-    },
-    {
-        primaryKPI: 'Employee and Workplace Environment',
-        label: 'Employee Engagement - Workforce Development',
-        htmlLabel: 'Employee Engagement - Workforce Development',
-        optionValue: 'employeeEngagementWorkforceDevelopment'
-    },
-    {
-        primaryKPI: 'Operations',
-        label: 'Maintenance Expense',
-        htmlLabel: 'Maintenance Expense',
-        optionValue: 'maintenanceExpense'
+        primaryKPI: 'Strategic Relationship Impact',
+        label: 'Strategic Relationship Impact',
+        htmlLabel: 'Strategic Relationship Impact',
+        optionValue: 'strategicRelationshipImpact'
     },
 ]
\ No newline at end of file
diff --git a/src/app/shared/helper-pipes/kpi-list-filter.pipe.ts b/src/app/shared/helper-pipes/kpi-list-filter.pipe.ts
index c116a0b3..0b021f34 100644
--- a/src/app/shared/helper-pipes/kpi-list-filter.pipe.ts
+++ b/src/app/shared/helper-pipes/kpi-list-filter.pipe.ts
@@ -19,9 +19,26 @@ export class KpiListFilterPipe implements PipeTransform {
         return option.label.toLowerCase().includes(searchStr.toLowerCase());
       });
     }
+
+
     return _.orderBy(filteredOptions, (option: KeyPerformanceIndicatorOption) => {
-      return option.label;
+      return this.getPrimaryOrder(option);
     }, 'asc');
   }
 
-}
+
+  getPrimaryOrder(option: KeyPerformanceIndicatorOption): number {
+    switch (option.primaryKPI) {
+      case 'Operations':
+        return 1;
+      case 'Employee and Workplace Environment':
+        return 2;
+      case 'Sustainability (Environmental Impact)':
+        return 3;
+      case 'Strategic Relationship Impact':
+        return 4;
+      case 'Other':
+        return 5;
+    }
+  }
+}
\ No newline at end of file

From e5fd9aae8794467d229f4c2ed57b00017b04f763 Mon Sep 17 00:00:00 2001
From: rmroot <rootrm@ornl.gov>
Date: Tue, 21 Jan 2025 11:38:45 -0600
Subject: [PATCH 2/2] quick fix to routing

---
 .../kpi-search-form/kpi-list/kpi-list.component.ts              | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/shared/shared-facility-forms/kpi-search-form/kpi-list/kpi-list.component.ts b/src/app/shared/shared-facility-forms/kpi-search-form/kpi-list/kpi-list.component.ts
index 63a86425..23e12120 100644
--- a/src/app/shared/shared-facility-forms/kpi-search-form/kpi-list/kpi-list.component.ts
+++ b/src/app/shared/shared-facility-forms/kpi-search-form/kpi-list/kpi-list.component.ts
@@ -112,7 +112,7 @@ export class KpiListComponent {
 
   goToKpiDetails(kpi: IdbKeyPerformanceIndicator) {
     if (this.router.url.includes('portfolio')) {
-      this.router.navigateByUrl('portfolio/company/' + kpi.companyId + '/performance-indicators/details/' + kpi.guid);
+      this.router.navigateByUrl('portfolio/facility/' + kpi.facilityId + '/performance-indicators/details/' + kpi.guid);
     } else {
       let onSiteVisit: IdbOnSiteVisit = this.onSiteVisitIdbService.selectedVisit.getValue();
       this.router.navigateByUrl('setup-wizard/pre-visit/' + onSiteVisit.guid + '/facility-kpi-detail/' + kpi.guid);