From eeccb00a5fb07269d4095bcc9ab9336ae52cb4dd Mon Sep 17 00:00:00 2001
From: Mathias Chouet <mathias.chouet@irstea.fr>
Date: Thu, 30 Apr 2020 11:52:26 +0200
Subject: [PATCH] Modules diagram: added Verificateur links
---
.../modules-diagram.component.ts | 20 ++++++++++++++++++-
src/locale/messages.en.json | 2 ++
src/locale/messages.fr.json | 2 ++
3 files changed, 23 insertions(+), 1 deletion(-)
diff --git a/src/app/components/modules-diagram/modules-diagram.component.ts b/src/app/components/modules-diagram/modules-diagram.component.ts
index 150764b20..0ec976df7 100644
--- a/src/app/components/modules-diagram/modules-diagram.component.ts
+++ b/src/app/components/modules-diagram/modules-diagram.component.ts
@@ -18,7 +18,10 @@ import {
Nub,
MacrorugoCompound,
Pab,
- Solveur
+ Solveur,
+ Verificateur,
+ Espece,
+ FishSpecies
} from "jalhyd";
import { I18nService } from "../../services/internationalisation.service";
@@ -222,6 +225,21 @@ export class ModulesDiagramComponent implements AfterContentInit, AfterViewCheck
def.push(nub.uid + "-->|" + finds + ":" + sp.symbol + "|" + sp.parentNub.uid);
}
}
+ // add Verificateur links
+ if (nub instanceof Verificateur) {
+ const ntv = nub.nubToVerify;
+ const sp = nub.species.filter((sp) => {
+ return sp.species === FishSpecies.SPECIES_CUSTOM;
+ });
+ const verifiesPass = this.intlService.localizeText("INFO_DIAGRAM_VERIFICATEUR_VERIFIES_PASS");
+ const verifiesSpecies = this.intlService.localizeText("INFO_DIAGRAM_VERIFICATEUR_VERIFIES_SPECIES");
+ if (ntv !== undefined) {
+ def.push(nub.uid + "-->|" + verifiesPass + "|" + ntv.uid);
+ }
+ for (const s of sp) {
+ def.push(nub.uid + "-->|" + verifiesSpecies + "|" + s.uid);
+ }
+ }
}
return def.join("\n");
diff --git a/src/locale/messages.en.json b/src/locale/messages.en.json
index 132e2b4f1..5820aaabf 100644
--- a/src/locale/messages.en.json
+++ b/src/locale/messages.en.json
@@ -98,6 +98,8 @@
"INFO_DEVER_TITRE": "Free flow weir stage-discharge laws",
"INFO_DIAGRAM_SOLVEUR_FINDS": "finds",
"INFO_DIAGRAM_SOLVEUR_READS": "reads",
+ "INFO_DIAGRAM_VERIFICATEUR_VERIFIES_PASS": "verifies pass",
+ "INFO_DIAGRAM_VERIFICATEUR_VERIFIES_SPECIES": "verifies species",
"INFO_DIAGRAM_TITLE": "Calculation modules diagram",
"INFO_DIAGRAM_DRAWING_ERROR": "Error while drawing diagram",
"INFO_DIAGRAM_CALCULATED_PARAM": "calculated parameter",
diff --git a/src/locale/messages.fr.json b/src/locale/messages.fr.json
index d2d4687f2..08262706c 100644
--- a/src/locale/messages.fr.json
+++ b/src/locale/messages.fr.json
@@ -98,6 +98,8 @@
"INFO_DEVER_TITRE": "Lois de déversoirs dénoyés",
"INFO_DIAGRAM_SOLVEUR_FINDS": "trouve",
"INFO_DIAGRAM_SOLVEUR_READS": "lit",
+ "INFO_DIAGRAM_VERIFICATEUR_VERIFIES_PASS": "vérifie la passe",
+ "INFO_DIAGRAM_VERIFICATEUR_VERIFIES_SPECIES": "vérifie les espèces",
"INFO_DIAGRAM_TITLE": "Diagramme des modules de calcul",
"INFO_DIAGRAM_DRAWING_ERROR": "Erreur lors du dessin du diagramme",
"INFO_DIAGRAM_CALCULATED_PARAM": "paramètre calculé",
--
GitLab