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

Calendar display:

Browse Source 
- Fix planner view clicking on user label breaks view
- Fix holidays and today off by one day in planner depending on time zone
This commit is contained in:
Nathan Gray 2015-11-09 23:49:26 +00:00
parent 8671fdc837
commit a8b62158ea
2 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
calendar/js/et2_widget_planner.js
View File

@ -1096,8 +1096,8 @@ var et2_calendar_planner = et2_valueWidget.extend([et2_IDetachedDOM, et2_IResize
// Holidays and birthdays // Holidays and birthdays
var holidays = et2_calendar_daycol.get_holidays(this,date.getUTCFullYear()); var holidays = et2_calendar_daycol.get_holidays(this,date.getUTCFullYear());
// Pass a number rather than the date object, to make sure it doesn't get changed // Pass a string rather than the date object, to make sure it doesn't get changed
this.date_helper.set_value(date.getTime()/1000); this.date_helper.set_value(date.toJSON());
var date_key = ''+this.date_helper.get_year() + sprintf('%02d',this.date_helper.get_month()) + sprintf('%02d',this.date_helper.get_date()); var date_key = ''+this.date_helper.get_year() + sprintf('%02d',this.date_helper.get_month()) + sprintf('%02d',this.date_helper.get_date());
if(holidays && holidays[date_key]) if(holidays && holidays[date_key])
{ {
@ -1120,9 +1120,9 @@ var et2_calendar_planner = et2_valueWidget.extend([et2_IDetachedDOM, et2_IResize
} }
holidays = holiday_list.join(','); holidays = holiday_list.join(',');
var today = new Date(); var today = new Date();
if(date_key === ''+today.getUTCFullYear()+ if(date_key === ''+today.getFullYear()+
sprintf("%02d",today.getUTCMonth()+1)+ sprintf("%02d",today.getMonth()+1)+
sprintf("%02d",today.getUTCDate()) sprintf("%02d",today.getDate())
) )
{ {
day_class += "calendar_calToday "; day_class += "calendar_calToday ";
@ -1827,6 +1827,13 @@ var et2_calendar_planner = et2_valueWidget.extend([et2_IDetachedDOM, et2_IResize
{ {
// Click on a header, we can go there // Click on a header, we can go there
_ev.data = jQuery.extend({},_ev.target.parentNode.dataset, _ev.target.dataset); _ev.data = jQuery.extend({},_ev.target.parentNode.dataset, _ev.target.dataset);
for(var key in _ev.data)
{
if(!_ev.data[key])
{
delete _ev.data[key];
}
}
// Handle it locally // Handle it locally
var old_start = this.options.start_date; var old_start = this.options.start_date;

4
calendar/js/et2_widget_planner_row.js
View File

@ -189,7 +189,7 @@ var et2_calendar_planner_row = et2_valueWidget.extend([et2_IDetachedDOM],
var day_width = 100/days; var day_width = 100/days;
var t = new Date(start); var t = new Date(start);
var content = ''; var content = '';
for(var left = 0,i = 0; i < days;left += day_width,++i) for(var i = 0; i < days;i++)
{ {
var holidays = []; var holidays = [];
// TODO: implement this, pull / copy data from et2_widget_timegrid // TODO: implement this, pull / copy data from et2_widget_timegrid
@ -198,7 +198,7 @@ var et2_calendar_planner_row = et2_valueWidget.extend([et2_IDetachedDOM],
if (day_class) // no regular weekday if (day_class) // no regular weekday
{ {
content += '<div class="calendar_eventRowsMarkedDay '+day_class+ content += '<div class="calendar_eventRowsMarkedDay '+day_class+
'" style="left: '+left+'%; width:'+day_width+'%;"'+ '" style="left: '+(i*day_width)+'%; width:'+day_width+'%;"'+
(holidays ? ' title="'+holidays.join(',')+'"' : '')+ (holidays ? ' title="'+holidays.join(',')+'"' : '')+
' ></div>'; ' ></div>';
} }