Commit 49e66bc8 authored by Grand Francois's avatar Grand Francois
Browse files

Correction bug d'affichage des titres de saisie de paramètre (section...

Correction bug d'affichage des titres de saisie de paramètre (section param/parabolique) dû à un pb de MAJ de l'internationalisation
Showing with 25 additions and 8 deletions
+25 -8
...@@ -2,7 +2,6 @@ import { ComputeNodeType, ParamsEquation, Nub, acSection, RegimeUniforme, Method ...@@ -2,7 +2,6 @@ import { ComputeNodeType, ParamsEquation, Nub, acSection, RegimeUniforme, Method
import { ParamsSectionRectang, cSnRectang, ParamsSectionCirc, cSnCirc, ParamsSectionPuiss, cSnPuiss, Result } from "jalhyd"; import { ParamsSectionRectang, cSnRectang, ParamsSectionCirc, cSnCirc, ParamsSectionPuiss, cSnPuiss, Result } from "jalhyd";
import { ConduiteDistrib, ConduiteDistribParams, LechaptCalmon, LechaptCalmonParams, ParamsSectionTrapez, cSnTrapez } from "jalhyd"; import { ConduiteDistrib, ConduiteDistribParams, LechaptCalmon, LechaptCalmonParams, ParamsSectionTrapez, cSnTrapez } from "jalhyd";
import { ParamService } from "../services/param/param.service"; import { ParamService } from "../services/param/param.service";
import { InternationalisationService } from "../services/internationalisation/internationalisation.service"; import { InternationalisationService } from "../services/internationalisation/internationalisation.service";
import { Field } from "./field"; import { Field } from "./field";
...@@ -21,6 +20,7 @@ import { ExistenceDependency } from "./existence-dependency"; ...@@ -21,6 +20,7 @@ import { ExistenceDependency } from "./existence-dependency";
import { FixedVarResults } from "../results/fixed-var-results"; import { FixedVarResults } from "../results/fixed-var-results";
import { SectionResults } from "../results/section-results"; import { SectionResults } from "../results/section-results";
import { RemousResults } from "../results/remous-results"; import { RemousResults } from "../results/remous-results";
import { StringMap } from "../stringmap";
export enum CalculatorType { export enum CalculatorType {
...@@ -1089,4 +1089,17 @@ export class FormulaireDefinition { ...@@ -1089,4 +1089,17 @@ export class FormulaireDefinition {
public hasRemousResults(): boolean { public hasRemousResults(): boolean {
return this._remousResults.hasResults(); return this._remousResults.hasResults();
} }
public updateLocalisation(localisation: StringMap) {
for (let loc_id in localisation) {
for (let fs of this._fieldSets) {
if (fs.id == loc_id)
fs.updateLocalisation(localisation);
for (let p of fs.fields)
if (p.id === loc_id)
p.updateLocalisation(localisation);
}
}
}
} }
...@@ -10,7 +10,7 @@ export abstract class FormulaireElement { ...@@ -10,7 +10,7 @@ export abstract class FormulaireElement {
private _id: string; private _id: string;
private _formId: number; private _formId: number;
public isDisplayed: boolean; public isDisplayed: boolean;
public label: string; private _label: string;
constructor(nodeType: ComputeNodeType, id: string, formId: number) { constructor(nodeType: ComputeNodeType, id: string, formId: number) {
this._nodeType = nodeType; this._nodeType = nodeType;
...@@ -31,6 +31,10 @@ export abstract class FormulaireElement { ...@@ -31,6 +31,10 @@ export abstract class FormulaireElement {
return this._formId; return this._formId;
} }
get label(): string {
return this._label;
}
protected abstract verifyDependency(d: Dependency): boolean; protected abstract verifyDependency(d: Dependency): boolean;
public verifiesDependency(d: Dependency): boolean { public verifiesDependency(d: Dependency): boolean {
...@@ -41,7 +45,7 @@ export abstract class FormulaireElement { ...@@ -41,7 +45,7 @@ export abstract class FormulaireElement {
} }
public updateLocalisation(loc: StringMap) { public updateLocalisation(loc: StringMap) {
this.label = loc[this.id]; this._label = loc[this.id];
} }
public toString() { public toString() {
......
...@@ -50,11 +50,11 @@ export class FormulaireService extends Observable { ...@@ -50,11 +50,11 @@ export class FormulaireService extends Observable {
* @param localisation ensemble id-message traduit * @param localisation ensemble id-message traduit
*/ */
private updateFormulaireLocalisation(formId: number, localisation: StringMap) { private updateFormulaireLocalisation(formId: number, localisation: StringMap) {
for (let loc_id in localisation) { for (let f of this._formulaires)
let fe = this.getFormulaireElementById(formId, loc_id); if (f.uid == formId) {
if (fe != undefined) f.updateLocalisation(localisation);
fe.updateLocalisation(localisation); break;
} }
} }
/** /**
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment