done with food groups

dahauns · Apr 22, 2013 · cb5827c · cb5827c
1 parent 8fbcf7b
commit cb5827c
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 36 deletions.
diff --git a/demo/SurveyApp.Web/App/main.js b/demo/SurveyApp.Web/App/main.js
@@ -47,7 +47,7 @@ define(['durandal/app', 'durandal/viewLocator', 'durandal/system', 'durandal/vie
         //ex: visiting '#/surveys' results in 'viewmodels/surveys'
         router.mapNav('surveys');
 
-        router.mapNav('foodgroups', 'viewmodels/foodgroups', 'Food Groups');
+        router.mapNav('foodGroups', 'viewmodels/foodGroups', 'Food Groups');
 
         //creates a route for showing a particular survey
         //':id' extracts the value and it is passed as an argument into the 'activate' function of the viewmodel

diff --git a/demo/SurveyApp.Web/App/viewmodels/foodgroups.js b/demo/SurveyApp.Web/App/viewmodels/foodgroups.js
@@ -20,7 +20,6 @@ function (foodGroupApi, foodGroup, typeMetadataHelper, app, router) {
                     });
 
                     self.foodGroups(wrappedFoodGroups);
-                    ajaxLoaded();
                 });
         };
 
@@ -46,34 +45,15 @@ function (foodGroupApi, foodGroup, typeMetadataHelper, app, router) {
             });
         };
 
+        self.save = function() {
+            foodGroupApi.post(ko.mapping.toJS(self.foodGroups))
+                .then(function() {
+                    router.navigateTo('#/surveys');
+                });
+        };
 
-        function ajaxLoaded() {
-            self.dirtyFlag = new ko.DirtyFlag(self.foodGroups, false, ko.mapping.toJSON);       //kolite plugin
-
-            ko.validation.init({ grouping: { deep: true } });
-            self.validator = ko.validatedObservable(self.foodGroups());                         //knockout validation plugin
-
-            self.save = ko.asyncCommand({ //kolite plugin
-                execute: function () {
-                    foodGroupApi.post(ko.mapping.toJS(self.foodGroups))
-                        .then(function () {
-                            self.dirtyFlag().reset();
-                            router.navigateTo('#/surveys');
-                        });
-                },
-                canExecute: function (isExecuting) {
-                    return !isExecuting && self.dirtyFlag().isDirty() && self.validator().isValid();
-                }
-            });
-
-            var resetCopy = ko.mapping.toJS(self.foodGroups);
-            self.reset = function () {
-                ko.mapping.fromJS(resetCopy, {}, self.foodGroups);
-            };
-
-            self.cancel = function () {
-                router.navigateTo('#/surveys');
-            };
-        }
+        self.cancel = function () {
+            router.navigateTo('#/surveys');
+        };
     };
 });
diff --git a/demo/SurveyApp.Web/App/views/foodGroups.cshtml b/demo/SurveyApp.Web/App/views/foodGroups.cshtml
@@ -10,9 +10,8 @@
             Edit Food Groups
         </h1>
         <div class="pull-right">
-			<button class="btn" data-bind="click: reset">Reset</button>
 			<button class="btn" data-bind="click: cancel">Cancel</button>
-			<button class="btn btn-primary" data-bind="command: save">Save</button>
+			<button class="btn btn-primary" data-bind="click: save">Save</button>
 		</div>
     </div>
 
@@ -43,7 +42,7 @@
                 </thead>
                 <tbody>
 
-                    @*a foreach on a nested element*@
+                    @*a foreach on a nested element (foods)*@
                     @using (var food = foodGroup.ForEachKoComment(x => x.Foods))
                     {
                         <tr>

diff --git a/demo/SurveyApp.Web/SurveyApp.Web.csproj b/demo/SurveyApp.Web/SurveyApp.Web.csproj
@@ -183,7 +183,7 @@
     <Content Include="App\main.js" />
     <Content Include="App\requirePlugins\async.js" />
     <Content Include="App\utility\typeMetadataHelper.js" />
-    <Content Include="App\viewmodels\foodgroups.js" />
+    <Content Include="App\viewmodels\foodGroups.js" />
     <Content Include="App\viewmodels\foodGroups\foodGroup.js" />
     <Content Include="App\viewmodels\surveys\addEditTechProductModal.js" />
     <Content Include="App\viewmodels\surveys\relation.js" />

diff --git a/demo/SurveyApp.Web/local.config b/demo/SurveyApp.Web/local.config