diff --git a/InventoryTraker.Web/Controllers/ControllerBase.cs b/InventoryTraker.Web/Controllers/ControllerBase.cs index 97316a8..082f38d 100644 --- a/InventoryTraker.Web/Controllers/ControllerBase.cs +++ b/InventoryTraker.Web/Controllers/ControllerBase.cs @@ -1,4 +1,5 @@ -using System.Linq; +using System.Collections.Generic; +using System.Linq; using System.Web.Mvc; using InventoryTraker.Web.ActionResults; @@ -11,14 +12,22 @@ namespace InventoryTraker.Web.Controllers return new BetterJsonResult {Data = model}; } - protected JsonResult PackageModelStateErrors() + protected IEnumerable GetModelStateErrorList() + { + var errorList = + from kvp in ModelState + where kvp.Value.Errors.Any() + let errors = string.Join(", ", kvp.Value.Errors.Select(e => e.ErrorMessage)) + let msg = kvp.Key + ": " + errors + select msg; + return errorList; + } + + protected JsonResult GetModelStateErrorListJson() { var betterJsonResult = new BetterJsonResult(); - foreach (var err in ModelState.Where(ms => ms.Value.Errors.Any())) - { - betterJsonResult.AddError( - err.Key + ": " + string.Join(", ", err.Value.Errors.Select(e => e.ErrorMessage))); - } + foreach (var err in GetModelStateErrorList()) + betterJsonResult.AddError(err); return betterJsonResult; } } diff --git a/InventoryTraker.Web/Controllers/InventoryController.cs b/InventoryTraker.Web/Controllers/InventoryController.cs index 0bfd247..5a59176 100644 --- a/InventoryTraker.Web/Controllers/InventoryController.cs +++ b/InventoryTraker.Web/Controllers/InventoryController.cs @@ -46,7 +46,7 @@ namespace InventoryTraker.Web.Controllers public JsonResult Add(InventoryAddForm form) { if (!ModelState.IsValid) - return PackageModelStateErrors(); + return GetModelStateErrorListJson(); var inventory = Mapper.Map(form); inventory.InventoryType = _context.InventoryTypes.Find(form.InventoryTypeId); @@ -71,7 +71,7 @@ namespace InventoryTraker.Web.Controllers public JsonResult Distribute(InventoryDistributeForm form) { if (!ModelState.IsValid) - return PackageModelStateErrors(); + return GetModelStateErrorListJson(); foreach (var quantityForm in form.InventoryQuantities) { diff --git a/InventoryTraker.Web/Controllers/InventoryTypeController.cs b/InventoryTraker.Web/Controllers/InventoryTypeController.cs index b13c451..fd7b048 100644 --- a/InventoryTraker.Web/Controllers/InventoryTypeController.cs +++ b/InventoryTraker.Web/Controllers/InventoryTypeController.cs @@ -1,6 +1,10 @@ +using System; +using System.Collections.Generic; using System.Linq; using System.Web.Mvc; +using AutoMapper; using AutoMapper.QueryableExtensions; +using InventoryTraker.Web.Core; using InventoryTraker.Web.Data; using InventoryTraker.Web.Models; @@ -15,6 +19,11 @@ namespace InventoryTraker.Web.Controllers _context = context; } + public ActionResult Index() + { + return View(); + } + public JsonResult All() { var viewModels = _context.InventoryTypes @@ -23,5 +32,32 @@ namespace InventoryTraker.Web.Controllers return BetterJson(viewModels.ToArray()); } + + public JsonResult Add(InventoryTypeViewModel form) + { + if (!ModelState.IsValid) + return GetModelStateErrorListJson(); + + var inventoryType = Mapper.Map(form); + _context.InventoryTypes.Add(inventoryType); + _context.SaveChanges(); + + var model = Mapper.Map(inventoryType); + return BetterJson(model); + } + + public JsonResult Update(InventoryTypeViewModel form) + { + if (!ModelState.IsValid) + return GetModelStateErrorListJson(); + + var inventoryType = _context.InventoryTypes.Find(form.Id); + Mapper.Map(form, inventoryType); + + _context.SaveChanges(); + + var model = Mapper.Map(inventoryType); + return BetterJson(model); + } } } \ No newline at end of file diff --git a/InventoryTraker.Web/InventoryTraker.Web.csproj b/InventoryTraker.Web/InventoryTraker.Web.csproj index 87b6f49..95bd9fa 100644 --- a/InventoryTraker.Web/InventoryTraker.Web.csproj +++ b/InventoryTraker.Web/InventoryTraker.Web.csproj @@ -224,10 +224,14 @@ + + + + - + @@ -270,6 +274,9 @@ PreserveNewest + + + @@ -319,6 +326,7 @@ + @@ -349,6 +357,7 @@ + Web.config diff --git a/InventoryTraker.Web/Models/InventoryDistributeForm.cs b/InventoryTraker.Web/Models/InventoryDistributeForm.cs index 7fd7c6e..7ff4240 100644 --- a/InventoryTraker.Web/Models/InventoryDistributeForm.cs +++ b/InventoryTraker.Web/Models/InventoryDistributeForm.cs @@ -4,15 +4,6 @@ using System.ComponentModel.DataAnnotations; namespace InventoryTraker.Web.Models { - public class InventoryQuantityForm - { - [Required] - public int InventoryId { get; set; } - - [Required, Range(1, int.MaxValue, ErrorMessage = "Quantity must be greater than 0")] - public int Quantity { get; set; } - } - public class InventoryDistributeForm { public IList InventoryQuantities { get; set; } diff --git a/InventoryTraker.Web/Models/InventoryQuantityForm.cs b/InventoryTraker.Web/Models/InventoryQuantityForm.cs new file mode 100644 index 0000000..2afa59a --- /dev/null +++ b/InventoryTraker.Web/Models/InventoryQuantityForm.cs @@ -0,0 +1,13 @@ +using System.ComponentModel.DataAnnotations; + +namespace InventoryTraker.Web.Models +{ + public class InventoryQuantityForm + { + [Required] + public int InventoryId { get; set; } + + [Required, Range(1, int.MaxValue, ErrorMessage = "Quantity must be greater than 0")] + public int Quantity { get; set; } + } +} \ No newline at end of file diff --git a/InventoryTraker.Web/Models/InventoryTypeViewModel.cs b/InventoryTraker.Web/Models/InventoryTypeViewModel.cs index da8f12b..00e8921 100644 --- a/InventoryTraker.Web/Models/InventoryTypeViewModel.cs +++ b/InventoryTraker.Web/Models/InventoryTypeViewModel.cs @@ -1,22 +1,31 @@ -using Heroic.AutoMapper; +using System.ComponentModel.DataAnnotations; +using System.Web.Mvc; +using Heroic.AutoMapper; using InventoryTraker.Web.Core; namespace InventoryTraker.Web.Models { - public class InventoryTypeViewModel : IMapFrom + public class InventoryTypeViewModel : IMapFrom, IMapTo { + [HiddenInput] public int Id { get; set; } + [Required] public string Identifier { get; set; } + [Required] public string Name { get; set; } + [Required] public int UnitsPerCase { get; set; } + [Required] public string ContainerType { get; set; } + [Required] public double WeightPerCase { get; set; } + [Required] public decimal PricePerCase { get; set; } } } \ No newline at end of file diff --git a/InventoryTraker.Web/Views/Inventory/Index.cshtml b/InventoryTraker.Web/Views/Inventory/Index.cshtml index 68e0418..a6c7651 100644 --- a/InventoryTraker.Web/Views/Inventory/Index.cshtml +++ b/InventoryTraker.Web/Views/Inventory/Index.cshtml @@ -1,17 +1,14 @@ -@model dynamic - -@{ - ViewBag.Title = "Inventory"; -} - -
+

Inventory

-
+
Arrival Distribute
+
+ Commodity Types +
\ No newline at end of file diff --git a/InventoryTraker.Web/Views/InventoryType/Index.cshtml b/InventoryTraker.Web/Views/InventoryType/Index.cshtml new file mode 100644 index 0000000..b1b5fe7 --- /dev/null +++ b/InventoryTraker.Web/Views/InventoryType/Index.cshtml @@ -0,0 +1,16 @@ +@model dynamic + +@{ + ViewBag.Title = "Inventory"; +} + +
+

+ Commodity Types +

+
+ Add +
+ + +
\ No newline at end of file diff --git a/InventoryTraker.Web/Views/Shared/_Navigation.cshtml b/InventoryTraker.Web/Views/Shared/_Navigation.cshtml index d23b3bf..c3e2ece 100644 --- a/InventoryTraker.Web/Views/Shared/_Navigation.cshtml +++ b/InventoryTraker.Web/Views/Shared/_Navigation.cshtml @@ -30,7 +30,7 @@ Inventory
  • - Transactions + Transaction History
    • diff --git a/InventoryTraker.Web/Views/Transaction/Index.cshtml b/InventoryTraker.Web/Views/Transaction/Index.cshtml index 4b8537b..7efe498 100644 --- a/InventoryTraker.Web/Views/Transaction/Index.cshtml +++ b/InventoryTraker.Web/Views/Transaction/Index.cshtml @@ -8,13 +8,10 @@

    - Transactions + Transaction History

    - @* Arrival - Distribute*@
    -
    \ No newline at end of file diff --git a/InventoryTraker.Web/js/inventory/InventoryEditDirective.js b/InventoryTraker.Web/js/inventory/InventoryEditDirective.js index 9491e84..8b8d519 100644 --- a/InventoryTraker.Web/js/inventory/InventoryEditDirective.js +++ b/InventoryTraker.Web/js/inventory/InventoryEditDirective.js @@ -31,7 +31,7 @@ $scope.$parent.$close(); }) .error(function(data) { - vm.errorMessage = 'There was a problem saving changes to the inventory: ' + data; + vm.errorMessage = 'There was a problem saving changes to the inventory: ' + data.errorMessage; }) .finally(function() { vm.saving = false; diff --git a/InventoryTraker.Web/js/inventory/templates/inventoryAdd.tmpl.cshtml b/InventoryTraker.Web/js/inventory/templates/inventoryAdd.tmpl.cshtml index a2a216b..1a818e2 100644 --- a/InventoryTraker.Web/js/inventory/templates/inventoryAdd.tmpl.cshtml +++ b/InventoryTraker.Web/js/inventory/templates/inventoryAdd.tmpl.cshtml @@ -9,7 +9,7 @@
    -

    Inventory Arrival

    +

    Inventory Arrival

    diff --git a/InventoryTraker.Web/js/inventory/templates/inventoryDetails.tmpl.cshtml b/InventoryTraker.Web/js/inventory/templates/inventoryDetails.tmpl.cshtml index 4ca79b3..5ac9eb5 100644 --- a/InventoryTraker.Web/js/inventory/templates/inventoryDetails.tmpl.cshtml +++ b/InventoryTraker.Web/js/inventory/templates/inventoryDetails.tmpl.cshtml @@ -17,8 +17,8 @@ - - @inventory.BindingFor(x => x.Name) + + @inventory.BindingFor(x => x.Name) @inventory.BindingFor(x => x.UnitsPerCase) / @inventory.BindingFor(x => x.ContainerType) @inventory.BindingFor(x => x.Quantity) {{inventory.quantity * inventory.unitsPerCase}} diff --git a/InventoryTraker.Web/js/inventory/templates/inventoryDistribute.tmpl.cshtml b/InventoryTraker.Web/js/inventory/templates/inventoryDistribute.tmpl.cshtml index dd314e2..77509fe 100644 --- a/InventoryTraker.Web/js/inventory/templates/inventoryDistribute.tmpl.cshtml +++ b/InventoryTraker.Web/js/inventory/templates/inventoryDistribute.tmpl.cshtml @@ -9,7 +9,7 @@
    -

    Inventory Distribution

    +

    Inventory Distribution

    diff --git a/InventoryTraker.Web/js/inventory/templates/inventoryEdit.tmpl.cshtml b/InventoryTraker.Web/js/inventory/templates/inventoryEdit.tmpl.cshtml index a64075a..498a898 100644 --- a/InventoryTraker.Web/js/inventory/templates/inventoryEdit.tmpl.cshtml +++ b/InventoryTraker.Web/js/inventory/templates/inventoryEdit.tmpl.cshtml @@ -6,7 +6,7 @@
    -

    Edit Inventory

    +

    Edit Inventory

    diff --git a/InventoryTraker.Web/js/inventoryType/InventoryTypeAddDirective.js b/InventoryTraker.Web/js/inventoryType/InventoryTypeAddDirective.js new file mode 100644 index 0000000..e74748c --- /dev/null +++ b/InventoryTraker.Web/js/inventoryType/InventoryTypeAddDirective.js @@ -0,0 +1,41 @@ +(function() { + "use strict"; + + window.app.directive('inventoryTypeAdd', inventoryTypeAdd); + + function inventoryTypeAdd() { + return { + templateUrl: '/inventoryType/template/inventoryTypeAdd.tmpl.cshtml', + controller: controller, + controllerAs: 'vm' + } + } + + controller.$inject = ['$scope', 'inventoryTypeSvc']; + + function controller($scope, inventoryTypeSvc) { + var vm = this; + + vm.add = add; + vm.saving = false; + vm.inventoryType = {}; + + vm.errorMessage = null; + + function add() { + vm.saving = true; + inventoryTypeSvc.add(vm.inventoryType) + .success(function () { + //Close the modal + $scope.$close(); + }) + .error(function(data) { + vm.errorMessage = + 'There was a problem adding the commodity type: ' + data.errorMessage; + }) + .finally(function() { + vm.saving = false; + }); + } + } +})(); \ No newline at end of file diff --git a/InventoryTraker.Web/js/inventoryType/InventoryTypeController.js b/InventoryTraker.Web/js/inventoryType/InventoryTypeController.js new file mode 100644 index 0000000..1cce01c --- /dev/null +++ b/InventoryTraker.Web/js/inventoryType/InventoryTypeController.js @@ -0,0 +1,28 @@ +(function() { + 'use strict'; + + window.app.controller('InventoryTypeController', InventoryTypeController); + + InventoryTypeController.$inject = ['$uibModal', 'inventoryTypeSvc']; + function InventoryTypeController($uibModal, inventoryTypeSvc) { + var vm = this; + + vm.add = add; + vm.edit = edit; + vm.inventoryTypes = inventoryTypeSvc.inventoryTypes; + + function add() { + $uibModal.open({ + template: '', + backdrop: 'static' + }); + } + + function edit() { + $uibModal.open({ + template: '', + backdrop: 'static' + }); + } + } +})(); \ No newline at end of file diff --git a/InventoryTraker.Web/js/inventoryType/InventoryTypeEditDirective.js b/InventoryTraker.Web/js/inventoryType/InventoryTypeEditDirective.js new file mode 100644 index 0000000..ef113b1 --- /dev/null +++ b/InventoryTraker.Web/js/inventoryType/InventoryTypeEditDirective.js @@ -0,0 +1,42 @@ +(function() { + "use strict"; + + window.app.directive('editInventoryType', editInventory); + + function editInventory() { + return { + scope: { + inventoryType: "=" + }, + templateUrl: '/inventoryType/template/inventoryTypeEdit.tmpl.cshtml', + controller: controller, + controllerAs: 'vm' + } + } + + controller.$inject = ['$scope', 'inventoryTypeSvc']; + function controller($scope, inventoryTypeSvc) { + var vm = this; + vm.inventoryType = angular.copy($scope.inventoryType); + vm.save = save; + + vm.saving = false; + vm.inventoryTypeSvc = inventoryTypeSvc; + vm.errorMessage = null; + + function save() { + vm.saving = true; + inventoryTypeSvc.update($scope.inventoryType, vm.inventoryType) + .success(function () { + //Close the modal + $scope.$parent.$close(); + }) + .error(function(data) { + vm.errorMessage = 'There was a problem saving changes to the commodity type: ' + data.errorMessage; + }) + .finally(function() { + vm.saving = false; + }); + } + } +})(); \ No newline at end of file diff --git a/InventoryTraker.Web/js/inventoryType/InventoryTypeListDirective.js b/InventoryTraker.Web/js/inventoryType/InventoryTypeListDirective.js new file mode 100644 index 0000000..3f2a46b --- /dev/null +++ b/InventoryTraker.Web/js/inventoryType/InventoryTypeListDirective.js @@ -0,0 +1,28 @@ +(function() { + 'use strict'; + + window.app.directive('inventoryTypeList', inventoryTypeList); + function inventoryTypeList() { + return { + scope: { "inventoryTypes": "=" }, + templateUrl: '/inventoryType/template/inventoryTypeList.tmpl.cshtml', + controller: controller, + controllerAs: 'vm' + } + } + + controller.$inject = ['$scope', '$uibModal']; + function controller($scope, $uibModal) { + var vm = this; + + vm.inventoryTypes = $scope.inventoryTypes; + vm.edit = edit; + + function edit(inventoryType) { + $uibModal.open({ + template: '', + scope: angular.extend($scope.$new(true), { inventoryType: inventoryType }) + }); + } + } +})(); \ No newline at end of file diff --git a/InventoryTraker.Web/js/inventory/inventoryTypeSvc.js b/InventoryTraker.Web/js/inventoryType/inventoryTypeSvc.js similarity index 58% rename from InventoryTraker.Web/js/inventory/inventoryTypeSvc.js rename to InventoryTraker.Web/js/inventoryType/inventoryTypeSvc.js index 5e30bd5..138cecb 100644 --- a/InventoryTraker.Web/js/inventory/inventoryTypeSvc.js +++ b/InventoryTraker.Web/js/inventoryType/inventoryTypeSvc.js @@ -10,8 +10,7 @@ var svc = { add: add, update: update, - inventoryTypes: inventoryTypes, - getInventoryType: getInventoryType + inventoryTypes: inventoryTypes }; return svc; @@ -30,19 +29,11 @@ }); } - function update(existingInventory, updatedInventory) { - return $http.post('/InventoryType/Update', updatedInventory) - .success(function (inventory) { - angular.extend(existingInventory, inventory); + function update(existingInventoryType, updatedInventoryType) { + return $http.post('/InventoryType/Update', updatedInventoryType) + .success(function (inventoryType) { + angular.extend(existingInventoryType, inventoryType); }); } - - function getInventoryType(id) { - for (var i = 0; i < inventoryTypes.length; i++) { - if (inventoryTypes[i].Id == id) return inventoryTypes[i]; - } - - return null; - } } })(); \ No newline at end of file diff --git a/InventoryTraker.Web/js/inventoryType/templates/inventoryTypeAdd.tmpl.cshtml b/InventoryTraker.Web/js/inventoryType/templates/inventoryTypeAdd.tmpl.cshtml new file mode 100644 index 0000000..8477b83 --- /dev/null +++ b/InventoryTraker.Web/js/inventoryType/templates/inventoryTypeAdd.tmpl.cshtml @@ -0,0 +1,34 @@ +@using InventoryTraker.Web.Helpers +@model InventoryTraker.Web.Models.InventoryTypeViewModel +@{ + var inventoryType = Html.Angular().ModelFor("vm.inventoryType"); +} +
    +
    + +
    +

    Add Commodity Type

    +
    + +
    + +
    + Enter details for the commodity type below. +
    +
    + {{vm.errorMessage}} +
    + + @Html.Angular().FormForModel("vm.inventoryType") + +
    + +
    + + +
    + +
    +
    \ No newline at end of file diff --git a/InventoryTraker.Web/js/inventoryType/templates/inventoryTypeEdit.tmpl.cshtml b/InventoryTraker.Web/js/inventoryType/templates/inventoryTypeEdit.tmpl.cshtml new file mode 100644 index 0000000..7f27fe4 --- /dev/null +++ b/InventoryTraker.Web/js/inventoryType/templates/inventoryTypeEdit.tmpl.cshtml @@ -0,0 +1,31 @@ +@using InventoryTraker.Web.Helpers +@model InventoryTraker.Web.Models.InventoryTypeViewModel +
    +
    + +
    +

    Edit Commodity Type

    +
    + +
    + +
    + Make changes to the commodity type below. +
    +
    + {{vm.errorMessage}} +
    + + @Html.Angular().FormForModel("vm.inventoryType") + +
    + +
    + + +
    + +
    +
    \ No newline at end of file diff --git a/InventoryTraker.Web/js/inventoryType/templates/inventoryTypeList.tmpl.cshtml b/InventoryTraker.Web/js/inventoryType/templates/inventoryTypeList.tmpl.cshtml new file mode 100644 index 0000000..17ff6bc --- /dev/null +++ b/InventoryTraker.Web/js/inventoryType/templates/inventoryTypeList.tmpl.cshtml @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + + + + + +
    IDNameUnits per CaseContainer TypeWeight Per CasePrice Per Case
    + + {{inventoryType.identifier}} + {{inventoryType.name}}{{inventoryType.unitsPerCase}}{{inventoryType.containerType}}{{inventoryType.weightPerCase}} lbs{{inventoryType.pricePerCase | currency}}
    diff --git a/InventoryTraker.Web/js/transaction/TransactionController.js b/InventoryTraker.Web/js/transaction/TransactionController.js index 69c4bc7..7592444 100644 --- a/InventoryTraker.Web/js/transaction/TransactionController.js +++ b/InventoryTraker.Web/js/transaction/TransactionController.js @@ -30,7 +30,8 @@ '\r{{row.entity.unitsPerCase}} / {{row.entity.containerType}}' + '\rExp Date: {{row.entity.expirationDate | date:shortDate}}' + '\rAdd Date: {{row.entity.addedDate | date:shortDate}}">' + - '{{row.entity.name}}
    ' + ' ' + + '{{row.entity.name}}
    ' }, { field: 'memo', cellTooltip: true }, { field: 'transactionDate', name: 'Transaction Date', cellFilter: "date:MM/dd/yyyy", width: "15%" }, @@ -61,19 +62,12 @@ var updateData = function () { transactionSvc .getTransactions(paginationOptions.pageNumber, paginationOptions.pageSize) - .then(function(data) { + .success(function(data) { vm.gridOptions.totalItems = data.totalItems; vm.gridOptions.data = data.transactions; }); }; updateData(); - - function del() { - $uibModal.open({ - template: '', - backdrop: 'static' - }); - } } })(); \ No newline at end of file diff --git a/InventoryTraker.Web/js/transaction/transactionSvc.js b/InventoryTraker.Web/js/transaction/transactionSvc.js index d0f63f0..7f9f0eb 100644 --- a/InventoryTraker.Web/js/transaction/transactionSvc.js +++ b/InventoryTraker.Web/js/transaction/transactionSvc.js @@ -14,10 +14,10 @@ function getTransactions(pageNumber, pageSize) { var url = '/Transaction/GetTransactions'; - return $http.post(url, {pageNumber: pageNumber, pageSize: pageSize}) - .then(function(data) { - return data.data; - }); + return $http.post(url, { pageNumber: pageNumber, pageSize: pageSize }); + //.success(function(data) { + // return data.data; + //}); } function update(existingTransaction, updatedTransaction) {