sudoxreboot/habitica
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica.git synced 2026-07-13 15:38:59 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #5021 from Alys/revert-4996-Sort-dated-todos

Browse source 
revert PR #4996 (Sort dated todos) because of problems sorting other tasks
This commit is contained in:
Alys 2015-04-13 20:24:27 +10:00
commit e7775c1d82
4 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
common/locales/en/tasks.json
View file

@ -44,6 +44,7 @@
"remaining": "Active", "remaining": "Active",
"complete": "Done", "complete": "Done",
"dated": "Dated", "dated": "Dated",
"datedNotSorted": "Dated To-Dos are NOT sorted by date. Sorting will probably be implemented in future.",
"due": "Due", "due": "Due",
"grey": "Grey", "grey": "Grey",
"score": "Score", "score": "Score",

4
website/public/js/controllers/tasksCtrl.js
View file

@ -84,9 +84,9 @@ habitrpg.controller("TasksCtrl", ['$scope', '$rootScope', '$location', 'User','N
} }
}; };
$scope.removeTask = function(task) { $scope.removeTask = function(list, $index) {
if (!confirm(window.env.t('sureDelete'))) return; if (!confirm(window.env.t('sureDelete'))) return;
User.user.ops.deleteTask({params:{id:task.id}}) User.user.ops.deleteTask({params:{id:list[$index].id}})
}; };
$scope.saveTask = function(task, stayOpen, isSaveAndClose) { $scope.saveTask = function(task, stayOpen, isSaveAndClose) {

2
website/views/shared/tasks/lists.jade
View file

@ -66,7 +66,7 @@ script(id='templates/habitrpg-tasks.html', type="text/ng-template")
ul.task-filter ul.task-filter
li(ng-class='{active: list.view == "remaining"}') li(ng-class='{active: list.view == "remaining"}')
a(ng-click='list.view = "remaining"')=env.t('remaining') a(ng-click='list.view = "remaining"')=env.t('remaining')
li(ng-class='{active: list.view == "dated"}') li(ng-class='{active: list.view == "dated"}', tooltip=env.t('datedNotSorted'))
a(ng-click='list.view = "dated"')=env.t('dated') a(ng-click='list.view = "dated"')=env.t('dated')
li(ng-class='{active: list.view == "complete"}') li(ng-class='{active: list.view == "complete"}')
a(ng-click='list.view = "complete"')=env.t('complete') a(ng-click='list.view = "complete"')=env.t('complete')

6
website/views/shared/tasks/task.jade
View file

@ -1,4 +1,4 @@
li(bindonce='list', id='task-{{::task.id}}', ng-repeat='task in obj[list.type+"s"] | orderBy:(list.view == "dated" ? "date" : null)', class='task {{Shared.taskClasses(task, user.filters, user.preferences.dayStart, user.lastCron, list.showCompleted, main)}}', ng-click='spell && (list.type != "reward") && castEnd(task, "task", $event)', ng-class='{"cast-target":spell && (list.type != "reward"), "locked-task":obj._locked === true}', popover-trigger='mouseenter', data-popover-html="{{task.notes | markdown}}", popover-placement="top", popover-append-to-body='{{::modal ? "false":"true"}}', ng-show='shouldShow(task, list, user.preferences)') li(bindonce='list', id='task-{{::task.id}}', ng-repeat='task in obj[list.type+"s"]', class='task {{Shared.taskClasses(task, user.filters, user.preferences.dayStart, user.lastCron, list.showCompleted, main)}}', ng-click='spell && (list.type != "reward") && castEnd(task, "task", $event)', ng-class='{"cast-target":spell && (list.type != "reward"), "locked-task":obj._locked === true}', popover-trigger='mouseenter', data-popover-html="{{task.notes | markdown}}", popover-placement="top", popover-append-to-body='{{::modal ? "false":"true"}}', ng-show='shouldShow(task, list, user.preferences)')
// right-hand side control buttons // right-hand side control buttons
.task-meta-controls .task-meta-controls
@ -44,7 +44,7 @@ li(bindonce='list', id='task-{{::task.id}}', ng-repeat='task in obj[list.type+"s
span.glyphicon.glyphicon-bullhorn(tooltip=env.t('challenge')) span.glyphicon.glyphicon-bullhorn(tooltip=env.t('challenge'))
|   |  
// delete // delete
a(ng-if='!task.challenge.id', ng-click='removeTask(task)', tooltip=env.t('delete')) a(ng-if='!task.challenge.id', ng-click='removeTask(obj[list.type+"s"], $index)', tooltip=env.t('delete'))
span.glyphicon.glyphicon-trash span.glyphicon.glyphicon-trash
|   |  
@ -101,7 +101,7 @@ li(bindonce='list', id='task-{{::task.id}}', ng-repeat='task in obj[list.type+"s
p p
a(ng-click='unlink(task, "keep")')=env.t('keepIt') a(ng-click='unlink(task, "keep")')=env.t('keepIt')
|    |   
a(ng-click="removeTask(task)")=env.t('removeIt') a(ng-click="removeTask(obj[list.type+'s'], $index)")=env.t('removeIt')
div(ng-if='task.challenge.broken=="CHALLENGE_DELETED"') div(ng-if='task.challenge.broken=="CHALLENGE_DELETED"')
p p
|  |