wbrawner/tasks
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #349 from korelstar/fixing-task-order

Browse source 
Fixing and Harmonizing Sorting of Tasks
This commit is contained in:
raimund-schluessler 2016-08-25 19:31:22 +02:00 committed by GitHub
commit 372792db6f
4 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
templates/part.collectionall.php
View file

@ -14,7 +14,7 @@
<li class="task-item ui-draggable handler"
taskID="{{task.uri}}"
ng-animate="'animate'"
ng-repeat="task in filtered = filteredTasks() | filter:hasNoParent(task) | filter:filterTasks(task,calendar.uri) | filter:filterTasks(task,route.collectionID) | orderBy:sortDue | orderBy:'priority':true | orderBy:'completed_date':true"
ng-repeat="task in filtered = filteredTasks() | filter:hasNoParent(task) | filter:filterTasks(task,calendar.uri) | filter:filterTasks(task,route.collectionID) | orderBy:[sortDue,'-priority','-completed','start','summary']"
ng-click="openDetails(task.uri,$event)"
ng-class="{done: task.completed}"
dnd-draggable="task"

2
templates/part.collectionweek.php
View file

@ -13,7 +13,7 @@
<li class="task-item ui-draggable handler"
taskID="{{task.uri}}"
ng-animate="'animate'"
ng-repeat="task in filtered = filteredTasks() | filter:taskAtDay(task,day) | filter:hasNoParent(task) | filter:{'completed':'false'} | orderBy:sortDue | orderBy:'priority':true"
ng-repeat="task in filtered = filteredTasks() | filter:taskAtDay(task,day) | filter:hasNoParent(task) | filter:{'completed':'false'} | orderBy:[sortDue,'-priority','-completed','start','summary']"
ng-click="openDetails(task.uri,$event)"
ng-class="{done: task.completed}"
dnd-draggable="task"

2
templates/part.taskbody.php
View file

@ -49,7 +49,7 @@
</li>
<li taskID="{{ task.uri }}"
class="task-item ui-draggable handler subtask"
ng-repeat="task in getSubTasks(filtered,task) | orderBy:'1*id':true | orderBy:'priority':true | orderBy:'completed':false"
ng-repeat="task in getSubTasks(filtered,task) | orderBy:[sortDue,'-priority','-completed','start','summary']"
ng-click="openDetails(task.uri,$event)"
ng-class="{done: task.completed}"
ng-include="'part.taskbody'"

2
templates/part.tasklist.php
View file

@ -11,7 +11,7 @@
dnd-dragover="dragover(event, index)">
<li class="task-item ui-draggable handler"
taskID="{{ task.uri }}"
ng-repeat="task in filtered = filteredTasks() | filter:hasNoParent(task) | filter:filterTasks(task,route.calendarID) | filter:{'completed':'false'} | orderBy:'1*id':true | orderBy:sortDue | orderBy:'priority':true"
ng-repeat="task in filtered = filteredTasks() | filter:hasNoParent(task) | filter:filterTasks(task,route.calendarID) | filter:{'completed':'false'} | orderBy:[sortDue,'-priority','-completed','start','summary']"
ng-click="openDetails(task.uri,$event)"
ng-class="{done: task.completed}"
dnd-draggable="task"