diff options
| author | pliablepixels <pliablepixels@gmail.com> | 2016-03-06 10:31:10 -0500 |
|---|---|---|
| committer | pliablepixels <pliablepixels@gmail.com> | 2016-03-06 10:31:10 -0500 |
| commit | 856e977356f0a70839f323deef44671fb3f6f533 (patch) | |
| tree | 42417941a0d77158f34e81c6999920928b0edb36 /www/js/EventsGraphsCtrl.js | |
| parent | 0786d0b87dc358be3919891bbb3c3b69b3978b37 (diff) | |
#175 - new option to enable/disable 24hr clock in Dev settings
Former-commit-id: 86fbef04eb4f75e4c4441fa7f57821cfe4d9bfe1
Diffstat (limited to 'www/js/EventsGraphsCtrl.js')
| -rw-r--r-- | www/js/EventsGraphsCtrl.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/www/js/EventsGraphsCtrl.js b/www/js/EventsGraphsCtrl.js index fe1185e7..758e7ec8 100644 --- a/www/js/EventsGraphsCtrl.js +++ b/www/js/EventsGraphsCtrl.js @@ -141,8 +141,8 @@ angular.module('zmApp.controllers').controller('zmApp.EventsGraphsCtrl', ['$ioni if (hrs) { // Apply a time based filter if I am not watching all events var cur = moment(); - endDate = cur.format("YYYY-MM-DD hh:mm:ss"); - startDate = cur.subtract(hrs, 'hours').format("YYYY-MM-DD hh:mm:ss"); + endDate = cur.format("YYYY-MM-DD "+ZMDataModel.getTimeFormat()); + startDate = cur.subtract(hrs, 'hours').format("YYYY-MM-DD "+ZMDataModel.getTimeFormat()); //console.log("Start and End " + startDate + "==" + endDate); ZMDataModel.zmLog("Generating graph for " + startDate + " to " + endDate); |