Merge pull request #965 from Cap-go/switch_to_utc_date_calc

riderx · web-flow · commit 28199fceeb2f · 2025-01-11T19:30:15.000Z
feat: switch to UTC stats calculation
diff --git a/src/components/dashboard/Usage.vue b/src/components/dashboard/Usage.vue
@@ -70,9 +70,9 @@ async function getUsages() {
     cycleDay = currentDay
   }
   else {
-    const cycleStartDay = cycleStart.getDate()
-    const daysInMonth = new Date(currentDate.getFullYear(), currentDate.getMonth() + 1, 0).getDate()
-    cycleDay = (currentDay - cycleStartDay + 1 + daysInMonth) % daysInMonth
+    const cycleStartDay = cycleStart.getUTCDate()
+    const daysInMonth = new Date(Date.UTC(currentDate.getUTCFullYear(), currentDate.getUTCMonth() + 1, 0)).getUTCDate()
+    cycleDay = (currentDate.getUTCDate() - cycleStartDay + 1 + daysInMonth) % daysInMonth
     if (cycleDay === 0)
       cycleDay = daysInMonth
   }

Original file line number	Diff line number	Diff line change
`@@ -70,9 +70,9 @@ async function getUsages() {`
`70`	`70`	`cycleDay = currentDay`
`71`	`71`	`}`
`72`	`72`	`else {`
`73`		`- const cycleStartDay = cycleStart.getDate()`
`74`		`- const daysInMonth = new Date(currentDate.getFullYear(), currentDate.getMonth() + 1, 0).getDate()`
`75`		`- cycleDay = (currentDay - cycleStartDay + 1 + daysInMonth) % daysInMonth`
	`73`	`+ const cycleStartDay = cycleStart.getUTCDate()`
	`74`	`+ const daysInMonth = new Date(Date.UTC(currentDate.getUTCFullYear(), currentDate.getUTCMonth() + 1, 0)).getUTCDate()`
	`75`	`+ cycleDay = (currentDate.getUTCDate() - cycleStartDay + 1 + daysInMonth) % daysInMonth`
`76`	`76`	`if (cycleDay === 0)`
`77`	`77`	`cycleDay = daysInMonth`
`78`	`78`	`}`