Refact storage from time intervals

Author: Stigmatoz

src/index.html

@@ -30,7 +30,7 @@
    </div>
    <div id="buttons" class="btn-block">
       <a class="active" id="btnToday">Today</a>
-      <a id="btnAll">All time</a>
+      <a id="btnAll">All-time</a>
       <a id="btnByDays">By days</a>
       <a id="settings">Settings</a>
    </div>

src/manifest.json

@@ -34,8 +34,8 @@
                         "scripts/storage.js", 
                         "scripts/activity.js", 
                         "scripts/tab.js", 
-                        "scripts/background.js",
                         "scripts/timeInterval.js",
+                        "scripts/background.js",
                         "scripts/restriction.js"],
             "persistent": false
         },

src/scripts/activity.js

@@ -28,7 +28,7 @@ class Activity {
                     this.addTimeInterval(domain);
                 }
             }
-        }
+        } else this.closeIntervalForCurrentTab();
     }
 
     isValidPage(tab) {
@@ -110,20 +110,26 @@ class Activity {
     }
 
     addTimeInterval(domain) {
-        var item = timeIntervalList.find(o => o.domain === domain);
+        var item = timeIntervalList.find(o => o.domain === domain && o.day == new Date().toLocaleDateString("en-US"));
         if (item != undefined) {
-            item.addInterval();
+            if (item.day == new Date().toLocaleDateString("en-US"))
+                item.addInterval();
+            else {
+                var newInterval = new TimeInterval(new Date().toLocaleDateString("en-US"), domain);
+                newInterval.addInterval();
+                timeIntervalList.push(newInterval);
+            }
         } else {
             var newInterval = new TimeInterval(new Date().toLocaleDateString("en-US"), domain);
-            timeIntervalList.push(newInterval);
             newInterval.addInterval();
+            timeIntervalList.push(newInterval);
         }
     }
 
 
     closeIntervalForCurrentTab() {
         if (currentTab !== '') {
-            var item = timeIntervalList.find(o => o.domain === currentTab);
+            var item = timeIntervalList.find(o => o.domain === currentTab && o.day == new Date().toLocaleDateString("en-US"));
             if (item != undefined)
                 item.closeInterval();
         }

src/scripts/background.js

@@ -52,9 +52,7 @@ function backgroundCheck() {
                     }
                 }
             }
-        } else {
-            activity.closeIntervalForCurrentTab();
-        }
+        } else activity.closeIntervalForCurrentTab();
     });
 }
 
@@ -115,7 +113,7 @@ function checkPermissions(callback, activeUrl, tab, activeTab) {
                     callback(activeUrl, tab, activeTab);
                 else activity.closeIntervalForCurrentTab();
             });
-        }
+        } else activity.closeIntervalForCurrentTab();
     });
 }
 

src/scripts/timeInterval.js

@@ -10,16 +10,20 @@ class TimeInterval {
     }
 
     addInterval() {
-        console.log('add interval');
         var date = new Date();
         var stringDate = date.getHours() + ':' + date.getMinutes() + ':' + date.getSeconds();
         this.intervals.push(stringDate + '-' + stringDate);
     }
 
     closeInterval() {
         var today = new Date();
-        var stringDate = zeroAppend(today.getHours()) + ':' + zeroAppend(today.getMinutes()) + ':' + zeroAppend(today.getSeconds());
-        var currentInterval = this.intervals.pop();
-        this.intervals.push(currentInterval.split('-')[0] + '-' + stringDate);
+        var stringDate = today.getHours() + ':' + today.getMinutes() + ':' + today.getSeconds();
+        var currentInterval = this.intervals[this.intervals.length - 1];
+        if (currentInterval != undefined) {
+            if (currentInterval.split('-')[0] == currentInterval.split('-')[1]) {
+                this.intervals.pop();
+                this.intervals.push(currentInterval.split('-')[0] + '-' + stringDate);
+            }
+        }
     }
 };