diff --git a/DEVELOPERS.md b/DEVELOPERS.md index 82e88bb26244e2f4d2eacf6022a362c215818d6d..4a6b1d4d7c84a92e4065a46daaac74f043aa8559 100644 --- a/DEVELOPERS.md +++ b/DEVELOPERS.md @@ -575,7 +575,7 @@ Dans la configuration du module, dans le "fieldset_template", ajouter un sélect "id": "fs_ouvrage", "type": "fieldset_template", "calcType": "Structure", - "defaultStructType": "VanneRectangulaire", + "defaultStructType": "VanneFondRectangulaire", "defaultLoiDebit": "GateCem88v", "fields": [ { @@ -594,7 +594,7 @@ Dans la configuration du module, dans le "fieldset_template", ajouter un sélect "SeuilRectangulaire_WeirVillemonte": "structures/kivi.html", "SeuilRectangulaire_WeirSubmergedLarinier": "structures/fente_noyee.html", "SeuilRectangulaire_WeirCunge80": "structures/cunge_80.html", - "VanneRectangulaire_GateCunge80": "structures/cunge_80.html", + "VanneFondRectangulaire_GateCunge80": "structures/cunge_80.html", "SeuilTriangulaire_TriangularWeirFree": "structures/dever_triang.html", "SeuilTriangulaire_TriangularWeirBroad": "structures/dever_triang.html", "SeuilTriangulaireTrunc_TriangularTruncWeirFree": "structures/dever_triang_tronque.html" diff --git a/e2e/ouvrages-empty-fields.e2e-spec.ts b/e2e/ouvrages-empty-fields.e2e-spec.ts index 60f2512f61631479c1f06d3ffd50072033ff5a20..4a28316f8c5a2001f778241fd31c211da1d00fec 100644 --- a/e2e/ouvrages-empty-fields.e2e-spec.ts +++ b/e2e/ouvrages-empty-fields.e2e-spec.ts @@ -102,7 +102,7 @@ describe("ngHyd - check that created/cloned structures have empty fields - ", () // change 2nd structure type to rectangular gate const selects = await element.all(by.css("mat-select#select_structure")); const structSelect2 = selects[1]; - await calcPage.changeSelectValue(structSelect2, 4); + await calcPage.changeSelectValue(structSelect2, 5); await browser.sleep(200); // check empty fields diff --git a/src/app/calculators/parallelstructure/config.json b/src/app/calculators/parallelstructure/config.json index 3ac1aef2cfeda5da3ba2b81728bf66fa1960d946..26c3cf9a4414b5e672b7f5dc88a34ac15195da06 100644 --- a/src/app/calculators/parallelstructure/config.json +++ b/src/app/calculators/parallelstructure/config.json @@ -13,7 +13,7 @@ "id": "fs_ouvrage", "type": "fieldset_template", "calcType": "Structure", - "defaultStructType": "VanneRectangulaire", + "defaultStructType": "SeuilOrificeRectangulaire", "defaultLoiDebit": "GateCem88v", "fields": [ { diff --git a/src/locale/messages.en.json b/src/locale/messages.en.json index 4416adeefc9d8d8fd7f01f41a3cbef17676693aa..5171fdefcf7082ccdc67004a17ebf8eb59e1a1b2 100755 --- a/src/locale/messages.en.json +++ b/src/locale/messages.en.json @@ -362,9 +362,10 @@ "INFO_LIB_STRUCT_CONTAINER": "Devices", "INFO_LIB_STRUCTURE_ORIFICE": "Orifice", "INFO_LIB_STRUCTURE_SEUILRECTANGULAIRE": "Rectangular weir", + "INFO_LIB_STRUCTURE_SEUILORIFICERECTANGULAIRE": "Rectangular weir/orifice", "INFO_LIB_STRUCTURE_SEUILTRIANGULAIRE": "Triangular weir", "INFO_LIB_STRUCTURE_SEUILTRIANGULAIRETRUNC": "Truncated triangular weir", - "INFO_LIB_STRUCTURE_VANNERECTANGULAIRE": "Rectangular gate", + "INFO_LIB_STRUCTURE_VANNEFONDRECTANGULAIRE": "Rectangular bottom gate", "INFO_LIB_STRUCTURE_N_COURT": "D", "INFO_LIB_TAU0": "Tractive force", "INFO_LIB_TOR": "Supercritical water line", diff --git a/src/locale/messages.fr.json b/src/locale/messages.fr.json index 4161aea6c0d2697cff2267b91eeb73ed698299ed..d41d2edd497d521cbe205e3a2ece875cd7de9954 100755 --- a/src/locale/messages.fr.json +++ b/src/locale/messages.fr.json @@ -363,9 +363,10 @@ "INFO_LIB_STRUCT_CONTAINER": "Ouvrages", "INFO_LIB_STRUCTURE_ORIFICE": "Orifice", "INFO_LIB_STRUCTURE_SEUILRECTANGULAIRE": "Seuil rectangulaire", + "INFO_LIB_STRUCTURE_SEUILORIFICERECTANGULAIRE": "Seuil/orifice rectangulaire", "INFO_LIB_STRUCTURE_SEUILTRIANGULAIRE": "Seuil triangulaire", "INFO_LIB_STRUCTURE_SEUILTRIANGULAIRETRUNC": "Seuil triangulaire tronqué", - "INFO_LIB_STRUCTURE_VANNERECTANGULAIRE": "Vanne rectangulaire", + "INFO_LIB_STRUCTURE_VANNEFONDRECTANGULAIRE": "Vanne de fond rectangulaire", "INFO_LIB_STRUCTURE_N_COURT": "O", "INFO_LIB_TAU0": "Force tractrice", "INFO_LIB_TOR": "Ligne d'eau torrentielle",