From cde2ac1d29b0efb39fa4396c64fe74eecad9bdc4 Mon Sep 17 00:00:00 2001 From: Jon Ziebell Date: Fri, 19 Aug 2022 15:16:34 -0400 Subject: [PATCH] Added "yesterday" as a visualize time period option --- js/component/card/three_d.js | 23 ++++-------------- js/component/card/visualize_settings.js | 32 +++++++++++++++++++++---- 2 files changed, 33 insertions(+), 22 deletions(-) diff --git a/js/component/card/three_d.js b/js/component/card/three_d.js index 6b2811d..ba199d8 100644 --- a/js/component/card/three_d.js +++ b/js/component/card/three_d.js @@ -158,24 +158,11 @@ beestat.component.card.three_d.prototype.decorate_contents_ = function(parent) { // console.log('data is undefined need to load it'); this.show_loading_('Fetching'); - var value; - var operator; - // var value = [ - // required_begin.format(), - // required_end.format() - // ]; - // var operator = 'between'; - - if (beestat.setting('visualize.range_type') === 'dynamic') { - value = required_begin.format(); - operator = '>='; - } else { - value = [ - required_begin.format(), - required_end.format() - ]; - operator = 'between'; - } + const value = [ + required_begin.format(), + required_end.format() + ]; + const operator = 'between'; const sensor_ids = Object.keys(this.get_sensor_ids_map_()); // if (sensor_ids.length > 0) { diff --git a/js/component/card/visualize_settings.js b/js/component/card/visualize_settings.js index 8557bba..e840438 100644 --- a/js/component/card/visualize_settings.js +++ b/js/component/card/visualize_settings.js @@ -221,7 +221,7 @@ beestat.component.card.visualize_settings.prototype.decorate_time_period_ = func const tile_group = new beestat.component.tile_group(); // Current Day - const day_tile = new beestat.component.tile() + const current_day_tile = new beestat.component.tile() .set_background_hover_color(color) .set_text_color('#fff') .set_icon('calendar') @@ -231,9 +231,9 @@ beestat.component.card.visualize_settings.prototype.decorate_time_period_ = func beestat.setting('visualize.range_type') === 'dynamic' && beestat.setting('visualize.range_dynamic') === 0 ) { - day_tile.set_background_color(color); + current_day_tile.set_background_color(color); } else { - day_tile + current_day_tile .set_background_color(beestat.style.color.bluegray.light) .addEventListener('click', function() { beestat.cache.delete('data.three_d__runtime_sensor'); @@ -242,7 +242,31 @@ beestat.component.card.visualize_settings.prototype.decorate_time_period_ = func self.rerender(); }); } - tile_group.add_tile(day_tile); + tile_group.add_tile(current_day_tile); + + // Yesterday + const yesterday_tile = new beestat.component.tile() + .set_background_hover_color(color) + .set_text_color('#fff') + .set_icon('calendar') + .set_text('Yesterday'); + + if ( + beestat.setting('visualize.range_type') === 'dynamic' && + beestat.setting('visualize.range_dynamic') === 1 + ) { + yesterday_tile.set_background_color(color); + } else { + yesterday_tile + .set_background_color(beestat.style.color.bluegray.light) + .addEventListener('click', function() { + beestat.cache.delete('data.three_d__runtime_sensor'); + beestat.setting('visualize.range_type', 'dynamic'); + beestat.setting('visualize.range_dynamic', 1); + self.rerender(); + }); + } + tile_group.add_tile(yesterday_tile); // Current Week const week_tile = new beestat.component.tile()