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