add moment

ShaneK · Feb 1, 2017 · 4a0316a · 4a0316a
1 parent 42bf2e7
commit 4a0316a
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 1 deletion.
diff --git a/package.json b/package.json
@@ -12,6 +12,7 @@
     "express": "^4.13.4",
     "less": "~2.1.2",
     "lodash": "~2.4.1",
+    "moment": "^2.17.1",
     "q": "~1.1.2",
     "redis": "^2.5.3"
   },

diff --git a/public/templates/jobList.dust b/public/templates/jobList.dust
@@ -33,7 +33,7 @@ Matador
             <td data-bind="text: type"></td>
             <td data-bind="text: status"></td>
             <td data-bind="visible: keys.length > 0 && keys[0].progress != undefined, text: keys[0].progress != undefined ? progress : ''"></td>
-            <td data-bind="visible: keys.length > 0 && keys[0].delayUntil != undefined, text: keys[0].delayUntil != undefined ? delayUntil : ''"></td>
+            <td data-bind="visible: keys.length > 0 && keys[0].delayUntil != undefined, text: keys[0].delayUntil != undefined ? moment(new Date(delayUntil)).diff(moment(), 'seconds') + ' seconds' : ''"></td>
             <td>
                 <button class="btn btn-default" data-bind="click: redisHandler.fn.deleteById" title="Delete">
                     <i class="fa fa-trash-o"></i>

diff --git a/public/templates/layouts/master.dust b/public/templates/layouts/master.dust
@@ -21,6 +21,7 @@
 
     <script src="https://ajax.googleapis.com/ajax/libs/jquery/2.1.0/jquery.min.js"></script>
     <script src="{basepath}/js/knockout.min.js"></script>
+	<script src="{basepath}/js/moment.min.js"></script>
     <script src="{basepath}/js/jquery.blockUI.js"></script>
     <script src="{basepath}/js/jquery.noty.packaged.min.js"></script>
     <script src="{basepath}/js/bootstrap.min.js"></script>