Mercurial > gemma

diff client/src/components/gauge/Waterlevel.vue @ 3576:1109a38f7ff1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
client: waterlevel format in diagrams changed from cm to m and localized
author Markus Kottlaender <markus@intevation.de>
date Mon, 03 Jun 2019 16:58:02 +0200
parents f6d67697f158
children c03170a1c333
line wrap: on
line diff
--- a/client/src/components/gauge/Waterlevel.vue	Mon Jun 03 16:20:35 2019 +0200
+++ b/client/src/components/gauge/Waterlevel.vue	Mon Jun 03 16:58:02 2019 +0200
@@ -497,7 +497,8 @@
         y: d3
           .axisRight(this.scale.y)
           .tickSizeInner(this.dimensions.width)
-          .tickSizeOuter(0),
+          .tickSizeOuter(0)
+          .tickFormat(d => this.$options.filters.waterlevel(d)),
         x2: d3.axisBottom(this.scale.x2)
       };
 
@@ -774,7 +775,7 @@
         .attr("y", 15);
       this.diagram // label
         .append("text")
-        .text(this.$gettext("Waterlevel [cm]"))
+        .text(this.$gettext("Waterlevel [m]"))
         .attr("text-anchor", "middle")
         .attr(
           "transform",
@@ -963,7 +964,11 @@
             .attr("height", 12);
           this.diagram
             .append("text")
-            .text(`${ref} (${refWaterLevels[ref]})`)
+            .text(
+              `${ref} (${this.$options.filters.waterlevel(
+                refWaterLevels[ref]
+              )})`
+            )
             .attr("class", "ref-waterlevel-label")
             .attr("x", 5)
             .attr("y", this.scale.y(refWaterLevels[ref]) - 3);
@@ -1170,7 +1175,7 @@
               .attr("dy", "1.4em")
               .attr("dominant-baseline", "hanging")
               .attr("text-anchor", "middle")
-              .text(d.max + " cm");
+              .text(this.$options.filters.waterlevel(d.max) + " m");
             tooltipText
               .append("tspan")
               .attr("x", 0)
@@ -1179,7 +1184,7 @@
               .attr("dominant-baseline", "hanging")
               .attr("text-anchor", "middle")
               .attr("class", "font-weight-bold")
-              .text(d.waterlevel + " cm");
+              .text(this.$options.filters.waterlevel(d.waterlevel) + " m");
             tooltipText
               .append("tspan")
               .attr("x", 0)
@@ -1187,7 +1192,7 @@
               .attr("dy", "3.8em")
               .attr("dominant-baseline", "hanging")
               .attr("text-anchor", "middle")
-              .text(d.min + " cm");
+              .text(this.$options.filters.waterlevel(d.min) + " m");
           } else {
             tooltipText
               .append("tspan")
@@ -1197,7 +1202,7 @@
               .attr("dominant-baseline", "hanging")
               .attr("text-anchor", "middle")
               .attr("class", "font-weight-bold")
-              .text(d.waterlevel + " cm");
+              .text(this.$options.filters.waterlevel(d.waterlevel) + " m");
           }
 
           // get text dimensions