holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Calendar: Fix incorrect week view header

Browse Source
This commit is contained in:
nathan 2022-08-22 16:03:40 -06:00
parent c82d727b33
commit a73fa72764
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
calendar/js/View.ts
View File

@ -247,15 +247,25 @@ export class week extends View
{ {
public static header(state) public static header(state)
{ {
var end_date = state.last; let start_date = state.first;
let end_date = state.last;
if(!week.show_weekend(state)) if(!week.show_weekend(state))
{ {
start_date = new Date(state.first);
while([0, 6].indexOf(start_date.getUTCDay()) != -1)
{
start_date.setUTCDate(start_date.getUTCDate() + 1);
}
end_date = new Date(state.last); end_date = new Date(state.last);
end_date.setUTCDate(end_date.getUTCDate() - 2); while([0, 6].indexOf(end_date.getUTCDay()) != -1)
{
end_date.setUTCDate(end_date.getUTCDate() - 1);
}
} }
return super._owner(state) + app.calendar.egw.lang('Week') + ' ' + return super._owner(state) + app.calendar.egw.lang('Week') + ' ' +
app.calendar.date.week_number(state.first) + ': ' + app.calendar.date.week_number(start_date) + ': ' +
app.calendar.date.long_date(state.first, end_date); app.calendar.date.long_date(start_date, end_date);
} }
public static start_date(state) public static start_date(state)