From b6b12069df7f9c692e79a0a8f42147bd74dcc63b Mon Sep 17 00:00:00 2001
From: Thomas Bruederli <bruederli@kolabsys.com>
Date: Wed, 13 Aug 2014 11:07:06 +0200
Subject: [PATCH] Implement client-side and user-adjustable sorting of tasks
 (#3259)

---
 plugins/tasklist/config.inc.php.dist          |   9 +-
 .../drivers/kolab/tasklist_kolab_driver.php   |   9 +-
 plugins/tasklist/localization/en_US.inc       |   8 +-
 plugins/tasklist/skins/larry/sprites.png      | Bin 5007 -> 6500 bytes
 plugins/tasklist/skins/larry/tasklist.css     |  28 +++--
 .../skins/larry/templates/mainview.html       |  27 ++++-
 plugins/tasklist/tasklist.js                  |  98 ++++++++++++++++--
 plugins/tasklist/tasklist.php                 |  30 +++---
 plugins/tasklist/tasklist_ui.php              |   2 +
 9 files changed, 174 insertions(+), 37 deletions(-)

diff --git a/plugins/tasklist/config.inc.php.dist b/plugins/tasklist/config.inc.php.dist
index 2fc5e282..399344cd 100644
--- a/plugins/tasklist/config.inc.php.dist
+++ b/plugins/tasklist/config.inc.php.dist
@@ -1,4 +1,11 @@
 <?php
 
-$rcmail_config['tasklist_driver'] = 'kolab';
+// backend type (database, kolab)
+$config['tasklist_driver'] = 'kolab';
+
+// default sorting order of tasks listing (auto, datetime, startdatetime, flagged, complete, changed)
+$config['tasklist_sort_col'] = '';
+
+// default sorting order for tasks listing (asc or desc)
+$config['tasklist_sort_order'] = 'asc';
 
diff --git a/plugins/tasklist/drivers/kolab/tasklist_kolab_driver.php b/plugins/tasklist/drivers/kolab/tasklist_kolab_driver.php
index a3e61813..662311cb 100644
--- a/plugins/tasklist/drivers/kolab/tasklist_kolab_driver.php
+++ b/plugins/tasklist/drivers/kolab/tasklist_kolab_driver.php
@@ -794,8 +794,11 @@ class tasklist_kolab_driver extends tasklist_driver
             if (!$record['start']->_dateonly)
                 $task['starttime'] = $start->format('H:i');
         }
-        if (is_a($record['dtstamp'], 'DateTime')) {
-            $task['changed'] = $record['dtstamp'];
+        if (is_a($record['changed'], 'DateTime')) {
+            $task['changed'] = $record['changed'];
+        }
+        if (is_a($record['created'], 'DateTime')) {
+            $task['created'] = $record['created'];
         }
 
         if ($record['valarms']) {
@@ -912,7 +915,7 @@ class tasklist_kolab_driver extends tasklist_driver
             $object['sequence'] = $old['sequence'];
         }
 
-        unset($object['tempid'], $object['raw'], $object['list'], $object['flagged'], $object['tags']);
+        unset($object['tempid'], $object['raw'], $object['list'], $object['flagged'], $object['tags'], $object['created']);
         return $object;
     }
 
diff --git a/plugins/tasklist/localization/en_US.inc b/plugins/tasklist/localization/en_US.inc
index 3fd045a3..41323274 100644
--- a/plugins/tasklist/localization/en_US.inc
+++ b/plugins/tasklist/localization/en_US.inc
@@ -34,10 +34,13 @@ $labels['status-in-process'] = 'In process';
 $labels['status-completed'] = 'Completed';
 $labels['status-cancelled'] = 'Cancelled';
 $labels['assignedto'] = 'Assigned to';
+$labels['created'] = 'Created';
+$labels['changed'] = 'Last Modified';
 
 $labels['all'] = 'All';
 $labels['flagged'] = 'Flagged';
 $labels['complete'] = 'Complete';
+$labels['completeness'] = 'Progress';
 $labels['overdue'] = 'Overdue';
 $labels['today'] = 'Today';
 $labels['tomorrow'] = 'Tomorrow';
@@ -49,6 +52,7 @@ $labels['mytasks'] = 'My tasks';
 $labels['mytaskstitle'] = 'Tasks assigned to you';
 $labels['nodate'] = 'no date';
 $labels['removetag'] = 'Remove';
+$labels['auto'] = 'Auto';
 
 $labels['taskdetails'] = 'Details';
 $labels['newtask'] = 'New Task';
@@ -74,7 +78,7 @@ $labels['listactions'] = 'List options...';
 $labels['listname'] = 'Name';
 $labels['showalarms'] = 'Show reminders';
 $labels['import'] = 'Import';
-$labels['viewoptions'] = 'View options';
+$labels['viewactions'] = 'View actions';
 $labels['focusview'] = 'View only this list';
 
 // date words
@@ -172,3 +176,5 @@ $labels['itipresponseerror'] = 'Failed to send the response to this task assignm
 $labels['itipinvalidrequest'] = 'This invitation is no longer valid';
 $labels['sentresponseto'] = 'Successfully sent assignment response to $mailto';
 $labels['successremoval'] = 'The task has been deleted successfully.';
+
+$labels['arialabelsortmenu'] = 'Tasks sorting options';
diff --git a/plugins/tasklist/skins/larry/sprites.png b/plugins/tasklist/skins/larry/sprites.png
index 144657392c5c5d51bdff1d720a9ed073e31a2108..fecbd58909f52b287e4524dc3e8fd13a62546cc0 100644
GIT binary patch
literal 6500
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
KMNUMnLSTaD32S@+

literal 5007
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
Z{tt`ukJwX#pLzfQ002ovPDHLkV1kB*j9LHy

diff --git a/plugins/tasklist/skins/larry/tasklist.css b/plugins/tasklist/skins/larry/tasklist.css
index 3b0e403a..824f6053 100644
--- a/plugins/tasklist/skins/larry/tasklist.css
+++ b/plugins/tasklist/skins/larry/tasklist.css
@@ -507,13 +507,14 @@ body.tasklist.attachmentwin #mainscreen {
 	cursor: pointer;
 }
 
-.buttonbar-right .listmenu .inner {
-	display: inline-block;
-	height: 18px;
-	width: 20px;
+.buttonbar-right a.iconbutton {
 	padding: 0;
-	background: url(sprites.png) 0 -237px no-repeat;
-	text-indent: -5000px;
+	background-image: url(sprites.png);
+	background-position: 0 -238px;
+}
+
+.buttonbar-right a.iconbutton.sorting {
+	background-position: -18px -347px;
 }
 
 #thelist {
@@ -728,7 +729,8 @@ body.tasklist.attachmentwin #mainscreen {
 
 ul.toolbarmenu li span.add,
 ul.toolbarmenu li span.expand,
-ul.toolbarmenu li span.collapse {
+ul.toolbarmenu li span.collapse,
+ul.toolbarmenu.iconized .selected span.icon {
 	background-image: url(sprites.png);
 }
 
@@ -748,6 +750,14 @@ ul.toolbarmenu li span.delete {
 	background-position: 0 -1508px;
 }
 
+ul.toolbarmenu.iconized .selected span.icon {
+	background-position: 0 -324px;
+}
+
+ul.toolbarmenu .sortcol.by-auto a {
+	font-style: italic;
+}
+
 .taskitem-draghelper {
 /*
 	width: 32px;
@@ -975,6 +985,10 @@ div.form-section {
 	margin-bottom: 0.3em;
 }
 
+.tasklistview div.form-section span.task-text + label {
+	margin-left: 2em;
+}
+
 label.block {
 	display: block;
 	margin-bottom: 0.3em;
diff --git a/plugins/tasklist/skins/larry/templates/mainview.html b/plugins/tasklist/skins/larry/templates/mainview.html
index 5f6831f9..124af6b6 100644
--- a/plugins/tasklist/skins/larry/templates/mainview.html
+++ b/plugins/tasklist/skins/larry/templates/mainview.html
@@ -97,12 +97,31 @@
 			</ul>
 
 			<div class="buttonbar-right">
-				<roundcube:button name="taskviewmenulink" id="taskviewmenulink" type="link" title="tasklist.viewoptions" class="listmenu viewoptions" onclick="return UI.toggle_popup('taskviewmenu',event)" innerClass="inner" label="tasklist.viewoptions" aria-haspopup="true" aria-expanded="false" aria-owns="taskviewmenu-menu" />
+				<roundcube:button name="taskviewactionslink" id="taskviewactionslink" type="link" title="tasklist.viewactions" class="iconbutton viewactions" onclick="return UI.toggle_popup('taskviewactions',event)" label="tasklist.viewactions" aria-haspopup="true" aria-expanded="false" aria-owns="taskviewactions-menu" />
+				<roundcube:button name="taskviewsortmenulink" id="taskviewsortmenulink" type="link" title="sortby" class="iconbutton sorting" onclick="return UI.toggle_popup('taskviewsortmenu',event)" label="sortby" aria-haspopup="true" aria-expanded="false" aria-owns="taskviewsortmenu-menu" />
 			</div>
 
-			<div id="taskviewmenu" class="popupmenu" aria-hidden="true">
-				<h3 id="aria-label-taskviewmenu" class="voice"><roundcube:label name="tasklist.viewoptions" /></h3>
-				<ul class="toolbarmenu" id="taskviewmenu-menu" role="menu" aria-labelledby="aria-label-taskviewmenu">
+			<div id="taskviewsortmenu" class="popupmenu" aria-hidden="true" data-align="right">
+				<h3 id="aria-label-taskviewsortmenu" class="voice"><roundcube:label name="tasklist.arialabelsortmenu" /></h3>
+				<ul class="toolbarmenu iconized" id="taskviewsortmenu-menu" role="menu" aria-labelledby="aria-label-taskviewsortmenu">
+					<ul role="radiogroup" aria-label="<roundcube:label name='sortby' />">
+						<li><roundcube:button command="list-sort" prop="auto" type="link" label="tasklist.auto" role="radio" aria-checked="false" class="sortcol by-auto icon active" innerclass="icon" /></li>
+						<li><roundcube:button command="list-sort" prop="datetime" type="link" label="tasklist.datetime" role="radio" aria-checked="false" class="sortcol by-datetime icon active" innerclass="icon" /></li>
+						<li><roundcube:button command="list-sort" prop="startdatetime" type="link" label="tasklist.start" role="radio" aria-checked="false" class="sortcol by-startdatetime icon active" innerclass="icon" /></li>
+						<li><roundcube:button command="list-sort" prop="flagged" type="link" label="tasklist.flagged" role="radio" aria-checked="false" class="sortcol by-flagged icon active" innerclass="icon" /></li>
+						<li><roundcube:button command="list-sort" prop="complete" type="link" label="tasklist.completeness" role="radio" aria-checked="false" class="sortcol by-complete icon active" innerclass="icon" /></li>
+						<li><roundcube:button command="list-sort" prop="changed" type="link" label="tasklist.changed" role="radio" aria-checked="false" class="sortcol by-changed icon active" innerclass="icon" /></li>
+					</ul>
+					<li role="separator" class="separator"><label id="aria-label-taskviewsortorder"><roundcube:label name="listorder" /></label></li>
+					<ul role="radiogroup" aria-labelledby="aria-label-taskviewsortorder">
+						<li><roundcube:button command="list-order" prop="asc" type="link" label="sortasc" role="radio" aria-checked="false" class="sortorder asc icon" classAct="icon sortorder asc active" innerclass="icon" /></li>
+						<li><roundcube:button command="list-order" prop="desc" type="link" label="sortdesc" role="radio" aria-checked="false" class="sortorder desc icon" classAct="icon sortorder desc active" innerclass="icon" /></li>
+					</ul>
+				</ul>
+			</div>
+			<div id="taskviewactions" class="popupmenu" aria-hidden="true" data-align="right">
+				<h3 id="aria-label-taskviewactions" class="voice"><roundcube:label name="tasklist.viewactions" /></h3>
+				<ul class="toolbarmenu" id="taskviewactions-menu" role="menu" aria-labelledby="aria-label-taskviewactions">
 					<li role="menuitem"><roundcube:button command="expand-all" label="expand-all" class="icon" classAct="icon active" innerclass="icon expand" /></li>
 					<li role="menuitem"><roundcube:button command="collapse-all" label="collapse-all" class="icon" classAct="icon active" innerclass="icon collapse" /></li>
 				</ul>
diff --git a/plugins/tasklist/tasklist.js b/plugins/tasklist/tasklist.js
index 76e6313d..91a05372 100644
--- a/plugins/tasklist/tasklist.js
+++ b/plugins/tasklist/tasklist.js
@@ -256,6 +256,13 @@ function rcube_tasklist_ui(settings)
             setTimeout(fetch_counts, 200);
         });
 
+        rcmail.register_command('list-sort', list_set_sort, true);
+        rcmail.register_command('list-order', list_set_order, (settings.sort_col || 'auto') != 'auto');
+
+        $('#taskviewsortmenu .by-' + (settings.sort_col || 'auto')).attr('aria-checked', 'true').addClass('selected');
+        $('#taskviewsortmenu .sortorder.' + (settings.sort_order || 'asc')).attr('aria-checked', 'true').addClass('selected');
+
+
         // start loading tasks
         fetch_counts();
         list_tasks();
@@ -743,6 +750,9 @@ function rcube_tasklist_ui(settings)
                 listdata[listdata[id].parent_id].children.push(id);
         }
 
+        // sort index before rendering
+        listindex.sort(function(a, b) { return task_cmp(listdata[a], listdata[b]); });
+
         append_tags(response.tags || []);
         render_tasklist();
 
@@ -1016,6 +1026,14 @@ function rcube_tasklist_ui(settings)
             }
         }
 
+        // copy _depth property from old rec or derive from parent
+        if (rec.parent_id && listdata[rec.parent_id]) {
+            rec._depth = (listdata[rec.parent_id]._depth || 0) + 1;
+        }
+        else if (oldrec) {
+            rec._depth = oldrec._depth || 0;
+        }
+
         if (list.active || rec.tempid) {
             if (!filter || match_filter(rec, {}))
                 render_task(rec, oldid);
@@ -1294,10 +1312,33 @@ function rcube_tasklist_ui(settings)
      */
     function task_cmp(a, b)
     {
-        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;
+        // sort by hierarchy level first
+        if ((a._depth || 0) != (b._depth || 0))
+            return a._depth - b._depth;
+
+        var p, alt, inv = 1, c = is_complete(a) - is_complete(b), d = c;
+
+        // completed tasks always move to the end
+        if (c != 0)
+            return c;
+
+        // custom sorting
+        if (settings.sort_col && settings.sort_col != 'auto') {
+            alt = settings.sort_col == 'datetime' || settings.sort_col == 'startdatetime' ? 99999999999 : 0
+            d = (a[settings.sort_col]||alt) - (b[settings.sort_col]||alt);
+            inv = settings.sort_order == 'desc' ? -1 : 1;
+        }
+        // default sorting (auto)
+        else {
+            if (!d) d = (b._hasdate-0) - (a._hasdate-0);
+            if (!d) d = (a.datetime||99999999999) - (b.datetime||99999999999);
+        }
+
+        // fall-back to created/changed date
+        if (!d) d = (a.created||0) - (b.created||0);
+        if (!d) d = (a.changed||0) - (b.changed||0);
+
+        return d * inv;
     }
 
     /**
@@ -1688,6 +1729,12 @@ function rcube_tasklist_ui(settings)
             $('#task-recurrence').hide();
         }
 
+        if (rec.created || rec.changed) {
+            $('#task-created-changed .task-created').html(Q(rec.created_ || rcmail.gettext('unknown','tasklist')))
+            $('#task-created-changed .task-changed').html(Q(rec.changed_ || rcmail.gettext('unknown','tasklist')))
+            $('#task-created-changed').show()
+        }
+
         // build attachments list
         $('#task-attachments').hide();
         if ($.isArray(rec.attachments)) {
@@ -2179,12 +2226,12 @@ function rcube_tasklist_ui(settings)
     /**
      *
      */
-    var remove_attachment = function(elem, id)
+    function remove_attachment(elem, id)
     {
         $(elem.parentNode).hide();
         me.selected_task.deleted_attachments.push(id);
         delete rcmail.env.attachments[id];
-    };
+    }
 
     /**
      *
@@ -2363,6 +2410,45 @@ function rcube_tasklist_ui(settings)
         return $.unqiqueStrings(itags);
     }
 
+    /**
+     * Change tasks list sorting
+     */
+    function list_set_sort(col)
+    {
+        if (settings.sort_col != col) {
+          settings.sort_col = col;
+          $('#taskviewsortmenu .sortcol').attr('aria-checked', 'false').removeClass('selected')
+              .filter('.by-' + col).attr('aria-checked', 'true').addClass('selected');
+
+          // re-sort list index and re-render list
+          listindex.sort(function(a, b) { return task_cmp(listdata[a], listdata[b]); });
+          render_tasklist();
+
+          rcmail.enable_command('list-order', settings.sort_col != 'auto');
+          $('#taskviewsortmenu .sortorder').removeClass('selected').filter('[aria-checked=true]').addClass('selected');
+
+          rcmail.save_pref({ name: 'tasklist_sort_col', value: (col == 'auto' ? '' : col) });
+        }
+    }
+
+    /**
+     * Change tasks list sort order
+     */
+    function list_set_order(order)
+    {
+        if (settings.sort_order != order) {
+          settings.sort_order = order;
+          $('#taskviewsortmenu .sortorder').attr('aria-checked', 'false').removeClass('selected')
+              .filter('.' + order).attr('aria-checked', 'true').addClass('selected');
+
+          // re-sort list index and re-render list
+          listindex.sort(function(a, b) { return task_cmp(listdata[a], listdata[b]); });
+          render_tasklist();
+
+          rcmail.save_pref({ name: 'tasklist_sort_order', value: order });
+        }
+    }
+
     /**
      *
      */
diff --git a/plugins/tasklist/tasklist.php b/plugins/tasklist/tasklist.php
index 35c59eea..7894b102 100644
--- a/plugins/tasklist/tasklist.php
+++ b/plugins/tasklist/tasklist.php
@@ -51,6 +51,8 @@ class tasklist extends rcube_plugin
     );
 
     public $task = '?(?!login|logout).*';
+    public $allowed_prefs = array('tasklist_sort_col','tasklist_sort_order');
+
     public $rc;
     public $lib;
     public $driver;
@@ -959,9 +961,8 @@ class tasklist extends rcube_plugin
                 $data[] = $rec;
         }
 
-        // sort tasks according to their hierarchy level and due date
+        // assign hierarchy level indicators for later sorting
         array_walk($data, array($this, 'task_walk_tree'));
-        usort($data, array($this, 'task_sort_cmp'));
 
         return $data;
     }
@@ -974,7 +975,18 @@ class tasklist extends rcube_plugin
         $rec['mask'] = $this->filter_mask($rec);
         $rec['flagged'] = intval($rec['flagged']);
         $rec['complete'] = floatval($rec['complete']);
-        $rec['changed'] = is_object($rec['changed']) ? $rec['changed']->format('U') : null;
+
+        if (is_object($rec['created'])) {
+            $rec['created_'] = $this->rc->format_date($rec['created']);
+            $rec['created'] = $rec['created']->format('U');
+        }
+        if (is_object($rec['changed'])) {
+            $rec['changed_'] = $this->rc->format_date($rec['changed']);
+            $rec['changed'] = $rec['changed']->format('U');
+        }
+        else {
+            $rec['changed'] = null;
+        }
 
         if ($rec['date']) {
             try {
@@ -1045,18 +1057,6 @@ class tasklist extends rcube_plugin
         }
     }
 
-    /**
-     * Compare function for task list sorting.
-     * Nested tasks need to be sorted to the end.
-     */
-    private function task_sort_cmp($a, $b)
-    {
-        $d = $a['_depth'] - $b['_depth'];
-        if (!$d) $d = $b['_hasdate'] - $a['_hasdate'];
-        if (!$d) $d = $a['datetime'] - $b['datetime'];
-        return $d;
-    }
-
     /**
      * Compute the filter mask of the given task
      *
diff --git a/plugins/tasklist/tasklist_ui.php b/plugins/tasklist/tasklist_ui.php
index 5b10df4c..f3a2bb63 100644
--- a/plugins/tasklist/tasklist_ui.php
+++ b/plugins/tasklist/tasklist_ui.php
@@ -72,6 +72,8 @@ class tasklist_ui
         $settings = array();
 
         $settings['invite_shared'] = (int)$this->rc->config->get('calendar_allow_invite_shared', 0);
+        $settings['sort_col']      = $this->rc->config->get('tasklist_sort_col', '');
+        $settings['sort_order']    = $this->rc->config->get('tasklist_sort_order', 'asc');
 
         // get user identity to create default attendee
         foreach ($this->rc->user->list_identities() as $rec) {