Skip to content
Snippets Groups Projects
Commit 88d2ffdc authored by François Grand's avatar François Grand
Browse files

refactor: application start page: rename Lechapt-Calmon calculator to Pressure loss

refs #585
parent 877ce7bb
No related branches found
No related tags found
2 merge requests!225Release v4.17.0,!193Resolve "Restructurer Lechapt et Calmon pour de nouvelles lois de pertes de charge"
[
{
"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
{
"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)",
......
{
"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)",
......
......@@ -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({
......
......@@ -63,7 +63,7 @@
"path": "en-charge.jpg",
"credits": "Catherine Tailleux / Inrae"
},
"calculators": [ 1, 0 ]
"calculators": [ 35, 0 ]
},
{
"name": "LOIS_D_OUVRAGES",
......
......@@ -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",
......
......@@ -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",
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment