From 240c4ae6f0217d830b2ab844e47089fafc8c2b84 Mon Sep 17 00:00:00 2001
From: "mathias.chouet" <mathias.chouet@irstea.fr>
Date: Thu, 14 Nov 2019 12:19:41 +0100
Subject: [PATCH] Simplify linked values display for children Nubs
---
.../param-link/param-link.component.ts | 17 ++++-------------
src/locale/messages.en.json | 1 -
src/locale/messages.fr.json | 1 -
3 files changed, 4 insertions(+), 15 deletions(-)
diff --git a/src/app/components/param-link/param-link.component.ts b/src/app/components/param-link/param-link.component.ts
index ec58bf19c..addd6ab5b 100644
--- a/src/app/components/param-link/param-link.component.ts
+++ b/src/app/components/param-link/param-link.component.ts
@@ -172,19 +172,10 @@ export class ParamLinkComponent implements OnChanges, Observer, OnDestroy {
if (i.nub instanceof ChildNub) {
let pos: number;
pos = i.nub.findPositionInParent();
- if (i.isResult()) {
- // résultat d'enfant
- return `${preview} - ` + sprintf(
- this.intlService.localizeText("INFO_LINKED_VALUE_CHILD_RESULT"),
- s, c, i.nub.parent.childrenType, (pos + 1)
- );
- } else {
- // paramètre d'enfant
- return `${preview} - ` + sprintf(
- this.intlService.localizeText("INFO_LINKED_VALUE_CHILD"),
- s, c, i.nub.parent.childrenType, (pos + 1)
- );
- }
+ return `${preview} - ` + sprintf(
+ this.intlService.localizeText("INFO_LINKED_VALUE_CHILD"),
+ s, c, i.nub.parent.childrenType.toLowerCase(), (pos + 1)
+ );
} else
// 2. Paramètre / résultat d'une section dans un Nub de type SectionNub
if (i.nub instanceof acSection) {
diff --git a/src/locale/messages.en.json b/src/locale/messages.en.json
index 334ea7dea..d45de2d33 100644
--- a/src/locale/messages.en.json
+++ b/src/locale/messages.en.json
@@ -285,7 +285,6 @@
"INFO_LIB_ZRAM": "Upstream apron elevation",
"INFO_LIB_ZRMB": "Downstream basin bottom elevation",
"INFO_LIB_ZT": "Triangle top elevation",
- "INFO_LINKED_VALUE_CHILD_RESULT": "%s (%s, %s %s)",
"INFO_LINKED_VALUE_CHILD": "%s (%s, %s %s)",
"INFO_LINKED_VALUE_EXTRA_RESULT_OF": "%s (%s)",
"INFO_LINKED_VALUE_EXTRA_RESULT": "%s (%s)",
diff --git a/src/locale/messages.fr.json b/src/locale/messages.fr.json
index cb6923212..4545fd081 100644
--- a/src/locale/messages.fr.json
+++ b/src/locale/messages.fr.json
@@ -284,7 +284,6 @@
"INFO_LIB_ZRAM": "Cote du radier amont",
"INFO_LIB_ZRMB": "Cote de radier mi-bassin",
"INFO_LIB_ZT": "Cote haute du triangle",
- "INFO_LINKED_VALUE_CHILD_RESULT": "%s (%s, %s %s)",
"INFO_LINKED_VALUE_CHILD": "%s (%s, %s %s)",
"INFO_LINKED_VALUE_EXTRA_RESULT_OF": "%s (%s)",
"INFO_LINKED_VALUE_EXTRA_RESULT": "%s (%s)",
--
GitLab