From 73df92809ab2d7f291b1092ee839f84aeaceae3c Mon Sep 17 00:00:00 2001 From: Michael Arndt Date: Wed, 19 Dec 2018 12:30:20 +0100 Subject: [PATCH] changed error where week began a day to late changed an error where week 1 could occur multiple times --- src/jsx/ui/print_modi/week.jsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/jsx/ui/print_modi/week.jsx b/src/jsx/ui/print_modi/week.jsx index 03deab9..0371ef4 100644 --- a/src/jsx/ui/print_modi/week.jsx +++ b/src/jsx/ui/print_modi/week.jsx @@ -19,7 +19,7 @@ export class Modi_Week{ weeks[week] = {}; weeks[week].data = []; weeks[week].start = md[1]; - weeks[week].num = moment(md[1]).diff(moment(anfang),'weeks')+1; + weeks[week].num = moment(md[1]).diff(moment(anfang).startOf('isoWeek'),'weeks')+1; weeks[week].end = ""; } var tasks = md[5].split(','); @@ -71,7 +71,7 @@ export class Modi_Week{ } for(var w in weeks){ - weeks[w].start = moment(weeks[w].start).format('YYYY-MM-DD'); + weeks[w].start = moment(weeks[w].start).add(-1, "days").format('YYYY-MM-DD'); weeks[w].end = moment(moment(weeks[w].start).day(7)).format('YYYY-MM-DD');