Beginning work on tasks

donnielrt · Sep 28, 2012 · d5b8184 · d5b8184
1 parent 0900172
commit d5b8184
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 25 deletions.
diff --git a/public/js/app/models/quest.js b/public/js/app/models/quest.js
@@ -60,8 +60,8 @@ define(['backbone', 'backbone-validate', 'moment'], function(Backbone, validatio
           }
 
           // "6 days from now formatting"
-          //response.humanFriendlyDeadline = deadline.fromNow();
-          response.deadline = deadline.fromNow();
+          response.humanFriendlyDeadline = deadline.fromNow();
+          response.deadline = deadline.format("MM/DD/YYYY");
 
         } else {
           response.deadline = "date missing or invalid";

diff --git a/public/js/app/templates/quests/list.html b/public/js/app/templates/quests/list.html
@@ -18,7 +18,7 @@
             %>
             <li class="quest-item<%= newRow %>">
                 <a href="#quests/<%= quest._id %>"><h2><%= quest.name %></h2></a>
-                <p><%= quest.description %> &mdash; <span class="deadline <%= quest.deadlineStatus %>">Due <%= quest.deadline %></span></p>
+                <p><%= quest.description %> &mdash; <span class="deadline <%= quest.deadlineStatus %>">Due <%= quest.humanFriendlyDeadline %></span></p>
                 <p>Status: <span class="status"><%= quest.status %></span></p>
 
                 <p><a class="btn" href="#quests/<%= quest._id %>">View details &raquo;</a></p>

diff --git a/public/js/app/templates/quests/single.html b/public/js/app/templates/quests/single.html
@@ -5,7 +5,7 @@
     </div>
 
     <div class="row-fluid">
-        <div class="span12"><%= description %> &mdash; <span class="deadline<%= deadlineStatus %>">Due <%= deadline %></span></div>
+        <div class="span12"><%= description %> &mdash; <span class="deadline<%= deadlineStatus %>">Due <%= humanFriendlyDeadline %></span></div>
     </div>
 
   <div class="row-fluid">

diff --git a/public/js/app/views/quests/form.js b/public/js/app/views/quests/form.js
@@ -6,9 +6,7 @@ define([
 	'text!templates/quests/single.html',
 	'text!templates/quests/_item.html',
 	'text!templates/quests/form.html',
-  'datejs',
-  'rangepicker',
-  'moment'],
+  'rangepicker'],
   function(
     Backbone,
     Questience,
@@ -17,9 +15,7 @@ define([
     singleQuestTemplate,
     questItemTemplate,
     questFormTemplate,
-    Date,
-    rangePicker,
-    moment){
+    daterangepicker){
 
   "use strict";
 
@@ -57,8 +53,9 @@ define([
             {text: 'This week', dateStart: 'Today+7', dateEnd: 'Today+7' },
             {text: 'Next 30 Days', dateStart: 'Today+30', dateEnd: 'Today+30' }
           ],
-          presets: []
-
+          presets: {
+            specificDate: 'Specific Date'
+          }
         });
 
       });
@@ -75,18 +72,15 @@ define([
 
     saveQuest: function() {
 
-      var result, 
-        deadlineDate = this.$("input[name='deadline']").val(); // we show a human-friendly string in the actual value field
+      var result;
 
       this.model.set({
         name: this.$("input[name='name']").val(),
         description: this.$("textarea[name='description']").val(),
-        deadline: deadlineDate,
+        deadline: this.$("input[name='deadline']").val(),
         status: this.$("select[name='status']").val()
       });
 
-      console.log("Parsing: ", dateJs);
-
       this.collection = new Quests();
 
       if (this.model.isNew()) {

diff --git a/public/js/libs/plugins/date.js b/public/js/libs/plugins/date.js