when sleeping, nullng last track items.

MayGo · Mar 6, 2016 · c24bff2 · c24bff2
1 parent f6916ee
commit c24bff2
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/app/background.service.js b/app/background.service.js
@@ -134,13 +134,15 @@ var createOrUpdate = function (appTrackItem) {
         console.log('midnight');
         var almostMidnight = moment(appTrackItem.beginDate).startOf('day').add(1, 'days').subtract(1, 'seconds').toDate();
         var afterMidnight = dateToAfterMidnight(appTrackItem.beginDate);
+        var originalEndDate = appTrackItem.endDate;
 
         logger.log('Midnight- almostMidnight: ' + almostMidnight + ', ' + afterMidnight);
         appTrackItem.endDate = almostMidnight;
         createOrUpdate(appTrackItem).then(function (item1) {
             lastAppTrackItemSaved = null;
             logger.log('Midnight- Saved one: ' + item1);
             item1.beginDate = afterMidnight;
+            item1.endDate = originalEndDate;
             createOrUpdate(item1).then(function (item2) {
                 logger.log('Midnight- Saved second: ' + item2);
                 deferred.resolve(item2);
@@ -186,7 +188,7 @@ var createOrUpdate = function (appTrackItem) {
     }
 
 
-    return deferred.promise;
+    return deferred;
 }
 
 var addRawTrackItemToList = function (item) {
@@ -301,6 +303,8 @@ var saveIdleTrackItem = function (seconds) {
 
 BackgroundService.onSleep = function () {
     isSleeping = true;
+    lastStatusTrackItemSaved = null;
+    lastAppTrackItemSaved = null;
 };
 
 BackgroundService.onResume = function () {