Uncommitted Updates

InventoryTraker.Web/ActionResults/BetterJsonResult.cs

@@ -9,7 +9,7 @@ namespace InventoryTraker.Web.ActionResults
 {
 	public class BetterJsonResult : JsonResult
 	{
-		public IList<string> ErrorMessages { get; private set; }
+		public IList<string> ErrorMessages { get; }
 
 		public BetterJsonResult()
 		{

InventoryTraker.Web/Controllers/InventoryController.cs

@@ -212,5 +212,11 @@ namespace InventoryTraker.Web.Controllers
 			return BetterJson(_mapper.Map<InventoryViewModel>(inventory));
 		}
 
+		[ActionLog]
+		public JsonResult Update(InventoryTypeViewModel form)
+		{
+			// TODO: add update stuff
+			return BetterJson(true);
+		}
 	}
 }

InventoryTraker.Web/Properties/PublishProfiles/ETHRA.pubxml

@@ -13,7 +13,7 @@ by editing this MSBuild file. In order to learn more about this please visit htt
     <ExcludeApp_Data>False</ExcludeApp_Data>
     <DesktopBuildPackageLocation>C:\Users\poprhythm\Documents\code\PublishPackages\InventoryTraker.Web.zip</DesktopBuildPackageLocation>
     <PackageAsSingleFile>true</PackageAsSingleFile>
-    <DeployIisAppPath>Default Web Site</DeployIisAppPath>
+    <DeployIisAppPath>InventoryTraker</DeployIisAppPath>
     <PublishDatabaseSettings>
       <Objects xmlns="">
         <ObjectGroup Name="DefaultConnection" Order="1" Enabled="True">

InventoryTraker.Web/Views/Report/Distribution.cshtml

@@ -5,7 +5,11 @@
 
 <div ng-controller="DistributionReportController as vm">
     <h1 class="page-header">
-        <i class="fa fa-file-o"></i> @ViewBag.Title
+        <span class="fa-stack" style="font-size: 50%">
+            <i class="fa fa-file-o fa-stack-2x"></i>
+            <i class="fa  fa-share-square fa-stack-1x"></i>
+        </span>
+        @ViewBag.Title
     </h1>
     <div class="row hidden-print">
         <div class="col-md-9">

InventoryTraker.Web/Views/Report/Movement.cshtml

@@ -5,7 +5,11 @@
 
 <div ng-controller="MovementReportController as vm">
     <h1 class="page-header">
-        <i class="fa fa-file-o"></i> @ViewBag.Title
+        <span class="fa-stack" style="font-size: 50%">
+            <i class="fa fa-file-o fa-stack-2x"></i>
+            <i class="fa fa-cubes fa-stack-1x"></i>
+        </span>
+         @ViewBag.Title
     </h1>
     <div class="row hidden-print">
         <div class="col-md-4">

InventoryTraker.Web/Views/Shared/_Layout.cshtml

@@ -27,7 +27,7 @@
     {
         <footer class="footer hidden-print">
             <div class="container">
-                <p>Inventory Traker &copy; 2016 Kolpack Software Consulting LLC</p>
+                <p>Inventory Traker &copy; ETHRA, 2016 Kolpack Software Consulting LLC</p>
             </div>
         </footer>
     }

InventoryTraker.Web/Views/Transaction/Index.cshtml

@@ -1,6 +1,4 @@
-@using InventoryTraker.Web.Helpers
+@model dynamic
-@using InventoryTraker.Web.Models
-@model dynamic
 
 @{
 	ViewBag.Title = "Inventory";
@@ -8,7 +6,7 @@
 
 <div ng-controller="TransactionController as vm">
     <h1 class="page-header">
-        Transaction History
+        <i class="fa fa-fw fa-list"></i> Transaction History
     </h1>
     <div class="pull-right">
     </div>

InventoryTraker.Web/Web.config

@@ -106,5 +106,7 @@
       <remove name="TRACEVerbHandler" />
       <add name="ExtensionlessUrlHandler-Integrated-4.0" path="*." verb="*" type="System.Web.Handlers.TransferRequestHandler" preCondition="integratedMode,runtimeVersionv4.0" />
     </handlers>
-  </system.webServer>
+	<!-- http://stackoverflow.com/a/4029197/99492 -->
+	<httpErrors existingResponse="PassThrough"></httpErrors>
+</system.webServer>
 </configuration>

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>
+                <tr>
-                        <th>Name<br/>Units per Case</th>
+                    <th>Name<br/>Units per Case</th>
-                        <th>Expiration Date</th>
+                    <th>Expiration Date</th>
-                        <th>Available Case Qty</th>
+                    <th>Available Case Qty</th>
-                        <th>Distribute Case Qty</th>
+                    <th>Distribute Case Qty</th>
-                    </tr>
+                </tr>
                 </thead>
                 <tbody>
-                    <tr ng-repeat="inventory in vm.quantities" inventory="inventory">
+                <tr ng-repeat="inventory in vm.quantities" inventory="inventory">
-                        <td>
+                    <td>
-                            {{inventory.name}}<br/>
+                        {{inventory.name}}<br/>
-                            {{inventory.unitsPerCase}} / {{inventory.containerType}}<br/>
+                        {{inventory.unitsPerCase}} / {{inventory.containerType}}<br/>
-                        </td>
+                    </td>
-                        <td ng-class="{ danger: inventory.isExpired }">{{inventory.expirationDate | date:'shortDate'}}</td>
+                    <td ng-class="{ danger: inventory.isExpired }">{{inventory.expirationDate | date:'shortDate'}}</td>
-                        <td>{{inventory.quantity}}</td>
+                    <td>{{inventory.quantity}}</td>
-                        <td>
+                    <td>
-                            <div class="form-group col-sm-9" form-group-validation="DistributeQuantity{{inventory.name}}">
+                        <div class="form-group col-sm-9" form-group-validation="DistributeQuantity{{inventory.name}}">
-                                <input name="DistributeQuantity{{inventory.name}}" type="number"
+                            <input name="DistributeQuantity{{inventory.name}}" type="number"
-                                       class="form-control"
+                                   class="form-control"
-                                       ng-model="inventory.distributeQuantity"
+                                   ng-model="inventory.distributeQuantity"
-                                       ng-max="{{inventory.quantity}}"
+                                   ng-max="{{inventory.quantity}}"
-                                       ng-min="0" />
+                                   ng-min="0"/>
-                            </div>
+                        </div>
-                        </td>
+                    </td>
-                    </tr>
+                </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 />