Cutlery/beestat
1
0
Fork 0
mirror of https://github.com/beestat/app.git synced 2026-05-29 10:32:32 -04:00
Code Actions Packages Releases Activity

Better date range clamping

Browse Source
This commit is contained in:
Jon Ziebell
2026-02-25 05:35:04 -05:00
parent 898e4e1c8d
commit eebe2e07e9
5 changed files with 116 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
js/component/modal/air_quality_detail_custom.js
+16 -9
View File
@@ -322,16 +322,23 @@ beestat.component.modal.air_quality_detail_custom.prototype.get_buttons_ = funct
.set_text_color('#fff')
.set_text('Save')
.addEventListener('click', function() {
// Bit of a rig to fix the odd situation where somehow people are
// getting these values set to more than 30 days.
var air_quality_detail_range_static_begin_m = moment(self.state_.air_quality_detail_range_static_begin);
var air_quality_detail_range_static_end_m = moment(self.state_.air_quality_detail_range_static_end);
var range = beestat.date_range.clamp(
{
'type': self.state_.air_quality_detail_range_type,
'dynamic': self.state_.air_quality_detail_range_dynamic,
'static_begin': self.state_.air_quality_detail_range_static_begin,
'static_end': self.state_.air_quality_detail_range_static_end
},
{
'max_dynamic_days': 7,
'max_static_days': 7
}
);
var diff = Math.abs(air_quality_detail_range_static_begin_m.diff(air_quality_detail_range_static_end_m, 'day')) + 1;
if (diff > 30) {
air_quality_detail_range_static_end_m = air_quality_detail_range_static_begin_m.clone().add(29, 'days');
self.state_.air_quality_detail_range_static_end = air_quality_detail_range_static_end_m.format('M/D/YYYY');
}
self.state_.air_quality_detail_range_type = range.type;
self.state_.air_quality_detail_range_dynamic = range.dynamic;
self.state_.air_quality_detail_range_static_begin = range.static_begin;
self.state_.air_quality_detail_range_static_end = range.static_end;
this
.set_background_color(beestat.style.color.gray.base)
js/component/modal/runtime_sensor_detail_custom.js
+16 -9
View File
@@ -322,16 +322,23 @@ beestat.component.modal.runtime_sensor_detail_custom.prototype.get_buttons_ = fu
.set_text_color('#fff')
.set_text('Save')
.addEventListener('click', function() {
// Bit of a rig to fix the odd situation where somehow people are
// getting these values set to more than 30 days.
var runtime_sensor_detail_range_static_begin_m = moment(self.state_.runtime_sensor_detail_range_static_begin);
var runtime_sensor_detail_range_static_end_m = moment(self.state_.runtime_sensor_detail_range_static_end);
var range = beestat.date_range.clamp(
{
'type': self.state_.runtime_sensor_detail_range_type,
'dynamic': self.state_.runtime_sensor_detail_range_dynamic,
'static_begin': self.state_.runtime_sensor_detail_range_static_begin,
'static_end': self.state_.runtime_sensor_detail_range_static_end
},
{
'max_dynamic_days': 7,
'max_static_days': 7
}
);
var diff = Math.abs(runtime_sensor_detail_range_static_begin_m.diff(runtime_sensor_detail_range_static_end_m, 'day')) + 1;
if (diff > 30) {
runtime_sensor_detail_range_static_end_m = runtime_sensor_detail_range_static_begin_m.clone().add(29, 'days');
self.state_.runtime_sensor_detail_range_static_end = runtime_sensor_detail_range_static_end_m.format('M/D/YYYY');
}
self.state_.runtime_sensor_detail_range_type = range.type;
self.state_.runtime_sensor_detail_range_dynamic = range.dynamic;
self.state_.runtime_sensor_detail_range_static_begin = range.static_begin;
self.state_.runtime_sensor_detail_range_static_end = range.static_end;
this
.set_background_color(beestat.style.color.gray.base)
js/component/modal/runtime_thermostat_detail_custom.js
+16 -9
View File
@@ -322,16 +322,23 @@ beestat.component.modal.runtime_thermostat_detail_custom.prototype.get_buttons_
.set_text_color('#fff')
.set_text('Save')
.addEventListener('click', function() {
// Bit of a rig to fix the odd situation where somehow people are
// getting these values set to more than 30 days.
var runtime_thermostat_detail_range_static_begin_m = moment(self.state_.runtime_thermostat_detail_range_static_begin);
var runtime_thermostat_detail_range_static_end_m = moment(self.state_.runtime_thermostat_detail_range_static_end);
var range = beestat.date_range.clamp(
{
'type': self.state_.runtime_thermostat_detail_range_type,
'dynamic': self.state_.runtime_thermostat_detail_range_dynamic,
'static_begin': self.state_.runtime_thermostat_detail_range_static_begin,
'static_end': self.state_.runtime_thermostat_detail_range_static_end
},
{
'max_dynamic_days': 30,
'max_static_days': 30
}
);
var diff = Math.abs(runtime_thermostat_detail_range_static_begin_m.diff(runtime_thermostat_detail_range_static_end_m, 'day')) + 1;
if (diff > 30) {
runtime_thermostat_detail_range_static_end_m = runtime_thermostat_detail_range_static_begin_m.clone().add(29, 'days');
self.state_.runtime_thermostat_detail_range_static_end = runtime_thermostat_detail_range_static_end_m.format('M/D/YYYY');
}
self.state_.runtime_thermostat_detail_range_type = range.type;
self.state_.runtime_thermostat_detail_range_dynamic = range.dynamic;
self.state_.runtime_thermostat_detail_range_static_begin = range.static_begin;
self.state_.runtime_thermostat_detail_range_static_end = range.static_end;
this
.set_background_color(beestat.style.color.gray.base)