Cast date format to UTC

Author: Stigmatoz

src/scripts/activity.js

@@ -48,7 +48,7 @@ class Activity {
         if (setting_restriction_list !== undefined && setting_restriction_list.length > 0) {
             var item = setting_restriction_list.find(o => isDomainEquals(o.domain, domain));
             if (item !== undefined) {
-                var today = new Date().toLocaleDateString();
+                var today = new Date().toLocaleDateString("en-US");
                 var data = tab.days.find(x => x.date == today);
                 if (data !== undefined) {
                     var todayTimeUse = data.summary;

src/scripts/background.js

@@ -72,7 +72,7 @@ function mainTRacker(activeUrl, tab, activeTab) {
             });
         } else {
             chrome.browserAction.setBadgeBackgroundColor({ color: [0, 0, 0, 0] })
-            var today = new Date().toLocaleDateString();
+            var today = new Date().toLocaleDateString("en-US");
             var summary = tab.days.find(s => s.date === today).summary;
             chrome.browserAction.setBadgeText({
                 tabId: activeTab.id,

src/scripts/chart/chart-core.js

@@ -252,23 +252,23 @@ function barChart(data) {
         .offset([-10, 0])
         .html(function (d) {
             if (data.length > 9)
-                return "<strong><span class='red-label'>" + d.date + "</span></strong></br><strong>" + convertShortSummaryTimeToString(d.total) + "</strong>";
+                return "<strong><span class='red-label'>" + new Date(d.date).toLocaleDateString() + "</span></strong></br><strong>" + convertShortSummaryTimeToString(d.total) + "</strong>";
             else
                 return "<strong>" + convertShortSummaryTimeToString(d.total) + "</strong>";
         });
 
     svg.call(tip);
 
     // Scale the range of the data in the domains
-    x.domain(data.map(function (d) { return d.date; }));
+    x.domain(data.map(function (d) { return new Date(d.date).toLocaleDateString(); }));
     y.domain([0, d3.max(data, function (d) { return d.total; })]);
 
     // append the rectangles for the bar chart
     svg.selectAll(".bar")
         .data(data)
         .enter().append("rect")
         .attr("class", "bar")
-        .attr("x", function (d) { return x(d.date); })
+        .attr("x", function (d) { return x(new Date(d.date).toLocaleDateString()); })
         .attr("width", x.bandwidth())
         .attr("y", function (d) { return y(d.total); })
         .attr("height", function (d) { return height - y(d.total); })

src/scripts/common.js

@@ -127,18 +127,11 @@ function zeroAppend(time) {
 }
 
 function isDateInRange(dateStr, range) {
-    return dateStr >= range.from && dateStr <= range.to;
+    return new Date(dateStr) >= range.from && new Date(dateStr) <= range.to;
 }
 
-function getDateValueFromString(value) {
-    var arr;
-    if (value.indexOf('.') !== -1) {
-        arr = value.split('.');
-        return new Date(arr[2], arr[1] - 1, arr[0]);
-    }
-    if (value.indexOf('/') !== -1)
-        arr = value.split('/');
-    return new Date(arr[2], arr[0] - 1, arr[1]);
+function isCorrectDate(range){
+    return range.from.getFullYear() >= 2019 && range.to.getFullYear() >= 2019;
 }
 
 function getDateFromRange(range) {

src/scripts/tab.js

@@ -21,7 +21,7 @@ class Tab {
     incSummaryTime() {
         this.summaryTime += 1;
 
-        var today = new Date().toLocaleDateString();
+        var today = new Date().toLocaleDateString("en-US");
         var day = this.days.find(x => x.date == today);
         if (day === undefined) {
             this.addNewDay(today);
@@ -34,7 +34,7 @@ class Tab {
     incCounter(){
         this.counter +=1;
 
-        var today = new Date().toLocaleDateString();
+        var today = new Date().toLocaleDateString("en-US");
         var day = this.days.find(x => x.date == today);
         if (day === undefined) {
             this.addNewDay(today);

src/scripts/ui.js

@@ -104,9 +104,9 @@ class UI {
             p.innerHTML = 'Today (' + counterOfSite + ' sites)';
         if (currentTypeOfList === TypeListEnum.All && totalDays !== undefined) {
             if (totalDays.countOfDays > 0) {
-                p.innerHTML = 'Aggregate data since ' + totalDays.minDate + ' (' + totalDays.countOfDays + ' days) (' + counterOfSite + ' sites)';
+                p.innerHTML = 'Aggregate data since ' + new Date(totalDays.minDate).toLocaleDateString() + ' (' + totalDays.countOfDays + ' days) (' + counterOfSite + ' sites)';
             } else {
-                p.innerHTML = 'Aggregate data since ' + today + ' (' + counterOfSite + ' sites)';
+                p.innerHTML = 'Aggregate data since ' + new Date().toLocaleDateString() + ' (' + counterOfSite + ' sites)';
             }
         }
 
@@ -208,18 +208,17 @@ class UI {
         var from = this.createElement('span', null, 'From');
         var to = this.createElement('span', null,'To');
 
-        var dateNow = new Date();
         var calendarFirst = document.createElement('input');
         calendarFirst.id = 'dateFrom';
         calendarFirst.type = 'date';
-        var previousDate = new Date(Date.UTC(dateNow.getFullYear(), dateNow.getMonth(), dateNow.getDate()));
+        var previousDate = new Date();
         previousDate.setDate(previousDate.getDate() - getDateFromRange(range));
-        calendarFirst.valueAsDate = previousDate;
+        calendarFirst.valueAsDate = new Date(Date.UTC(previousDate.getFullYear(), previousDate.getMonth(), previousDate.getDate()));
 
         var calendarTwo = document.createElement('input');
         calendarTwo.id = 'dateTo';
         calendarTwo.type = 'date';
-        calendarTwo.valueAsDate = new Date(Date.UTC(dateNow.getFullYear(), dateNow.getMonth(), dateNow.getDate()));
+        calendarTwo.valueAsDate = new Date(Date.UTC(new Date().getFullYear(), new Date().getMonth(), new Date().getDate()));
 
         var tableForDaysBlock = document.createElement('div');
         tableForDaysBlock.id = 'tableForDaysBlock';
@@ -239,8 +238,8 @@ class UI {
 
     getDateRange() {
         return {
-            'from': new Date(document.getElementById('dateFrom').value).toLocaleDateString(),
-            'to': new Date(document.getElementById('dateTo').value).toLocaleDateString()
+            'from': new Date(document.getElementById('dateFrom').value),
+            'to': new Date(document.getElementById('dateTo').value)
         };
     }
 
@@ -267,7 +266,7 @@ class UI {
 
                 var label = this.createElement('label', ['day-block', 'lbl-toggle']);
                 label.setAttribute('for', days[i].date);
-                var span = this.createElement('span', ['day'], days[i].date);
+                var span = this.createElement('span', ['day'], new Date(days[i].date).toLocaleDateString());
                 var spanTime = this.createElement('span', ['day-time'], convertSummaryTimeToString(days[i].total));
 
                 label = this.appendChild(label, [span, spanTime]);
@@ -311,7 +310,7 @@ class UI {
     createElement(type, css, innerText){
         var element = document.createElement(type);
         if (css !== undefined && css !== null){
-            for (let i=0; i<=css.length; i++)
+            for (let i=0; i<css.length; i++)
                 element.classList.add(css[i]);
         }
         if (innerText !== undefined)

src/scripts/webact.js

@@ -6,7 +6,7 @@ var totalTime;
 var tabsFromStorage;
 var targetTabs;
 var currentTypeOfList;
-var today = new Date().toLocaleDateString();
+var today = new Date().toLocaleDateString("en-US");
 var setting_range_days;
 var restrictionList;
 
@@ -264,7 +264,7 @@ function getTabsByDays(tabs) {
         ui.fillEmptyBlockForDays();
         return;
     }
-    if (range.from !== 'Invalid Date' && range.to !== 'Invalid Date') {
+    if (range.from !== 'Invalid Date' && range.to !== 'Invalid Date' && isCorrectDate(range)) {
         var listOfDays = [];
         tabs.forEach(tab => {
             return tab.days.forEach(day => {
@@ -284,15 +284,15 @@ function getTabsByDays(tabs) {
         });
 
         var getDaysArray = function(start, end) {
-            let first = new Date(start);
-            let second = new Date(end);
+            let first = start;
+            let second = end;
             var arr = [];
             for (let i = first; i <= second; i = new Date(i.setDate(i.getDate() + 1))){
-                arr.push(new Date(i).toLocaleDateString());
+                arr.push(new Date(i).toLocaleDateString("en-US"));
             }
             return arr;
         };
-        ui.fillListOfDays(listOfDays, getDaysArray(getDateValueFromString(range.from), getDateValueFromString(range.to)));
+        ui.fillListOfDays(listOfDays, getDaysArray(range.from, range.to));
     }
     else {
         ui.fillEmptyBlockForDaysIfInvalid();