Skip to content

Commit 039b539

Browse files
committed
Add average time by active days
1 parent 6d7c145 commit 039b539

File tree

3 files changed

+36
-12
lines changed

3 files changed

+36
-12
lines changed

src/index.html

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -47,44 +47,48 @@
4747
<div id="statsBlock">
4848
<div class="title-block">
4949
<div class="block">
50-
<div>First day</div>
50+
<div class="summary-title">First day</div>
5151
<div class="value-block" id="statFirstDay"></div>
5252
</div>
5353
<div class="block">
54-
<div>Last day</div>
54+
<div class="summary-title">Last day</div>
5555
<div class="value-block" id="statLastDay"></div>
5656
</div>
5757
</div>
5858
<div class="title-block">
5959
<div class="block">
60-
<div>Active days</div>
60+
<div class="summary-title">Active days</div>
6161
<div class="value-block" id="statActiveDays"></div>
6262
</div>
6363
<div class="block">
64-
<div>Days in total</div>
64+
<div class="summary-title">Days in total</div>
6565
<div class="value-block" id="statTotalDays"></div>
6666
</div>
6767
</div>
6868
<div class="title-block">
69-
<div class="block">
70-
<div>Today</div>
69+
<div class="block-additional">
70+
<div class="summary-title">Today</div>
7171
<div class="span-time" id="statTodayTime"></div>
7272
</div>
73-
<div class="block">
74-
<div>All-time</div>
73+
<div class="block-additional">
74+
<div class="summary-title">All-time</div>
7575
<div class="span-time" id="statAllDaysTime"></div>
7676
</div>
77+
<div class="block-additional">
78+
<div class="summary-title">Average by active days</div>
79+
<div class="span-time" id="statAverageTime"></div>
80+
</div>
7781
</div>
7882
<div class="title-block">
7983
<div class="block">
80-
<div>Most active day</div>
84+
<div class="summary-title">Most active day</div>
8185
<div class="inline-block">
8286
<div class="value-block" id="statActiveDay"></div>
8387
<div class="span-time" id="statActiveDayTime"></div>
8488
</div>
8589
</div>
8690
<div class="block">
87-
<div>Most inactive day</div>
91+
<div class="summary-title">Most inactive day</div>
8892
<div class="inline-block">
8993
<div class="value-block" id="statInActiveDay"></div>
9094
<div class="span-time" id="statInActiveDayTime"></div>

src/scripts/webact.js

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
var tabsFromBackground;
44
var storage = new LocalStorage();
55
var ui = new UI();
6-
var totalTime;
6+
var totalTime, averageTime;
77
var tabsFromStorage;
88
var targetTabs;
99
var currentTypeOfList;
@@ -33,6 +33,10 @@ var stat = {
3333
set activeDay(value) {
3434
document.getElementById('statActiveDay').innerHTML = value;
3535
},
36+
set averageTime(value) {
37+
document.getElementById('statAverageTime').innerHTML = '';
38+
ui.createElementsForTotalTime(value, TypeListEnum.ToDay, document.getElementById('statAverageTime'));
39+
},
3640
set activeDayTime(value) {
3741
document.getElementById('statActiveDayTime').innerHTML = '';
3842
ui.createElementsForTotalTime(value, TypeListEnum.ToDay, document.getElementById('statActiveDayTime'));
@@ -147,6 +151,7 @@ function getTabsFromStorage(tabs) {
147151
if (targetTabs.length > 0) {
148152
totalTime = getTotalTime(targetTabs);
149153
stat.allDaysTime = totalTime;
154+
150155
} else {
151156
ui.fillEmptyBlock('chart');
152157
return;
@@ -371,6 +376,7 @@ function setStatData(array) {
371376
stat.firstDay = new Date(array[0]).toLocaleDateString('ru-RU');;
372377
stat.lastDay = new Date(array[array.length - 1]).toLocaleDateString('ru-RU');;
373378
stat.activeDays = array.length;
379+
stat.averageTime = totalTime / array.length;
374380
stat.totalDays = daysBetween(array[0], array[array.length - 1]);
375381
}
376382

src/style/webact.css

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -393,7 +393,21 @@ input[type='checkbox'] {
393393
}
394394

395395
#statsBlock .block {
396-
width: 40%;
396+
width: 45%;
397+
display: inline-block;
398+
text-align: center;
399+
}
400+
401+
#statsBlock .summary-title{
402+
background: #dbdbdb;
403+
border: #dbdbdb 1px solid;
404+
border-radius: 10px;
405+
color: #919191;
406+
padding: 2px;
407+
}
408+
409+
#statsBlock .block-additional {
410+
width: 30%;
397411
display: inline-block;
398412
text-align: center;
399413
}

0 commit comments

Comments
 (0)