krikkert/habitica
1
0
Fork 0
mirror of https://github.com/HabitRPG/habitica.git synced 2025-12-17 14:47:53 +01:00
Code Issues Packages Projects Releases Wiki Activity

Tasks score notes (#8507)

Browse Source 
* Added setting and modal for score notes

* Added persistent score notes

* Fixed linting issues and documented new field

* Added max length to task score notes

* Added check for score notes existence

* Combined tasks perferences
This commit is contained in:
Keith Holliday
2017-02-27 14:56:34 -07:00
committed by GitHub
parent 68a042cdb9
commit 93befcebcc
12 changed files with 102 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
website/client-old/js/controllers/tasksCtrl.js
View File

@@ -1,7 +1,7 @@
"use strict";
habitrpg.controller("TasksCtrl", ['$scope', '$rootScope', '$location', 'User','Notification', '$http', 'ApiUrl', '$timeout', 'Content', 'Shared', 'Guide', 'Tasks', 'Analytics',
function($scope, $rootScope, $location, User, Notification, $http, ApiUrl, $timeout, Content, Shared, Guide, Tasks, Analytics) {
habitrpg.controller("TasksCtrl", ['$scope', '$rootScope', '$location', 'User','Notification', '$http', 'ApiUrl', '$timeout', 'Content', 'Shared', 'Guide', 'Tasks', 'Analytics', '$modal',
function($scope, $rootScope, $location, User, Notification, $http, ApiUrl, $timeout, Content, Shared, Guide, Tasks, Analytics, $modal) {
$scope.obj = User.user; // used for task-lists
$scope.user = User.user;
@@ -11,7 +11,7 @@ habitrpg.controller("TasksCtrl", ['$scope', '$rootScope', '$location', 'User','N
return Shared.count.remainingGearInSet(gear, 'armoire');
};
$scope.score = function(task, direction) {
function scoreTask (task, direction) {
switch (task.type) {
case 'reward':
playRewardSound(task);
@@ -26,8 +26,36 @@ habitrpg.controller("TasksCtrl", ['$scope', '$rootScope', '$location', 'User','N
if (direction === 'down') $rootScope.playSound('Minus_Habit');
else if (direction === 'up') $rootScope.playSound('Plus_Habit');
}
User.score({params:{task: task, direction:direction}});
User.score({
params: {
task: task,
direction:direction
},
body: {
scoreNotes: task.scoreNotes,
},
});
Analytics.updateUser();
}
$scope.score = function(task, direction) {
if (!User.user.preferences.tasks.confirmScoreNotes) return scoreTask(task, direction);
$modal.open({
templateUrl: 'modals/task-notes.html',
controller: function ($scope, task) {
$scope.task = task;
},
resolve: {
task: function() {
return task;
}
}
}).result.then(function(result) {
task = result;
if (!task) return;
scoreTask(task, direction);
});
};
function addUserTasks(listDef, tasks) {