diff --git a/src/app/calculators/lechaptcalmon/config.json b/src/app/calculators/pressureloss/config.json similarity index 54% rename from src/app/calculators/lechaptcalmon/config.json rename to src/app/calculators/pressureloss/config.json index 1b440a6ae98b420fbb98eed5dfc49ef134424cf8..00befe99ff5745e957e58ea07280bd4adecffc54 100644 --- a/src/app/calculators/lechaptcalmon/config.json +++ b/src/app/calculators/pressureloss/config.json @@ -1,6 +1,21 @@ [ { - "id": "fs_materiau", + "id": "fs_pressureloss_law", + "type": "fieldset", + "fields": [ + { + "id": "select_pressureloss_law", + "type": "select", + "property": "pressureLossType", + "default": "LechaptCalmon", + "help": { + "0": "hyd_en_charge/lechapt-calmon.html" + } + } + ] + }, + { + "id": "fs_lechaptcalmon", "type": "fieldset", "fields": [ { @@ -24,9 +39,5 @@ "Lg", "Ks" ] - }, - { - "type": "options", - "help": "hyd_en_charge/lechapt-calmon.html" } ] \ No newline at end of file diff --git a/src/app/calculators/lechaptcalmon/en.json b/src/app/calculators/pressureloss/en.json similarity index 91% rename from src/app/calculators/lechaptcalmon/en.json rename to src/app/calculators/pressureloss/en.json index 729994b0eefa9009092b821d43e3410b05358419..e93afd9bf044f73fc704a4f36e0378a53fd28d72 100644 --- a/src/app/calculators/lechaptcalmon/en.json +++ b/src/app/calculators/pressureloss/en.json @@ -1,4 +1,6 @@ { + "fs_pressureloss_law": "Pressure loss", + "select_pressureloss_law": "Pressure loss law", "fs_materiau": "Type of material", "select_material": "Choice of material", "MATERIAL_0": "Unlined cast iron - Coarse concrete (corrosive water)", diff --git a/src/app/calculators/lechaptcalmon/fr.json b/src/app/calculators/pressureloss/fr.json similarity index 91% rename from src/app/calculators/lechaptcalmon/fr.json rename to src/app/calculators/pressureloss/fr.json index 89884cabd4634f566ed4d86d2a419de79000447f..17965675cc4dbbed9a3af2d5bcbc8e776720eb51 100644 --- a/src/app/calculators/lechaptcalmon/fr.json +++ b/src/app/calculators/pressureloss/fr.json @@ -1,4 +1,6 @@ { + "fs_pressureloss_law": "Perte de charge", + "select_pressureloss_law": "Loi de perte de charge", "fs_materiau": "Type du matériau", "select_material": "Choix du matériau", "MATERIAL_0": "Fonte ou acier non revêtus - Béton grossier (eau corrosive)", diff --git a/src/app/components/calculator-list/calculator-list.component.ts b/src/app/components/calculator-list/calculator-list.component.ts index ec0ec059a9df1cea2998e70ecbdbe9f0112580fa..b62c4f2e4cdbd58b89ee75fb1feebcc144edfe27 100644 --- a/src/app/components/calculator-list/calculator-list.component.ts +++ b/src/app/components/calculator-list/calculator-list.component.ts @@ -120,7 +120,8 @@ export class CalculatorListComponent implements OnInit { CalculatorType.CloisonAval, CalculatorType.YAXN, CalculatorType.PbBassin, - CalculatorType.PbCloison + CalculatorType.PbCloison, + CalculatorType.LechaptCalmon ].includes(t) ) { unusedTheme.calculators.push({ diff --git a/src/app/config.json b/src/app/config.json index 97f3c60d6743c80c47231016f0666d26fb40e77d..1bc4882309f296358e3b051647ffbb6b8867896d 100644 --- a/src/app/config.json +++ b/src/app/config.json @@ -63,7 +63,7 @@ "path": "en-charge.jpg", "credits": "Catherine Tailleux / Inrae" }, - "calculators": [ 1, 0 ] + "calculators": [ 35, 0 ] }, { "name": "LOIS_D_OUVRAGES", diff --git a/src/locale/messages.en.json b/src/locale/messages.en.json index 6ac8ce559ee4a307c510e6ebdab1ed70a5fb7068..c88ae52e58bfc38478cb6e105b94fa5518a97256 100755 --- a/src/locale/messages.en.json +++ b/src/locale/messages.en.json @@ -261,6 +261,7 @@ "INFO_LECHAPTCALMON_DESCRIPTION": "pipe flow circular headloss", "INFO_LECHAPTCALMON_TITRE_COURT": "Lechapt-C.", "INFO_LECHAPTCALMON_TITRE": "Lechapt-Calmon", + "INFO_PRESSURELOSS_TITRE": "Pressure loss", "INFO_LIB_ABSCISSE": "Abscissa (m)", "INFO_LIB_ALTITUDE": "Altitude (m)", "INFO_LIB_LENGTHS": "Every length", diff --git a/src/locale/messages.fr.json b/src/locale/messages.fr.json index 24135323659bf1aafcebc9ba8881f9ffe3e84e60..70fd109ee35a65a4498590a05ff9ea7d7ba192ee 100755 --- a/src/locale/messages.fr.json +++ b/src/locale/messages.fr.json @@ -261,6 +261,7 @@ "INFO_LECHAPTCALMON_DESCRIPTION": "Hydraulique en charge conduite colebrook", "INFO_LECHAPTCALMON_TITRE_COURT": "Lechapt-C.", "INFO_LECHAPTCALMON_TITRE": "Lechapt-Calmon", + "INFO_PRESSURELOSS_TITRE": "Perte de charge", "INFO_LIB_ABSCISSE": "Abscisse (m)", "INFO_LIB_ALTITUDE": "Altitude (m)", "INFO_LIB_LENGTHS": "Toutes les longueurs",