From 515cb6505bc960eaf84989df7fab0e0dab60b04e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Munsch?= Date: Thu, 1 Dec 2022 16:40:42 +0100 Subject: [PATCH] Ticket 1142 fix previous button on Planning --- resources/ts/components/ScheduleComponent.vue | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/resources/ts/components/ScheduleComponent.vue b/resources/ts/components/ScheduleComponent.vue index a90cf3f..8343609 100644 --- a/resources/ts/components/ScheduleComponent.vue +++ b/resources/ts/components/ScheduleComponent.vue @@ -597,16 +597,14 @@ export default defineComponent({ if (!route) { throw new Error("undefined route schedule.index"); } - // console.log(forward); - let date = this.momentJs(this.currentDate) - .startOf("week") - .subtract(7, "day"); - if (forward) { - date = this.momentJs(this.currentDate).add(7, "day"); - } + const thisWeekMonday = this.momentJs(this.currentDate).startOf("week"); const url = new URL(route); (window as Window).location = - url.origin + url.pathname + "?p=" + date.format("DD/MM/YYYY"); + `${url.origin}${url.pathname}?p=` + + (forward + ? thisWeekMonday.add(8, "day") + : thisWeekMonday.subtract(6, "day") + ).format("DD/MM/YYYY"); }, prepareDays(): Day[] { let mydays = [];