Merge pull request #7124 from ORNL-AMO/6114-add-centf-autoshutoff

6114 - CA team feedback
ORNL-AMO · Nov 13, 2024 · 6f7bf2f · 6f7bf2f
2 parents 5dec98d + d20698a
commit 6f7bf2f
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/src/app/compressed-air-assessment/inventory/inventory.service.ts b/src/app/compressed-air-assessment/inventory/inventory.service.ts
@@ -187,7 +187,10 @@ export class InventoryService {
   }
 
   checkDisplayAutomaticShutdown(controlType: number): boolean {
-    return (controlType != undefined && controlType != 5 && controlType != 7 && controlType != 9 && controlType != 1);
+    if (controlType !== undefined) {
+      return [2, 3, 4, 6, 7, 8, 9, 10, 11].includes(controlType);
+    } 
+    return false;
   }
 
   setCompressorControlValidators(form: UntypedFormGroup): UntypedFormGroup {

diff --git a/src/app/compressed-air-assessment/system-information/system-information.component.html b/src/app/compressed-air-assessment/system-information/system-information.component.html
@@ -128,7 +128,7 @@ <h3>System Information</h3>
                     <option [ngValue]="'cascading'">Cascading Pressure</option>
                     <option [ngValue]="'targetPressureSequencer'">Target Pressure Sequencer</option>
                     <option [ngValue]="'isentropicEfficiency'">Isentropic Efficiency</option>
-                    <option [ngValue]="'loadSharing'">Centrifugal Load Sharing</option>
+                    <option [ngValue]="'loadSharing'">Equal Capacity Ratio Load Sharing</option>
                     <option [ngValue]="'baseTrim'">Base/Trim</option>
                 </select>
             </div>