diff --git a/.vs/InventoryTraker/config/applicationhost.config b/.vs/InventoryTraker/config/applicationhost.config new file mode 100644 index 0000000..b7464de --- /dev/null +++ b/.vs/InventoryTraker/config/applicationhost.config @@ -0,0 +1,1038 @@ + + + + + + + + +
+
+
+
+
+
+
+
+ + + +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ +
+
+ +
+
+
+
+
+
+ +
+
+
+
+
+ +
+
+
+ +
+
+ +
+
+ +
+
+
+ + +
+
+
+
+
+
+ +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/.vs/InventoryTraker/v15/Server/sqlite3/db.lock b/.vs/InventoryTraker/v15/Server/sqlite3/db.lock new file mode 100644 index 0000000..e69de29 diff --git a/.vs/InventoryTraker/v15/Server/sqlite3/storage.ide b/.vs/InventoryTraker/v15/Server/sqlite3/storage.ide new file mode 100644 index 0000000..56758a8 Binary files /dev/null and b/.vs/InventoryTraker/v15/Server/sqlite3/storage.ide differ diff --git a/.vs/InventoryTraker/v15/Server/sqlite3/storage.ide-shm b/.vs/InventoryTraker/v15/Server/sqlite3/storage.ide-shm new file mode 100644 index 0000000..6d66478 Binary files /dev/null and b/.vs/InventoryTraker/v15/Server/sqlite3/storage.ide-shm differ diff --git a/.vs/InventoryTraker/v15/Server/sqlite3/storage.ide-wal b/.vs/InventoryTraker/v15/Server/sqlite3/storage.ide-wal new file mode 100644 index 0000000..b7f3f67 Binary files /dev/null and b/.vs/InventoryTraker/v15/Server/sqlite3/storage.ide-wal differ diff --git a/InventoryTraker.Web/ActionResults/BetterJsonResult.cs b/InventoryTraker.Web/ActionResults/BetterJsonResult.cs index 8b3ceb5..0a7e9fb 100644 --- a/InventoryTraker.Web/ActionResults/BetterJsonResult.cs +++ b/InventoryTraker.Web/ActionResults/BetterJsonResult.cs @@ -9,7 +9,7 @@ namespace InventoryTraker.Web.ActionResults { public class BetterJsonResult : JsonResult { - public IList ErrorMessages { get; private set; } + public IList ErrorMessages { get; } public BetterJsonResult() { diff --git a/InventoryTraker.Web/Controllers/InventoryController.cs b/InventoryTraker.Web/Controllers/InventoryController.cs index a1cd2fe..b458538 100644 --- a/InventoryTraker.Web/Controllers/InventoryController.cs +++ b/InventoryTraker.Web/Controllers/InventoryController.cs @@ -212,5 +212,11 @@ namespace InventoryTraker.Web.Controllers return BetterJson(_mapper.Map(inventory)); } + [ActionLog] + public JsonResult Update(InventoryTypeViewModel form) + { + // TODO: add update stuff + return BetterJson(true); + } } } \ No newline at end of file diff --git a/InventoryTraker.Web/Properties/PublishProfiles/ETHRA.pubxml b/InventoryTraker.Web/Properties/PublishProfiles/ETHRA.pubxml index 530d421..c6ffe8d 100644 --- a/InventoryTraker.Web/Properties/PublishProfiles/ETHRA.pubxml +++ b/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 False C:\Users\poprhythm\Documents\code\PublishPackages\InventoryTraker.Web.zip true - Default Web Site + InventoryTraker diff --git a/InventoryTraker.Web/Views/Report/Distribution.cshtml b/InventoryTraker.Web/Views/Report/Distribution.cshtml index c3cf3a1..8093cda 100644 --- a/InventoryTraker.Web/Views/Report/Distribution.cshtml +++ b/InventoryTraker.Web/Views/Report/Distribution.cshtml @@ -5,7 +5,11 @@

- @ViewBag.Title + + + + + @ViewBag.Title

diff --git a/InventoryTraker.Web/Views/Report/Movement.cshtml b/InventoryTraker.Web/Views/Report/Movement.cshtml index 511fe12..0f98155 100644 --- a/InventoryTraker.Web/Views/Report/Movement.cshtml +++ b/InventoryTraker.Web/Views/Report/Movement.cshtml @@ -5,7 +5,11 @@

- @ViewBag.Title + + + + + @ViewBag.Title

diff --git a/InventoryTraker.Web/Views/Shared/_Layout.cshtml b/InventoryTraker.Web/Views/Shared/_Layout.cshtml index fb2dbcc..63074e8 100644 --- a/InventoryTraker.Web/Views/Shared/_Layout.cshtml +++ b/InventoryTraker.Web/Views/Shared/_Layout.cshtml @@ -27,7 +27,7 @@ {
-

Inventory Traker © 2016 Kolpack Software Consulting LLC

+

Inventory Traker © ETHRA, 2016 Kolpack Software Consulting LLC

} diff --git a/InventoryTraker.Web/Views/Transaction/Index.cshtml b/InventoryTraker.Web/Views/Transaction/Index.cshtml index 7efe498..e77b6b1 100644 --- a/InventoryTraker.Web/Views/Transaction/Index.cshtml +++ b/InventoryTraker.Web/Views/Transaction/Index.cshtml @@ -1,6 +1,4 @@ -@using InventoryTraker.Web.Helpers -@using InventoryTraker.Web.Models -@model dynamic +@model dynamic @{ ViewBag.Title = "Inventory"; @@ -8,7 +6,7 @@

- Transaction History + Transaction History

diff --git a/InventoryTraker.Web/Web.config b/InventoryTraker.Web/Web.config index 449d6b5..28dfbb0 100644 --- a/InventoryTraker.Web/Web.config +++ b/InventoryTraker.Web/Web.config @@ -106,5 +106,7 @@ - + + + \ No newline at end of file diff --git a/InventoryTraker.Web/js/inventory/inventorySvc.js b/InventoryTraker.Web/js/inventory/inventorySvc.js index 6127937..eeeb9d5 100644 --- a/InventoryTraker.Web/js/inventory/inventorySvc.js +++ b/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); }); } diff --git a/InventoryTraker.Web/js/inventory/templates/inventoryDistribute.tmpl.cshtml b/InventoryTraker.Web/js/inventory/templates/inventoryDistribute.tmpl.cshtml index 2cb508e..368a74c 100644 --- a/InventoryTraker.Web/js/inventory/templates/inventoryDistribute.tmpl.cshtml +++ b/InventoryTraker.Web/js/inventory/templates/inventoryDistribute.tmpl.cshtml @@ -25,37 +25,49 @@ - - - - - - + + + + + + - - - - - - + + + + + +
Name
Units per Case		Expiration DateAvailable Case QtyDistribute Case Qty
Name
Units per Case		Expiration DateAvailable Case QtyDistribute Case Qty
- {{inventory.name}}
- {{inventory.unitsPerCase}} / {{inventory.containerType}}
- 		{{inventory.expirationDate | date:'shortDate'}}{{inventory.quantity}} -
- -
-
+ {{inventory.name}}
+ {{inventory.unitsPerCase}} / {{inventory.containerType}}
+ 		{{inventory.expirationDate | date:'shortDate'}}{{inventory.quantity}} +
+ +
+
+
+ @*
+
    +
  • + {{ key }} errors +
      +
    • {{ e.$name }} has an error: {{ key }}.
      • +
    +
    • +
+
*@ +
- +
diff --git a/InventoryTraker.Web/js/inventory/templates/inventoryEdit.tmpl.cshtml b/InventoryTraker.Web/js/inventory/templates/inventoryEdit.tmpl.cshtml index 7b25f1a..0148740 100644 --- a/InventoryTraker.Web/js/inventory/templates/inventoryEdit.tmpl.cshtml +++ b/InventoryTraker.Web/js/inventory/templates/inventoryEdit.tmpl.cshtml @@ -16,7 +16,7 @@
- +