Skip to content

Commit 10dd236

Browse files
committed
daytoday: Align start of day with data across zones
This change correctly aligns the name of the day in the current zone with the start of the data for the equivalent day in the profile's zone. This makes it so that viewing a day to day report in any timezone works going both east and west directions.
1 parent f6b2d4f commit 10dd236

File tree

3 files changed

+6
-5
lines changed

3 files changed

+6
-5
lines changed

lib/report/reportclient.js

+2-1
Original file line numberDiff line numberDiff line change
@@ -259,9 +259,10 @@ var init = function init () {
259259
if ($('#rp_enabledate').is(':checked')) {
260260
matchesneeded++;
261261
var from = moment.tz(moment($('#rp_from').val()).startOf('day'), zone).startOf('day');
262-
var to = moment.tz(moment($('#rp_to').val()).startOf('day'), zone).endOf('day');
262+
var to = moment.tz(moment($('#rp_to').val()).endOf('day'), zone).endOf('day');
263263
timerange = '&find[created_at][$gte]=' + from.toISOString() + '&find[created_at][$lt]=' + to.toISOString();
264264

265+
//console.log("FROM", from.format( ), "TO", to.format( ), 'timerange', timerange);
265266
//console.log($('#rp_from').val(),$('#rp_to').val(),zone,timerange);
266267
while (from <= to) {
267268
if (daystoshow[from.format('YYYY-MM-DD')]) {

lib/report_plugins/daytoday.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -432,7 +432,7 @@ daytoday.report = function report_daytoday (datastorage, sorteddaystoshow, optio
432432
contextCircles.exit()
433433
.remove();
434434

435-
var from = moment.tz(day, profile.getTimezone( )).startOf('day');
435+
var from = moment.tz(moment(day), profile.getTimezone( )).startOf('day');
436436
var to = moment(from.clone( )).add(1, 'days');
437437
var iobpolyline = ''
438438
, cobpolyline = '';

tests/reports.test.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ var someData = {
3030
'/api/v1/treatments.json?find[created_at][$gte]=2015-08-14T00:00:00.000Z&find[created_at][$lt]=2015-08-15T00:00:00.000Z&count=1000': [{'enteredBy':'Dad','eventType':'Site Change','glucose':268,'glucoseType':'Finger','insulin':1.75,'units':'mg/dl','created_at':'2015-08-14T00:00:00.000Z','_id':'55ce78fe925aa80e7071e5d6'},{'enteredBy':'Mom ','eventType':'Meal Bolus','glucose':89,'glucoseType':'Finger','carbs':54,'insulin':3.15,'units':'mg/dl','created_at':'2015-08-14T21:00:00.000Z','_id':'55ce59bb925aa80e7071e5ba'}],
3131
'/api/v1/entries.json?find[date][$gte]=1439596800000&find[date][$lt]=1439683200000&count=10000': [{'_id':'55cfd25f38a8d88ad1b49931','unfiltered':283136,'filtered':304768,'direction':'SingleDown','device':'dexcom','rssi':185,'sgv':306,'dateString':'Sat Aug 15 16:58:16 PDT 2015','type':'sgv','date':1439683096000,'noise':1},{'_id':'55cfd13338a8d88ad1b4992e','unfiltered':302528,'filtered':312576,'direction':'FortyFiveDown','device':'dexcom','rssi':179,'sgv':329,'dateString':'Sat Aug 15 16:53:16 PDT 2015','type':'sgv','date':1439682796000,'noise':1}],
3232
'/api/v1/food/regular.json': [{'_id':'552ece84a6947ea011db35bb','type':'food','category':'Zakladni','subcategory':'Sladkosti','name':'Bebe male','portion':18,'carbs':12,'gi':1,'unit':'pcs','created_at':'2015-04-15T20:48:04.966Z'}],
33-
'/api/v1/treatments.json?find[eventType]=/BG Check/i&find[created_at][$gte]=2015-08-08T00:00:00.000Z&find[created_at][$lt]=2015-09-07T23:59:59.999Z': [
33+
'/api/v1/treatments.json?find[eventType]=/BG Check/i&find[created_at][$gte]=2015-08-08T00:00:00.000Z&find[created_at][$lt]=2015-09-08T23:59:59.999Z': [
3434
{'created_at':'2015-08-08T00:00:00.000Z'},
3535
{'created_at':'2015-08-09T00:00:00.000Z'},
3636
{'created_at':'2015-08-10T00:00:00.000Z'},
@@ -63,7 +63,7 @@ var someData = {
6363
{'created_at':'2015-09-06T00:00:00.000Z'},
6464
{'created_at':'2015-09-07T00:00:00.000Z'}
6565
],
66-
'/api/v1/treatments.json?find[notes]=/something/i&find[created_at][$gte]=2015-08-08T00:00:00.000Z&find[created_at][$lt]=2015-09-07T23:59:59.999Z': [
66+
'/api/v1/treatments.json?find[notes]=/something/i&find[created_at][$gte]=2015-08-08T00:00:00.000Z&find[created_at][$lt]=2015-09-08T23:59:59.999Z': [
6767
{'created_at':'2015-08-08T00:00:00.000Z'},
6868
{'created_at':'2015-08-09T00:00:00.000Z'},
6969
{'created_at':'2015-08-10T00:00:00.000Z'},
@@ -96,7 +96,7 @@ var someData = {
9696
{'created_at':'2015-09-06T00:00:00.000Z'},
9797
{'created_at':'2015-09-07T00:00:00.000Z'}
9898
],
99-
'/api/v1/devicestatus.json&find[created_at][$gte]=2015-08-08T00:00:00.000Z&find[created_at][$lt]=2015-09-07T23:59:59.999Z?find[openaps][$exists]=true&count=1000': [
99+
'/api/v1/devicestatus.json&find[created_at][$gte]=2015-08-08T00:00:00.000Z&find[created_at][$lt]=2015-09-08T23:59:59.999Z?find[openaps][$exists]=true&count=1000': [
100100
{
101101
'openaps': {
102102
'suggested': {

0 commit comments

Comments
 (0)