Merge pull request #7044 from ORNL-AMO/issue-6921-bugfix

Issue 6921: bug fix to PF Correction Calc
ORNL-AMO · Oct 9, 2024 · 84fd4b6 · 84fd4b6
2 parents b952ed6 + 4058f5e
commit 84fd4b6
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 25 deletions.
diff --git a/...actor-correction/power-factor-correction-form/power-factor-correction-form.component.html b/...actor-correction/power-factor-correction-form/power-factor-correction-form.component.html
@@ -5,7 +5,9 @@
     <label for="billedForDemand">How are you billed for Demand</label>
     <select id="billedForDemand" name="billedForDemand" class="form-control" [(ngModel)]="data.billedForDemand"
       (focus)="focusField('billedForDemand')" (change)="setBilledForDemand()">
-      <option *ngFor="let option of billedOptions" [ngValue]="option.value">{{option.name}}</option>
+      <!-- <option *ngFor="let option of billedOptions" [ngValue]="option.value" [disabled]="true">{{option.name}}</option> -->
+      <option value="0">Real Power (kW)</option>
+      <option value="1" *ngIf="data.adjustedOrActual != 2">Apperent Power (kVA)</option>
     </select>
   </div>
 
@@ -25,7 +27,10 @@
     <label for="adjustedOrActual">PF Adjusted or Actual Demand</label>
     <select id="adjustedOrActual" name="adjustedOrActual" class="form-control" [(ngModel)]="data.adjustedOrActual"
       (focus)="focusField('adjustedOrActual')" (change)="setAdjustedOrActual()">
-      <option *ngFor="let option of demandOptions" [ngValue]="option.value">{{option.name}}</option>
+      <!-- <option *ngFor="let option of demandOptions" [ngValue]="option.value">{{option.name}}</option> -->
+      <option value="0">Power Factor</option>
+      <option value="1">Actual Demand</option>
+      <option *ngIf="data.billedForDemand != 1" value="2">Both</option>
     </select>
   </div>
 

diff --git a/...-factor-correction/power-factor-correction-form/power-factor-correction-form.component.ts b/...-factor-correction/power-factor-correction-form/power-factor-correction-form.component.ts
@@ -22,29 +22,6 @@ export class PowerFactorCorrectionFormComponent implements OnInit {
   //to emit a change, we need to define an EventEmitter<Type>() to be able
   //to call .emit()
 
-
-  billedOptions: any = [
-    {
-      name: 'Real Power (kW)',
-      value: 0,
-    }, {
-      name: 'Apperent Power (kVA)',
-      value: 1,
-    }
-  ];
-
-  demandOptions: any = [
-    {
-      name: 'Power Factor',
-      value: 0,
-    }, {
-      name: 'Actual Demand',
-      value: 1,
-    }, {
-      name: 'Both',
-      value: 2,
-    }
-  ];
 
   monthList: Array<{ value: number, name: string }> = [
     { value: 1, name: 'January' },