From ab0ea95a2938a07bf546135a57b158fb60100513 Mon Sep 17 00:00:00 2001
From: Jean-Pascal <jean-pascal.aubry@inrae.fr>
Date: Wed, 6 Dec 2023 17:07:10 +0100
Subject: [PATCH] fix: replace MacroRugo by Macrorugo and delete Q field in
marcrorugoremous form Refs #609
---
src/app/calculators/macrorugoremous/config.json | 3 +--
.../generic-calculator/calculator.component.ts | 12 ++++++------
.../formulaire/definition/form-macrorugo-remous.ts | 12 ++++++------
.../elements/select/select-field-target-pam.ts | 6 +++---
src/app/services/formulaire.service.ts | 6 +++---
5 files changed, 19 insertions(+), 20 deletions(-)
diff --git a/src/app/calculators/macrorugoremous/config.json b/src/app/calculators/macrorugoremous/config.json
index 0acfabef3..fd0020c7a 100644
--- a/src/app/calculators/macrorugoremous/config.json
+++ b/src/app/calculators/macrorugoremous/config.json
@@ -13,8 +13,7 @@
"id": "fs_condlim",
"type": "fieldset",
"fields": [
- "Z2",
- "Q"
+ "Z2"
]
},
{
diff --git a/src/app/components/generic-calculator/calculator.component.ts b/src/app/components/generic-calculator/calculator.component.ts
index fc99419c2..735bc0f5e 100644
--- a/src/app/components/generic-calculator/calculator.component.ts
+++ b/src/app/components/generic-calculator/calculator.component.ts
@@ -26,7 +26,7 @@ import {
Espece,
VariatedDetails,
ParallelStructure,
- MacroRugoRemous
+ MacrorugoRemous
} from "jalhyd";
import { generateValuesCombination, getUnformattedIthResult, getUnformattedIthValue } from "../../util/util";
@@ -707,7 +707,7 @@ export class GenericCalculatorComponent implements OnInit, DoCheck, AfterViewChe
// true if current Nub is MacroRugoRemous
public get isMRR() {
- return this.is(CalculatorType.MacroRugoRemous);
+ return this.is(CalculatorType.MacrorugoRemous);
}
// true if current Nub is MacroRugoCompound
@@ -742,7 +742,7 @@ export class GenericCalculatorComponent implements OnInit, DoCheck, AfterViewChe
// true if CourbeRemous results are present
public get hasCourbeRemousResults() {
- return (this.is(CalculatorType.CourbeRemous) || this.is(CalculatorType.MacroRugoRemous)) && this.hasResults;
+ return (this.is(CalculatorType.CourbeRemous) || this.is(CalculatorType.MacrorugoRemous)) && this.hasResults;
}
// true if current Nub is PAR
@@ -1274,9 +1274,9 @@ export class GenericCalculatorComponent implements OnInit, DoCheck, AfterViewChe
}
public async generateBackwaterInPAM() {
- const f: FormulaireDefinition = await this.formulaireService.createFormulaire(CalculatorType.MacroRugoRemous);
- const mrr = (f.currentNub as MacroRugoRemous);
- mrr.setPropValue(MacroRugoRemous.NubMacroRugoProp, this.formulaire.currentNub.uid);
+ const f: FormulaireDefinition = await this.formulaireService.createFormulaire(CalculatorType.MacrorugoRemous);
+ const mrr = (f.currentNub as MacrorugoRemous);
+ // mrr.setPropValue(MacrorugoRemous._nubMacroRugo, this.formulaire.currentNub.uid);
mrr.syncSectionMacroRugo();
this.router.navigate(["/calculator", f.uid]);
}
diff --git a/src/app/formulaire/definition/form-macrorugo-remous.ts b/src/app/formulaire/definition/form-macrorugo-remous.ts
index 5ce622c62..28c2308ea 100644
--- a/src/app/formulaire/definition/form-macrorugo-remous.ts
+++ b/src/app/formulaire/definition/form-macrorugo-remous.ts
@@ -1,9 +1,9 @@
import { RemousResults } from "app/results/remous-results";
-import { acSection, CourbeRemous, CourbeRemousParams, MacroRugo, MacroRugoRemous, Props, Result, Session } from "jalhyd";
-import { MacroRugoRemousParams } from "jalhyd/build/internal_modules";
+import { acSection, CourbeRemous, CourbeRemousParams, MacroRugo, MacrorugoRemous, Props, Result, Session } from "jalhyd";
+import { MacrorugoRemousParams} from "jalhyd/build/internal_modules";
import { FormulaireFixedVar } from "./form-fixedvar";
-export class FormulaireMacroRugoRemous extends FormulaireFixedVar {
+export class FormulaireMacrorugoRemous extends FormulaireFixedVar {
public initNub(props?: Props) {
// scan session, find first PAM
let pam: MacroRugo;
@@ -14,7 +14,7 @@ export class FormulaireMacroRugoRemous extends FormulaireFixedVar {
}
}
if (pam !== undefined) {
- props.setPropValue(MacroRugoRemous.NubMacroRugoProp, pam.uid);
+ // props.setPropValue(MacrorugoRemous.nubMacroRugo, pam.uid);
props.setPropValue("Q", pam.prms.Q.V);
}
return super.initNub(props);
@@ -40,7 +40,7 @@ export class FormulaireMacroRugoRemous extends FormulaireFixedVar {
}
protected reaffectResultComponents() {
- const mrr = this.currentNub as MacroRugoRemous;
+ const mrr = this.currentNub as MacrorugoRemous;
mrr.syncSectionMacroRugo();
// variable supplémentaire à calculer
@@ -49,7 +49,7 @@ export class FormulaireMacroRugoRemous extends FormulaireFixedVar {
// calcul
this._remousResults.result = mrr.CalcSerie();
- const prmMRR = mrr.prms as MacroRugoRemousParams;
+ const prmMRR = mrr.prms as MacrorugoRemousParams;
this._remousResults.parameters = prmMRR;
// calcul
diff --git a/src/app/formulaire/elements/select/select-field-target-pam.ts b/src/app/formulaire/elements/select/select-field-target-pam.ts
index 5a5a7620c..3d0c09ad4 100644
--- a/src/app/formulaire/elements/select/select-field-target-pam.ts
+++ b/src/app/formulaire/elements/select/select-field-target-pam.ts
@@ -1,6 +1,6 @@
import { ServiceFactory } from "app/services/service-factory";
import { decodeHtml } from "../../../util/util";
-import { CalculatorType, MacroRugoRemous, Message, MessageCode, Session } from "jalhyd";
+import { CalculatorType, MacrorugoRemous, Message, MessageCode, Session } from "jalhyd";
import { SelectField } from "./select-field";
import { FormulaireNode } from "../formulaire-node";
import { SelectEntry } from "./select-entry";
@@ -9,7 +9,7 @@ import { SelectEntry } from "./select-entry";
export class SelectFieldTargetPam extends SelectField {
constructor(parent: FormulaireNode) {
super(parent);
- this._associatedProperty = MacroRugoRemous.NubMacroRugoProp;
+ // this._associatedProperty = MacrorugoRemous.nubMacroRugo;
this._messageWhenEmpty = "INFO_MACRORUGOREMOUS_CREATE_PAM_FIRST";
}
@@ -28,7 +28,7 @@ export class SelectFieldTargetPam extends SelectField {
}
protected initSelectedValue() {
- const mrr = (this.nub as MacroRugoRemous).nubMacroRugo;
+ const mrr = (this.nub as MacrorugoRemous).nubMacroRugo;
if (mrr !== undefined) {
this.setValueFromId(this._entriesBaseId + mrr.uid);
}
diff --git a/src/app/services/formulaire.service.ts b/src/app/services/formulaire.service.ts
index 019244c56..9078a93ab 100644
--- a/src/app/services/formulaire.service.ts
+++ b/src/app/services/formulaire.service.ts
@@ -59,7 +59,7 @@ import { FormulairePrebarrage } from "../formulaire/definition/form-prebarrage";
import { ServiceFactory } from "./service-factory";
import { FormulairePressureLoss } from "app/formulaire/definition/form-pressureloss";
import { getNubResultUnit } from "jalhyd";
-import { FormulaireMacroRugoRemous } from "app/formulaire/definition/form-macrorugo-remous";
+import { FormulaireMacrorugoRemous } from "app/formulaire/definition/form-macrorugo-remous";
@Injectable()
export class FormulaireService extends Observable {
@@ -345,8 +345,8 @@ export class FormulaireService extends Observable {
f = new FormulairePressureLoss();
break;
- case CalculatorType.MacroRugoRemous:
- f = new FormulaireMacroRugoRemous();
+ case CalculatorType.MacrorugoRemous:
+ f = new FormulaireMacrorugoRemous();
break;
default:
--
GitLab