From 2b90a67b751d6b399311cc01759681878c487ba2 Mon Sep 17 00:00:00 2001 From: Rachel Stone Date: Wed, 12 Feb 2025 14:45:30 -0600 Subject: [PATCH 1/2] fixed validation bug in PF Triangle calc and graph --- .../power-factor-triangle-results.component.ts | 3 +-- .../power-factor-triangle/power-factor-triangle.service.ts | 7 +++++++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/app/calculator/utilities/power-factor-triangle/power-factor-triangle-results/power-factor-triangle-results.component.ts b/src/app/calculator/utilities/power-factor-triangle/power-factor-triangle-results/power-factor-triangle-results.component.ts index b6e3ec45ce..e0117cb8e3 100644 --- a/src/app/calculator/utilities/power-factor-triangle/power-factor-triangle-results/power-factor-triangle-results.component.ts +++ b/src/app/calculator/utilities/power-factor-triangle/power-factor-triangle-results/power-factor-triangle-results.component.ts @@ -1,6 +1,7 @@ import { Component, ElementRef, Input, OnInit, SimpleChanges, ViewChild } from '@angular/core'; import { PowerFactorTriangleOutputs } from '../../../../shared/models/standalone'; import { PlotlyService } from 'angular-plotly.js'; +import { auto } from '@popperjs/core'; @Component({ selector: 'app-power-factor-triangle-results', @@ -90,12 +91,10 @@ export class PowerFactorTriangleResultsComponent implements OnInit { xaxis: { range: [0, 1.05 * this.results.realPower], scaleratio: 1, - dtick: 10, }, yaxis: { range: [-1, 1.05 * this.results.reactivePower], scaleratio: 1, - dtick: 10, }, margin: { t: 25, b: 25, l: 25, r: 25 }, }; diff --git a/src/app/calculator/utilities/power-factor-triangle/power-factor-triangle.service.ts b/src/app/calculator/utilities/power-factor-triangle/power-factor-triangle.service.ts index e8d17346ac..c78072e3f2 100644 --- a/src/app/calculator/utilities/power-factor-triangle/power-factor-triangle.service.ts +++ b/src/app/calculator/utilities/power-factor-triangle/power-factor-triangle.service.ts @@ -32,7 +32,14 @@ export class PowerFactorTriangleService { form.controls.apparentPower.setValidators([Validators.required, Validators.min(form.controls.reactivePower.value)]); form.controls.reactivePower.setValidators([Validators.required, , Validators.min(0), Validators.max(form.controls.apparentPower.value)]); + } else if (form.controls.mode.value != 1 && form.controls.mode.value != 2 ){ + form.controls.apparentPower.setValidators(Validators.required); + form.controls.realPower.setValidators([Validators.required, Validators.min(0)]); + form.controls.reactivePower.setValidators([Validators.required, , Validators.min(0)]); + } + + form.controls.apparentPower.updateValueAndValidity(); form.controls.realPower.updateValueAndValidity(); form.controls.reactivePower.updateValueAndValidity(); From 0ab4d9d51c070ca15af001b2f57d311ee4edca99 Mon Sep 17 00:00:00 2001 From: Rachel Stone Date: Thu, 13 Feb 2025 10:16:40 -0600 Subject: [PATCH 2/2] removed unused import --- .../power-factor-triangle-results.component.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/src/app/calculator/utilities/power-factor-triangle/power-factor-triangle-results/power-factor-triangle-results.component.ts b/src/app/calculator/utilities/power-factor-triangle/power-factor-triangle-results/power-factor-triangle-results.component.ts index e0117cb8e3..4affe17b3b 100644 --- a/src/app/calculator/utilities/power-factor-triangle/power-factor-triangle-results/power-factor-triangle-results.component.ts +++ b/src/app/calculator/utilities/power-factor-triangle/power-factor-triangle-results/power-factor-triangle-results.component.ts @@ -1,7 +1,6 @@ import { Component, ElementRef, Input, OnInit, SimpleChanges, ViewChild } from '@angular/core'; import { PowerFactorTriangleOutputs } from '../../../../shared/models/standalone'; import { PlotlyService } from 'angular-plotly.js'; -import { auto } from '@popperjs/core'; @Component({ selector: 'app-power-factor-triangle-results',