From a5e0e171cca1f77ca27bf07d5b3d0bdf77e119ea Mon Sep 17 00:00:00 2001
From: Keith Holliday <krh121791@gmail.com>
Date: Thu, 18 May 2017 10:42:11 -0600
Subject: [PATCH] Added next due date

---
 website/client-old/js/services/taskServices.js   | 11 ++++++++++-
 website/common/locales/en/tasks.json             |  3 ++-
 website/views/shared/tasks/edit/repeatables.jade |  4 ++++
 3 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/website/client-old/js/services/taskServices.js b/website/client-old/js/services/taskServices.js
index e28c3d8b2c..0b7cc9b952 100644
--- a/website/client-old/js/services/taskServices.js
+++ b/website/client-old/js/services/taskServices.js
@@ -294,6 +294,7 @@ angular.module('habitrpg')
           $scope.$watch('task._edit', function (newValue, oldValue) {
             if ($scope.task.type !== 'daily' || !task._edit) return;
             $scope.summary = generateSummary($scope.task);
+            $scope.nextDue = generateNextDue($scope.task);
 
             $scope.repeatSuffix = generateRepeatSuffix($scope.task);
             if ($scope.task._edit.repeatsOn == 'dayOfMonth') {
@@ -385,9 +386,17 @@ angular.module('habitrpg')
       } else if (task._edit.frequency === 'yearly') {
         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) {
       task._edit = undefined;
       task._editing = false;
diff --git a/website/common/locales/en/tasks.json b/website/common/locales/en/tasks.json
index faddcd2c34..1e3eee45dc 100644
--- a/website/common/locales/en/tasks.json
+++ b/website/common/locales/en/tasks.json
@@ -168,5 +168,6 @@
     "monthlyRepeatHelpContent": "This task will be due every X months",
     "yearlyRepeatHelpContent": "This task will be due every X years",
     "resets": "Resets",
-    "summaryStart": "Repeats <%= frequency %> every <%= everyX %> <%= frequencyPlural %> "
+    "summaryStart": "Repeats <%= frequency %> every <%= everyX %> <%= frequencyPlural %> ",
+    "nextDue": "Next Due Dates"
 }
diff --git a/website/views/shared/tasks/edit/repeatables.jade b/website/views/shared/tasks/edit/repeatables.jade
index d385aea332..5bb8e72911 100644
--- a/website/views/shared/tasks/edit/repeatables.jade
+++ b/website/views/shared/tasks/edit/repeatables.jade
@@ -32,3 +32,7 @@ fieldset.option-group.advanced-option(ng-show="task.type === 'daily'")
     .form-group
       legend.option-title=env.t('summary')
       div {{summary}}
+    
+    .form-group(ng-if='nextDue')
+      legend.option-title=env.t('nextDue')
+      div {{nextDue}}