Merge pull request nightscout#4029 from DigitalDan1/dev

PieterGit · web-flow · commit 834d5f9f6b45 · 2018-10-28T23:38:11.000+01:00
Fix daylight saving bug in profile editor
diff --git a/static/profile/js/profileeditor.js b/static/profile/js/profileeditor.js
@@ -630,11 +630,11 @@
   }
 
   function toTimeString(minfrommidnight) {
-    return moment().startOf('day').add(minfrommidnight,'minutes').format('HH:mm');
+    return moment.utc().startOf('day').add(minfrommidnight,'minutes').format('HH:mm'); // using utc to avoid daylight saving offset
   }
 
   function toDisplayTime (minfrommidnight) {
-    var time = moment().startOf('day').add(minfrommidnight,'minutes');
+    var time = moment.utc().startOf('day').add(minfrommidnight,'minutes'); // using utc to avoid daylight saving offset
     return client.settings.timeFormat === 24 ? time.format('HH:mm') : time.format('h:mm A');
   }
 

Original file line number	Diff line number	Diff line change
`@@ -630,11 +630,11 @@`
`630`	`630`	`}`
`631`	`631`
`632`	`632`	`function toTimeString(minfrommidnight) {`
`633`		`- return moment().startOf('day').add(minfrommidnight,'minutes').format('HH:mm');`
	`633`	`+ return moment.utc().startOf('day').add(minfrommidnight,'minutes').format('HH:mm'); // using utc to avoid daylight saving offset`
`634`	`634`	`}`
`635`	`635`
`636`	`636`	`function toDisplayTime (minfrommidnight) {`
`637`		`- var time = moment().startOf('day').add(minfrommidnight,'minutes');`
	`637`	`+ var time = moment.utc().startOf('day').add(minfrommidnight,'minutes'); // using utc to avoid daylight saving offset`
`638`	`638`	`return client.settings.timeFormat === 24 ? time.format('HH:mm') : time.format('h:mm A');`
`639`	`639`	`}`
`640`	`640`