diff --git a/src/tsdb/TsDB.java b/src/tsdb/TsDB.java index 6e755b7f..52709ba6 100644 --- a/src/tsdb/TsDB.java +++ b/src/tsdb/TsDB.java @@ -33,7 +33,7 @@ public class TsDB implements AutoCloseable { private static final Logger log = LogManager.getLogger(); - public static final String tubedb_version = "1.17.2"; + public static final String tubedb_version = "1.17.3"; /** * map regionName -> Region diff --git a/webcontent/visualisation_meta/visualisation_meta.html b/webcontent/visualisation_meta/visualisation_meta.html index 0980bb9b..2ab377f6 100644 --- a/webcontent/visualisation_meta/visualisation_meta.html +++ b/webcontent/visualisation_meta/visualisation_meta.html @@ -517,7 +517,7 @@

plots

diff --git a/webcontent/visualisation_meta/visualisation_meta.js b/webcontent/visualisation_meta/visualisation_meta.js index c7308c4c..6851e6b2 100644 --- a/webcontent/visualisation_meta/visualisation_meta.js +++ b/webcontent/visualisation_meta/visualisation_meta.js @@ -512,6 +512,21 @@ computed: { } return this.timeMonths.filter(m => this.timeMonthsNumber[m] >= this.timeMonthsNumber[this.timeMonth]); }, + timeDayEnds: function() { + if(this.timeMonthEnd === '') { + return this.timeDays; + } + if(this.timeMonth === '*') { + return this.timeDays; + } + if(this.timeMonth !== this.timeMonthEnd) { + return this.timeDays; + } + if(this.timeDay === '*') { + return this.timeDays; + } + return this.timeDays.filter(d => +d >= +this.timeDay); + }, }, //end computed mounted: function () { @@ -996,6 +1011,21 @@ watch: { } } }, + timeYearEnds: function() { + if(this.timeYearEnds.every(y => y != this.timeYearEnd)) { + this.timeYearEnd = ''; + } + }, + timeMonthEnds: function() { + if(this.timeMonthEnds.every(m => m != this.timeMonthEnd)) { + this.timeMonthEnd = ''; + } + }, + timeDayEnds: function() { + if(this.timeDayEnds.every(m => m != this.timeDayEnd)) { + this.timeDayEnd = ''; + } + }, }, //end watch }); //end visualisation-interface