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

Keep client side state up to date with month & week filters

Browse Source
This commit is contained in:
Nathan Gray 2015-12-10 00:06:08 +00:00
parent b4cfde8c35
commit da2d6cc321
2 changed files with 21 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
calendar/inc/class.calendar_uilist.inc.php
View File

@ -332,8 +332,12 @@ class calendar_uilist extends calendar_ui
unset($this->last['raw']); unset($this->last['raw']);
$this->last = $this->bo->date2ts($this->last); $this->last = $this->bo->date2ts($this->last);
$this->date_filters['week'] = $label = lang('Week').' '.adodb_date('W',$this->first).': '.$this->bo->long_date($this->first,$this->last); $this->date_filters['week'] = $label = lang('Week').' '.adodb_date('W',$this->first).': '.$this->bo->long_date($this->first,$this->last);
$params['startdate'] = $search_params['start'] = $this->first; $search_params['start'] = $this->first;
$params['enddate'] = $search_params['end'] = $this->last; $search_params['end'] = $this->last;
egw_json_response::get()->apply('app.calendar.update_state', array(array(
'first' => egw_time::to($this->first,egw_time::ET2),
'last' => egw_time::to($this->last,egw_time::ET2)
)));
break; break;
case 'month': case 'month':
@ -346,8 +350,12 @@ class calendar_uilist extends calendar_ui
$this->first = $this->bo->date2ts($this->first); $this->first = $this->bo->date2ts($this->first);
$this->last = $this->bo->date2ts($this->last); $this->last = $this->bo->date2ts($this->last);
$this->last--; $this->last--;
$params['startdate'] = $search_params['start'] = $this->first; $search_params['start'] = $this->first;
$params['enddate'] = $search_params['end'] = $this->last; $search_params['end'] = $this->last;
egw_json_response::get()->apply('app.calendar.update_state', array(array(
'first' => egw_time::to($this->first,egw_time::ET2),
'last' => egw_time::to($this->last,egw_time::ET2)
)));
break; break;
// fall through to after given date // fall through to after given date
@ -508,8 +516,6 @@ class calendar_uilist extends calendar_ui
} }
} }
} }
$params['options-selectcols']['week'] = lang('Week');
$params['options-selectcols']['weekday'] = lang('Weekday');
if ((substr($this->cal_prefs['nextmatch-calendar.list.rows'],0,4) == 'week' && strlen($this->cal_prefs['nextmatch-calendar.list.rows'])==4) || substr($this->cal_prefs['nextmatch-calendar.list.rows'],0,5) == 'week,') if ((substr($this->cal_prefs['nextmatch-calendar.list.rows'],0,4) == 'week' && strlen($this->cal_prefs['nextmatch-calendar.list.rows'])==4) || substr($this->cal_prefs['nextmatch-calendar.list.rows'],0,5) == 'week,')
{ {
$rows['format'] = '32'; // prefix date with week-number $rows['format'] = '32'; // prefix date with week-number
@ -525,10 +531,6 @@ class calendar_uilist extends calendar_ui
$rows['format'] = '64'; $rows['format'] = '64';
} }
if ($this->cat_id) $rows['no_cat_id'] = true; if ($this->cat_id) $rows['no_cat_id'] = true;
if (!$GLOBALS['egw_info']['user']['apps']['projectmanager'])
{
$params['options-selectcols']['pm_id'] = false;
}
//_debug_array($rows); //_debug_array($rows);
return $this->bo->total; return $this->bo->total;
} }

15
calendar/js/app.js
View File

@ -1935,11 +1935,6 @@ app.classes.calendar = AppJS.extend(
} }
nm.applyFilters(state.state); nm.applyFilters(state.state);
// Try to keep last value up to date with what's in nextmatch
if(nm.activeFilters.enddate)
{
this.state.last = nm.activeFilters.enddate;
}
// Updates the display of start & end date // Updates the display of start & end date
this.filter_change(); this.filter_change();
} }
@ -3305,7 +3300,15 @@ jQuery.extend(app.classes.calendar,{
date(egw.preference('dateformat'),startDate) + date(egw.preference('dateformat'),startDate) +
(start_check == end_check ? '' : ' - ' + date(egw.preference('dateformat'),endDate)); (start_check == end_check ? '' : ' - ' + date(egw.preference('dateformat'),endDate));
}, },
etemplates: ['calendar.list'] etemplates: ['calendar.list'],
start_date: function(state) {
var filter = app.classes.calendar.views.listview.etemplates[0].widgetContainer.getWidgetById('nm').activeFilters.filter || false;
return filter && state.first ? state.first : app.calendar.View.start_date.call(this, state);
},
end_date: function(state) {
var filter = app.classes.calendar.views.listview.etemplates[0].widgetContainer.getWidgetById('nm').activeFilters.filter || false;
return filter && state.last ? state.last : app.calendar.View.start_date.call(this, state);
}
}) })
}} }}
); );