diff --git a/src/app/calculators/parallel-structures/parallel-structures.config.json b/src/app/calculators/parallel-structures/parallel-structures.config.json index 840ccc54408b107250fb9d1083d2a18fac2c7c3d..0c90faf54a08e51b0198aadd3eef975686d5892f 100644 --- a/src/app/calculators/parallel-structures/parallel-structures.config.json +++ b/src/app/calculators/parallel-structures/parallel-structures.config.json @@ -1,228 +1,26 @@ [ { - "id": "fs_ouvrage", + "id": "fs_param_hydro", "type": "fieldset", - "fields": [ - { - "id": "select_ouvrage", - "type": "select", - "select": [ - { - "id": "select_ouvrage_vanne_rect" - }, - { - "id": "select_ouvrage_vanne_circ" - }, - { - "id": "select_ouvrage_seuil_rect" - }, - { - "id": "select_ouvrage_seuil_trap" - }, - { - "id": "select_ouvrage_vanne_trap" - } - ] - }, - { - "id": "select_loidebit1", - "type": "select", - "dep_exist": [ - { - "refid": "select_ouvrage_vanne", - "refvalue": "select_ouvrage_vanne_rect" - }, - { - "refid": "select_ouvrage_vanne", - "refvalue": "select_ouvrage_vanne_circ" - }, - { - "refid": "select_ouvrage_vanne", - "refvalue": "select_ouvrage_seuil_rect" - } - ], - "select": [ - { - "id": "select_loidebit1_cemagref88" - }, - { - "id": "select_loidebit1_vannedenoye" - }, - { - "id": "select_loidebit1_vannenoye" - } - ] - }, - { - "id": "select_loidebit2", - "type": "select", - "dep_exist": [ - { - "refid": "select_ouvrage_vanne", - "refvalue": "select_ouvrage_seuil_trap" - }, - { - "refid": "select_ouvrage_vanne", - "refvalue": "select_ouvrage_vanne_trap" - } - ], - "select": [ - { - "id": "select_loidebit4_cemagref88" - } - ] - } - ] - }, - { - "id": "fs_caract_1", - "type": "fieldset", - "dep_exist": [ - { - "refid": "select_ouvrage_vanne", - "refvalue": "select_ouvrage_vanne_rect" - }, - { - "refid": "select_ouvrage_vanne", - "refvalue": "select_ouvrage_vanne_circ" - } - ], + "option": "cal", "fields": [ { "type": "input", - "id": "larg", + "id": "Z1", "unit": "m", "value": 2 }, { "type": "input", - "id": "ouv", - "unit": "m", - "value": 0.5 - }, - { - "type": "input", - "id": "kq", - "unit": "", - "value": 0.4 - } - ] - }, - { - "id": "fs_caract_2", - "type": "fieldset", - "dep_exist": [ - { - "refid": "select_ouvrage_vanne", - "refvalue": "select_ouvrage_seuil_rect" - } - ], - "fields": [ - { - "type": "input", - "id": "larg", + "id": "Z2", "unit": "m", - "value": 2 + "value": 1 }, - { - "type": "input", - "id": "kq", - "unit": "", - "value": 0.4 - } - ] - }, - { - "id": "fs_caract_3", - "type": "fieldset", - "dep_exist": [ - { - "refid": "select_ouvrage_vanne", - "refvalue": "select_ouvrage_seuil_trap" - }, - { - "refid": "select_ouvrage_vanne", - "refvalue": "select_ouvrage_vanne_trap" - } - ], - "fields": [ - { - "type": "input", - "id": "largf", - "unit": "m", - "value": 2 - }, - { - "type": "input", - "id": "kqr", - "unit": "", - "value": 0.4 - }, - { - "type": "input", - "id": "kqt", - "unit": "", - "value": 0.5 - }, - { - "type": "input", - "id": "fruit", - "unit": "m/m", - "value": 0.56 - } - ] - }, - { - "id": "fs_surverse", - "type": "fieldset", - "dep_exist": [ - { - "id": "select_ouvrage_vanne_rect" - }, - { - "id": "select_ouvrage_vanne_circ" - }, - { - "id": "select_ouvrage_vanne_trap" - } - ], - "fields": [ - { - "type": "bool", - "id": "surverse", - "value": false - } - ] - }, - { - "id": "fs_hydraulique", - "type": "fieldset", - "name": "Caractéristiques globales", - "option": "cal", - "fields": [ { "type": "input", "id": "Q", "unit": "m³/s", - "value": 3 - }, - { - "type": "input", - "id": "D", - "unit": "m", - "value": 1.2 - }, - { - "type": "input", - "id": "J", - "unit": "m", - "value": 0.6 - }, - { - "type": "input", - "id": "Lg", - "unit": "m", - "value": 100 + "value": 0.5 } ] }, diff --git a/src/app/calculators/parallel-structures/parallel-structures.fr.json b/src/app/calculators/parallel-structures/parallel-structures.fr.json index ce4d974c577834aaba2dc09d4d62ba6d1b098f7c..d2637fdbdc5b08f9e0cf205fe6aeb9083520a97e 100644 --- a/src/app/calculators/parallel-structures/parallel-structures.fr.json +++ b/src/app/calculators/parallel-structures/parallel-structures.fr.json @@ -1,32 +1,8 @@ { - "fs_ouvrage": "Type d'ouvrage", - "select_ouvrage": "Ouvrage", - "select_ouvrage_vanne_rect": "Vanne rectangulaire", - "select_loidebit1": "Loi de débit", - "select_loidebit1_cemagref88": "Déversoir/Orifice Cemagref 88", - "select_loidebit1_vannedenoye": "Vanne dénoyé", - "select_loidebit1_vannenoye": "Vanne noyé", - "select_loidebit2": "Loi de débit", - "select_loidebit2_cemagref88": "Déversoir/Orifice Cemagref 88", - "select_ouvrage_circ": "Vanne circulaire", - "select_ouvrage_seuil_rect": "Seuil rectangulaire", - "select_ouvrage_seuil_trap": "Seuil trapézoïdal", - "select_ouvrage_vanne_trap": "Vanne trapézoïdale", - "fs_caract_1": "Caractéristiques de l'ouvrage", - "larg": "Largeur", - "ouv": "Ouverture", - "kq": "Coefficient de débit", - "fs_caract_2": "Caractéristiques de l'ouvrage", - "fs_caract_3": "Caractéristiques de l'ouvrage", - "largf": "Largeur au fond", - "kqr": "Coefficient de débit partie rectangulaire", - "kqt": "Coefficient de débit partie triangulaire", - "fruit": "Fruit", - "fs_surverse": "Surverse", - "fs_hydraulique": "Caractéristiques globales", - "Q": "Débit", - "Y_A": "Cote de l'eau à l'amont", - "Y_a": "Cote de l'eau à l'aval", + "fs_param_hydro": "Paramètres hydrauliques", + "Z1": "Cote amont", + "Z2": "Cote aval", + "Q": "Débit total", "fs_param_calc": "Paramètres de calcul", "Pr": "Précision de calcul" } \ No newline at end of file diff --git a/src/app/components/calculator-list/calculator-list.component.ts b/src/app/components/calculator-list/calculator-list.component.ts index 9a10529fa5401dabae61b9381f2ee826068e46e4..7a46f4293f01d17908ddb4cc9e2fea988c8e8b94 100644 --- a/src/app/components/calculator-list/calculator-list.component.ts +++ b/src/app/components/calculator-list/calculator-list.component.ts @@ -37,7 +37,8 @@ export class CalculatorListComponent implements OnInit { private updateLocale() { this._items = []; for (let t of EnumEx.getValues(CalculatorType)) - this._items.push(new ListElement(t, this.formulaireService)); + if (t !== CalculatorType.Structure) + this._items.push(new ListElement(t, this.formulaireService)); } private create(t: CalculatorType) {