Fixes to chapter 04 samples

DamonOehlman · DamonOehlman · commit ea10366b76e7 · 2010-09-10T15:18:54.000+10:00
diff --git a/js/prowebapps.js b/js/prowebapps.js
@@ -210,10 +210,8 @@ PROWEBAPPS = (function() {
             } // getAction
             
             function updateViewStack(oldView, newView) {
-                var shouldPush = false;
-                    
                 // first let's determine if we should push onto the stack
-                shouldPush = oldView && (
+                var shouldPush = oldView && (
                     (viewStack.length === 0) ||
                     (newView && (viewStack[viewStack.length - 1].id != newView.id))
                 );
diff --git a/snippets/04/todolist.html b/snippets/04/todolist.html
@@ -15,11 +15,11 @@
 	<div id="main" class="view">
 		<h1>To Do List</h1>
 		<div class="task" style="display: none;">
-			<h3>MIT: <span class="task-name">Mow the Lawn</span></h3>
-			<p class="task-description">Task description goes here</p>
+			<h3>Task: <span class="task-name"></span></h3>
+			<p class="task-description"></p>
 			<p class="task-due">
 				<label>DUE IN:</label>
-				<span class="task-daysleft">5 days</span>
+				<span class="task-daysleft"></span>
 			</p>
 			<ul class="task-actions">
 				<li class="right"><a href="#" class="task-complete">COMPLETE TASK</a></li>
@@ -41,11 +41,11 @@ <h1 class="fancy">Create Task</h1>
 		<div id="errors"></div>
 	    <form id="taskentry">
 	    <ul>
-	        <li><input type="text" class="required" name="task[name]" id="taskname" placeholder="Task Name" value="Mow the Lawn "/></li>
+	        <li><input type="text" class="required" name="task[name]" id="taskname" placeholder="Task Name" value=""/></li>
 	        <li>
 	            <textarea name="task[description]" id="taskdesc" placeholder="Description" rows="5"></textarea>
 	        </li>
-	        <li><input type="text" class="required date" name="task[due]" id="taskdue" placeholder="Task Due" value="2010-08-23 11:23" /></li>
+	        <li><input type="text" class="required date" name="task[due]" id="taskdue" placeholder="Task Due" value="" /></li>
 	        <li class="naked"><input type="submit" name="Save" /></li>
 	    </ul>
 	    </form>
diff --git a/snippets/04/todolist.js b/snippets/04/todolist.js
@@ -178,7 +178,43 @@ TODOLIST = (function() {
                     });
                 },
                 
-getMostImportantTask
+                saveTask: function(task, callback) {
+                    db.transaction(function(transaction) {
+                        // if the task id is not assigned, then insert
+                        if (! task.id) {
+                            transaction.executeSql(
+                                "INSERT INTO task(name, description, due) VALUES (?, ?, ?);", 
+                                [task.name, task.description, task.due],
+                                function(tx) {
+                                    transaction.executeSql(
+                                        "SELECT MAX(rowid) AS id from task",
+                                        [],
+                                        function (tx, results) {
+                                            task.id = results.rows.item(0).id;
+                                            if (callback) {
+                                                callback();
+                                            } // if
+                                        } 
+                                    );
+                                }
+                            );
+                        }
+                        // otherwise, update
+                        else {
+                            transaction.executeSql(
+                                "UPDATE task " +
+                                "SET name = ?, description = ?, due = ?, completed = ? " + 
+                                "WHERE rowid = ?;",
+                                [task.name, task.description, task.due, task.completed, task.id],
+                                function (tx) {
+                                    if (callback) {
+                                        callback();
+                                    } // if
+                                }
+                            );
+                        } // if..else
+                    });
+                }
             };
             
             return subModule;
@@ -236,23 +272,23 @@ getMostImportantTask
         /* view activation handlers */
         
         activateMain: function() {
-            TODOLIST.Storage.getMostImportantTask(function(mit) {
-                if (mit) {
+            TODOLIST.Storage.getMostImportantTask(function(task) {
+                if (task) {
                     // the no tasks message may be displayed, so remove it
                     jQuery("#main .notasks").remove();
 
                     // update the task details
-                    showTaskDetails("#main .task", mit);
+                    showTaskDetails("#main .task", task);
                     
                     // attach a click handler to the complete task button
                     jQuery("#main .task-complete").unbind().click(function() {
                         jQuery("#main .task").slideUp();
                         
                         // mark the task as complete
-                        mit.complete();
+                        task.complete();
                         
                         // save the task back to storage
-                        TODOLIST.Storage.saveTask(mit, module.activateMain);
+                        TODOLIST.Storage.saveTask(task, module.activateMain);
                     });
                 }
                 else {
@@ -269,7 +305,7 @@ getMostImportantTask
 
                 populateTaskList();
                 
-                // update the task list
+                // refresh the task list display
                 jQuery("ul#tasklist li").click(function() {
                     toggleDetailsDisplay(this);
                 });
