extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-27 17:18:54 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix some extra next buttons in the planner header

Browse Source
This commit is contained in:
Nathan Gray 2015-12-14 23:46:45 +00:00
parent d07ab5285f
commit fdfad272aa
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
calendar/js/et2_widget_planner.js
View File

@ -883,6 +883,8 @@ var et2_calendar_planner = et2_valueWidget.extend([et2_IDetachedDOM, et2_IResize
var content = '<div class="calendar_plannerScale" data-planner_days="0" data-last="">'; var content = '<div class="calendar_plannerScale" data-planner_days="0" data-last="">';
var days_in_month = 0; var days_in_month = 0;
var day_width = 100 / days; var day_width = 100 / days;
var end = new Date(start);
end.setUTCDate(end.getUTCDate()+days);
var t = new Date(start.valueOf()); var t = new Date(start.valueOf());
for(var left = 0,i = 0; i < days;t.setUTCDate(1),t.setUTCMonth(t.getUTCMonth()+1),left += days_in_month*day_width,i += days_in_month) for(var left = 0,i = 0; i < days;t.setUTCDate(1),t.setUTCMonth(t.getUTCMonth()+1),left += days_in_month*day_width,i += days_in_month)
{ {
@ -918,11 +920,9 @@ var et2_calendar_planner = et2_valueWidget.extend([et2_IDetachedDOM, et2_IResize
title = this._scroll_button('first',full) + this._scroll_button('left',half) + title; title = this._scroll_button('first',full) + this._scroll_button('left',half) + title;
} }
// show next scales, if there are more then 10 days in the next month or there is no next month // show next scales, if there are less then 10 days in the next month or there is no next month
var end = new Date(start); var days_until_end = (end - t) / (1000 * 3600 * 24);
end.setUTCDate(end.getUTCDate()+days); if (days_until_end - days_in_month <= 10 || end.getUTCMonth() === t.getUTCMonth() && end.getUTCFullYear() === t.getUTCFullYear())
var days_in_next_month = end.getUTCDate();
if (days_in_next_month <= 10 || end.getUTCMonth() == t.getUTCMonth())
{ {
// next links // next links
var next = new Date(t); var next = new Date(t);