get date from date range

Author: Stigmatoz

scripts/common.js

@@ -58,3 +58,7 @@ function zeroAppend(time) {
         return '0' + time;
     else return time;
 }
+
+function isDateInRange(date, range){
+    return date >= range.from && date <= range.to;
+}

scripts/ui.js

@@ -9,12 +9,16 @@ class UI {
         document.getElementById('btnToday').classList.add('active');
         document.getElementById('btnAll').classList.remove('active');
         document.getElementById('btnByDays').classList.remove('active');
+
+        this.clearUI();
     }
 
     setUIForAll() {
         document.getElementById('btnAll').classList.add('active');
         document.getElementById('btnToday').classList.remove('active');
         document.getElementById('btnByDays').classList.remove('active');
+
+        this.clearUI();
     }
 
     setUIForByDays() {
@@ -141,19 +145,29 @@ class UI {
         var to = document.createElement('span');
         to.innerHTML = 'To';
 
+        var dateNow = new Date();
         var calendarFirst = document.createElement('input');
+        calendarFirst.id = 'dateFrom';
         calendarFirst.type = 'date';
-        var previousDate = new Date();
+        var previousDate = new Date(Date.UTC(dateNow.getFullYear(), dateNow.getMonth(), dateNow.getDate()));
         previousDate.setDate(previousDate.getDate() - 7);
         calendarFirst.valueAsDate = previousDate;
 
         var calendarTwo = document.createElement('input');
+        calendarTwo.id = 'dateTo';
         calendarTwo.type = 'date';
-        calendarTwo.valueAsDate = new Date();
+        calendarTwo.valueAsDate = new Date(Date.UTC(dateNow.getFullYear(), dateNow.getMonth(), dateNow.getDate()));
 
         div.appendChild(from);
         div.appendChild(calendarFirst);
         div.appendChild(to);
         div.appendChild(calendarTwo);
     }
+
+    getDateRange() {
+        return {
+            'from': new Date(document.getElementById('dateFrom').value).toLocaleDateString(),
+            'to': new Date(document.getElementById('dateTo').value).toLocaleDateString()
+        };
+    }
 }

scripts/webact.js

@@ -12,32 +12,33 @@ document.addEventListener('DOMContentLoaded', function () {
     document.getElementById('btnToday').addEventListener('click', function () {
         currentTypeOfList = TypeListEnum.ToDay;
         ui.setUIForToday();
-        getDataFromStorageToday();
+        getDataFromStorage();
     });
     document.getElementById('btnAll').addEventListener('click', function () {
         currentTypeOfList = TypeListEnum.All;
         ui.setUIForAll();
-        getDataFromStorageAll();
+        getDataFromStorage();
     });
     document.getElementById('btnByDays').addEventListener('click', function () {
         currentTypeOfList = TypeListEnum.ByDays;
         ui.setUIForByDays();
+        getDataFromStorageByDays();
     });
 });
 
 firstInitPage();
 
 function firstInitPage() {
     currentTypeOfList = TypeListEnum.ToDay;
-    getDataFromStorageToday();
+    getDataFromStorage();
 }
 
-function getDataFromStorageToday() {
+function getDataFromStorage() {
     storage.load(STORAGE_TABS, getTabsFromStorage);
 }
 
-function getDataFromStorageAll() {
-    storage.load(STORAGE_TABS, getTabsFromStorage);
+function getDataFromStorageByDays(){
+    storage.load(STORAGE_TABS, getTabsByDays);
 }
 
 function getTabsFromStorage(tabs) {
@@ -170,4 +171,18 @@ function getFirstDay() {
         'countOfDays': array.length,
         'minDate': array[0]
     };
+}
+
+function getTabsByDays(tabs){
+    var range = ui.getDateRange();
+    var listOfDays = [];
+    tabs.map(function (a) {
+        return a.days.map(function (a) {
+            if (listOfDays.indexOf(a.date) === -1 && isDateInRange(a.date, range))
+                return listOfDays.push(a.date);
+        });
+    });
+    listOfDays = listOfDays.sort(function (a, b) {
+        return new Date(a) - new Date(b);
+    });
 }

style/webact.css

@@ -79,7 +79,7 @@ hr {
 }
 
 .title{
-    font-size: 17px;
+    font-size: 15px;
     font-weight: 650;
     margin: 5px;
     text-align: center;