Skip to content

Commit 8c84194

Browse files
committed
Add number of sites in header table
1 parent cdf675f commit 8c84194

File tree

2 files changed

+13
-9
lines changed

2 files changed

+13
-9
lines changed

scripts/ui.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -98,16 +98,16 @@ class UI {
9898
ui.addHrAfterChart();
9999
}
100100

101-
addTableHeader(currentTypeOfList, totalDays) {
101+
addTableHeader(currentTypeOfList, counterOfSite, totalDays) {
102102
var p = document.createElement('p');
103103
p.classList.add('table-header');
104104
if (currentTypeOfList === TypeListEnum.ToDay)
105-
p.innerHTML = 'Today';
105+
p.innerHTML = 'Today (' + counterOfSite + ' sites)';
106106
if (currentTypeOfList === TypeListEnum.All && totalDays !== undefined) {
107107
if (totalDays.countOfDays > 0) {
108-
p.innerHTML = 'Aggregate data since ' + totalDays.minDate + ' (' + totalDays.countOfDays + ' days)';
108+
p.innerHTML = 'Aggregate data since ' + totalDays.minDate + ' (' + totalDays.countOfDays + ' days) (' + counterOfSite + ' sites)';
109109
} else {
110-
p.innerHTML = 'Aggregate data since ' + today;
110+
p.innerHTML = 'Aggregate data since ' + today + ' (' + counterOfSite + ' sites)';
111111
}
112112
}
113113

scripts/webact.js

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -76,21 +76,25 @@ function getTabsFromStorage(tabs) {
7676
return;
7777
}
7878

79+
var counterOfSite;
7980
if (currentTypeOfList === TypeListEnum.All) {
8081
targetTabs = tabs.sort(function (a, b) {
8182
return b.summaryTime - a.summaryTime;
8283
});
8384

84-
if (targetTabs.length > 0){
85+
if (targetTabs.length > 0) {
8586
totalTime = getTotalTime(targetTabs);
8687
}
87-
else{
88+
else {
8889
ui.fillEmptyBlock('chart');
8990
return;
9091
}
92+
93+
counterOfSite = tabs.length;
9194
}
9295
if (currentTypeOfList === TypeListEnum.ToDay) {
9396
targetTabs = tabs.filter(x => x.days.find(s => s.date === today));
97+
counterOfSite = targetTabs.length;
9498
if (targetTabs.length > 0) {
9599
targetTabs = targetTabs.sort(function (a, b) {
96100
return b.days.find(s => s.date === today).summary - a.days.find(s => s.date === today).summary;
@@ -105,9 +109,9 @@ function getTabsFromStorage(tabs) {
105109
}
106110

107111
if (currentTypeOfList === TypeListEnum.All)
108-
ui.addTableHeader(currentTypeOfList, getFirstDay());
112+
ui.addTableHeader(currentTypeOfList, counterOfSite, getFirstDay());
109113
if (currentTypeOfList === TypeListEnum.ToDay)
110-
ui.addTableHeader(currentTypeOfList);
114+
ui.addTableHeader(currentTypeOfList, counterOfSite);
111115

112116
var currentTab = getCurrentTab();
113117

@@ -277,7 +281,7 @@ function getTabsFromStorageByDay(day, blockName) {
277281
for (var i = 0; i < targetTabs.length; i++) {
278282
var summaryTime, counter;
279283
summaryTime = targetTabs[i].days.find(x => x.date == day).summary;
280-
counter = targetTabs[i].days.find(x => x.date == today).counter;
284+
counter = targetTabs[i].days.find(x => x.date == day).counter;
281285

282286
ui.addLineToTableOfSite(targetTabs[i], currentTab, summaryTime, TypeListEnum.ByDays, counter, blockName + '_content');
283287
}

0 commit comments

Comments
 (0)