Skip to content

Commit d833da6

Browse files
committed
Add week progress
1 parent 41b6cf6 commit d833da6

File tree

2 files changed

+26
-1
lines changed

2 files changed

+26
-1
lines changed

index.html

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,10 @@ <h1>Current Date and Time Progress</h1>
2424
max="1"
2525
></progress>
2626
</p>
27+
<!--current week progress bar-->
28+
<p>
29+
Week progress: <br /><progress id="weekProgress" max="1"></progress>
30+
</p>
2731
<!--current day progress bar-->
2832
<p>
2933
Day progress: <br /><progress id="dayProgress" max="1"></progress>

main.js

Lines changed: 22 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,22 @@ const monthStart = new Date(currentYear, currentMonth, 1); //start of month
3636
const monthEnd = new Date(currentYear, currentMonth + 1, 0); //end of month
3737
const monthStartUtc = new Date(currentUtcYear, currentUtcMonth, 1); //start of month in UTC
3838
const monthEndUtc = new Date(currentUtcYear, currentUtcMonth + 1, 0); //end of month in UTC
39+
const weekStart = new Date(currentYear, currentMonth, currentDate - currentDay); //start of week
40+
const weekEnd = new Date(
41+
currentYear,
42+
currentMonth,
43+
currentDate + (7 - currentDay),
44+
); //end of week
45+
const weekStartUtc = new Date(
46+
currentUtcYear,
47+
currentUtcMonth,
48+
currentUtcDate - currentUtcDay,
49+
); //start of week in UTC
50+
const weekEndUtc = new Date(
51+
currentUtcYear,
52+
currentUtcMonth,
53+
currentUtcDate + (7 - currentUtcDay),
54+
); //end of week in UTC
3955
const dayStart = new Date(currentYear, currentMonth, currentDate); //start of day
4056
const dayEnd = new Date(currentYear, currentMonth, currentDate + 1); //end of day
4157
const dayStartUtc = new Date(currentUtcYear, currentUtcMonth, currentUtcDate); //start of day in UTC
@@ -125,6 +141,9 @@ const yearProgressUtc =
125141
const monthProgress = (currentDateTime - monthStart) / (monthEnd - monthStart); //month progress
126142
const monthProgressUtc =
127143
(currentUtcDateTime - monthStartUtc) / (monthEndUtc - monthStartUtc); //month progress in UTC
144+
const weekProgress = (currentDateTime - weekStart) / (weekEnd - weekStart); //week progress
145+
const weekProgressUtc =
146+
(currentUtcDateTime - weekStartUtc) / (weekEndUtc - weekStartUtc); //week progress in UTC
128147
const dayProgress = (currentDateTime - dayStart) / (dayEnd - dayStart); //day progress
129148
const dayProgressUtc =
130149
(currentUtcDateTime - dayStartUtc) / (dayEndUtc - dayStartUtc); //day progress in UTC
@@ -141,14 +160,16 @@ const secondProgressUtc =
141160
(currentUtcDateTime - secondStartUtc) / (secondEndUtc - secondStartUtc); //second progress in UTC
142161
const yearProgressText = document.getElementById("yearProgress"); //year progress text
143162
const monthProgressText = document.getElementById("monthProgress"); //month progress text
163+
const weekProgressText = document.getElementById("weekProgress"); //week progress text
144164
const dayProgressText = document.getElementById("dayProgress"); //day progress text
145165
const hourProgressText = document.getElementById("hourProgress"); //hour progress text
146166
const minuteProgressText = document.getElementById("minuteProgress"); //minute progress text
147167
const secondProgressText = document.getElementById("secondProgress"); //second progress text
148168
yearProgressText.value = yearProgress; //set year progress text
149169
monthProgressText.value = monthProgress; //set month progress text
170+
weekProgressText.value = weekProgress; //set week progress text
150171
dayProgressText.value = dayProgress; //set day progress text
151172
hourProgressText.value = hourProgress; //set hour progress text
152173
minuteProgressText.value = minuteProgress; //set minute progress text
153174
secondProgressText.value = secondProgress; //set second progress text
154-
currentProgressText.textContent = `Year progress: ${yearProgress} (${yearProgressUtc})\nMonth progress: ${monthProgress} (${monthProgressUtc})\nDay progress: ${dayProgress} (${dayProgressUtc})\nHour progress: ${hourProgress} (${hourProgressUtc})\nMinute progress: ${minuteProgress} (${minuteProgressUtc})\nSecond progress: ${secondProgress} (${secondProgressUtc})`; //set current progress text based on current date and time progress
175+
currentProgressText.textContent = `Year progress: ${yearProgress} (${yearProgressUtc})\nMonth progress: ${monthProgress} (${monthProgressUtc})\nWeek progress: ${weekProgress} (${weekProgressUtc})\nDay progress: ${dayProgress} (${dayProgressUtc})\nHour progress: ${hourProgress} (${hourProgressUtc})\nMinute progress: ${minuteProgress} (${minuteProgressUtc})\nSecond progress: ${secondProgress} (${secondProgressUtc})`; //set current progress text based on current date and time progress

0 commit comments

Comments
 (0)