Uncommitted Updates

InventoryTraker.Web/js/inventory/inventorySvc.js

@@ -47,9 +47,10 @@
 			}
 
 			function update(existingInventory, updatedInventory) {
+				
 				return $http.post("/Inventory/Update", updatedInventory)
 					.success(function(inventory) {
-						angular.extend(existingInventory, inventory);
+						//angular.extend(existingInventory, inventory);
 					});
 			}
 

InventoryTraker.Web/js/inventory/templates/inventoryDistribute.tmpl.cshtml

@@ -25,37 +25,49 @@
 
             <table class="table table-condensed" ng-class="vm.getValidationClass()">
                 <thead>
-                    <tr>
-                        <th>Name<br/>Units per Case</th>
-                        <th>Expiration Date</th>
-                        <th>Available Case Qty</th>
-                        <th>Distribute Case Qty</th>
-                    </tr>
+                <tr>
+                    <th>Name<br/>Units per Case</th>
+                    <th>Expiration Date</th>
+                    <th>Available Case Qty</th>
+                    <th>Distribute Case Qty</th>
+                </tr>
                 </thead>
                 <tbody>
-                    <tr ng-repeat="inventory in vm.quantities" inventory="inventory">
-                        <td>
-                            {{inventory.name}}<br/>
-                            {{inventory.unitsPerCase}} / {{inventory.containerType}}<br/>
-                        </td>
-                        <td ng-class="{ danger: inventory.isExpired }">{{inventory.expirationDate | date:'shortDate'}}</td>
-                        <td>{{inventory.quantity}}</td>
-                        <td>
-                            <div class="form-group col-sm-9" form-group-validation="DistributeQuantity{{inventory.name}}">
-                                <input name="DistributeQuantity{{inventory.name}}" type="number"
-                                       class="form-control"
-                                       ng-model="inventory.distributeQuantity"
-                                       ng-max="{{inventory.quantity}}"
-                                       ng-min="0" />
-                            </div>
-                        </td>
-                    </tr>
+                <tr ng-repeat="inventory in vm.quantities" inventory="inventory">
+                    <td>
+                        {{inventory.name}}<br/>
+                        {{inventory.unitsPerCase}} / {{inventory.containerType}}<br/>
+                    </td>
+                    <td ng-class="{ danger: inventory.isExpired }">{{inventory.expirationDate | date:'shortDate'}}</td>
+                    <td>{{inventory.quantity}}</td>
+                    <td>
+                        <div class="form-group col-sm-9" form-group-validation="DistributeQuantity{{inventory.name}}">
+                            <input name="DistributeQuantity{{inventory.name}}" type="number"
+                                   class="form-control"
+                                   ng-model="inventory.distributeQuantity"
+                                   ng-max="{{inventory.quantity}}"
+                                   ng-min="0"/>
+                        </div>
+                    </td>
+                </tr>
                 </tbody>
             </table>
+            <error-list errors="vm.errorMessages"></error-list>
         </div>
 
+        @*<div>
+            <ul>
+                <li ng-repeat="(key, errors) in vm.form.$error track by $index">
+                    <strong>{{ key }}</strong> errors
+                    <ul>
+                        <li ng-repeat="e in errors">{{ e.$name }} has an error: <strong>{{ key }}</strong>.</li>
+                    </ul>
+                </li>
+            </ul>
+        </div>*@
+
         <div class="modal-footer">
-            <button class="btn btn-success" ng-disabled="vm.form.$invalid || vm.form.$pristine">Save</button>
+            <button class="btn btn-success" @*ng-disabled="vm.form.$invalid || vm.form.$pristine"*@>Save</button>
             <button type="button" class="btn" ng-click="$dismiss()">Cancel</button>
         </div>
 

InventoryTraker.Web/js/inventory/templates/inventoryEdit.tmpl.cshtml

@@ -16,7 +16,7 @@
             <div class="modal-footer">
                 <button ng-click="vm.removeInventory()" class="btn btn-sm pull-left"><i class="fa fa-minus-circle"></i> Remove Inventory</button>
                 <button class="btn btn-success" ng-disabled="vm.form.$invalid || vm.form.$pristine">Save</button>
-                <button type="button" class="btn" ng-click="$parent.$dismiss()">Cancel</button>
+                <button type="button" class="btn" ng-click="$parent.$dismiss()">Close</button>
             </div>
 
             <hr />