sudoxreboot/habitica
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica.git synced 2026-08-04 09:39:23 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Added next due date

Browse source
This commit is contained in:
Keith Holliday 2017-05-18 10:42:11 -06:00
parent 1d93943458
commit a5e0e171cc
3 changed files with 16 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
website/client-old/js/services/taskServices.js
View file

@ -294,6 +294,7 @@ angular.module('habitrpg')
$scope.$watch('task._edit', function (newValue, oldValue) { $scope.$watch('task._edit', function (newValue, oldValue) {
if ($scope.task.type !== 'daily' || !task._edit) return; if ($scope.task.type !== 'daily' || !task._edit) return;
$scope.summary = generateSummary($scope.task); $scope.summary = generateSummary($scope.task);
$scope.nextDue = generateNextDue($scope.task);
$scope.repeatSuffix = generateRepeatSuffix($scope.task); $scope.repeatSuffix = generateRepeatSuffix($scope.task);
if ($scope.task._edit.repeatsOn == 'dayOfMonth') { if ($scope.task._edit.repeatsOn == 'dayOfMonth') {
@ -385,9 +386,17 @@ angular.module('habitrpg')
} else if (task._edit.frequency === 'yearly') { } else if (task._edit.frequency === 'yearly') {
return task._edit.everyX == 1 ? window.env.t('year') : window.env.t('years'); return task._edit.everyX == 1 ? window.env.t('year') : window.env.t('years');
} }
}; };
function generateNextDue (task) {
if (!task.nextDue) return;
let nextDue = task.nextDue.map((date) => {
let dateObject = new Date(date);
return [dateObject.getFullYear(), dateObject.getMonth() + 1, dateObject.getDate()].join('-');
})
return nextDue.join(', ');
}
function cancelTaskEdit(task) { function cancelTaskEdit(task) {
task._edit = undefined; task._edit = undefined;
task._editing = false; task._editing = false;

3
website/common/locales/en/tasks.json
View file

@ -168,5 +168,6 @@
"monthlyRepeatHelpContent": "This task will be due every X months", "monthlyRepeatHelpContent": "This task will be due every X months",
"yearlyRepeatHelpContent": "This task will be due every X years", "yearlyRepeatHelpContent": "This task will be due every X years",
"resets": "Resets", "resets": "Resets",
"summaryStart": "Repeats <%= frequency %> every <%= everyX %> <%= frequencyPlural %> " "summaryStart": "Repeats <%= frequency %> every <%= everyX %> <%= frequencyPlural %> ",
"nextDue": "Next Due Dates"
} }

4
website/views/shared/tasks/edit/repeatables.jade
View file

@ -32,3 +32,7 @@ fieldset.option-group.advanced-option(ng-show="task.type === 'daily'")
.form-group .form-group
legend.option-title=env.t('summary') legend.option-title=env.t('summary')
div {{summary}} div {{summary}}
.form-group(ng-if='nextDue')
legend.option-title=env.t('nextDue')
div {{nextDue}}