From 80cbbda123d72ab0d141046093e3de193222e79a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Grand?= <francois.grand@inrae.fr>
Date: Fri, 31 Mar 2023 15:44:49 +0200
Subject: [PATCH] fix: MacroRugoRemous generation: use discharge value from PAM
refs #609
---
src/app/components/generic-calculator/calculator.component.ts | 1 +
src/app/formulaire/definition/form-macrorugo-remous.ts | 1 +
2 files changed, 2 insertions(+)
diff --git a/src/app/components/generic-calculator/calculator.component.ts b/src/app/components/generic-calculator/calculator.component.ts
index 0228b5f3c..fc99419c2 100644
--- a/src/app/components/generic-calculator/calculator.component.ts
+++ b/src/app/components/generic-calculator/calculator.component.ts
@@ -1277,6 +1277,7 @@ export class GenericCalculatorComponent implements OnInit, DoCheck, AfterViewChe
const f: FormulaireDefinition = await this.formulaireService.createFormulaire(CalculatorType.MacroRugoRemous);
const mrr = (f.currentNub as MacroRugoRemous);
mrr.setPropValue(MacroRugoRemous.NubMacroRugoProp, 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 ab26cd956..5ce622c62 100644
--- a/src/app/formulaire/definition/form-macrorugo-remous.ts
+++ b/src/app/formulaire/definition/form-macrorugo-remous.ts
@@ -15,6 +15,7 @@ export class FormulaireMacroRugoRemous extends FormulaireFixedVar {
}
if (pam !== undefined) {
props.setPropValue(MacroRugoRemous.NubMacroRugoProp, pam.uid);
+ props.setPropValue("Q", pam.prms.Q.V);
}
return super.initNub(props);
}
--
GitLab