Skip to content

[WIP] Manual sorting #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 3 commits into from
Closed

[WIP] Manual sorting #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e725a86
Show manual sort option
Sep 2, 2016
46473e1
Enable manually sorting root tasks
Sep 3, 2016
22be85f
Fix already defined variables
Sep 8, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion css/style.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1562,7 +1562,8 @@ ol[dnd-list] .copy.dndDraggingSource {
ol[dnd-list] .dndPlaceholder {
display: block;
background-color: #ddd;
min-height: 37px;
min-height: 36px;
height: 36px;
}
.dropzone-visible > ol[dnd-list] {
min-height: 50px;
Expand Down
32 changes: 27 additions & 5 deletions js/app/controllers/taskscontroller.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -344,7 +344,7 @@
case 'alphabetically':
return 'summary';
case 'manual':
return 'manual';
return 'manualSort';
default:
return ['completed', _$scope.sortDue, '-priority', _$scope.sortStart, 'summary'];
}
Expand All @@ -357,10 +357,10 @@
_settingsbusinesslayer.set('various', 'sortDirection', _$scope.settingsmodel.getById('various').sortDirection);
};

this._$scope.dropAsSubtask = function($event, item, index) {
this._$scope.dropAsSubtask = function($event, task, index, tasks) {
if ($event.dataTransfer.dropEffect === 'move') {
var parentID = $($event.target).closest('.task-item').attr('taskID');
var task = _$tasksmodel.getByUri(item.uri);
task = _$tasksmodel.getByUri(task.uri);
var parent = _$tasksmodel.getByUri(parentID);
_tasksbusinesslayer.changeParent(task, parent);
}
Expand All @@ -369,9 +369,10 @@

};

this._$scope.dropAsRootTask = function($event, item, index) {
this._$scope.dropAsRootTask = function($event, task, index, tasks) {
if ($event.dataTransfer.dropEffect === 'move') {
var task = _$tasksmodel.getByUri(item.uri);
task = _$tasksmodel.getByUri(task.uri);
_$scope.reorderTasks(tasks, task, index);
var collectionID = $($event.target).closest('ol[dnd-list]').attr('collectionID');
var calendarID = $($event.target).closest('ol[dnd-list]').attr('calendarID');
var newCalendar = _$listsmodel.getByUri(calendarID);
Expand All @@ -384,6 +385,27 @@
return true;
};

this._$scope.reorderTasks = function(tasks, task, index) {
if (index > 0) {
task.manualSort = tasks[index-1].manualSort+1;
} else {
task.manualSort = tasks[index].manualSort;
}
if (task.manualSort >= tasks[index].manualSort) {
for (var jj = index; jj<tasks.length; jj++) {
if (tasks[jj] === task) {
break;
}
_tasksbusinesslayer.incrementOrder(tasks[jj]);
if (jj<tasks.length-1) {
if (tasks[jj].manualSort < tasks[jj+1].manualSort) {
break;
}
}
}
}
};

this._$scope.dragover = function($event, item, index) {
$('.subtasks-container').removeClass('dropzone-visible');
var calendarID = $($event.target).closest('ol[dnd-list]').attr('calendarID');
Expand Down
7 changes: 7 additions & 0 deletions js/app/services/businesslayer/tasksbusinesslayer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,13 @@ angular.module('Tasks').factory('TasksBusinessLayer', [
}
};

TasksBusinessLayer.prototype.incrementOrder = function(task) {
if (task.calendar.writable) {
task.manualSort++;
this.doUpdate(task);
}
};

TasksBusinessLayer.prototype.setPercentComplete = function(task, percentComplete) {
if (task.calendar.writable) {
if (percentComplete < 100) {
Expand Down
28 changes: 28 additions & 0 deletions js/app/services/models/vtodo.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -224,6 +224,34 @@ angular.module('Tasks').factory('VTodo', ['$filter', 'ICalFactory', 'RandomStrin
get comments() {
return null;
},
get manualSort() {
var vtodos = this.components.getAllSubcomponents('vtodo');
var order = vtodos[0].getFirstPropertyValue('x-apple-sort-order');
if (order === null) {
order = this.created.subtractDate(
new ICAL.Time({
year: 2001,
month: 1,
day: 1,
hour: 0,
minute: 0,
second: 0,
isDate: false
})
).toSeconds();
}
return +order;
},
set manualSort(order) {
var vtodos = this.components.getAllSubcomponents('vtodo');
vtodos[0].updatePropertyWithValue('x-apple-sort-order', order);
this.updateLastModified();
this.data = this.components.toString();
},
get created() {
var vtodos = this.components.getAllSubcomponents('vtodo');
return vtodos[0].getFirstPropertyValue('created');
},
get loadedCompleted () {
return this.loaded;
},
Expand Down
67 changes: 62 additions & 5 deletions js/public/app.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1223,7 +1223,7 @@ angular.module('Tasks').controller('SettingsController', [
case 'alphabetically':
return 'summary';
case 'manual':
return 'manual';
return 'manualSort';
default:
return ['completed', _$scope.sortDue, '-priority', _$scope.sortStart, 'summary'];
}
Expand All @@ -1236,10 +1236,10 @@ angular.module('Tasks').controller('SettingsController', [
_settingsbusinesslayer.set('various', 'sortDirection', _$scope.settingsmodel.getById('various').sortDirection);
};

this._$scope.dropAsSubtask = function($event, item, index) {
this._$scope.dropAsSubtask = function($event, task, index, tasks) {
if ($event.dataTransfer.dropEffect === 'move') {
var parentID = $($event.target).closest('.task-item').attr('taskID');
var task = _$tasksmodel.getByUri(item.uri);
task = _$tasksmodel.getByUri(task.uri);
var parent = _$tasksmodel.getByUri(parentID);
_tasksbusinesslayer.changeParent(task, parent);
}
Expand All @@ -1248,9 +1248,10 @@ angular.module('Tasks').controller('SettingsController', [

};

this._$scope.dropAsRootTask = function($event, item, index) {
this._$scope.dropAsRootTask = function($event, task, index, tasks) {
if ($event.dataTransfer.dropEffect === 'move') {
var task = _$tasksmodel.getByUri(item.uri);
task = _$tasksmodel.getByUri(task.uri);
_$scope.reorderTasks(tasks, task, index);
var collectionID = $($event.target).closest('ol[dnd-list]').attr('collectionID');
var calendarID = $($event.target).closest('ol[dnd-list]').attr('calendarID');
var newCalendar = _$listsmodel.getByUri(calendarID);
Expand All @@ -1263,6 +1264,27 @@ angular.module('Tasks').controller('SettingsController', [
return true;
};

this._$scope.reorderTasks = function(tasks, task, index) {
if (index > 0) {
task.manualSort = tasks[index-1].manualSort+1;
} else {
task.manualSort = tasks[index].manualSort;
}
if (task.manualSort >= tasks[index].manualSort) {
for (var jj = index; jj<tasks.length; jj++) {
if (tasks[jj] === task) {
break;
}
_tasksbusinesslayer.incrementOrder(tasks[jj]);
if (jj<tasks.length-1) {
if (tasks[jj].manualSort < tasks[jj+1].manualSort) {
break;
}
}
}
}
};

this._$scope.dragover = function($event, item, index) {
$('.subtasks-container').removeClass('dropzone-visible');
var calendarID = $($event.target).closest('ol[dnd-list]').attr('calendarID');
Expand Down Expand Up @@ -2056,6 +2078,13 @@ angular.module('Tasks').factory('TasksBusinessLayer', [
}
};

TasksBusinessLayer.prototype.incrementOrder = function(task) {
if (task.calendar.writable) {
task.manualSort++;
this.doUpdate(task);
}
};

TasksBusinessLayer.prototype.setPercentComplete = function(task, percentComplete) {
if (task.calendar.writable) {
if (percentComplete < 100) {
Expand Down Expand Up @@ -4262,6 +4291,34 @@ angular.module('Tasks').factory('VTodo', ['$filter', 'ICalFactory', 'RandomStrin
get comments() {
return null;
},
get manualSort() {
var vtodos = this.components.getAllSubcomponents('vtodo');
var order = vtodos[0].getFirstPropertyValue('x-apple-sort-order');
if (order === null) {
order = this.created.subtractDate(
new ICAL.Time({
year: 2001,
month: 1,
day: 1,
hour: 0,
minute: 0,
second: 0,
isDate: false
})
).toSeconds();
}
return +order;
},
set manualSort(order) {
var vtodos = this.components.getAllSubcomponents('vtodo');
vtodos[0].updatePropertyWithValue('x-apple-sort-order', order);
this.updateLastModified();
this.data = this.components.toString();
},
get created() {
var vtodos = this.components.getAllSubcomponents('vtodo');
return vtodos[0].getFirstPropertyValue('created');
},
get loadedCompleted () {
return this.loaded;
},
Expand Down
4 changes: 2 additions & 2 deletions templates/main.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -201,13 +201,13 @@ class="collection"
<span class="sort-indicator" ng-class="{'icon-triangle-n': settingsmodel.getById('various').sortDirection, 'icon-triangle-s': !settingsmodel.getById('various').sortDirection}"></span>
</span>
</li>
<!-- <li ng-click="setSortOrder($event, 'manual')" ng-class="{active: settingsmodel.getById('various').sortOrder == 'manual'}">
<li ng-click="setSortOrder($event, 'manual')" ng-class="{active: settingsmodel.getById('various').sortOrder == 'manual'}">
<span>
<span class="icon sort-manual"></span>
<span><?php p($l->t('Manually')); ?></span>
<span class="sort-indicator" ng-class="{'icon-triangle-n': settingsmodel.getById('various').sortDirection, 'icon-triangle-s': !settingsmodel.getById('various').sortDirection}"></span>
</span>
</li> -->
</li>
</ul>
</div>
<div class="task-list">
Expand Down
3 changes: 2 additions & 1 deletion templates/part.taskbody.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
<a ng-show="route.collectionID=='week'" class="listname" >{{ task.calendar.displayname }}</a>
<div class="title-wrapper">
<span class="title" ng-bind-html="task.summary | linky:'_blank':{rel: 'nofollow'}"></span>
<span class="title">{{task.manualSort}}</span>
<span class="categories-list">
<ul>
<li ng-repeat="category in task.categories"><span>{{ category }}</span></li>
Expand All @@ -34,7 +35,7 @@
ng-class="{subtaskshidden: hideSubtasks(task)}">
<ol dnd-list="draggedTasks"
calendarID="{{task.calendar.uri}}"
dnd-drop="dropAsSubtask(event, item, index)"
dnd-drop="dropAsSubtask(event, item, index, getSubTasks(filtered,task))"
dnd-dragover="dragover(event, index)">
<li class="task-item ui-draggable handler add-subtask"
ng-show="status.addSubtaskTo == task.uid">
Expand Down
8 changes: 4 additions & 4 deletions templates/part.tasklist.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@
collectionID="uncompleted"
type="list"
dnd-list="draggedTasks"
dnd-drop="dropAsRootTask(event, item, index)"
dnd-drop="dropAsRootTask(event, item, index, selectionIncomplete)"
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:getSortOrder():settingsmodel.getById('various').sortDirection"
ng-repeat="task in selectionIncomplete = (filtered = filteredTasks() | filter:hasNoParent(task) | filter:filterTasks(task,route.calendarID) | filter:{'completed':'false'} | orderBy:getSortOrder():settingsmodel.getById('various').sortDirection)"
ng-click="openDetails(task.uri,$event)"
ng-class="{done: task.completed}"
dnd-draggable="task"
Expand All @@ -29,11 +29,11 @@
collectionID="completed"
type="list"
dnd-list="draggedTasks"
dnd-drop="dropAsRootTask(event, item, index)"
dnd-drop="dropAsRootTask(event, item, index, selectionComplete)"
dnd-dragover="dragover(event, index)">
<li class="task-item handler"
taskID="{{ task.uri }}"
ng-repeat="task in filtered = filteredTasks() | filter:hasNoParent(task) | filter:filterTasks(task,route.calendarID) | filter:{'completed':true} | orderBy:'completed_date':true"
ng-repeat="task in selectionComplete = (filtered = filteredTasks() | filter:hasNoParent(task) | filter:filterTasks(task,route.calendarID) | filter:{'completed':true} | orderBy:'completed_date':true)"
ng-click="openDetails(task.uri,$event)"
ng-class="{done: task.completed}"
dnd-draggable="task"
Expand Down