瀏覽代碼

Fix time service mkWeek logic: Use isoWeek instead of week (shifts +1 week number)

Tatiana Inama 7 年之前
父節點
當前提交
67d19068de
共有 1 個文件被更改,包括 2 次插入2 次删除
  1. 2 2
      recipes/src/services/time.ts

+ 2 - 2
recipes/src/services/time.ts

@@ -4,7 +4,7 @@ import { Weekday, WeekShift } from 'types/planner';
 export const mkWeek = () => ['monday', 'tuesday', 'wednesday', 'thursday', 'friday', 'saturday', 'sunday'] as Weekday[];
 
 export const mkWeekDay = (day: string | number, week?: number): Moment => {
-  const date = week ? moment().week(week) : moment();
+  const date = week ? moment().isoWeek(week) : moment();
   return date.isoWeekday(day);
 };
 
@@ -13,7 +13,7 @@ export const getWeekNumber = (date?: string|Date|Moment): number => moment(date)
 export const getWeekDay = (day: Moment): Weekday => day.format('dddd').toLowerCase() as Weekday;
 
 export const mkWeekData = (weekNumber: number): [Weekday, string][] => mkWeek().map(day => (
-  [ day, moment().week(weekNumber).isoWeekday(day).format() ]
+  [ day, moment().isoWeek(weekNumber).isoWeekday(day).format() ]
 ))
 
 export const getWeekPeriod = (start: Moment|Date|string, shift?: WeekShift) => {