Skip to content

Commit 903669a

Browse files
bewestbewest
authored
Merge pull request nightscout#7857 from nightscout/wip/bewest/daytoday-redo-03
Wip/bewest/daytoday redo 03
2 parents 3b7528a + a805939 commit 903669a

File tree

3 files changed

+94
-8
lines changed

3 files changed

+94
-8
lines changed

‎lib/report/reportclient.js‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -258,9 +258,11 @@ var init = function init () {
258258
function datefilter () {
259259
if ($('#rp_enabledate').is(':checked')) {
260260
matchesneeded++;
261-
var from = moment.tz($('#rp_from').val().replace(/\//g, '-') + 'T00:00:00', zone);
262-
var to = moment.tz($('#rp_to').val().replace(/\//g, '-') + 'T23:59:59', zone);
261+
var from = moment.tz(moment($('#rp_from').val()).startOf('day'), zone).startOf('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();
264+
265+
console.log("FROM", from.format( ), "TO", to.format( ), 'timerange', timerange);
264266
//console.log($('#rp_from').val(),$('#rp_to').val(),zone,timerange);
265267
while (from <= to) {
266268
if (daystoshow[from.format('YYYY-MM-DD')]) {

‎lib/report_plugins/daytoday.js‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,9 @@ daytoday.report = function report_daytoday (datastorage, sorteddaystoshow, optio
9696
var fatSum = 0;
9797

9898
daytoday.prepareHtml(sorteddaystoshow);
99+
console.log('DAY2DAY', 'sorteddaystoshow', sorteddaystoshow);
99100
sorteddaystoshow.forEach(function eachDay (day) {
101+
100102
drawChart(day, datastorage[day], options);
101103
});
102104

@@ -168,7 +170,7 @@ daytoday.report = function report_daytoday (datastorage, sorteddaystoshow, optio
168170
// create svg and g to contain the chart contents
169171
charts = d3.select('#daytodaychart-' + day).html(
170172
'<b>' +
171-
report_plugins.utils.localeDate(day) +
173+
report_plugins.utils.localeDate(moment(day)) +
172174
'</b><br>'
173175
).append('svg');
174176

@@ -432,8 +434,8 @@ daytoday.report = function report_daytoday (datastorage, sorteddaystoshow, optio
432434
contextCircles.exit()
433435
.remove();
434436

435-
var to = moment(day).add(1, 'days');
436-
var from = moment(day);
437+
var from = moment.tz(moment(day), profile.getTimezone( )).startOf('day');
438+
var to = moment(from.clone( )).add(1, 'days');
437439
var iobpolyline = ''
438440
, cobpolyline = '';
439441

‎tests/reports.test.js‎

Lines changed: 85 additions & 3 deletions
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.000Z': [
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.000Z': [
66+
'/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': [
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,89 @@ 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.000Z?find[openaps][$exists]=true&count=1000': [
99+
'/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': [
100+
{'created_at':'2015-08-08T00:00:00.000Z'},
101+
{'created_at':'2015-08-09T00:00:00.000Z'},
102+
{'created_at':'2015-08-10T00:00:00.000Z'},
103+
{'created_at':'2015-08-11T00:00:00.000Z'},
104+
{'created_at':'2015-08-12T00:00:00.000Z'},
105+
{'created_at':'2015-08-13T00:00:00.000Z'},
106+
{'created_at':'2015-08-14T00:00:00.000Z'},
107+
{'created_at':'2015-08-15T00:00:00.000Z'},
108+
{'created_at':'2015-08-16T00:00:00.000Z'},
109+
{'created_at':'2015-08-17T00:00:00.000Z'},
110+
{'created_at':'2015-08-18T00:00:00.000Z'},
111+
{'created_at':'2015-08-19T00:00:00.000Z'},
112+
{'created_at':'2015-08-20T00:00:00.000Z'},
113+
{'created_at':'2015-08-21T00:00:00.000Z'},
114+
{'created_at':'2015-08-22T00:00:00.000Z'},
115+
{'created_at':'2015-08-23T00:00:00.000Z'},
116+
{'created_at':'2015-08-24T00:00:00.000Z'},
117+
{'created_at':'2015-08-25T00:00:00.000Z'},
118+
{'created_at':'2015-08-26T00:00:00.000Z'},
119+
{'created_at':'2015-08-27T00:00:00.000Z'},
120+
{'created_at':'2015-08-28T00:00:00.000Z'},
121+
{'created_at':'2015-08-29T00:00:00.000Z'},
122+
{'created_at':'2015-08-30T00:00:00.000Z'},
123+
{'created_at':'2015-08-31T00:00:00.000Z'},
124+
{'created_at':'2015-09-01T00:00:00.000Z'},
125+
{'created_at':'2015-09-02T00:00:00.000Z'},
126+
{'created_at':'2015-09-03T00:00:00.000Z'},
127+
{'created_at':'2015-09-04T00:00:00.000Z'},
128+
{'created_at':'2015-09-05T00:00:00.000Z'},
129+
{'created_at':'2015-09-06T00:00:00.000Z'},
130+
{'created_at':'2015-09-07T00:00:00.000Z'}
131+
],
132+
'/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': [
133+
{'created_at':'2015-08-08T00:00:00.000Z'},
134+
{'created_at':'2015-08-09T00:00:00.000Z'},
135+
{'created_at':'2015-08-10T00:00:00.000Z'},
136+
{'created_at':'2015-08-11T00:00:00.000Z'},
137+
{'created_at':'2015-08-12T00:00:00.000Z'},
138+
{'created_at':'2015-08-13T00:00:00.000Z'},
139+
{'created_at':'2015-08-14T00:00:00.000Z'},
140+
{'created_at':'2015-08-15T00:00:00.000Z'},
141+
{'created_at':'2015-08-16T00:00:00.000Z'},
142+
{'created_at':'2015-08-17T00:00:00.000Z'},
143+
{'created_at':'2015-08-18T00:00:00.000Z'},
144+
{'created_at':'2015-08-19T00:00:00.000Z'},
145+
{'created_at':'2015-08-20T00:00:00.000Z'},
146+
{'created_at':'2015-08-21T00:00:00.000Z'},
147+
{'created_at':'2015-08-22T00:00:00.000Z'},
148+
{'created_at':'2015-08-23T00:00:00.000Z'},
149+
{'created_at':'2015-08-24T00:00:00.000Z'},
150+
{'created_at':'2015-08-25T00:00:00.000Z'},
151+
{'created_at':'2015-08-26T00:00:00.000Z'},
152+
{'created_at':'2015-08-27T00:00:00.000Z'},
153+
{'created_at':'2015-08-28T00:00:00.000Z'},
154+
{'created_at':'2015-08-29T00:00:00.000Z'},
155+
{'created_at':'2015-08-30T00:00:00.000Z'},
156+
{'created_at':'2015-08-31T00:00:00.000Z'},
157+
{'created_at':'2015-09-01T00:00:00.000Z'},
158+
{'created_at':'2015-09-02T00:00:00.000Z'},
159+
{'created_at':'2015-09-03T00:00:00.000Z'},
160+
{'created_at':'2015-09-04T00:00:00.000Z'},
161+
{'created_at':'2015-09-05T00:00:00.000Z'},
162+
{'created_at':'2015-09-06T00:00:00.000Z'},
163+
{'created_at':'2015-09-07T00:00:00.000Z'}
164+
],
165+
'/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': [
166+
{
167+
'openaps': {
168+
'suggested': {
169+
'temp': 'absolute',
170+
'bg': 67,
171+
'tick': '+6',
172+
'eventualBG': 145,
173+
'snoozeBG': 145,
174+
'reason': 'BG 67<74.5, delta 6>0; no high-temp to cancel',
175+
'timestamp': '2015-08-31T00:00:00.000Z'
176+
}
177+
},
178+
'created_at': '2015-08-31T00:00:00.000Z'
179+
}
180+
],
181+
'/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': [
100182
{
101183
'openaps': {
102184
'suggested': {

0 commit comments

Comments
 (0)