Micke/roundcubemail-plugins-kolab
0
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix date picker format and quick-filter assigments

Browse source
This commit is contained in:
Thomas Bruederli 2012-09-19 13:20:14 +02:00
parent 2cc6a00acf
commit c7614649e4
2 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
plugins/tasklist/tasklist.js
View file

@ -69,7 +69,7 @@ function rcube_tasklist_ui(settings)
// general datepicker settings
var datepicker_settings = {
// translate from PHP format to datepicker format
dateFormat: settings['date_format'].replace(/m/, 'mm').replace(/n/g, 'm').replace(/F/, 'MM').replace(/l/, 'DD').replace(/dd/, 'D').replace(/d/, 'dd').replace(/j/, 'd').replace(/Y/g, 'yy'),
dateFormat: settings['date_format'].replace(/M/g, 'm').replace(/mmmmm/, 'MM').replace(/mmm/, 'M').replace(/dddd/, 'DD').replace(/ddd/, 'D').replace(/yy/g, 'y'),
firstDay : settings['first_day'],
// dayNamesMin: settings['days_short'],
// monthNames: settings['months'],

9
plugins/tasklist/tasklist.php
View file

@ -595,6 +595,7 @@ class tasklist extends rcube_plugin
$mask = 0;
$start = $rec['startdate'] ?: '1900-00-00';
$duedate = $rec['date'] ?: '3000-00-00';
if ($rec['flagged'])
$mask |= self::FILTER_MASK_FLAGGED;
@ -606,13 +607,13 @@ class tasklist extends rcube_plugin
else if ($rec['date'] < $today)
$mask |= self::FILTER_MASK_OVERDUE;
if ($rec['date'] >= $today && $start <= $today)
if ($duedate <= $today || ($rec['startdate'] && $start <= $today))
$mask |= self::FILTER_MASK_TODAY;
if ($rec['date'] >= $tomorrow && $start <= $tomorrow)
if ($duedate <= $tomorrow || ($rec['startdate'] && $start <= $tomorrow))
$mask |= self::FILTER_MASK_TOMORROW;
if (($start > $tomorrow || $rec['date'] > $tomorrow) && $rec['date'] <= $weeklimit)
if (($start > $tomorrow || $duedate > $tomorrow) && $duedate <= $weeklimit)
$mask |= self::FILTER_MASK_WEEK;
if ($start > $weeklimit || $rec['date'] > $weeklimit)
if ($start > $weeklimit || $duedate > $weeklimit)
$mask |= self::FILTER_MASK_LATER;
return $mask;