[WIP] subform system for PreBarrage

src/app/calculators/prebarrage/config.json

@@ -4,24 +4,127 @@
         "type": "pb_schema"
     },
     {
-        "id": "fs_params",
-        "type": "fieldset",
-        "fields": [
+        "id": "subform_river",
+        "type": "subform",
+        "config": [
             {
-                "id": "select_upstream",
-                "type": "select_reference",
-                "reference": "nub",
-                "source": "upstream_stuff"
+                "id": "fs_river_params",
+                "type": "fieldset",
+                "fields": [
+                    "Q",
+                    "Z1",
+                    "Z2"
+                ]
             },
             {
-                "id": "select_downstream",
-                "type": "select_reference",
-                "reference": "nub",
-                "source": "downstream_stuff"
+                "type": "options",
+                "selectIds": [ ]
+            }
+        ]
+    },
+    {
+        "id": "subform_basin",
+        "type": "subform",
+        "config": [
+            {
+                "id": "fs_basin_params",
+                "type": "fieldset",
+                "fields": [
+                    {
+                        "id": "select_upstream",
+                        "type": "select_reference",
+                        "reference": "nub",
+                        "source": "upstream_stuff"
+                    },
+                    {
+                        "id": "select_downstream",
+                        "type": "select_reference",
+                        "reference": "nub",
+                        "source": "downstream_stuff"
+                    },
+                    "Q",
+                    "Z1",
+                    "Z2"
+                ]
             },
-            "Q",
-            "Z1",
-            "Z2"
+            {
+                "type": "options",
+                "selectIds": [ ]
+            }
+        ]
+    },
+    {
+        "id": "subform_wall",
+        "type": "subform",
+        "config": [
+            {
+                "id": "fs_wall_device",
+                "type": "fieldset_template",
+                "calcType": "Structure",
+                "defaultStructType": "SeuilRectangulaire",
+                "defaultLoiDebit": "WeirSubmergedLarinier",
+                "fields": [
+                    {
+                        "id": "select_structure",
+                        "type": "select",
+                        "property": "structureType",
+                        "source": "device_structure_type"
+                    },
+                    {
+                        "id": "select_loidebit",
+                        "type": "select",
+                        "property": "loiDebit",
+                        "source": "device_loi_debit",
+                        "help": {
+                            "Orifice_OrificeSubmerged": "structures/orifice_noye.html",
+                            "SeuilRectangulaire_WeirVillemonte": "structures/kivi.html",
+                            "SeuilRectangulaire_WeirSubmergedLarinier": "structures/fente_noyee.html",
+                            "SeuilTriangulaire_TriangularWeirFree": "structures/dever_triang.html",
+                            "SeuilTriangulaire_TriangularWeirBroad": "structures/dever_triang.html",
+                            "SeuilTriangulaireTrunc_TriangularTruncWeirFree": "structures/dever_triang_tronque.html"
+                        }
+                    },
+                    "h1",
+                    "L",
+                    "CdWSL",
+                    "CdWR",
+                    "CdGR",
+                    "CdT",
+                    "S",
+                    "alpha2",
+                    "BT",
+                    "ZT"
+                ]
+            },
+            {
+                "id": "fs_wall_params",
+                "type": "fieldset",
+                "fields": [
+                    {
+                        "id": "select_upstream",
+                        "type": "select_reference",
+                        "reference": "nub",
+                        "source": "upstream_stuff"
+                    },
+                    {
+                        "id": "select_downstream",
+                        "type": "select_reference",
+                        "reference": "nub",
+                        "source": "downstream_stuff"
+                    },
+                    {
+                        "id": "devices_container",
+                        "type": "template_container",
+                        "templates": [
+                            "fs_wall_device"
+                        ]
+                    }
+                ]
+            },
+            {
+                "type": "options",
+                "selectIds": [ ]
+            }
         ]
     },
     {

src/app/components/generic-calculator/calculator.component.html

@@ -103,7 +103,7 @@
                                 [fxFlex.lt-sm]="isPB ? '1 0 300px' : '1 0 auto'">
 
                                 <pb-schema *ngIf="isPbSchema(fe)" [pbSchema]=fe (radio)=onRadioClick($event)
-                                    (validChange)=onElementValid() (inputChange)=onInputChange($event)>
+                                    (validChange)=onElementValid() (nodeSelected)="onPBNodeSelected($event)">
                                 </pb-schema>
 
                                 <div fxHide.sm fxFlex.gt-sm="0 0 16px"></div>

src/app/components/generic-calculator/calculator.component.ts

@@ -586,6 +586,13 @@ export class GenericCalculatorComponent implements OnInit, DoCheck, AfterViewChe
         elt.select();
     }
 
+    /** réception d'un événement de clic sur un nœud du schéma de PréBarrage */
+    public onPBNodeSelected(event: any) {
+        console.log("node selected", event.node ? event.node.constructor.name : "zubi");
+        this.showPBInputData = true;
+        // show proper form depending on what was clicked
+    }
+
     public openHelp() {
         window.open("assets/docs/" + this.appSetupService.language + "/calculators/" + this._formulaire.helpLink, "_blank");
     }
@@ -859,14 +866,14 @@ export class GenericCalculatorComponent implements OnInit, DoCheck, AfterViewChe
         }
 
         const f: FormulaireDefinition = await this.formulaireService.createFormulaire(CalculatorType.SectionParametree, secParam);
-                const sp = (f.currentNub as SectionParametree);
-                sp.section.prms.Y.setValues(Ys);
-                sp.section.prms.If.setValues(Ifs);
-                // calculate
-                f.doCompute();
-                // go to new SP
+        const sp = (f.currentNub as SectionParametree);
+        sp.section.prms.Y.setValues(Ys);
+        sp.section.prms.If.setValues(Ifs);
+        // calculate
+        f.doCompute();
+        // go to new SP
         this.router.navigate(["/calculator", f.uid]);
-            }
+    }
 
     public get generateRuSpEnabled(): boolean {
         return this.hasResults && ! this._formulaire.currentNub.result.hasErrorMessages();
@@ -900,10 +907,10 @@ export class GenericCalculatorComponent implements OnInit, DoCheck, AfterViewChe
         Session.getInstance().registerNub(secParam);
 
         const f: FormulaireDefinition = await this.formulaireService.createFormulaire(CalculatorType.SectionParametree, secParam);
-                // calculate
-                f.doCompute();
-                // go to new SP
-            }
+        // calculate
+        f.doCompute();
+        // go to new SP
+    }
 
     public get generatePARSimulationEnabled(): boolean {
         const parCalage = (this._formulaire.currentNub as Par);
@@ -1015,9 +1022,9 @@ export class GenericCalculatorComponent implements OnInit, DoCheck, AfterViewChe
         Session.getInstance().registerNub(parSimulation);
 
         const f: FormulaireDefinition = await this.formulaireService.createFormulaire(CalculatorType.ParSimulation, parSimulation);
-                // calculate
-                f.doCompute();
-                // go to new ParSimulation
+        // calculate
+        f.doCompute();
+        // go to new ParSimulation
         this.router.navigate(["/calculator", f.uid]);
     }
 
@@ -1072,6 +1079,6 @@ export class GenericCalculatorComponent implements OnInit, DoCheck, AfterViewChe
         const serialisedNub: string = this._formulaire.currentNub.serialise({ title: this._formulaire.calculatorName });
         const nubPointer = Session.getInstance().unserialiseSingleNub(serialisedNub);
         const f = await this.formulaireService.createFormulaire(nubPointer.nub.calcType, nubPointer.nub, nubPointer.meta.title);
-            this.router.navigate(["/calculator", f.uid]);
+        this.router.navigate(["/calculator", f.uid]);
     }
 }

src/app/components/pb-schema/pb-schema.component.html

@@ -39,6 +39,6 @@
 
     <div id="schema" #schema></div>
 
-    <!-- <pre id="debug">{{ graphDef }} </pre> -->
+    <pre id="debug">{{ graphDef }} </pre>
 
 </mat-card-content>

src/app/components/pb-schema/pb-schema.component.scss

@@ -57,3 +57,7 @@ mat-card-content {
     margin-bottom: .5em;
     text-align: center;
 }
+
+#debug {
+    display: none;
+}

src/app/components/pb-schema/pb-schema.component.ts

@@ -46,9 +46,9 @@ export class PbSchemaComponent implements AfterViewInit, OnInit {
     @Output()
     private validChange = new EventEmitter();
 
-    /** événément de changement de valeur d'un input */
+    /** événément de sélection d'un nœud du graphique Mermaid */
     @Output()
-    private inputChange = new EventEmitter();
+    private nodeSelected = new EventEmitter();
 
     /** underlying PB */
     private model: PreBarrage;
@@ -255,6 +255,10 @@ export class PbSchemaComponent implements AfterViewInit, OnInit {
                 }
             }
         }
+        // show proper form, hide results
+        this.nodeSelected.emit({
+            node: this._selectedItem
+        });
     }
 
     // for debug only
@@ -271,24 +275,11 @@ export class PbSchemaComponent implements AfterViewInit, OnInit {
         return this._isValid;
     }
 
+    /** used for a cosmetics CSS trick only (mat-card-header right margin) */
     public get showInputData(): boolean {
         return this.calculatorComponent.showPBInputData;
     }
 
-    /**
-     * Checks that input value is a valid number, according to input[type="number"] algorithm,
-     * and stores it in cell.uiValidity, so that the <td> element can access it and get angry
-     * if input is invalid
-     */
-    public inputValueChanged($event, cell) {
-        if ($event && $event.target && $event.target.validity) {
-            cell.uiValidity = $event.target.validity.valid;
-        }
-        this.updateValidity();
-        // send input change event (used to reset form results)
-        this.inputChange.emit();
-    }
-
     public get prefixedItemDescription(): string {
         let desc = this.itemDesription(this._selectedItem);
         if (this._selectedItem instanceof PbCloison) {
@@ -420,6 +411,7 @@ export class PbSchemaComponent implements AfterViewInit, OnInit {
         // check that at least 1 basin is present and a route from river
         // upstream to river downstream exists (2nd check includes 1st)
         this._isValid = this.model.hasUpDownConnection();
+        console.log("schéma valide", this._isValid);
         this.validChange.emit();
     }
 

src/app/formulaire/definition/form-definition.ts

@@ -50,7 +50,7 @@ export abstract class FormulaireDefinition extends FormulaireNode implements Obs
     protected _calculateDisabled = false;
 
     /** fichier de configuration */
-    private _jsonConfig: {};
+    protected _jsonConfig: {};
 
     /** copy of options.resultsHelp read by FormDefinition.parseOptions() */
     public helpLinks: { [key: string]: string };
@@ -200,31 +200,25 @@ export abstract class FormulaireDefinition extends FormulaireNode implements Obs
     public removeFieldset(fs: FieldSet) {
     }
 
-    private parse_fieldset(json: {}, nub?: Nub) {
+    protected parse_fieldset(json: {}, nub?: Nub) {
         const fs = this.createFieldset(this, json, undefined, nub);
         fs.parseConfig(json);
         this.afterParseFieldset(fs);
     }
 
-    private parse_template_container(json: {}, templates: any[]) {
+    protected parse_template_container(json: {}, templates: any[]) {
         const fsc: FieldsetContainer = new FieldsetContainer(this);
         fsc.parseConfig(json, templates);
         this.kids.push(fsc);
     }
 
+    // @TODO move to FormulairePAB by overloading parseConfig()
     private parse_pab_table(json: {}) {
         const tab: PabTable = new PabTable(this);
         tab.parseConfig(json);
         this.kids.push(tab);
     }
 
-    private parse_pb_schema(json: {}) {
-        const sch: PbSchema = new PbSchema(this);
-        sch.parseConfig(json);
-        this.kids.push(sch);
-    }
-
-
     /**
      * 1ère passe d'analyse de la configuration
      */
@@ -282,10 +276,6 @@ export abstract class FormulaireDefinition extends FormulaireNode implements Obs
                     this.parse_pab_table(conf);
                     break;
 
-                case "pb_schema": // not generic at all
-                    this.parse_pb_schema(conf);
-                    break;
-
                 default:
                     throw new Error(`type d'objet de module de calcul ${type} non pris en charge`);
             }

src/app/formulaire/definition/form-prebarrage.ts

+import { CalculatorType } from "jalhyd";
+
+import { FormulaireFixedVar } from "./form-fixedvar";
+import { FormulaireParallelStructure } from "./form-parallel-structures";
+import { PbSchema } from "../elements/pb-schema";
+
+/**
+ * Formulaire pour les PréBarrage
+ */
+export class FormulairePrebarrage extends FormulaireFixedVar {
+
+    /** child form for river upstream/downstream elevations and flow */
+    private riverForm: FormulaireFixedVar;
+
+    /** child form for basins dimensions */
+    private basinForm: FormulaireFixedVar;
+
+    /** child form for walls (repeatable devices) */
+    private wallForm: FormulaireParallelStructure;
+
+    public constructor() {
+        super();
+        console.log("Construction du FormPreBarrage !!");
+        this.riverForm = new FormulaireFixedVar();
+        this.riverForm.defaultProperties["calcType"] = CalculatorType.PreBarrage;
+        this.basinForm = new FormulaireFixedVar();
+        this.basinForm.defaultProperties["calcType"] = CalculatorType.PbBassin;
+        this.wallForm = new FormulaireParallelStructure();
+        this.wallForm.defaultProperties["calcType"] = CalculatorType.PbCloison;
+    }
+
+    protected parseOptions(json: {}) {
+        // super.parseOptions(json);
+        // @TODO parse children forms configs
+    }
+
+    public parseConfig(json?: {}) {
+        console.log("> parse confaïgue");
+        if (json !== undefined) {
+            this._jsonConfig = json;
+        }
+        for (const conf_index in this._jsonConfig) {
+            const conf = this._jsonConfig[conf_index];
+            const type: string = conf["type"];
+
+            switch (type) {
+                // options globales
+                case "options":
+                    break;
+
+                case "subform":
+                    this.parse_subform(conf);
+                    break;
+
+                case "pb_schema":
+                    this.parse_pb_schema(conf);
+                    break;
+
+                default:
+                    throw new Error(`type d'objet de module de calcul ${type} non pris en charge`);
+            }
+        }
+        this.completeParse(this._jsonConfig);
+    }
+
+    private parse_subform(json: {}) {
+        console.log("parse sf", json);
+        switch (json["id"]) {
+            case "subform_river":
+                this.riverForm.currentNub = this.currentNub;
+                this.riverForm.parseConfig(json["config"]);
+                break;
+            case "subform_basin":
+                // this.basinForm.currentNub = this.currentNub;
+                this.basinForm.parseConfig(json["config"]);
+                break;
+            case "subform_wall":
+                // this.wallForm.currentNub = this.currentNub;
+                this.wallForm.parseConfig(json["config"]);
+                break;
+        }
+        // console.log(">> triggering parsing of new subform", subform.constructor.name, subform.uid);
+        // subform.parseConfig(json);
+        // this.kids.push(subform);
+        // f.defaultProperties["calcType"] = ct;
+    }
+
+    private parse_pb_schema(json: {}) {
+        const sch: PbSchema = new PbSchema(this);
+        sch.parseConfig(json);
+        this.kids.push(sch);
+    }
+
+    protected completeParse(json: {}, firstNotif: boolean = true) {
+        // super.completeParse(json);
+        // @TODO parse children forms configs
+    }
+
+    // interface Observer
+
+    /* public update(sender: IObservable, data: any) {
+        // copied from FormDefinition, to avoid calling super.update()
+        if (sender instanceof Nub) {
+            switch (data.action) {
+                case "resultUpdated":
+                    // forward Nub results update notification to FormCompute objects
+                    this.reaffectResultComponents();
+                    break;
+            }
+        }
+        // copied from FormFixedVar, to avoid calling super.update()
+        if (data.action === "propertyChange") {
+            this.reset();
+        }
+    } */
+}

src/app/services/formulaire.service.ts

@@ -42,6 +42,7 @@ import { FormulaireSection } from "../formulaire/definition/form-section";
 import { FormulairePAR } from "../formulaire/definition/form-par";
 import { FormulaireVerificateur } from "../formulaire/definition/form-verificateur";
 import { FormulaireEspece } from "../formulaire/definition/form-espece";
+import { FormulairePrebarrage } from "../formulaire/definition/form-prebarrage";
 
 @Injectable()
 export class FormulaireService extends Observable {
@@ -317,6 +318,10 @@ export class FormulaireService extends Observable {
                 f = new FormulaireEspece();
                 break;
 
+            case CalculatorType.PreBarrage:
+                f = new FormulairePrebarrage();
+                break;
+
             default:
                 f = new FormulaireFixedVar();
         }
@@ -338,92 +343,92 @@ export class FormulaireService extends Observable {
         this._formulaires.push(f);
         // Charge la configuration dépendamment du type
         const s: any = await this.loadConfig(ct);
-            f.preparseConfig(s);
+        f.preparseConfig(s);
 
-            // Associe le Nub fourni (chargement de session / duplication de module), sinon en crée un nouveau
-            if (nub) {
-                f.currentNub = nub;
-            } else {
-                f.initNub();
-            }
+        // Associe le Nub fourni (chargement de session / duplication de module), sinon en crée un nouveau
+        if (nub) {
+            f.currentNub = nub;
+        } else {
+            f.initNub();
+        }
 
-            // Restaure le nom du module, sinon affecte le nom par défaut
-            let tempName: string;
-            if (calculatorName) {
-                tempName = calculatorName;
-            } else {
-                tempName = decode(this.getLocalisedShortTitleFromCalculatorType(ct));
-            }
-            // Suffixe le nom du module si nécessaire
-            f.calculatorName = this.suffixNameIfNeeded(tempName);
-
-            f.parseConfig();
-
-            // add fieldsets for existing Structures if needed
-            // (when loading session only)
-            if (f.currentNub instanceof ParallelStructure) {
-                for (const struct of f.currentNub.structures) {
-                    for (const e of f.allFormElements) {
-                        if (e instanceof FieldsetContainer) { // @TODO manage many containers one day ?
-                            e.addFromTemplate(0, undefined, struct);
-                        }
+        // Restaure le nom du module, sinon affecte le nom par défaut
+        let tempName: string;
+        if (calculatorName) {
+            tempName = calculatorName;
+        } else {
+            tempName = decode(this.getLocalisedShortTitleFromCalculatorType(ct));
+        }
+        // Suffixe le nom du module si nécessaire
+        f.calculatorName = this.suffixNameIfNeeded(tempName);
+
+        f.parseConfig();
+
+        // add fieldsets for existing Structures if needed
+        // (when loading session only)
+        if (f.currentNub instanceof ParallelStructure) {
+            for (const struct of f.currentNub.structures) {
+                for (const e of f.allFormElements) {
+                    if (e instanceof FieldsetContainer) { // @TODO manage many containers one day ?
+                        e.addFromTemplate(0, undefined, struct);
                     }
                 }
             }
+        }
 
-            // add fieldsets for existing YAXN if needed
-            // (when loading session only)
-            if (f.currentNub instanceof SPP) {
-                for (const c of f.currentNub.getChildren()) {
-                    for (const e of f.allFormElements) {
-                        if (e instanceof FieldsetContainer) { // @TODO manage many containers one day ?
-                            e.addFromTemplate(0, undefined, c);
-                        }
+        // add fieldsets for existing YAXN if needed
+        // (when loading session only)
+        if (f.currentNub instanceof SPP) {
+            for (const c of f.currentNub.getChildren()) {
+                for (const e of f.allFormElements) {
+                    if (e instanceof FieldsetContainer) { // @TODO manage many containers one day ?
+                        e.addFromTemplate(0, undefined, c);
                     }
                 }
             }
+        }
 
-            // when creating a new Pab, add one wall with one device, plus the downwall
-            // (when loading session, those items are already present)
-            if (
-                f instanceof FormulairePab
-                && f.currentNub instanceof Pab
-                && f.currentNub.children.length === 0
-                && f.currentNub.downWall === undefined
-            ) {
-                // 1. one wall
-                const newWall = Session.getInstance().createNub(
-                    new Props({
-                        calcType: CalculatorType.Cloisons
-                    })
-                ) as Cloisons;
-                // add new default device for new wall
-                const newDevice = Session.getInstance().createNub(
-                    new Props({
-                        calcType: CalculatorType.Structure,
-                        loiDebit: newWall.getDefaultLoiDebit()
-                    })
-                );
-                newWall.addChild(newDevice);
-                f.pabNub.addChild(newWall);
-                // 2. downwall
-                const newDownWall = Session.getInstance().createNub(
-                    new Props({
-                        calcType: CalculatorType.CloisonAval
-                    })
-                ) as CloisonAval;
-                // add new default device for new downwall
-                const newDownwallDevice = Session.getInstance().createNub(
-                    new Props({
-                        calcType: CalculatorType.Structure,
-                        loiDebit: newDownWall.getDefaultLoiDebit()
-                    })
-                );
-                newDownWall.addChild(newDownwallDevice);
-                f.pabNub.downWall = newDownWall;
-            }
-            this.notifyObservers({
-                "action": "createForm",
+        // when creating a new Pab, add one wall with one device, plus the downwall
+        // (when loading session, those items are already present)
+        if (
+            f instanceof FormulairePab
+            && f.currentNub instanceof Pab
+            && f.currentNub.children.length === 0
+            && f.currentNub.downWall === undefined
+        ) {
+            // 1. one wall
+            const newWall = Session.getInstance().createNub(
+                new Props({
+                    calcType: CalculatorType.Cloisons
+                })
+            ) as Cloisons;
+            // add new default device for new wall
+            const newDevice = Session.getInstance().createNub(
+                new Props({
+                    calcType: CalculatorType.Structure,
+                    loiDebit: newWall.getDefaultLoiDebit()
+                })
+            );
+            newWall.addChild(newDevice);
+            f.pabNub.addChild(newWall);
+            // 2. downwall
+            const newDownWall = Session.getInstance().createNub(
+                new Props({
+                    calcType: CalculatorType.CloisonAval
+                })
+            ) as CloisonAval;
+            // add new default device for new downwall
+            const newDownwallDevice = Session.getInstance().createNub(
+                new Props({
+                    calcType: CalculatorType.Structure,
+                    loiDebit: newDownWall.getDefaultLoiDebit()
+                })
+            );
+            newDownWall.addChild(newDownwallDevice);
+            f.pabNub.downWall = newDownWall;
+        }
+        this.notifyObservers({
+            "action": "createForm",
             "form": f
         });
         return f;
@@ -639,47 +644,47 @@ export class FormulaireService extends Observable {
      */
     public async calculatorInfosFromSessionFile(f: File): Promise<{ nubs: any[], formatVersion: string }> {
         const s = await this.readSingleFile(f);
-            // return value
+        // return value
         const res: {
             nubs: any[];
             formatVersion: string;
         } = {
-                nubs: [],
-                formatVersion: ""
-            };
-            const data = JSON.parse(s);
-            // liste des noms de modules de calcul
-            if (data.session && Array.isArray(data.session)) {
-                data.session.forEach((e: any) => {
-                    const nubInfo = {
-                        uid: e.uid,
-                        title: e.meta && e.meta.title ? e.meta.title : undefined,
-                        requires: [],
-                        children: [],
-                        type: e.props.calcType
-                    };
-                    // list linked params dependencies for each Nub
-                    if (e.parameters) {
-                        e.parameters.forEach((p) => {
+            nubs: [],
+            formatVersion: ""
+        };
+        const data = JSON.parse(s);
+        // liste des noms de modules de calcul
+        if (data.session && Array.isArray(data.session)) {
+            data.session.forEach((e: any) => {
+                const nubInfo = {
+                    uid: e.uid,
+                    title: e.meta && e.meta.title ? e.meta.title : undefined,
+                    requires: [],
+                    children: [],
+                    type: e.props.calcType
+                };
+                // list linked params dependencies for each Nub
+                if (e.parameters) {
+                    e.parameters.forEach((p) => {
                         if (p.targetNub && !nubInfo.requires.includes(p.targetNub)) {
-                                nubInfo.requires.push(p.targetNub);
-                            }
-                        });
-                    }
-                    // list children nubs for each Nub
-                    if (e.children) {
-                        e.children.forEach((p) => {
-                            nubInfo.children.push(p.uid);
-                        });
-                    }
-                    res.nubs.push(nubInfo);
-                });
-            }
-            // version du format de fichier
-            if (data.header && data.header.format_version) {
-                res.formatVersion = data.header.format_version;
-            }
-            return res;
+                            nubInfo.requires.push(p.targetNub);
+                        }
+                    });
+                }
+                // list children nubs for each Nub
+                if (e.children) {
+                    e.children.forEach((p) => {
+                        nubInfo.children.push(p.uid);
+                    });
+                }
+                res.nubs.push(nubInfo);
+            });
+        }
+        // version du format de fichier
+        if (data.header && data.header.format_version) {
+            res.formatVersion = data.header.format_version;
+        }
+        return res;
     }
 
     public saveForm(f: FormulaireDefinition) {