Consolidate last_reading_at in timeUtils

fablabbcn · Feb 28, 2024 · 8a67d03 · 8a67d03
1 parent 4067148
commit 8a67d03
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 21 deletions.
diff --git a/src/app/core/constructors/device/device.constructor.js b/src/app/core/constructors/device/device.constructor.js
@@ -2,7 +2,7 @@
   'use strict';
 
   angular.module('app.components')
-    .factory('Device', ['deviceUtils', function(deviceUtils) {
+    .factory('Device', ['deviceUtils', 'timeUtils', function(deviceUtils, timeUtils) {
 
       /**
        * Device constructor.
@@ -39,9 +39,9 @@
         this.userTags = deviceUtils.parseUserTags(object);
         this.isPrivate = deviceUtils.isPrivate(object);
         this.notifications = deviceUtils.parseNotifications(object);
-        this.lastReadingAt = deviceUtils.parseDate(object.last_reading_at);
-        this.createdAt = deviceUtils.parseDate(object.created_at);
-        this.updatedAt = deviceUtils.parseDate(object.updated_at);
+        this.lastReadingAt = timeUtils.parseDate(object.last_reading_at);
+        this.createdAt = timeUtils.parseDate(object.created_at);
+        this.updatedAt = timeUtils.parseDate(object.updated_at);
 
         // Location
         this.location = object.location;

diff --git a/src/app/core/constructors/marker/marker.constructor.js b/src/app/core/constructors/marker/marker.constructor.js
@@ -2,7 +2,7 @@
   'use strict';
 
   angular.module('app.components')
-    .factory('Marker', ['deviceUtils', 'markerUtils', '$state', function(deviceUtils, markerUtils, $state) {
+    .factory('Marker', ['deviceUtils', 'markerUtils', 'timeUtils', '$state', function(deviceUtils, markerUtils, timeUtils, $state) {
       /**
        * Marker constructor
        * @constructor
@@ -31,7 +31,7 @@
           deviceUtils.parseHardwareName(deviceData) +
           '</p><p class="popup_time"><md-icon class="popup_icon" ' +
           'md-svg-src="./assets/images/update_icon.svg"></md-icon>' +
-          deviceUtils.parseLastReadingAt(deviceData, true) + '</p>' + linkEnd + '</div>' +
+          timeUtils.parseDate(deviceData.last_reading_at).ago + '</p>' + linkEnd + '</div>' +
           '<div class="popup_bottom"><p class="popup_location">' +
           '<md-icon class="popup_icon" ' +
           'md-svg-src="./assets/images/location_icon_dark.svg"></md-icon>' +

diff --git a/src/app/core/utils/deviceUtils.service.js b/src/app/core/utils/deviceUtils.service.js
@@ -13,7 +13,6 @@
         parseUserTags: parseUserTags,
         classify: classify,
         parseNotifications: parseNotifications,
-        parseLastReadingAt: parseLastReadingAt,
         parseOwner: parseOwner,
         parseName: parseName,
         parseString: parseString,
@@ -97,20 +96,6 @@
         return object.name;
       }
 
-      function parseLastReadingAt(object, fromNow=false) {
-        var time = object.last_reading_at;
-        if(!time) {
-          if (fromNow) {
-            return 'No time'
-          }
-          return;
-        }
-        if(fromNow){
-          return moment(time).fromNow();
-        }
-        return time;
-      }
-
       function parseHardware(object) {
         if (!object.hardware) {
           return;