Skip to content

Commit a94316f

Browse files
committed
Add block with stats and fIx limilt icons
1 parent caebcf3 commit a94316f

File tree

4 files changed

+106
-1
lines changed

4 files changed

+106
-1
lines changed

src/index.html

Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,61 @@
3434
<a id="btnByDays">By days</a>
3535
<a id="settings">Settings</a>
3636
</div>
37+
<div id="stats" class="hide">
38+
<p class="table-header">Overall stats</p>
39+
<div id="statsBlock">
40+
<div>
41+
<div class="title-block">
42+
<span>First day</span>
43+
<span class="value-block" id="statFirstDay"></span>
44+
</div>
45+
<div class="inline-block">
46+
<span>Last day</span>
47+
<span class="value-block" id="statLastDay"></span>
48+
</div>
49+
</div>
50+
<div>
51+
<div class="title-block">
52+
<span>Active days</span>
53+
<span class="value-block" id="statActiveDays"></span>
54+
</div>
55+
<div class="inline-block">
56+
<span>Days in total</span>
57+
<span class="value-block" id="statTotalDays"></span>
58+
</div>
59+
</div>
60+
<div>
61+
<div class="most-inactive-days-title">
62+
<div class="most-inactive-days-value">
63+
<span>Most inactive day</span>
64+
</div>
65+
<div class="inline-block">
66+
<div class="value-block" id="statInActiveDay"></div>
67+
<div class="value-block" id="statInActiveDayTime"></div>
68+
</div>
69+
</div>
70+
<div class="inline-block">
71+
<div style="display: inline-block;vertical-align: top;">
72+
<span>Most active day</span>
73+
</div>
74+
<div class="inline-block">
75+
<div class="value-block" id="statActiveDay"></div>
76+
<div class="value-block" id="statActiveDayTime"></div>
77+
</div>
78+
</div>
79+
</div>
80+
<div>
81+
<div class="title-block">
82+
<span>Today</span>
83+
<span class="value-block" id="statTodayTime"></span>
84+
</div>
85+
<div class="inline-block">
86+
<span>All-time</span>
87+
<span class="value-block" id="statAllDaysTime"></span>
88+
</div>
89+
</div>
90+
</div>
91+
</div>
3792
<div id="blockForChartBtn">
3893
<a class="button active chart-btn chart-btn-donut" id="donutChartBtn">Common chart</a>
3994
<a class="button chart-btn chart-btn-heatmap" id="heatMapChartBtn">Time chart</a>

src/scripts/ui.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ class UI {
1010
document.getElementById('btnAll').classList.remove('active');
1111
document.getElementById('btnByDays').classList.remove('active');
1212
document.getElementById('blockForChartBtn').classList.remove('hide');
13+
document.getElementById('stats').classList.add('hide');
1314
this.setUIForDonutChart();
1415

1516
this.clearUI();
@@ -20,6 +21,7 @@ class UI {
2021
document.getElementById('btnToday').classList.remove('active');
2122
document.getElementById('btnByDays').classList.remove('active');
2223
document.getElementById('blockForChartBtn').classList.add('hide');
24+
document.getElementById('stats').classList.remove('hide');
2325

2426
this.clearUI();
2527
}
@@ -29,6 +31,7 @@ class UI {
2931
document.getElementById('btnAll').classList.remove('active');
3032
document.getElementById('btnToday').classList.remove('active');
3133
document.getElementById('blockForChartBtn').classList.add('hide');
34+
document.getElementById('stats').classList.add('hide');
3235

3336
this.clearUI();
3437
this.addBlockForCalendar(range);

src/scripts/webact.js

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,18 @@ var currentTypeOfList;
99
var today = new Date().toLocaleDateString("en-US");
1010
var setting_range_days;
1111
var restrictionList;
12+
var stat = {
13+
'firstDay': null,
14+
'lastDay': null,
15+
'activeDays': null,
16+
'totalDays': null,
17+
'inActiveDay': null,
18+
'inActiveDayTime': null,
19+
'activeDay': null,
20+
'activeDayTime': null,
21+
'todayTime': null,
22+
'allDaysTime': null
23+
};
1224

1325
document.addEventListener('DOMContentLoaded', function () {
1426
storage.getValue(SETTINGS_INTERVAL_RANGE, function (item) { setting_range_days = item; });
@@ -92,6 +104,7 @@ function getTabsFromStorage(tabs) {
92104

93105
if (targetTabs.length > 0) {
94106
totalTime = getTotalTime(targetTabs);
107+
stat.allDaysTime = totalTime;
95108
}
96109
else {
97110
ui.fillEmptyBlock('chart');
@@ -109,6 +122,7 @@ function getTabsFromStorage(tabs) {
109122
});
110123

111124
totalTime = getTotalTime(targetTabs);
125+
stat.todayTime = totalTime;
112126
}
113127
else {
114128
ui.fillEmptyBlock('chart');

src/style/webact.css

Lines changed: 34 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -302,7 +302,6 @@ p.table-header{
302302
}
303303

304304
.tooltip {
305-
width: 70px;
306305
position: relative;
307306
display: inline-block;
308307
}
@@ -397,4 +396,38 @@ p.table-header{
397396

398397
.chart-btn-heatmap{
399398
background-image: url(/icons/heat-map-16.png);
399+
}
400+
401+
#statsBlock{
402+
/* border: 1px solid rgb(195, 194, 194);
403+
border-radius: 5px; */
404+
/* padding: 7px; */
405+
color: #9b9b9b;
406+
font-size: 13px;
407+
}
408+
409+
#statsBlock .title-block{
410+
display: inline-block;
411+
width: 40%;
412+
margin-left:10%;
413+
}
414+
415+
#statsBlock .value-block{
416+
color:black;
417+
font-weight: 600;
418+
}
419+
420+
#statsBlock .inline-block{
421+
display: inline-block;
422+
}
423+
424+
#statsBlock .most-inactive-days-title{
425+
width: 50%;
426+
display: inline-block;
427+
}
428+
429+
#statsBlock .most-inactive-days-value{
430+
display: inline-block;
431+
margin-left:20%;
432+
vertical-align: top;
400433
}

0 commit comments

Comments
 (0)