settings part 3

Author: hai-altx-soft

scripts/background.js

@@ -33,14 +33,19 @@ function backgroundCheck() {
 
                 if (tab !== undefined) {
                     activity.setCurrentActiveTab(tab.url);
-                    chrome.idle.queryState(setting_interval_inactivity, function (state) {
+                    chrome.idle.queryState(parseInt(setting_interval_inactivity), function (state) {
                         if (state === 'active') {
                             tab.incSummaryTime();
-                            if (setting_view_in_badge) {
+                            if (setting_view_in_badge === true) {
                                 chrome.browserAction.setBadgeText({
                                     tabId: activeTab.id,
                                     text: String(convertSummaryTimeToBadgeString(tab.summaryTime))
                                 });
+                            } else {
+                                chrome.browserAction.setBadgeText({
+                                    tabId: activeTab.id,
+                                    text: ''
+                                });
                             }
                         }
                     });

scripts/common.js

@@ -93,3 +93,18 @@ function zeroAppend(time) {
 function isDateInRange(date, range){
     return date >= range.from && date <= range.to;
 }
+
+function getDateFromRange(range){
+    switch (range)
+    {
+        case 'days2': return 2;
+        case 'days3': return 3;
+        case 'days4': return 4;
+        case 'days5': return 5;
+        case 'days6': return 6;
+        case 'days7': return 7;
+        case 'month1': return 30;
+        case 'month2': return 60;
+        case 'month3': return 90;
+    }
+}

scripts/settings.js

@@ -18,6 +18,15 @@ document.addEventListener('DOMContentLoaded', function () {
     document.getElementById('clearAllData').addEventListener('click', function () {
         clearAllData();
     });
+    document.getElementById('viewTimeInBadge').addEventListener('change', function () {
+        storage.saveSettings(SETTINGS_VIEW_TIME_IN_BADGE, this.checked);
+    });
+    document.getElementById('intervalInactivity').addEventListener('change', function () {
+        storage.saveSettings(SETTINGS_INTERVAL_INACTIVITY, this.value);
+    });
+    document.getElementById('rangeToDays').addEventListener('change', function () {
+        storage.saveSettings(SETTINGS_INTERVAL_RANGE, this.value);
+    });
 });
 
 loadSettings();

scripts/ui.js

@@ -157,7 +157,7 @@ class UI {
         calendarFirst.id = 'dateFrom';
         calendarFirst.type = 'date';
         var previousDate = new Date(Date.UTC(dateNow.getFullYear(), dateNow.getMonth(), dateNow.getDate()));
-        previousDate.setDate(previousDate.getDate() - range);
+        previousDate.setDate(previousDate.getDate() - getDateFromRange(range));
         calendarFirst.valueAsDate = previousDate;
 
         var calendarTwo = document.createElement('input');

scripts/webact.js

@@ -10,6 +10,7 @@ var today = new Date().toLocaleDateString();
 var setting_range_days;
 
 document.addEventListener('DOMContentLoaded', function () {
+    storage.getSettings(SETTINGS_INTERVAL_RANGE, function (item) { setting_range_days = item; });
     document.getElementById('btnToday').addEventListener('click', function () {
         currentTypeOfList = TypeListEnum.ToDay;
         ui.setUIForToday();
@@ -22,16 +23,15 @@ document.addEventListener('DOMContentLoaded', function () {
     });
     document.getElementById('btnByDays').addEventListener('click', function () {
         currentTypeOfList = TypeListEnum.ByDays;
-        storage.getSettings(SETTINGS_INTERVAL_RANGE, function (item) { setting_range_days = item; });
         ui.setUIForByDays(setting_range_days);
         getDataFromStorageByDays();
     });
     document.getElementById('settings').addEventListener('click', function () {
         if (chrome.runtime.openOptionsPage) {
             chrome.runtime.openOptionsPage();
-          } else {
+        } else {
             window.open(chrome.runtime.getURL('options.html'));
-          }
+        }
     });
 });
 
@@ -200,12 +200,10 @@ function getTabsByDays(tabs) {
                     return item.total += a.summary;
                 }
                 if (item === undefined && isDateInRange(a.date, range))
-                    return listOfDays.push(
-                        {
-                            'date': a.date,
-                            'total': a.summary
-                        }
-                    );
+                    return listOfDays.push({
+                        'date': a.date,
+                        'total': a.summary
+                    });
             });
         });
         listOfDays = listOfDays.sort(function (a, b) {
@@ -242,7 +240,6 @@ function getTabsFromStorageByDay(day, blockName) {
 
     var currentTab = getCurrentTab();
 
-    var tabsForChart = [];
     var content = document.createElement('div');
     content.classList.add('content-inner');
     content.id = blockName + '_content';