Mercurial > gemma
changeset 3136:e52ba854bfe8
merge
| author | Thomas Junk <thomas.junk@intevation.de> |
|---|---|
| date | Tue, 30 Apr 2019 15:33:05 +0200 |
| parents | 4c6b66c12486 (current diff) 7b4092b6b51a (diff) |
| children | 35c0da49eb89 |
| files | |
| diffstat | 2 files changed, 4 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- 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)
--- 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 } }