diff options
| -rw-r--r-- | www/js/EventCtrl.js | 25 | ||||
| -rw-r--r-- | www/lang/locale-en.json | 1 | ||||
| -rw-r--r-- | www/templates/events.html | 10 |
3 files changed, 32 insertions, 4 deletions
diff --git a/www/js/EventCtrl.js b/www/js/EventCtrl.js index 6b6f81ca..b8b5521a 100644 --- a/www/js/EventCtrl.js +++ b/www/js/EventCtrl.js @@ -888,7 +888,8 @@ angular.module('zmApp.controllers') if ($scope.events == undefined || !$scope.events.length || $scope.events[item] == undefined) { return ""; } else { - return prettifyDate($scope.events[item].Event.StartTime); + //return prettifyDate($scope.events[item].Event.StartTime); + return dateForEventHeader($scope.events[item].Event.StartTime); } //return Math.random(); }; @@ -1674,7 +1675,27 @@ angular.module('zmApp.controllers') //-------------------------------------- // formats events dates in a nice way //--------------------------------------- - + + function dateForEventHeader(str) + { + var et = moment(str); + var m = moment.duration(moment().diff(et)).humanize(); + + var r = et.format('MMM Do') + ' ('+m+' '+$translate.instant('kAgo')+')'; + return (r); + } + + + $scope.relativeTime = function(str) + { + var et = moment(str); + var m = moment.duration(moment().diff(et)).humanize(); + + var r = m+' '+$translate.instant('kAgo'); + return (r); + + }; + $scope.prettifyDate = function (str) { return moment(str).format('MMM Do'); }; diff --git a/www/lang/locale-en.json b/www/lang/locale-en.json index 191d4479..2bb19bf1 100644 --- a/www/lang/locale-en.json +++ b/www/lang/locale-en.json @@ -3,6 +3,7 @@ "k1HourSummary" :"1 hour summary", "k1MonthSummary" :"1 month summary", "k1WeekSummary" :"1 week summary", + "kAgo" : "ago", "kAlarmAPIError" :"error - please make sure your API supports this feature", "kAlarmFrameCount" :"Alarm Frame Count", "kAlarmMaxFPS" :"Alarm Max FPS", diff --git a/www/templates/events.html b/www/templates/events.html index 0cece8c5..b5e75c74 100644 --- a/www/templates/events.html +++ b/www/templates/events.html @@ -47,10 +47,16 @@ <ion-item collection-repeat="event in events| filter:search.text" item-height="event.Event.height" id="item-{{$index}}" > - <span style="float:left;margin-top:-18px;background-color:#96281B;color:#fff;font-size:11px;opacity:0.7;width:90px;border-radius: 0px 0px 5px 5px;"> <i class="ion-calendar"></i> {{prettifyTime(event.Event.StartTime)}}</span> + <span style="float:left;margin-top:-18px;background-color:#96281B;color:#fff;font-size:11px;opacity:0.7;width:90px;border-radius: 0px 0px 5px 5px;"> <i class="ion-calendar"></i> {{prettifyTime(event.Event.StartTime)}}</span> + + + <span style="float:left;margin-top:-18px;background-color:#fff;color:#888;font-size:11px;opacity:1;"> <i class="ion-arrow-right-b"></i> {{relativeTime(event.Event.StartTime)}}</span> + + <span style="float:right;margin-top:-18px;background-color:#444444;color:#fff;font-size:11px;opacity:0.7;width:90px;border-radius: 0px 0px 5px 5px;"> <i class="ion-clock"></i> {{prettifyDate(event.Event.StartTime)}}</span> - + + |