Theenoro
/
wochenbericht-manager
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' into 'master' 

changed error where week began a day to late

See merge request theenoro/wochenbericht-manager!1
environments/production/deployments/5
Theenoro 2018-12-19 13:00:56 +01:00
parent 4d1e847512 73df92809a
commit e1299d799b
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/jsx/ui/print_modi/week.jsx
View File

@ -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');