extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2025-06-22 19:01:43 +02:00
Code Issues Packages Projects Releases Wiki Activity

Apply end date to list view too. Only makes a difference when selected range is used, but now it is pre-set.

Browse Source
This commit is contained in:
Nathan Gray 2015-10-05 18:27:19 +00:00
parent a6837b6a40
commit b2c78d5b6f
1 changed files with 27 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
calendar/js/app.js
View File

@ -440,6 +440,15 @@ app.classes.calendar = AppJS.extend(
.on('wheel.calendar','.et2_container .calendar_calTimeGrid, .et2_container .calendar_plannerWidget', .on('wheel.calendar','.et2_container .calendar_calTimeGrid, .et2_container .calendar_plannerWidget',
function(e) function(e)
{ {
var at_bottom = true;
var at_top = true;
$j(this).children().each(function() {
at_bottom = at_bottom && this.scrollTop === (this.scrollHeight - this.offsetHeight)
}).each(function() {
at_top = at_top && this.scrollTop === 0;
});
if(!at_bottom && !at_top) return;
e.preventDefault(); e.preventDefault();
var direction = e.originalEvent.deltaY > 0 ? 1 : -1; var direction = e.originalEvent.deltaY > 0 ? 1 : -1;
var delta = 1; var delta = 1;
@ -1609,6 +1618,11 @@ app.classes.calendar = AppJS.extend(
if(state.state.view === 'listview') if(state.state.view === 'listview')
{ {
state.state.startdate = state.state.date; state.state.startdate = state.state.date;
if(state.state.end_date)
{
state.state.enddate = state.state.end_date;
}
state.state.col_filter = {participant: state.state.owner}; state.state.col_filter = {participant: state.state.owner};
// Pass status filter in as status filter, avoids conflicts with nm filter // Pass status filter in as status filter, avoids conflicts with nm filter
@ -2322,6 +2336,12 @@ app.classes.calendar = AppJS.extend(
state.planner_days = 0; state.planner_days = 0;
state.last = false; state.last = false;
} }
else if (app.calendar.state.view == 'listview')
{
var d = app.calendar.View.end_date.call(this,state);
d = new Date(d.getFullYear(),d.getUTCMonth() + 1, 0);
state.end_date = d;
}
app.calendar.update_state(state); app.calendar.update_state(state);
}, },
// Mark holidays // Mark holidays
@ -2371,11 +2391,17 @@ app.classes.calendar = AppJS.extend(
{ {
app.calendar.update_state({view: 'week', date: date.getValue(), days: days}); app.calendar.update_state({view: 'week', date: date.getValue(), days: days});
} }
else if (app.calendar.state.view == 'planner') else if (view == 'planner')
{ {
// Clicked a week, show just a week // Clicked a week, show just a week
app.calendar.update_state({planner_days: 7}); app.calendar.update_state({planner_days: 7});
} }
else if (view == 'listview')
{
app.calendar.update_state({
end_date: app.classes.calendar.views.week.end_date({date:date.getValue()})
});
}
}); });
} }
}, },