# HG changeset patch
# User Thomas Junk <thomas.junk@intevation.de>
# Date 1556631185 -7200
# Node ID e52ba854bfe8c2e995f2da447de0493a4266bcd2
# Parent  4c6b66c1248620464b225d1147a1fd7936f7f60d# Parent  7b4092b6b51aed33e439acb96720b46ace757d57
merge

diff -r 4c6b66c12486 -r e52ba854bfe8 client/src/components/gauge/Waterlevel.vue
--- a/client/src/components/gauge/Waterlevel.vue	Tue Apr 30 15:32:57 2019 +0200
+++ b/client/src/components/gauge/Waterlevel.vue	Tue Apr 30 15:33:05 2019 +0200
@@ -319,9 +319,7 @@
         .attr("fill", "steelblue")
         .attr("fill-opacity", 0.2)
         .attr("clip-path", "url(#clip)");
-
       this.svg
-
         .selectAll("path.nash-sutcliffe")
         .attr("fill", "none")
         .attr("stroke", "black")
@@ -336,8 +334,7 @@
         .attr("clip-path", "url(#clip)")
         .selectAll("tspan:last-child")
         .style("font-size", "9px")
-        .attr(" fill", "#777");
-
+        .attr("fill", "#777");
       this.svg
         .selectAll(".tick line")
         .attr("stroke-dasharray", 5)
diff -r 4c6b66c12486 -r e52ba854bfe8 pkg/controllers/bottlenecks.go
--- a/pkg/controllers/bottlenecks.go	Tue Apr 30 15:32:57 2019 +0200
+++ b/pkg/controllers/bottlenecks.go	Tue Apr 30 15:33:05 2019 +0200
@@ -84,7 +84,6 @@
 `
 	selectGaugeLDCSQL = `
 SELECT
-  grwl.depth_reference,
   grwl.value
 FROM waterway.gauges_reference_water_levels grwl JOIN
      waterway.bottlenecks bns
@@ -691,7 +690,7 @@
 		}
 		f := pfrom
 		pfrom = pfrom.AddDate(0, 1, 0)
-		label := fmt.Sprint("%02d-%d", f.Month(), f.Year())
+		label := fmt.Sprintf("%02d-%d", f.Month(), f.Year())
 		return f, f.AddDate(0, 1, 0).Add(-time.Nanosecond), label
 	}
 }
@@ -704,7 +703,7 @@
 		}
 		f := pfrom
 		pfrom = pfrom.AddDate(0, 3, 0)
-		label := fmt.Sprint("Q%d-%d", int(f.Month())/4+1, f.Year())
+		label := fmt.Sprintf("Q%d-%d", int(f.Month())/4+1, f.Year())
 		return f, f.AddDate(0, 3, 0).Add(-time.Nanosecond), label
 	}
 }
@@ -717,7 +716,7 @@
 		}
 		f := pfrom
 		pfrom = pfrom.AddDate(1, 0, 0)
-		label := fmt.Sprint("%d", f.Year())
+		label := fmt.Sprintf("%d", f.Year())
 		return f, f.AddDate(1, 0, 0).Add(-time.Nanosecond), label
 	}
 }