diff --git a/plugins/tasklist/tasklist.js b/plugins/tasklist/tasklist.js
index fcf43062..4bc82b0a 100644
--- a/plugins/tasklist/tasklist.js
+++ b/plugins/tasklist/tasklist.js
@@ -264,7 +264,7 @@ function rcube_tasklist_ui(settings)
if (rcmail.busy)
return false;
- rec.complete = e.target.checked ? 1 : 0;
+ rec.status = e.target.checked ? 'COMPLETED' : (rec.complete == 1 ? 'NEEDS-ACTION' : '');
li.toggleClass('complete');
save_task(rec, 'edit');
return true;
@@ -815,7 +815,7 @@ function rcube_tasklist_ui(settings)
var div = $('
').addClass('taskhead').html(
'
' +
- '
' +
+ '
' +
'
' +
'
' + text2html(Q(rec.title)) + '' +
'
' + tags_html + '' +
@@ -835,7 +835,7 @@ function rcube_tasklist_ui(settings)
revertDuration: 300
});
- if (rec.complete == 1.0)
+ if (is_complete(rec))
div.addClass('complete');
if (rec.flagged)
div.addClass('flagged');
@@ -951,12 +951,20 @@ function rcube_tasklist_ui(settings)
*/
function task_cmp(a, b)
{
- var d = Math.floor(a.complete) - Math.floor(b.complete);
+ var d = is_complete(a) - is_complete(b);
if (!d) d = (b._hasdate-0) - (a._hasdate-0);
if (!d) d = (a.datetime||99999999999) - (b.datetime||99999999999);
return d;
}
+ /**
+ * Determine whether the given task should be displayed as "complete"
+ */
+ function is_complete(rec)
+ {
+ return ((rec.complete == 1.0 && !rec.status) || rec.status === 'COMPLETED') ? 1 : 0;
+ }
+
/**
*
*/
@@ -1144,6 +1152,7 @@ function rcube_tasklist_ui(settings)
$('#task-starttime').html(Q(rec.starttime || ''));
$('#task-alarm')[(rec.alarms_text ? 'show' : 'hide')]().children('.task-text').html(Q(rec.alarms_text));
$('#task-completeness .task-text').html(((rec.complete || 0) * 100) + '%');
+ $('#task-status')[(rec.status ? 'show' : 'hide')]().children('.task-text').html(rcmail.gettext('status-'+String(rec.status).toLowerCase(),'tasklist'));
$('#task-list .task-text').html(Q(me.tasklists[rec.list] ? me.tasklists[rec.list].name : ''));
var itags = get_inherited_tags(rec);
@@ -1257,6 +1266,7 @@ function rcube_tasklist_ui(settings)
var recstarttime = $('#taskedit-starttime').val(rec.starttime || '');
var complete = $('#taskedit-completeness').val((rec.complete || 0) * 100);
completeness_slider.slider('value', complete.val());
+ var taskstatus = $('#taskedit-status').val(rec.status || '');
var tasklist = $('#taskedit-tasklist').val(rec.list || me.selected_list).prop('disabled', rec.parent_id ? true : false);
// tag-edit line
@@ -1308,7 +1318,7 @@ function rcube_tasklist_ui(settings)
var buttons = {};
buttons[rcmail.gettext('save', 'tasklist')] = function() {
// copy form field contents into task object to save
- $.each({ title:title, description:description, date:recdate, time:rectime, startdate:recstartdate, starttime:recstarttime, list:tasklist }, function(key,input){
+ $.each({ title:title, description:description, date:recdate, time:rectime, startdate:recstartdate, starttime:recstarttime, status:taskstatus, list:tasklist }, function(key,input){
me.selected_task[key] = input.val();
});
me.selected_task.tags = [];
diff --git a/plugins/tasklist/tasklist.php b/plugins/tasklist/tasklist.php
index 65376d7c..d8ba4d04 100644
--- a/plugins/tasklist/tasklist.php
+++ b/plugins/tasklist/tasklist.php
@@ -214,7 +214,7 @@ class tasklist extends rcube_plugin
$child = array('id' => $cid, 'list' => $rec['list'], '_fromlist' => $rec['_fromlist']);
if ($this->driver->move_task($child)) {
$r = $this->driver->get_task($child);
- if ((bool)($filter & self::FILTER_MASK_COMPLETE) == ($r['complete'] == 1.0)) {
+ if ((bool)($filter & self::FILTER_MASK_COMPLETE) == $this->driver->is_complete($r)) {
$refresh[] = $r;
}
}
@@ -237,7 +237,7 @@ class tasklist extends rcube_plugin
$child['id'] = $cid;
if ($this->driver->move_task($child)) {
$r = $this->driver->get_task($child);
- if ((bool)($filter & self::FILTER_MASK_COMPLETE) == ($r['complete'] == 1.0)) {
+ if ((bool)($filter & self::FILTER_MASK_COMPLETE) == $this->driver->is_complete($r)) {
$refresh[] = $r;
}
}
@@ -524,7 +524,7 @@ class tasklist extends rcube_plugin
private function handle_recurrence(&$rec, $old)
{
$clone = null;
- if ($rec['complete'] == 1.0 && $old && $old['complete'] < 1.0 && is_array($rec['recurrence'])) {
+ if ($this->driver->is_complete($rec) && $old && $this->driver->is_complete($old) && is_array($rec['recurrence'])) {
$engine = libcalendaring::get_recurrence();
$rrule = $rec['recurrence'];
$updates = array();
@@ -569,6 +569,7 @@ class tasklist extends rcube_plugin
// update the task but unset completed flag
$rec = array_merge($rec, $updates);
$rec['complete'] = $old['complete'];
+ $rec['satus'] = $old['satus'];
}
}
@@ -718,7 +719,7 @@ class tasklist extends rcube_plugin
$tags = array_merge($tags, (array)$rec['tags']);
// apply filter; don't trust the driver on this :-)
- if ((!$f && $rec['complete'] < 1.0) || ($rec['mask'] & $f))
+ if ((!$f && !$this->driver->is_complete($rec)) || ($rec['mask'] & $f))
$data[] = $rec;
}
@@ -845,7 +846,7 @@ class tasklist extends rcube_plugin
if ($rec['flagged'])
$mask |= self::FILTER_MASK_FLAGGED;
- if ($rec['complete'] == 1.0)
+ if ($this->driver->is_complete($rec))
$mask |= self::FILTER_MASK_COMPLETE;
if (empty($rec['date']))
diff --git a/plugins/tasklist/tasklist_ui.php b/plugins/tasklist/tasklist_ui.php
index 6988a618..f6d4b3ad 100644
--- a/plugins/tasklist/tasklist_ui.php
+++ b/plugins/tasklist/tasklist_ui.php
@@ -67,7 +67,7 @@ class tasklist_ui
{
$this->plugin->register_handler('plugin.tasklists', array($this, 'tasklists'));
$this->plugin->register_handler('plugin.tasklist_select', array($this, 'tasklist_select'));
- $this->plugin->register_handler('plugin.category_select', array($this, 'category_select'));
+ $this->plugin->register_handler('plugin.status_select', array($this, 'status_select'));
$this->plugin->register_handler('plugin.searchform', array($this->rc->output, 'search_form'));
$this->plugin->register_handler('plugin.quickaddform', array($this, 'quickadd_form'));
$this->plugin->register_handler('plugin.tasks', array($this, 'tasks_resultview'));
@@ -129,6 +129,21 @@ class tasklist_ui
return html::tag('ul', $attrib, $li, html::$common_attrib);
}
+ /**
+ * Render HTML form for task status selector
+ */
+ function status_select($attrib = array())
+ {
+ $attrib['name'] = 'status';
+ $select = new html_select($attrib);
+ $select->add('---', '');
+ $select->add($this->plugin->gettext('status-needs-action'), 'NEEDS-ACTION');
+ $select->add($this->plugin->gettext('status-in-process'), 'IN-PROCESS');
+ $select->add($this->plugin->gettext('status-completed'), 'COMPLETED');
+ $select->add($this->plugin->gettext('status-cancelled'), 'CANCELLED');
+
+ return $select->show(null);
+ }
/**
* Render a HTML select box for list selection