fix(history): fix bug with skip some first day in month

checkmoney · Apr 16, 2019 · 062100c · 062100c
1 parent 517e5bb
commit 062100c
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/back/src/utils/infrastructure/dateGroups/createMonthGroups.ts b/back/src/utils/infrastructure/dateGroups/createMonthGroups.ts
@@ -9,7 +9,7 @@ export const createMonthGroups = ({ from, to }: DateRange): DateGroup[] => {
 
   let now = startOfMonth(from)
   while (now < to) {
-    const next = addMonths(now, 1)
+    const next = startOfMonth(addMonths(now, 1))
     const nowYear = now.getFullYear()
     groups.push({
       title: `${nowYear}-${getRealMonth(now)}`,

diff --git a/back/src/utils/infrastructure/dateGroups/createWeekGroups.ts b/back/src/utils/infrastructure/dateGroups/createWeekGroups.ts
@@ -8,7 +8,7 @@ export const createWeekGroups = ({ from, to }: DateRange): DateGroup[] => {
 
   let now = startOfWeek(from)
   while (now < to) {
-    const next = addWeeks(now, 1)
+    const next = startOfWeek(addWeeks(now, 1))
     groups.push({
       title: format(now, 'YYYY-MM-DD'),
       from: now,

diff --git a/front/src/features/history/helpers/createMonths.ts b/front/src/features/history/helpers/createMonths.ts
@@ -9,7 +9,7 @@ export const createMonths = (from: Date, to: Date) => {
 
   let now = wantUTC(startOfMonth)(from)
   while (now < to) {
-    const next = wantUTC(addMonths)(now, 1)
+    const next = wantUTC(startOfMonth)(wantUTC(addMonths)(now, 1))
     groups.push({
       title: createMonthTitle(now),
       from: now,