From 4ae5fecc1758de35f086dc9c1fe5510ae260cbf7 Mon Sep 17 00:00:00 2001
From: David Dorchies <david.dorchies@irstea.fr>
Date: Thu, 4 Jul 2019 18:45:48 +0200
Subject: [PATCH] Debuggage cassiopee/jalhyd#105

---
 src/app/services/formulaire/formulaire.service.ts | 3 +--
 src/locale/messages.en.json                       | 7 ++++++-
 src/locale/messages.fr.json                       | 7 ++++++-
 3 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/src/app/services/formulaire/formulaire.service.ts b/src/app/services/formulaire/formulaire.service.ts
index 6b6bb15e4..c9dea5a28 100644
--- a/src/app/services/formulaire/formulaire.service.ts
+++ b/src/app/services/formulaire/formulaire.service.ts
@@ -35,7 +35,6 @@ import { FieldsetContainer } from "../..//formulaire/fieldset-container";
 import { ApplicationSetupService } from "../app-setup/app-setup.service";
 import { NotificationsService } from "../notifications/notifications.service";
 import { FormulairePab } from "../../formulaire/definition/concrete/form-pab";
-import { CloisonAval } from "jalhyd";
 
 @Injectable()
 export class FormulaireService extends Observable {
@@ -372,7 +371,7 @@ export class FormulaireService extends Observable {
                 // 2. downwall
                 const newDownWall = Session.getInstance().createNub(
                     new Props({
-                        calcType: CalculatorType.ParallelStructure
+                        calcType: CalculatorType.CloisonAval
                     })
                 ) as CloisonAval;
                 // add new default device for new downwall
diff --git a/src/locale/messages.en.json b/src/locale/messages.en.json
index 53fb506aa..7523d3ebf 100644
--- a/src/locale/messages.en.json
+++ b/src/locale/messages.en.json
@@ -1,4 +1,5 @@
 {
+    "ERROR_CLOISON_AVAL_UN_OUVRAGE_REGULE": "Only one regulated device is allowed on the downstream wall",
     "ERROR_DICHO_CONVERGE": "Dichotomy could not converge",
     "ERROR_DICHO_FUNCTION_VARIATION": "unable to determinate function direction of variation",
     "ERROR_DICHO_INIT_DOMAIN": "Dichotomy: target %targetSymbol%=%targetValue% does not exist for variable %variableSymbol% valued in interval %variableInterval%",
@@ -141,6 +142,8 @@
     "INFO_LIB_J": "Head loss",
     "INFO_LIB_L": "Weir width",
     "INFO_LIB_LB": "Pool length",
+    "INFO_LIB_MINZDV": "Minimal crest elevation",
+    "INFO_LIB_MAXZDV": "Maximal crest elevation",
     "INFO_LIB_OUVRAGE_Q_ENUM_STRUCTUREFLOWMODE": "Mode",
     "INFO_LIB_OUVRAGE_Q_ENUM_STRUCTUREFLOWREGIME": "Regime",
     "INFO_LIB_OUVRAGE_Q": "Discharge",
@@ -203,8 +206,10 @@
     "INFO_LOIDEBIT_Cunge80": "Cunge 80",
     "INFO_LOIDEBIT_RectangularOrificeFree": "Free flow gate",
     "INFO_LOIDEBIT_RectangularOrificeSubmerged": "Submerged gate",
+    "INFO_LOIDEBIT_VanLevLarinier": "Regulated submerged slot (Larinier 1992)",
+    "INFO_LOIDEBIT_VanLevVillemonte": "Regulated notch (Villemonte 1957)",
     "INFO_LOIDEBIT_WeirFree": "Free flow weir",
-    "INFO_LOIDEBIT_WeirVillemonte": "Villemonte 1957",
+    "INFO_LOIDEBIT_WeirVillemonte": "Notch (Villemonte 1957)",
     "INFO_MACRORUGO_TITRE_COURT": "Rock-ramp",
     "INFO_MACRORUGO_TITRE": "Rock-ramp fishpasses",
     "INFO_MENU_EMPTY_SESSION_TITLE": "New session",
diff --git a/src/locale/messages.fr.json b/src/locale/messages.fr.json
index 33c863b89..84adca352 100644
--- a/src/locale/messages.fr.json
+++ b/src/locale/messages.fr.json
@@ -1,4 +1,5 @@
 {
+    "ERROR_CLOISON_AVAL_UN_OUVRAGE_REGULE": "Un seul ouvrage régulé est autorisé sur la cloison aval",
     "ERROR_DICHO_CONVERGE": "La dichotomie n'a pas pu converger",
     "ERROR_DICHO_FUNCTION_VARIATION": "Dichotomie&nbsp;: impossible de determiner le sens de  variation de la fonction",
     "ERROR_DICHO_INIT_DOMAIN": "Dichotomie&nbsp;: la valeur cible %targetSymbol%=%targetValue% n'existe pas pour la variable %variableSymbol% prise dans l'intervalle %variableInterval%",
@@ -141,6 +142,8 @@
     "INFO_LIB_J": "Perte de charge",
     "INFO_LIB_L": "Largeur du déversoir",
     "INFO_LIB_LB": "Longueur du bassin",
+    "INFO_LIB_MINZDV": "Cote minimale de la crête",
+    "INFO_LIB_MAXZDV": "Cote maximale de la crête",
     "INFO_LIB_OUVRAGE_Q_ENUM_STRUCTUREFLOWMODE": "Type d'écoulement",
     "INFO_LIB_OUVRAGE_Q_ENUM_STRUCTUREFLOWREGIME": "Régime",
     "INFO_LIB_OUVRAGE_Q": "Débit",
@@ -203,8 +206,10 @@
     "INFO_LOIDEBIT_Cunge80": "Cunge 80",
     "INFO_LOIDEBIT_RectangularOrificeFree": "Vanne dénoyé",
     "INFO_LOIDEBIT_RectangularOrificeSubmerged": "Vanne noyé",
+    "INFO_LOIDEBIT_VanLevLarinier": "Fente noyée régulée (Larinier 1992)",
+    "INFO_LOIDEBIT_VanLevVillemonte": "Échancrure régulée (Villemonte 1957)",
     "INFO_LOIDEBIT_WeirFree": "Seuil dénoyé",
-    "INFO_LOIDEBIT_WeirVillemonte": "Villemonte 1957",
+    "INFO_LOIDEBIT_WeirVillemonte": "Échancrure (Villemonte 1957)",
     "INFO_MACRORUGO_TITRE_COURT": "Macro-rugo.",
     "INFO_MACRORUGO_TITRE": "Passe à macro-rugosités",
     "INFO_MENU_EMPTY_SESSION_TITLE": "Nouvelle session",
-- 
GitLab