From c0461a19e36190983beac951e33f34696874e4d5 Mon Sep 17 00:00:00 2001
From: rmroot <rootrm@ornl.gov>
Date: Tue, 24 Sep 2024 15:38:36 -0500
Subject: [PATCH 1/2] pass through kpms and update calculation methods

---
 .../shared/constants/keyPerformanceMetrics.ts | 298 +++++++++++-------
 .../constants/nonEnergyBenefitOptions.ts      |  22 +-
 .../kpm-details-form.component.html           |  12 +-
 .../label-with-tooltip/LabelTooltips.ts       |   3 +
 4 files changed, 200 insertions(+), 135 deletions(-)

diff --git a/src/app/shared/constants/keyPerformanceMetrics.ts b/src/app/shared/constants/keyPerformanceMetrics.ts
index 292f51e2..ca40081c 100644
--- a/src/app/shared/constants/keyPerformanceMetrics.ts
+++ b/src/app/shared/constants/keyPerformanceMetrics.ts
@@ -14,7 +14,7 @@ export function getPerformanceMetrics(keyPerformanceIndicatorValue: KeyPerforman
                 baselineCost: undefined,
                 isCustom: false,
                 kpiGuid: kpiGuid,
-                calculationMethod: 'costPerUnit',
+                calculationMethod: option.calculationMethod ? option.calculationMethod : 'costPerUnit',
                 guid: getGUID(),
 
             }
@@ -110,7 +110,6 @@ export interface KeyPerformanceMetric extends KeyPerformanceMetricOption {
     isCustom: boolean,
     kpiGuid: string,
     guid: string,
-    calculationMethod: KpmCalculationMethod,
 }
 
 
@@ -122,7 +121,9 @@ export interface KeyPerformanceMetricOption {
     isQuantitative: boolean,
     totalUnit?: string,
     goalToIncrease: boolean,
-    timePeriod: string
+    timePeriod: string,
+    calculationMethod?: KpmCalculationMethod,
+    quantitativeUnavailable?: boolean
 };
 
 
@@ -135,7 +136,7 @@ export function convertOptionTypeToMetricType(option: KeyPerformanceMetricOption
         isCustom: false,
         kpiGuid: undefined,
         guid: undefined,
-        calculationMethod: 'costPerUnit',
+        calculationMethod: option.calculationMethod ? option.calculationMethod : 'directCost',
         goalToIncrease: true
     }
 }
@@ -149,16 +150,19 @@ export const KeyPerformanceMetricOptions: Array<KeyPerformanceMetricOption> = [
         kpiValue: "strategicRelationshipImpact",
         isQuantitative: false,
         goalToIncrease: true,
-        timePeriod: 'yr'
+        timePeriod: 'yr',
+        calculationMethod: 'directCost'
     },
     {
         label: "Sales growth ($)",
         htmlLabel: "Sales growth (&dollar;)",
         value: "salesGrowth",
         kpiValue: "strategicRelationshipImpact",
-        isQuantitative: false,
+        isQuantitative: true,
         goalToIncrease: true,
-        timePeriod: 'yr'
+        timePeriod: 'yr',
+        totalUnit: '$',
+        calculationMethod: 'percentTotal'
     },
     {
         label: "Customer Satisfaction Ratings",
@@ -167,16 +171,19 @@ export const KeyPerformanceMetricOptions: Array<KeyPerformanceMetricOption> = [
         kpiValue: "strategicRelationshipImpact",
         isQuantitative: false,
         goalToIncrease: true,
-        timePeriod: 'yr'
+        timePeriod: 'yr',
+        quantitativeUnavailable: true
     },
     {
         label: "Lost Customer Sales ($)",
         htmlLabel: "Lost Customer Sales (&dollar;)",
         value: "lostCustomerSales",
         kpiValue: "strategicRelationshipImpact",
-        isQuantitative: false,
-        goalToIncrease: true,
-        timePeriod: 'yr'
+        isQuantitative: true,
+        goalToIncrease: false,
+        timePeriod: 'yr',
+        calculationMethod: 'directCost',
+        totalUnit: '$'
     },
     {
         label: "Customer Churn Rate",
@@ -185,7 +192,8 @@ export const KeyPerformanceMetricOptions: Array<KeyPerformanceMetricOption> = [
         kpiValue: "strategicRelationshipImpact",
         isQuantitative: false,
         goalToIncrease: true,
-        timePeriod: 'yr'
+        timePeriod: 'yr',
+        quantitativeUnavailable: true
     },
     {
         label: "Supplier Satisfaction Ratings",
@@ -194,7 +202,8 @@ export const KeyPerformanceMetricOptions: Array<KeyPerformanceMetricOption> = [
         kpiValue: "strategicRelationshipImpact",
         isQuantitative: false,
         goalToIncrease: true,
-        timePeriod: 'yr'
+        timePeriod: 'yr',
+        quantitativeUnavailable: true
     },
     {
         label: "Productivity rate: Throughput",
@@ -203,43 +212,50 @@ export const KeyPerformanceMetricOptions: Array<KeyPerformanceMetricOption> = [
         kpiValue: "productivity",
         isQuantitative: false,
         goalToIncrease: true,
-        timePeriod: 'yr'
+        timePeriod: 'yr',
+        quantitativeUnavailable: true
     },
     {
         label: "Production Costs",
         htmlLabel: "Production Costs",
         value: "productionCosts",
         kpiValue: "productivity",
-        isQuantitative: false,
-        goalToIncrease: true,
-        timePeriod: 'yr'
+        isQuantitative: true,
+        goalToIncrease: false,
+        timePeriod: 'yr',
+        totalUnit: '$',
+        calculationMethod: 'directCost'
+
     },
     {
         label: "Cycle Time - Time to make goods",
         htmlLabel: "Cycle Time - Time to make goods",
         value: "cycleTimeToMakeGoods",
         kpiValue: "productivity",
-        isQuantitative: false,
-        goalToIncrease: true,
-        timePeriod: 'yr'
+        isQuantitative: true,
+        goalToIncrease: false,
+        timePeriod: 'yr',
+        calculationMethod: 'percentTotal'
     },
     {
         label: "Percent On time to due date",
         htmlLabel: "&#37; On time to due date",
         value: "percentOnTimeToDueDate",
         kpiValue: "productivity",
-        isQuantitative: false,
+        isQuantitative: true,
         goalToIncrease: true,
-        timePeriod: 'yr'
+        timePeriod: 'yr',
+        calculationMethod: 'percentTotal'
     },
     {
         label: "Revenue ($) / employee",
         htmlLabel: "Revenue (&dollar;) / employee",
         value: "revenuePerEmployee",
         kpiValue: "productivity",
-        isQuantitative: false,
+        isQuantitative: true,
         goalToIncrease: true,
-        timePeriod: 'yr'
+        timePeriod: 'yr',
+        calculationMethod: 'percentTotal'
     },
     {
         label: "Per-unit product cost",
@@ -247,8 +263,9 @@ export const KeyPerformanceMetricOptions: Array<KeyPerformanceMetricOption> = [
         value: "perUnitProductCost",
         kpiValue: "productivity",
         isQuantitative: false,
-        goalToIncrease: true,
-        timePeriod: 'yr'
+        goalToIncrease: false,
+        timePeriod: 'yr',
+        calculationMethod: 'percentTotal'
     },
     {
         label: "Work in process",
@@ -256,8 +273,9 @@ export const KeyPerformanceMetricOptions: Array<KeyPerformanceMetricOption> = [
         value: "workInProcess",
         kpiValue: "productivity",
         isQuantitative: false,
-        goalToIncrease: true,
-        timePeriod: 'yr'
+        goalToIncrease: false,
+        timePeriod: 'yr',
+        calculationMethod: 'directCost'
     },
     {
         label: "Num. Equipment caused defects",
@@ -266,8 +284,9 @@ export const KeyPerformanceMetricOptions: Array<KeyPerformanceMetricOption> = [
         kpiValue: "machineUtilization",
         isQuantitative: true,
         totalUnit: 'defect',
-        goalToIncrease: true,
-        timePeriod: 'yr'
+        goalToIncrease: false,
+        timePeriod: 'yr',
+        calculationMethod: 'costPerUnit'
     },
     {
         label: "Equipment Downtime",
@@ -276,26 +295,30 @@ export const KeyPerformanceMetricOptions: Array<KeyPerformanceMetricOption> = [
         kpiValue: "machineUtilization",
         isQuantitative: true,
         totalUnit: 'hr',
-        goalToIncrease: true,
-        timePeriod: 'yr'
+        goalToIncrease: false,
+        timePeriod: 'yr',
+        calculationMethod: 'costPerUnit'
     },
     {
         label: "Percent Capacity utilization",
         htmlLabel: "&#37; Capacity utilization",
         value: "percentCapacityUtilization",
         kpiValue: "machineUtilization",
-        isQuantitative: false,
+        isQuantitative: true,
         goalToIncrease: true,
-        timePeriod: 'yr'
+        timePeriod: 'yr',
+        calculationMethod: 'percentTotal',
     },
     {
         label: "Overall Equipment Effectiveness (OEE)",
         htmlLabel: "Overall Equipment Effectiveness (OEE)",
         value: "overallEquipmentEffectiveness",
         kpiValue: "machineUtilization",
-        isQuantitative: false,
+        isQuantitative: true,
         goalToIncrease: true,
-        timePeriod: 'yr'
+        timePeriod: 'yr',
+        calculationMethod: 'percentTotal'
+
     },
     {
         label: "Fork truck (industrial trucks) breakdown downtime time",
@@ -304,26 +327,29 @@ export const KeyPerformanceMetricOptions: Array<KeyPerformanceMetricOption> = [
         kpiValue: "machineUtilization",
         isQuantitative: true,
         totalUnit: 'hr',
-        goalToIncrease: true,
-        timePeriod: 'yr'
+        goalToIncrease: false,
+        timePeriod: 'yr',
+        calculationMethod: 'costPerUnit'
     },
     {
         label: "Useful equipment life extended (yrs)",
         htmlLabel: "Useful equipment life extended (yrs)",
         value: "usefulEquipmentLifeExtended",
         kpiValue: "machineUtilization",
-        isQuantitative: false,
+        isQuantitative: true,
         goalToIncrease: true,
-        timePeriod: 'yr'
+        timePeriod: 'yr',
+        calculationMethod: 'directCost'
     },
     {
         label: "Time to introduce new products or services",
         htmlLabel: "Time to introduce new products or services",
         value: "timeToIntroduceNewProducts",
         kpiValue: "machineUtilization",
-        isQuantitative: false,
+        isQuantitative: true,
         goalToIncrease: true,
-        timePeriod: 'yr'
+        timePeriod: 'yr',
+        calculationMethod: 'percentTotal'
     },
     {
         label: "($) Defective Production",
@@ -332,8 +358,9 @@ export const KeyPerformanceMetricOptions: Array<KeyPerformanceMetricOption> = [
         kpiValue: "quality",
         isQuantitative: true,
         totalUnit: 'product',
-        goalToIncrease: true,
-        timePeriod: 'yr'
+        goalToIncrease: false,
+        timePeriod: 'yr',
+        calculationMethod: 'directCost'
     },
     {
         label: "Defect Rate-PPM or DPM",
@@ -342,8 +369,9 @@ export const KeyPerformanceMetricOptions: Array<KeyPerformanceMetricOption> = [
         kpiValue: "quality",
         isQuantitative: true,
         totalUnit: 'product',
-        goalToIncrease: true,
-        timePeriod: 'yr'
+        goalToIncrease: false,
+        timePeriod: 'yr',
+        calculationMethod: 'percentTotal'
     },
     {
         label: "QTY Customer Complaints (quality)",
@@ -352,7 +380,8 @@ export const KeyPerformanceMetricOptions: Array<KeyPerformanceMetricOption> = [
         kpiValue: "quality",
         isQuantitative: false,
         goalToIncrease: true,
-        timePeriod: 'yr'
+        timePeriod: 'yr',
+        quantitativeUnavailable: true
     },
     {
         label: "$ Customer Returns (quality)",
@@ -361,26 +390,29 @@ export const KeyPerformanceMetricOptions: Array<KeyPerformanceMetricOption> = [
         kpiValue: "quality",
         isQuantitative: true,
         totalUnit: 'return',
-        goalToIncrease: true,
-        timePeriod: 'yr'
+        goalToIncrease: false,
+        timePeriod: 'yr',
+        calculationMethod: 'costPerUnit'
     },
     {
         label: "Percent Production (manufacturing) yield",
         htmlLabel: "&#37; Production (manufacturing) yield",
         value: "percentProductionYield",
         kpiValue: "materialUtilization",
-        isQuantitative: false,
+        isQuantitative: true,
         goalToIncrease: true,
-        timePeriod: 'yr'
+        timePeriod: 'yr',
+        calculationMethod: 'percentTotal'
     },
     {
         label: "Percent Shrinkage",
         htmlLabel: "&#37; Shrinkage",
         value: "percentShrinkage",
         kpiValue: "materialUtilization",
-        isQuantitative: false,
-        goalToIncrease: true,
-        timePeriod: 'yr'
+        isQuantitative: true,
+        goalToIncrease: false,
+        timePeriod: 'yr',
+        calculationMethod: 'percentTotal'
     },
     {
         label: "Dollar Consumables",
@@ -389,8 +421,9 @@ export const KeyPerformanceMetricOptions: Array<KeyPerformanceMetricOption> = [
         kpiValue: "materialUtilization",
         isQuantitative: true,
         totalUnit: 'consumable',
-        goalToIncrease: true,
-        timePeriod: 'yr'
+        goalToIncrease: false,
+        timePeriod: 'yr',
+        calculationMethod: 'directCost'
     },
     {
         label: "Percent Optimized space",
@@ -400,7 +433,8 @@ export const KeyPerformanceMetricOptions: Array<KeyPerformanceMetricOption> = [
         isQuantitative: true,
         totalUnit: 'ft2',
         goalToIncrease: true,
-        timePeriod: 'yr'
+        timePeriod: 'yr',
+        calculationMethod: 'percentTotal'
     },
     {
         label: "Maintenance Cost",
@@ -409,8 +443,9 @@ export const KeyPerformanceMetricOptions: Array<KeyPerformanceMetricOption> = [
         kpiValue: "reduceExpenseCost",
         isQuantitative: true,
         totalUnit: 'hr',
-        goalToIncrease: true,
-        timePeriod: 'yr'
+        goalToIncrease: false,
+        timePeriod: 'yr',
+        calculationMethod: 'costPerUnit'
     },
     {
         label: "Engineering support (dollars or hours)",
@@ -419,19 +454,20 @@ export const KeyPerformanceMetricOptions: Array<KeyPerformanceMetricOption> = [
         kpiValue: "reduceExpenseCost",
         isQuantitative: true,
         totalUnit: 'hr',
-        goalToIncrease: true,
-        timePeriod: 'yr'
-    },
-    {
-        label: "Energy Cost per Unit",
-        htmlLabel: "Energy Cost per Unit",
-        value: "energyCostPerUnit",
-        kpiValue: "energyCost",
-        isQuantitative: true,
-        totalUnit: 'MMBtu',
-        goalToIncrease: true,
-        timePeriod: 'yr'
-    },
+        goalToIncrease: false,
+        timePeriod: 'yr',
+        calculationMethod: 'costPerUnit'
+    },
+    // {
+    //     label: "Energy Cost per Unit",
+    //     htmlLabel: "Energy Cost per Unit",
+    //     value: "energyCostPerUnit",
+    //     kpiValue: "energyCost",
+    //     isQuantitative: true,
+    //     totalUnit: 'MMBtu',
+    //     goalToIncrease: true,
+    //     timePeriod: 'yr'
+    // },
     {
         label: "Hazardous Disposal Costs",
         htmlLabel: "Hazardous Disposal Costs",
@@ -439,8 +475,9 @@ export const KeyPerformanceMetricOptions: Array<KeyPerformanceMetricOption> = [
         kpiValue: "wasteReductionHazardous",
         isQuantitative: true,
         totalUnit: 'gal',
-        goalToIncrease: true,
-        timePeriod: 'yr'
+        goalToIncrease: false,
+        timePeriod: 'yr',
+        calculationMethod: 'percentTotal'
     },
     {
         label: "Non-Hazardous Disposal Costs",
@@ -449,17 +486,19 @@ export const KeyPerformanceMetricOptions: Array<KeyPerformanceMetricOption> = [
         kpiValue: "wasteReductionNonHazardous",
         isQuantitative: true,
         totalUnit: 'gal',
-        goalToIncrease: true,
-        timePeriod: 'yr'
+        goalToIncrease: false,
+        timePeriod: 'yr',
+        calculationMethod: 'percentTotal'
     },
     {
         label: "Percent Total or Costs",
         htmlLabel: "&#37; Total or Costs",
         value: "percentTotalOrCost",
         kpiValue: "reduceNonconformingProductWaste",
-        isQuantitative: false,
-        goalToIncrease: true,
-        timePeriod: 'yr'
+        isQuantitative: true,
+        goalToIncrease: false,
+        timePeriod: 'yr',
+        calculationMethod: 'percentTotal'
     },
     {
         label: "Consumption Cost",
@@ -468,8 +507,9 @@ export const KeyPerformanceMetricOptions: Array<KeyPerformanceMetricOption> = [
         kpiValue: "waterConsumption",
         isQuantitative: true,
         totalUnit: 'gal',
-        goalToIncrease: true,
-        timePeriod: 'yr'
+        goalToIncrease: false,
+        timePeriod: 'yr',
+        calculationMethod: 'directCost'
     },
     {
         label: "Consumption Cost",
@@ -478,8 +518,9 @@ export const KeyPerformanceMetricOptions: Array<KeyPerformanceMetricOption> = [
         kpiValue: "sewageVolume",
         isQuantitative: true,
         totalUnit: 'gal',
-        goalToIncrease: true,
-        timePeriod: 'yr'
+        goalToIncrease: false,
+        timePeriod: 'yr',
+        calculationMethod: 'directCost'
     },
     {
         label: "Percent Total lbs.",
@@ -488,35 +529,40 @@ export const KeyPerformanceMetricOptions: Array<KeyPerformanceMetricOption> = [
         kpiValue: "dustEmissions",
         isQuantitative: true,
         totalUnit: 'lb',
-        goalToIncrease: true,
-        timePeriod: 'yr'
+        goalToIncrease: false,
+        timePeriod: 'yr',
+        calculationMethod: 'percentTotal'
     },
     {
         label: "Quantity",
         htmlLabel: "Quantity",
         value: "percentOrTotalChemicalEmissions",
         kpiValue: "chemicalEmissions",
-        isQuantitative: false,
-        goalToIncrease: true,
-        timePeriod: 'yr'
+        isQuantitative: true,
+        goalToIncrease: false,
+        timePeriod: 'yr',
+        calculationMethod: 'percentTotal'
     },
     {
         label: "Quantity",
         htmlLabel: "Quantity",
         value: "percentOrTotalRefrigerantEmissions",
         kpiValue: "reduceRefrigerantGasEmissions",
-        isQuantitative: false,
-        goalToIncrease: true,
-        timePeriod: 'yr'
+        isQuantitative: true,
+        goalToIncrease: false,
+        timePeriod: 'yr',
+        calculationMethod: 'percentTotal'
     },
     {
         label: "(OSHA) Total recordable incident rate (TRIR)",
         htmlLabel: "(OSHA) Total recordable incident rate (TRIR)",
         value: "TRIR",
         kpiValue: "safety",
-        isQuantitative: false,
-        goalToIncrease: true,
-        timePeriod: 'yr'
+        isQuantitative: true,
+        goalToIncrease: false,
+        totalUnit: 'incident',
+        timePeriod: 'yr',
+        calculationMethod: 'costPerUnit'
     },
     {
         label: "OSHA Recordable Incidents",
@@ -525,8 +571,9 @@ export const KeyPerformanceMetricOptions: Array<KeyPerformanceMetricOption> = [
         kpiValue: "safety",
         isQuantitative: true,
         totalUnit: 'incident',
-        goalToIncrease: true,
-        timePeriod: 'yr'
+        goalToIncrease: false,
+        timePeriod: 'yr',
+        calculationMethod: 'costPerUnit'
     },
     {
         label: "Total Safety Non-Recordables, Incidents, Near Misses",
@@ -535,8 +582,9 @@ export const KeyPerformanceMetricOptions: Array<KeyPerformanceMetricOption> = [
         kpiValue: "safety",
         isQuantitative: true,
         totalUnit: 'incident',
-        goalToIncrease: true,
-        timePeriod: 'yr'
+        goalToIncrease: false,
+        timePeriod: 'yr',
+        calculationMethod: 'costPerUnit'
     },
     {
         label: "Days away from work",
@@ -545,8 +593,9 @@ export const KeyPerformanceMetricOptions: Array<KeyPerformanceMetricOption> = [
         kpiValue: "safety",
         isQuantitative: true,
         totalUnit: 'day',
-        goalToIncrease: true,
-        timePeriod: 'yr'
+        goalToIncrease: false,
+        timePeriod: 'yr',
+        calculationMethod: 'costPerUnit'
     },
     {
         label: "Lost time inury rate (LTIFR)",
@@ -555,26 +604,29 @@ export const KeyPerformanceMetricOptions: Array<KeyPerformanceMetricOption> = [
         kpiValue: "safety",
         isQuantitative: true,
         totalUnit: 'day',
-        goalToIncrease: true,
-        timePeriod: 'yr'
+        goalToIncrease: false,
+        timePeriod: 'yr',
+        calculationMethod: 'costPerUnit'
     },
     {
         label: "Hearing Conservation Program Compliance - Reduce Occupational Exposure",
         htmlLabel: "Hearing Conservation Program Compliance - Reduce Occupational Exposure",
         value: "hearingConservationProgram",
         kpiValue: "safety",
-        isQuantitative: false,
-        goalToIncrease: true,
-        timePeriod: 'yr'
+        isQuantitative: true,
+        goalToIncrease: false,
+        timePeriod: 'yr',
+        calculationMethod: 'directCost'
     },
     {
         label: "Hearing Conservation Program Compliance - Reduce Occupational Exposure",
         htmlLabel: "Hearing Conservation Program Compliance - Reduce Occupational Exposure",
         value: "hearingConservationProgram",
         kpiValue: "employeeEngagementWorkingEnvironment",
-        isQuantitative: false,
-        goalToIncrease: true,
-        timePeriod: 'yr'
+        isQuantitative: true,
+        goalToIncrease: false,
+        timePeriod: 'yr',
+        calculationMethod: 'directCost'
     },
     {
         label: "Number of particles",
@@ -582,8 +634,9 @@ export const KeyPerformanceMetricOptions: Array<KeyPerformanceMetricOption> = [
         value: "numberOfParticles",
         kpiValue: "employeeEngagementWorkingEnvironment",
         isQuantitative: false,
-        goalToIncrease: true,
-        timePeriod: 'yr'
+        goalToIncrease: false,
+        timePeriod: 'yr',
+        calculationMethod: 'percentTotal'
     },
     {
         label: "Workspace or factory floor comfort",
@@ -599,35 +652,40 @@ export const KeyPerformanceMetricOptions: Array<KeyPerformanceMetricOption> = [
         htmlLabel: "Absenteeism",
         value: "absenteeism",
         kpiValue: "employeeEngagementWorkingEnvironment",
-        isQuantitative: false,
-        goalToIncrease: true,
-        timePeriod: 'yr'
+        isQuantitative: true,
+        goalToIncrease: false,
+        timePeriod: 'yr',
+        totalUnit: 'days',
+        calculationMethod: 'costPerUnit'
     },
     {
         label: "Employee Engagement/Satisfaction",
         htmlLabel: "Employee Engagement/Satisfaction",
         value: "employeeEngagementSatisfaction",
         kpiValue: "employeeEngagementWorkforceDevelopment",
-        isQuantitative: false,
+        isQuantitative: true,
         goalToIncrease: true,
-        timePeriod: 'yr'
+        timePeriod: 'yr',
+        calculationMethod: 'directCost'
     },
     {
         label: "Employee Retention Rate",
         htmlLabel: "Employee Retention Rate",
         value: "employeeRetentionRate",
         kpiValue: "employeeEngagementWorkforceDevelopment",
-        isQuantitative: false,
+        isQuantitative: true,
         goalToIncrease: true,
-        timePeriod: 'yr'
+        timePeriod: 'yr',
+        calculationMethod: 'directCost'
     },
     {
         label: "Talent Turnover Rate",
         htmlLabel: "Talent Turnover Rate",
         value: "talentTurnoverRate",
         kpiValue: "employeeEngagementWorkforceDevelopment",
-        isQuantitative: false,
-        goalToIncrease: true,
-        timePeriod: 'yr'
+        isQuantitative: true,
+        goalToIncrease: false,
+        timePeriod: 'yr',
+        calculationMethod: 'directCost'
     },
 ]
\ No newline at end of file
diff --git a/src/app/shared/constants/nonEnergyBenefitOptions.ts b/src/app/shared/constants/nonEnergyBenefitOptions.ts
index a3c91ec8..50f486ae 100644
--- a/src/app/shared/constants/nonEnergyBenefitOptions.ts
+++ b/src/app/shared/constants/nonEnergyBenefitOptions.ts
@@ -365,17 +365,17 @@ export const NebOptions: Array<NebOption> = [
         howToCalculate: "N/A",
         KPM: ["contributeCompanyVision", "totalLbsDust"],
     },
-    {
-        label: "Reduce CO, CO2, NOx, SOx emissions",
-        htmlLabel: "Reduce CO, CO<sub>2</sub>, NO<sub>x</sub>, SO<sub>x</sub> emissions",
-        optionValue: "reduceChemicalEmissions",
-        // riskReduction: true,
-        // valuePropositionIncrease: true,
-        // decreaseCosts: true,
-        isQualitative: true,
-        howToCalculate: "N/A",
-        KPM: ["contributeCompanyVision", "percentOrTotalChemicalEmissions"],
-    },
+    // {
+    //     label: "Reduce CO, CO2, NOx, SOx emissions",
+    //     htmlLabel: "Reduce CO, CO<sub>2</sub>, NO<sub>x</sub>, SO<sub>x</sub> emissions",
+    //     optionValue: "reduceChemicalEmissions",
+    //     // riskReduction: true,
+    //     // valuePropositionIncrease: true,
+    //     // decreaseCosts: true,
+    //     isQualitative: true,
+    //     howToCalculate: "N/A",
+    //     KPM: ["contributeCompanyVision", "percentOrTotalChemicalEmissions"],
+    // },
     {
         label: "Reduce refrigerant gas emissions",
         htmlLabel: "Reduce refrigerant gas emissions",
diff --git a/src/app/shared/kpm-details-form/kpm-details-form.component.html b/src/app/shared/kpm-details-form/kpm-details-form.component.html
index 4cd8e860..e4a5df42 100644
--- a/src/app/shared/kpm-details-form/kpm-details-form.component.html
+++ b/src/app/shared/kpm-details-form/kpm-details-form.component.html
@@ -1,4 +1,4 @@
-<div class="row" *ngIf="keyPerformanceMetric.totalUnit">
+<div class="row" *ngIf="!keyPerformanceMetric.quantitativeUnavailable">
     <label class="col-sm-6 col-form-label" for="{{'isQuantitative_'+keyPerformanceMetric.value}}">
         Metric Type
     </label>
@@ -31,9 +31,13 @@
         </div>
     </div>
     <div class="row">
-        <label class="col-sm-6 col-form-label" for="{{'calculationMethod_'+keyPerformanceMetric.value}}">
+        <!-- <label class="col-sm-6 col-form-label" for="{{'calculationMethod_'+keyPerformanceMetric.value}}">
             Calculation Method
-        </label>
+        </label> -->
+        <div class="col-sm-6 col-form-label">
+            <app-label-with-tooltip [field]="'calculationMethod'" [labelId]="'calculationMethod_'+keyPerformanceMetric.value"
+                [label]="'Impact Calculation Method'"></app-label-with-tooltip>
+        </div>
         <div class="col-6">
             <select id="{{'calculationMethod_'+keyPerformanceMetric.value}}"
                 name="{{'calculationMethod_'+keyPerformanceMetric.value}}" class="form-select"
@@ -143,7 +147,7 @@
         </div>
     </ng-template>
 </ng-template>
-<ng-template [ngIf]="!keyPerformanceMetric.totalUnit">
+<ng-template [ngIf]="keyPerformanceMetric.quantitativeUnavailable">
     <div class="alert alert-info small mt-2">
         Quantitative results unavailable at this time.
     </div>
diff --git a/src/app/shared/label-with-tooltip/LabelTooltips.ts b/src/app/shared/label-with-tooltip/LabelTooltips.ts
index 13ff08df..e68bcb30 100644
--- a/src/app/shared/label-with-tooltip/LabelTooltips.ts
+++ b/src/app/shared/label-with-tooltip/LabelTooltips.ts
@@ -4,5 +4,8 @@ export const LabelTooltips = {
     },
     "goalToIncrease": {
         "tooltip": "Is the desired impact on this metric to increase or decrease its value?"
+    },
+    "calculationMethod": {
+        "tooltip": "The method used to calculate impacts on the metric."
     }
 }
\ No newline at end of file

From 46cf6d6a58172e7e074981e5ff4fdb9b56b4c20d Mon Sep 17 00:00:00 2001
From: rmroot <rootrm@ornl.gov>
Date: Wed, 25 Sep 2024 10:11:23 -0500
Subject: [PATCH 2/2] remove energy cost KPI

---
 src/app/shared/constants/keyPerformanceIndicatorOptions.ts | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/src/app/shared/constants/keyPerformanceIndicatorOptions.ts b/src/app/shared/constants/keyPerformanceIndicatorOptions.ts
index 5f6e0fcd..b6d68782 100644
--- a/src/app/shared/constants/keyPerformanceIndicatorOptions.ts
+++ b/src/app/shared/constants/keyPerformanceIndicatorOptions.ts
@@ -15,7 +15,6 @@ export type KeyPerformanceIndicatorValue =
     'reduceNonconformingProductWaste' |
     'wasteReductionNonHazardous' |
     'wasteReductionHazardous' |
-    'energyCost' |
     'reduceExpenseCost' |
     'improveSpaceUtilization' |
     'employeeEngagementWorkforceDevelopment' |
@@ -72,12 +71,6 @@ export const KeyPerformanceIndicatorOptions: Array<KeyPerformanceIndicatorOption
         htmlLabel: 'Reduce Expense Cost',
         optionValue: 'reduceExpenseCost'
     },
-    {
-        primaryKPI: 'Sustainability (Environmental Impact)',
-        label: 'Energy Cost',
-        htmlLabel: 'Energy Cost',
-        optionValue: 'energyCost'
-    },
     {
         primaryKPI: 'Sustainability (Environmental Impact)',
         label: 'Waste Reduction: Hazardous',