diff --git a/src/app/calculators/pab-chute/pab-chute.config.json b/src/app/calculators/pab-chute/pab-chute.config.json new file mode 100644 index 0000000000000000000000000000000000000000..7dfaaf76b34365313c8e5e29e76baee3774bcbbe --- /dev/null +++ b/src/app/calculators/pab-chute/pab-chute.config.json @@ -0,0 +1,29 @@ +[ + { + "id": "fs_chute", + "type": "fieldset", + "option": "cal", + "fields": [ + { + "type": "input", + "id": "Z1", + "unit": "m" + }, + { + "type": "input", + "id": "Z2", + "unit": "m" + }, + { + "type": "input", + "id": "DH", + "unit": "m" + } + ] + }, + { + "type": "options", + "idCal": "DH", + "help": "pab/chute" + } +] \ No newline at end of file diff --git a/src/app/calculators/pab-chute/pab-chute.en.json b/src/app/calculators/pab-chute/pab-chute.en.json new file mode 100644 index 0000000000000000000000000000000000000000..1e58e682f8152a20fa28d20c787b7ef9fbb1aee2 --- /dev/null +++ b/src/app/calculators/pab-chute/pab-chute.en.json @@ -0,0 +1,6 @@ +{ + "fs_chute": "Basin dimensions", + "Z1": "Upstream height", + "Z2": "Downstream height", + "DH": "Fall" +} \ No newline at end of file diff --git a/src/app/calculators/pab-chute/pab-chute.fr.json b/src/app/calculators/pab-chute/pab-chute.fr.json new file mode 100644 index 0000000000000000000000000000000000000000..dc3b62754b1c269f991cfe90fb5160c0e1ec1050 --- /dev/null +++ b/src/app/calculators/pab-chute/pab-chute.fr.json @@ -0,0 +1,6 @@ +{ + "fs_chute": "Dimensions du bassin", + "Z1": "Cote amont", + "Z2": "Cote aval", + "DH": "Chute" +} \ No newline at end of file diff --git a/src/app/services/formulaire/formulaire.service.ts b/src/app/services/formulaire/formulaire.service.ts index 79f728dcbe4404a21f454ebb9657b523d3fcbad1..d8a6e6830ba27a7debd123a1fdcf5ae519a99adc 100644 --- a/src/app/services/formulaire/formulaire.service.ts +++ b/src/app/services/formulaire/formulaire.service.ts @@ -173,6 +173,7 @@ export class FormulaireService extends Observable { let f: FormulaireDefinition; switch (ct) { case CalculatorType.ConduiteDistributrice: + case CalculatorType.PabChute: case CalculatorType.PabDimensions: case CalculatorType.PabPuissance: case CalculatorType.MacroRugo: @@ -378,6 +379,9 @@ export class FormulaireService extends Observable { case CalculatorType.MacroRugo: return "app/calculators/macrorugo/macrorugo."; + case CalculatorType.PabChute: + return "app/calculators/pab-chute/pab-chute."; + default: throw new Error("FormulaireService.getConfigPathPrefix() : valeur de CalculatorType " + ct + " non implémentée"); } diff --git a/src/locale/messages.en.json b/src/locale/messages.en.json index 8f555f4907f9f935f764aa6e45aec112844a1f3e..0a6edaaad48ae5e2ed5ba9e13b5029926a619c99 100644 --- a/src/locale/messages.en.json +++ b/src/locale/messages.en.json @@ -155,6 +155,8 @@ "INFO_OPTION_NONE": "None", "INFO_OPTION_NONE_F": "None", "INFO_OUVRAGE": "Structure", + "INFO_PABCHUTE_TITRE": "Fish ladder: fall", + "INFO_PABCHUTE_TITRE_COURT": "FL: fall", "INFO_PABDIMENSIONS_TITRE": "Fish ladder: dimensions", "INFO_PABDIMENSIONS_TITRE_COURT": "FL: dimensions", "INFO_PABPUISSANCE_TITRE": "Fish ladder: dissipated power", diff --git a/src/locale/messages.fr.json b/src/locale/messages.fr.json index 5d719c76a3249aea9913f20f47ae645fbcd160e9..d1457e74f8ba4bd3adf2cd8abc09cfb1944fa7fb 100644 --- a/src/locale/messages.fr.json +++ b/src/locale/messages.fr.json @@ -155,6 +155,8 @@ "INFO_OPTION_NONE": "Aucun", "INFO_OPTION_NONE_F": "Aucune", "INFO_OUVRAGE": "Ouvrage", + "INFO_PABCHUTE_TITRE": "Passe à bassin : chute", + "INFO_PABCHUTE_TITRE_COURT": "PAB : chute", "INFO_PABDIMENSIONS_TITRE": "Passe à bassin : dimensions", "INFO_PABDIMENSIONS_TITRE_COURT": "PAB : dimensions", "INFO_PABPUISSANCE_TITRE": "Passe à bassin : puissance dissipée",