changeset 2664:1a8123b8f75f import-overview-rework

Merged default into import-overview-rework branch.
author Sascha L. Teichmann <sascha.teichmann@intevation.de>
date Thu, 14 Mar 2019 12:45:34 +0100
parents 386ff766dfcd (current diff) ffef5f89b31c (diff)
children fea12fc850d2
files
diffstat 2 files changed, 9 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/client/src/components/gauge/Gauges.vue	Thu Mar 14 12:44:35 2019 +0100
+++ b/client/src/components/gauge/Gauges.vue	Thu Mar 14 12:45:34 2019 +0100
@@ -129,7 +129,7 @@
       let splitscreenConf = {
         id: "gauge-waterlevel",
         component: "waterlevel",
-        title: this.selectedGaugeName,
+        title: this.$gettext("Waterlevel") + ": " + this.selectedGaugeName,
         icon: "ruler-vertical",
         closeCallback: () => {
           this.$store.commit("gauges/selectedGaugeName", null);
--- a/client/src/components/gauge/Waterlevel.vue	Thu Mar 14 12:44:35 2019 +0100
+++ b/client/src/components/gauge/Waterlevel.vue	Thu Mar 14 12:45:34 2019 +0100
@@ -89,12 +89,12 @@
         .append("svg")
         .attr("width", "100%")
         .attr("height", "100%");
-      let mainMargin = { top: 50, right: 20, bottom: 110, left: 40 },
+      let mainMargin = { top: 50, right: 20, bottom: 110, left: 80 },
         navMargin = {
           top: svgHeight - mainMargin.top - 35,
           right: 20,
           bottom: 30,
-          left: 40
+          left: 80
         },
         width = +svgWidth - mainMargin.left - mainMargin.right,
         mainHeight = +svgHeight - mainMargin.top - mainMargin.bottom,
@@ -150,7 +150,7 @@
 
       // DRAWING MAINCHART
 
-      // define visible area
+      // define visible chart area
       // everything outside this area will be hidden (clipped)
       svg
         .append("defs")
@@ -169,6 +169,11 @@
         .append("g")
         .attr("transform", `translate(0, ${mainHeight})`)
         .call(xAxis);
+      mainChart // label
+        .append("text")
+        .text(this.$gettext("Waterlevel [cm]"))
+        .attr("text-anchor", "middle")
+        .attr("transform", `translate(-45, ${mainHeight / 2}) rotate(-90)`);
       mainChart.append("g").call(yAxis);
 
       // waterlevel chart