From 0b5dde065a501c95251c92eba1b75f93d74a0bc4 Mon Sep 17 00:00:00 2001 From: James Kolpack Date: Fri, 23 Sep 2016 15:12:46 -0400 Subject: [PATCH] Add user management --- .../Controllers/ProfileController.cs | 1 + .../Controllers/UserController.cs | 94 +++++++++++ .../Helpers/AngularModelHelper.cs | 3 + .../InventoryTraker.Web.csproj | 15 +- InventoryTraker.Web/Models/UserCreateForm.cs | 31 ++++ InventoryTraker.Web/Models/UserEditForm.cs | 29 ++++ InventoryTraker.Web/Models/UserViewModel.cs | 24 +++ .../Views/Inventory/Index.cshtml | 2 +- .../Views/InventoryType/Index.cshtml | 4 +- .../Views/Shared/_Navigation.cshtml | 29 ++-- InventoryTraker.Web/Views/User/Index.cshtml | 16 ++ .../js/authentication/LoginController.js | 46 +++--- .../js/inventory/InventoryAddDirective.js | 17 +- .../inventory/InventoryDistributeDirective.js | 17 +- .../js/inventory/InventoryEditDirective.js | 23 ++- .../js/inventory/InventoryListController.js | 46 +++--- .../js/inventory/InventoryListDirective.js | 18 +- .../js/inventory/inventoryInfoDirective.js | 19 +-- .../js/inventory/inventoryRemoveDirective.js | 19 +-- .../js/inventory/inventorySvc.js | 154 +++++++++--------- .../InventoryTypeAddDirective.js | 18 +- .../inventoryType/InventoryTypeController.js | 41 ++--- .../InventoryTypeEditDirective.js | 24 ++- .../InventoryTypeListDirective.js | 24 ++- .../js/inventoryType/inventoryTypeSvc.js | 68 ++++---- .../js/profile/EditProfileController.js | 44 +++-- .../js/report/DistributionReportController.js | 24 ++- .../js/report/DistributionReportDirective.js | 19 +-- .../js/report/MovementReportController.js | 22 ++- .../js/report/MovementReportDirective.js | 19 +-- InventoryTraker.Web/js/report/reportSvc.js | 72 ++++---- .../js/transaction/TransactionController.js | 141 ++++++++-------- .../js/transaction/transactionSvc.js | 56 +++---- InventoryTraker.Web/js/user/UserController.js | 29 ++++ .../js/user/UserCreateDirective.js | 37 +++++ .../js/user/UserEditDirective.js | 42 +++++ .../js/user/UserListDirective.js | 27 +++ .../js/user/templates/userCreate.tmpl.cshtml | 27 +++ .../js/user/templates/userEdit.tmpl.cshtml | 27 +++ .../js/user/templates/userList.tmpl.cshtml | 16 ++ InventoryTraker.Web/js/user/userSvc.js | 42 +++++ .../js/utility/DateRangeQueryDirective.js | 1 - .../js/utility/DownloadService.js | 24 ++- InventoryTraker.Web/js/utility/ErrorList.js | 25 ++- .../utility/FormGroupValidationDirective.js | 42 +++-- InventoryTraker.Web/js/utility/FormatCases.js | 17 +- .../js/utility/HideZeroFilter.js | 13 +- .../utility/InputValidationIconsDirective.js | 38 ++--- .../js/utility/MonthQueryDirective.js | 47 +++--- .../js/utility/MvcGridDirective.js | 46 ------ .../js/utility/ParseDateFilter.js | 15 +- .../js/utility/StatusMessage.js | 25 ++- InventoryTraker.Web/js/utility/ToUnits.js | 17 +- 53 files changed, 1046 insertions(+), 690 deletions(-) create mode 100644 InventoryTraker.Web/Controllers/UserController.cs create mode 100644 InventoryTraker.Web/Models/UserCreateForm.cs create mode 100644 InventoryTraker.Web/Models/UserEditForm.cs create mode 100644 InventoryTraker.Web/Models/UserViewModel.cs create mode 100644 InventoryTraker.Web/Views/User/Index.cshtml create mode 100644 InventoryTraker.Web/js/user/UserController.js create mode 100644 InventoryTraker.Web/js/user/UserCreateDirective.js create mode 100644 InventoryTraker.Web/js/user/UserEditDirective.js create mode 100644 InventoryTraker.Web/js/user/UserListDirective.js create mode 100644 InventoryTraker.Web/js/user/templates/userCreate.tmpl.cshtml create mode 100644 InventoryTraker.Web/js/user/templates/userEdit.tmpl.cshtml create mode 100644 InventoryTraker.Web/js/user/templates/userList.tmpl.cshtml create mode 100644 InventoryTraker.Web/js/user/userSvc.js delete mode 100644 InventoryTraker.Web/js/utility/MvcGridDirective.js diff --git a/InventoryTraker.Web/Controllers/ProfileController.cs b/InventoryTraker.Web/Controllers/ProfileController.cs index 491ec70..1257acd 100644 --- a/InventoryTraker.Web/Controllers/ProfileController.cs +++ b/InventoryTraker.Web/Controllers/ProfileController.cs @@ -1,5 +1,6 @@ using System.Web.Mvc; using AutoMapper; +using InventoryTraker.Web.Core; using InventoryTraker.Web.Identity; using InventoryTraker.Web.Models; using Microsoft.AspNet.Identity; diff --git a/InventoryTraker.Web/Controllers/UserController.cs b/InventoryTraker.Web/Controllers/UserController.cs new file mode 100644 index 0000000..629d1c6 --- /dev/null +++ b/InventoryTraker.Web/Controllers/UserController.cs @@ -0,0 +1,94 @@ +using System.Linq; +using System.Threading.Tasks; +using System.Web.Mvc; +using AutoMapper; +using AutoMapper.QueryableExtensions; +using InventoryTraker.Web.Attributes; +using InventoryTraker.Web.Core; +using InventoryTraker.Web.Identity; +using InventoryTraker.Web.Models; +using Microsoft.AspNet.Identity; +using Microsoft.AspNet.Identity.Owin; +using Microsoft.Owin.Security.DataProtection; + +namespace InventoryTraker.Web.Controllers +{ + public class UserController : ControllerBase + { + private readonly ApplicationUserManager _userManager; + + public UserController(ApplicationUserManager userManager) + { + _userManager = userManager; + } + + public ActionResult Index() + { + return View(); + } + + public JsonResult All() + { + var users = + _userManager + .Users + .ProjectTo() + .OrderBy(u => u.UserName); + + return BetterJson(users); + } + + [ActionLog] + [HttpPost] + public async Task Create(UserEditForm form) + { + if (!ModelState.IsValid) + return GetModelStateErrorListJson(); + + var user = + new User + { + Email = form.Email, + UserName = form.UserName + }; + + var identityResult = await _userManager.CreateAsync(user, form.Password); + + if (!identityResult.Succeeded) + return GetErrorListJson(identityResult.Errors.ToArray()); + + return BetterJson(Mapper.Map(user)); + } + + [ActionLog] + [HttpPost] + public async Task Edit(UserEditForm form) + { + if (!ModelState.IsValid) + return GetModelStateErrorListJson(); + + var user = _userManager.FindByEmail(form.Email); + + user.UserName = form.UserName; + user.Email = form.Email; + + if (!string.IsNullOrEmpty(form.Password)) + { + var provider = new DpapiDataProtectionProvider("Inventory Traker"); + _userManager.UserTokenProvider = new DataProtectorTokenProvider( + provider.Create("EmailConfirmation")); + var resetToken = await _userManager.GeneratePasswordResetTokenAsync(user.Id); + var resetResult = await _userManager.ResetPasswordAsync(user.Id, resetToken, form.Password); + if (!resetResult.Succeeded) + return GetErrorListJson(resetResult.Errors.ToArray()); + } + + var identityResult = _userManager.Update(user); + + if (!identityResult.Succeeded) + return GetErrorListJson(identityResult.Errors.ToArray()); + + return BetterJson(Mapper.Map(user)); + } + } +} \ No newline at end of file diff --git a/InventoryTraker.Web/Helpers/AngularModelHelper.cs b/InventoryTraker.Web/Helpers/AngularModelHelper.cs index c27277d..7a86f97 100644 --- a/InventoryTraker.Web/Helpers/AngularModelHelper.cs +++ b/InventoryTraker.Web/Helpers/AngularModelHelper.cs @@ -119,6 +119,9 @@ namespace InventoryTraker.Web.Helpers if (metadata.DataTypeName == "EmailAddress") input.Attr("type", "email"); + if (metadata.DataTypeName == "Password") + input.Attr("type", "password"); + if (metadata.ModelType == typeof(DateTime)) { //input.Attr("type", "date"); diff --git a/InventoryTraker.Web/InventoryTraker.Web.csproj b/InventoryTraker.Web/InventoryTraker.Web.csproj index ff03f21..605ee7f 100644 --- a/InventoryTraker.Web/InventoryTraker.Web.csproj +++ b/InventoryTraker.Web/InventoryTraker.Web.csproj @@ -232,6 +232,11 @@ + + + + + @@ -263,7 +268,6 @@ - @@ -310,6 +314,9 @@ + + + Designer @@ -335,6 +342,7 @@ + @@ -370,6 +378,9 @@ 201609201242047_Initial.cs + + + @@ -418,6 +429,7 @@ + Web.config @@ -430,6 +442,7 @@ 201609201242047_Initial.cs + 10.0 $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) diff --git a/InventoryTraker.Web/Models/UserCreateForm.cs b/InventoryTraker.Web/Models/UserCreateForm.cs new file mode 100644 index 0000000..1d255cc --- /dev/null +++ b/InventoryTraker.Web/Models/UserCreateForm.cs @@ -0,0 +1,31 @@ +using System.ComponentModel.DataAnnotations; + +namespace InventoryTraker.Web.Models +{ + public class UserCreateForm + { + [Required] + [StringLength(128)] + [RegularExpression(@"[A-Za-z().]+(\s+[A-Za-z().]+)+", ErrorMessage = "Need complete name")] + public string UserName { get; set; } + + [Required] + [DataType(DataType.EmailAddress)] + [RegularExpression(@"[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,4}", ErrorMessage = "Must be an email address")] + public string Email { get; set; } + + [Required] + [DataType(DataType.Password)] + public string Password { get; set; } + + [Required(ErrorMessage = "Confirm Password is required")] + [DataType(DataType.Password)] + [Compare("Password")] + public string ConfirmPassword { get; set; } + + public override string ToString() + { + return $"UserName: {UserName}, email: {Email}"; + } + } +} \ No newline at end of file diff --git a/InventoryTraker.Web/Models/UserEditForm.cs b/InventoryTraker.Web/Models/UserEditForm.cs new file mode 100644 index 0000000..73e3223 --- /dev/null +++ b/InventoryTraker.Web/Models/UserEditForm.cs @@ -0,0 +1,29 @@ +using System.ComponentModel.DataAnnotations; + +namespace InventoryTraker.Web.Models +{ + public class UserEditForm + { + [Required] + [StringLength(128)] + [RegularExpression(@"[A-Za-z().]+(\s+[A-Za-z().]+)+", ErrorMessage = "Need complete name")] + public string UserName { get; set; } + + [Required] + [DataType(DataType.EmailAddress)] + [RegularExpression(@"[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,4}", ErrorMessage = "Must be an email address")] + public string Email { get; set; } + + [DataType(DataType.Password)] + public string Password { get; set; } + + [DataType(DataType.Password)] + [Compare("Password")] + public string ConfirmPassword { get; set; } + + public override string ToString() + { + return $"UserName: {UserName}, email: {Email}"; + } + } +} \ No newline at end of file diff --git a/InventoryTraker.Web/Models/UserViewModel.cs b/InventoryTraker.Web/Models/UserViewModel.cs new file mode 100644 index 0000000..025697d --- /dev/null +++ b/InventoryTraker.Web/Models/UserViewModel.cs @@ -0,0 +1,24 @@ +using System.ComponentModel.DataAnnotations; +using Heroic.AutoMapper; +using InventoryTraker.Web.Core; + +namespace InventoryTraker.Web.Models +{ + public class UserViewModel : IMapFrom + { + [Required] + [StringLength(128)] + [RegularExpression(@"[A-Za-z().]+(\s+[A-Za-z().]+)+", ErrorMessage = "Need complete name")] + public string UserName { get; set; } + + [Required] + [DataType(DataType.EmailAddress)] + [RegularExpression(@"[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,4}", ErrorMessage = "Must be an email address")] + public string Email { get; set; } + + public override string ToString() + { + return $"UserName: {UserName}, email: {Email}"; + } + } +} \ No newline at end of file diff --git a/InventoryTraker.Web/Views/Inventory/Index.cshtml b/InventoryTraker.Web/Views/Inventory/Index.cshtml index e603bbd..2a032ec 100644 --- a/InventoryTraker.Web/Views/Inventory/Index.cshtml +++ b/InventoryTraker.Web/Views/Inventory/Index.cshtml @@ -4,7 +4,7 @@

- Inventory + @ViewBag.Title

Current inventory

diff --git a/InventoryTraker.Web/Views/InventoryType/Index.cshtml b/InventoryTraker.Web/Views/InventoryType/Index.cshtml index 1f9e0cd..d7ac58a 100644 --- a/InventoryTraker.Web/Views/InventoryType/Index.cshtml +++ b/InventoryTraker.Web/Views/InventoryType/Index.cshtml @@ -1,12 +1,12 @@ @model dynamic @{ - ViewBag.Title = "Inventory"; + ViewBag.Title = "Commodity Types"; }

- Commodity Types + @ViewBag.Title

Add diff --git a/InventoryTraker.Web/Views/Shared/_Navigation.cshtml b/InventoryTraker.Web/Views/Shared/_Navigation.cshtml index f27d29f..a27efb4 100644 --- a/InventoryTraker.Web/Views/Shared/_Navigation.cshtml +++ b/InventoryTraker.Web/Views/Shared/_Navigation.cshtml @@ -10,19 +10,22 @@ Inventory Traker
- +
    diff --git a/InventoryTraker.Web/Views/User/Index.cshtml b/InventoryTraker.Web/Views/User/Index.cshtml new file mode 100644 index 0000000..f4a4f72 --- /dev/null +++ b/InventoryTraker.Web/Views/User/Index.cshtml @@ -0,0 +1,16 @@ +@model dynamic + +@{ + ViewBag.Title = "Users"; +} + +
    +

    + @ViewBag.Title +

    +
    + Create +
    + + +
    \ No newline at end of file diff --git a/InventoryTraker.Web/js/authentication/LoginController.js b/InventoryTraker.Web/js/authentication/LoginController.js index ccf2b8b..3894abd 100644 --- a/InventoryTraker.Web/js/authentication/LoginController.js +++ b/InventoryTraker.Web/js/authentication/LoginController.js @@ -1,30 +1,28 @@ (function () { 'use strict'; - window.app.controller('LoginController', LoginController); - - LoginController.$inject = ['$window', '$http']; - function LoginController($window, $http) { - var vm = this; - vm.errorMessage = null; - vm.loggingIn = false; - vm.login = login; - - function login() { - - vm.loggingIn = true; + window.app.controller('LoginController', + function($window, $http) { + var vm = this; vm.errorMessage = null; + vm.loggingIn = false; + vm.login = login; - $http.post("/Authentication/Login", { emailAddress: vm.emailAddress, password: vm.password }) - .success(function() { - $window.location.href = "/"; - }) - .error(function(data) { - vm.errorMessage = "There was a problem logging in: " + data; - }) - .finally(function() { - vm.loggingIn = false; - }); - } - } + function login() { + + vm.loggingIn = true; + vm.errorMessage = null; + + $http.post("/Authentication/Login", { emailAddress: vm.emailAddress, password: vm.password }) + .success(function() { + $window.location.href = "/"; + }) + .error(function(data) { + vm.errorMessage = "There was a problem logging in: " + data; + }) + .finally(function() { + vm.loggingIn = false; + }); + } + }); })(); diff --git a/InventoryTraker.Web/js/inventory/InventoryAddDirective.js b/InventoryTraker.Web/js/inventory/InventoryAddDirective.js index 3dbc7db..97da381 100644 --- a/InventoryTraker.Web/js/inventory/InventoryAddDirective.js +++ b/InventoryTraker.Web/js/inventory/InventoryAddDirective.js @@ -1,15 +1,14 @@ (function() { "use strict"; - window.app.directive('inventoryAdd', inventoryAdd); - - function inventoryAdd() { - return { - templateUrl: '/inventory/template/inventoryAdd.tmpl.cshtml', - controller: controller, - controllerAs: 'vm' - } - } + window.app.directive('inventoryAdd', + function() { + return { + templateUrl: '/inventory/template/inventoryAdd.tmpl.cshtml', + controller: controller, + controllerAs: 'vm' + } + }); controller.$inject = ['$scope', 'inventorySvc', 'inventoryTypeSvc']; diff --git a/InventoryTraker.Web/js/inventory/InventoryDistributeDirective.js b/InventoryTraker.Web/js/inventory/InventoryDistributeDirective.js index 415d79e..2124cd8 100644 --- a/InventoryTraker.Web/js/inventory/InventoryDistributeDirective.js +++ b/InventoryTraker.Web/js/inventory/InventoryDistributeDirective.js @@ -1,15 +1,14 @@ (function() { "use strict"; - window.app.directive('inventoryDistribute', inventoryDistribute); - - function inventoryDistribute() { - return { - templateUrl: '/inventory/template/inventoryDistribute.tmpl.cshtml', - controller: controller, - controllerAs: 'vm' - } - } + window.app.directive('inventoryDistribute', + function() { + return { + templateUrl: '/inventory/template/inventoryDistribute.tmpl.cshtml', + controller: controller, + controllerAs: 'vm' + } + }); controller.$inject = ['$scope', 'inventorySvc']; function controller($scope, inventorySvc) { diff --git a/InventoryTraker.Web/js/inventory/InventoryEditDirective.js b/InventoryTraker.Web/js/inventory/InventoryEditDirective.js index 93cf8fa..cc65ba9 100644 --- a/InventoryTraker.Web/js/inventory/InventoryEditDirective.js +++ b/InventoryTraker.Web/js/inventory/InventoryEditDirective.js @@ -1,18 +1,17 @@ (function() { "use strict"; - window.app.directive('editInventory', editInventory); - - function editInventory() { - return { - scope: { - inventory: "=" - }, - templateUrl: '/inventory/template/inventoryEdit.tmpl.cshtml', - controller: controller, - controllerAs: 'vm' - } - } + window.app.directive('editInventory', + function() { + return { + scope: { + inventory: "=" + }, + templateUrl: '/inventory/template/inventoryEdit.tmpl.cshtml', + controller: controller, + controllerAs: 'vm' + } + }); controller.$inject = ['$scope', '$uibModal', 'inventorySvc', 'transactionSvc']; function controller($scope, $uibModal, inventorySvc, transactionSvc) { diff --git a/InventoryTraker.Web/js/inventory/InventoryListController.js b/InventoryTraker.Web/js/inventory/InventoryListController.js index 993666e..7c43323 100644 --- a/InventoryTraker.Web/js/inventory/InventoryListController.js +++ b/InventoryTraker.Web/js/inventory/InventoryListController.js @@ -1,33 +1,29 @@ (function() { 'use strict'; - window.app.controller('InventoryListController', InventoryListController); + window.app.controller('InventoryListController', + function($uibModal, inventorySvc, downloadSvc) { + var vm = this; - InventoryListController.$inject = ['$uibModal', 'inventorySvc', 'downloadSvc']; - function InventoryListController($uibModal, inventorySvc, downloadSvc) { - var vm = this; + vm.inventories = inventorySvc.inventories; - vm.add = add; - vm.distribute = distribute; - vm.inventories = inventorySvc.inventories; - - function add() { - $uibModal.open({ - template: '', - backdrop: 'static' - }); - } + vm.add = function() { + $uibModal.open({ + template: '', + backdrop: 'static' + }); + }; - function distribute() { - $uibModal.open({ - template: '', - backdrop: 'static' - }); - } + vm.distribute = function() { + $uibModal.open({ + template: '', + backdrop: 'static' + }); + }; - vm.export = function () { - inventorySvc.exportInventory() - .success(downloadSvc.success); - } - } + vm.export = function() { + inventorySvc.exportInventory() + .success(downloadSvc.success); + }; + }); })(); \ No newline at end of file diff --git a/InventoryTraker.Web/js/inventory/InventoryListDirective.js b/InventoryTraker.Web/js/inventory/InventoryListDirective.js index 7377d41..a4845bf 100644 --- a/InventoryTraker.Web/js/inventory/InventoryListDirective.js +++ b/InventoryTraker.Web/js/inventory/InventoryListDirective.js @@ -1,15 +1,15 @@ (function() { 'use strict'; - window.app.directive('inventoryList', inventoryList); - function inventoryList() { - return { - scope: {"inventories" : "="}, - templateUrl: '/inventory/template/inventoryList.tmpl.cshtml', - controller: controller, - controllerAs: 'vm' - } - } + window.app.directive('inventoryList', + function () { + return { + scope: {"inventories" : "="}, + templateUrl: '/inventory/template/inventoryList.tmpl.cshtml', + controller: controller, + controllerAs: 'vm' + } + }); controller.$inject = ['$scope', '$uibModal']; function controller($scope, $uibModal) { diff --git a/InventoryTraker.Web/js/inventory/inventoryInfoDirective.js b/InventoryTraker.Web/js/inventory/inventoryInfoDirective.js index 555e1b9..2d8f867 100644 --- a/InventoryTraker.Web/js/inventory/inventoryInfoDirective.js +++ b/InventoryTraker.Web/js/inventory/inventoryInfoDirective.js @@ -1,16 +1,15 @@ (function() { "use strict"; - window.app.directive('inventoryInfo', inventoryInfo); - - function inventoryInfo() { - return { - scope: { "inventory": "=" }, - templateUrl: '/inventory/template/inventoryInfo.tmpl.cshtml', - controller: controller, - controllerAs: 'vm' - } - } + window.app.directive('inventoryInfo', + function() { + return { + scope: { "inventory": "=" }, + templateUrl: '/inventory/template/inventoryInfo.tmpl.cshtml', + controller: controller, + controllerAs: 'vm' + } + }); controller.$inject = ['$scope']; function controller($scope) { diff --git a/InventoryTraker.Web/js/inventory/inventoryRemoveDirective.js b/InventoryTraker.Web/js/inventory/inventoryRemoveDirective.js index 9ea94e6..ba8dfdf 100644 --- a/InventoryTraker.Web/js/inventory/inventoryRemoveDirective.js +++ b/InventoryTraker.Web/js/inventory/inventoryRemoveDirective.js @@ -1,16 +1,15 @@ (function() { "use strict"; - window.app.directive('inventoryRemove', inventoryRemove); - - function inventoryRemove() { - return { - scope: { "inventory": "=" }, - templateUrl: '/inventory/template/inventoryRemove.tmpl.cshtml', - controller: controller, - controllerAs: 'vm' - } - } + window.app.directive('inventoryRemove', + function() { + return { + scope: { "inventory": "=" }, + templateUrl: '/inventory/template/inventoryRemove.tmpl.cshtml', + controller: controller, + controllerAs: 'vm' + } + }); controller.$inject = ['$scope', 'inventorySvc']; function controller($scope, inventorySvc) { diff --git a/InventoryTraker.Web/js/inventory/inventorySvc.js b/InventoryTraker.Web/js/inventory/inventorySvc.js index 212e9d4..fad3d09 100644 --- a/InventoryTraker.Web/js/inventory/inventorySvc.js +++ b/InventoryTraker.Web/js/inventory/inventorySvc.js @@ -1,87 +1,85 @@ (function() { - window.app.factory('inventorySvc', inventorySvc); + window.app.factory('inventorySvc', + function($http, $filter) { + var inventories = []; - inventorySvc.$inject = ['$http', '$filter']; - function inventorySvc($http, $filter) { - var inventories = []; + loadInventories(); - loadInventories(); + var svc = { + add: add, + distribute: distribute, + update: update, + remove: remove, + inventories: inventories, + get: get, + refresh: refresh, + find: find, + exportInventory: exportInventory + }; - var svc = { - add: add, - distribute: distribute, - update: update, - remove: remove, - inventories: inventories, - get: get, - refresh: refresh, - find: find, - exportInventory: exportInventory - }; + return svc; - return svc; - - function loadInventories() { - $http.post('/Inventory/All') - .success(function(data) { - angular.copy(data, inventories); - }); - } - - function exportInventory() { - return $http.post('/Inventory/Export', {}, { responseType: 'arraybuffer' }); - } - - function add(inventory) { - return $http.post('/Inventory/Add', inventory) - .success(function(inventory) { - inventories.unshift(inventory); - }); - } - - function distribute(distribution) { - return $http.post('/Inventory/Distribute', distribution) - .success(function (data) { - angular.copy(data, inventories); - }); - } - - function update(existingInventory, updatedInventory) { - return $http.post('/Inventory/Update', updatedInventory) - .success(function(inventory) { - angular.extend(existingInventory, inventory); - }); - } - - // remove quantity from this inventory - function remove(removeForm) { - var existingInventory = get(removeForm.inventoryId); - return $http.post('/Inventory/Remove', removeForm) - .success(function(data) { - angular.copy(data, existingInventory); - }); - } - - function get(id) { - var results = $filter('filter')(inventories, { id: id }); - if (results.length > 0) - return results[0]; - return null; - } - - // refresh this inventory from the server - function refresh(id) { - var existingInventory = get(id); - if (existingInventory) { - find(id) - .success(function(inventory) { - angular.copy(inventory, existingInventory); + function loadInventories() { + $http.post('/Inventory/All') + .success(function(data) { + angular.copy(data, inventories); }); } - } - function find(id) { - return $http.post('/Inventory/Find', { id: id }); - } - } + function exportInventory() { + return $http.post('/Inventory/Export', {}, { responseType: 'arraybuffer' }); + } + + function add(inventory) { + return $http.post('/Inventory/Add', inventory) + .success(function(inventory) { + inventories.unshift(inventory); + }); + } + + function distribute(distribution) { + return $http.post('/Inventory/Distribute', distribution) + .success(function(data) { + angular.copy(data, inventories); + }); + } + + function update(existingInventory, updatedInventory) { + return $http.post('/Inventory/Update', updatedInventory) + .success(function(inventory) { + angular.extend(existingInventory, inventory); + }); + } + + // remove quantity from this inventory + function remove(removeForm) { + var existingInventory = get(removeForm.inventoryId); + return $http.post('/Inventory/Remove', removeForm) + .success(function(data) { + angular.copy(data, existingInventory); + }); + } + + function get(id) { + var results = $filter('filter')(inventories, { id: id }); + if (results.length > 0) + return results[0]; + return null; + } + + // refresh this inventory from the server + function refresh(id) { + var existingInventory = get(id); + if (existingInventory) { + find(id) + .success(function(inventory) { + angular.copy(inventory, existingInventory); + }); + } + } + + function find(id) { + return $http.post('/Inventory/Find', { id: id }); + } + }); })(); \ No newline at end of file diff --git a/InventoryTraker.Web/js/inventoryType/InventoryTypeAddDirective.js b/InventoryTraker.Web/js/inventoryType/InventoryTypeAddDirective.js index b3f6fca..8941803 100644 --- a/InventoryTraker.Web/js/inventoryType/InventoryTypeAddDirective.js +++ b/InventoryTraker.Web/js/inventoryType/InventoryTypeAddDirective.js @@ -1,17 +1,15 @@ (function() { "use strict"; - window.app.directive('inventoryTypeAdd', inventoryTypeAdd); + window.app.directive("inventoryTypeAdd", + function() { + return { + templateUrl: "/inventoryType/template/inventoryTypeAdd.tmpl.cshtml", + controller: controller, + controllerAs: "vm" + }; + }); - function inventoryTypeAdd() { - return { - templateUrl: '/inventoryType/template/inventoryTypeAdd.tmpl.cshtml', - controller: controller, - controllerAs: 'vm' - } - } - - controller.$inject = ['$scope', 'inventoryTypeSvc']; function controller($scope, inventoryTypeSvc){ var vm = this; diff --git a/InventoryTraker.Web/js/inventoryType/InventoryTypeController.js b/InventoryTraker.Web/js/inventoryType/InventoryTypeController.js index 7722957..7455732 100644 --- a/InventoryTraker.Web/js/inventoryType/InventoryTypeController.js +++ b/InventoryTraker.Web/js/inventoryType/InventoryTypeController.js @@ -1,33 +1,22 @@ (function() { 'use strict'; - window.app.controller('InventoryTypeController', InventoryTypeController); + window.app.controller('InventoryTypeController', + function($uibModal, inventoryTypeSvc, downloadSvc) { + var vm = this; - InventoryTypeController.$inject = ['$uibModal', 'inventoryTypeSvc', 'downloadSvc']; - function InventoryTypeController($uibModal, inventoryTypeSvc, downloadSvc) { - var vm = this; + vm.inventoryTypes = inventoryTypeSvc.inventoryTypes; - vm.add = add; - vm.edit = edit; - vm.inventoryTypes = inventoryTypeSvc.inventoryTypes; + vm.add = function() { + $uibModal.open({ + template: '', + backdrop: 'static' + }); + } - function add() { - $uibModal.open({ - template: '', - backdrop: 'static' - }); - } - - function edit() { - $uibModal.open({ - template: '', - backdrop: 'static' - }); - } - - vm.export = function () { - inventoryTypeSvc.exportInventoryTypes() - .success(downloadSvc.success); - } - } + vm.export = function() { + inventoryTypeSvc.exportInventoryTypes() + .success(downloadSvc.success); + } + }); })(); \ No newline at end of file diff --git a/InventoryTraker.Web/js/inventoryType/InventoryTypeEditDirective.js b/InventoryTraker.Web/js/inventoryType/InventoryTypeEditDirective.js index efef121..35e341b 100644 --- a/InventoryTraker.Web/js/inventoryType/InventoryTypeEditDirective.js +++ b/InventoryTraker.Web/js/inventoryType/InventoryTypeEditDirective.js @@ -1,20 +1,18 @@ (function() { "use strict"; - window.app.directive('editInventoryType', editInventory); + window.app.directive('editInventoryType', + function() { + return { + scope: { + inventoryType: "=" + }, + templateUrl: '/inventoryType/template/inventoryTypeEdit.tmpl.cshtml', + controller: controller, + controllerAs: 'vm' + } + }); - 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); diff --git a/InventoryTraker.Web/js/inventoryType/InventoryTypeListDirective.js b/InventoryTraker.Web/js/inventoryType/InventoryTypeListDirective.js index 3f2a46b..ee7784b 100644 --- a/InventoryTraker.Web/js/inventoryType/InventoryTypeListDirective.js +++ b/InventoryTraker.Web/js/inventoryType/InventoryTypeListDirective.js @@ -1,28 +1,26 @@ (function() { 'use strict'; - window.app.directive('inventoryTypeList', inventoryTypeList); - function inventoryTypeList() { - return { - scope: { "inventoryTypes": "=" }, - templateUrl: '/inventoryType/template/inventoryTypeList.tmpl.cshtml', - controller: controller, - controllerAs: 'vm' - } - } + window.app.directive('inventoryTypeList', + function() { + 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) { + vm.edit = function(inventoryType) { $uibModal.open({ template: '', scope: angular.extend($scope.$new(true), { inventoryType: inventoryType }) }); - } + }; } })(); \ No newline at end of file diff --git a/InventoryTraker.Web/js/inventoryType/inventoryTypeSvc.js b/InventoryTraker.Web/js/inventoryType/inventoryTypeSvc.js index 432653c..d021543 100644 --- a/InventoryTraker.Web/js/inventoryType/inventoryTypeSvc.js +++ b/InventoryTraker.Web/js/inventoryType/inventoryTypeSvc.js @@ -1,44 +1,42 @@ (function () { - window.app.factory('inventoryTypeSvc', inventoryTypeSvc); + window.app.factory('inventoryTypeSvc', + function($http) { + var inventoryTypes = []; - inventoryTypeSvc.$inject = ['$http']; - function inventoryTypeSvc($http) { - var inventoryTypes = []; + loadInventoryTypes(); - loadInventoryTypes(); + var svc = { + add: add, + update: update, + inventoryTypes: inventoryTypes, + exportInventoryTypes: exportInventoryTypes + }; - var svc = { - add: add, - update: update, - inventoryTypes: inventoryTypes, - exportInventoryTypes: exportInventoryTypes - }; + return svc; - return svc; + function loadInventoryTypes() { + $http.post('/InventoryType/All') + .success(function(data) { + inventoryTypes.addRange(data); + }); + } - function loadInventoryTypes() { - $http.post('/InventoryType/All') - .success(function (data) { - inventoryTypes.addRange(data); - }); - } + function exportInventoryTypes() { + return $http.post('/InventoryType/Export', {}, { responseType: 'arraybuffer' }); + } - function exportInventoryTypes() { - return $http.post('/InventoryType/Export', {}, { responseType: 'arraybuffer' }); - } + function add(inventoryType) { + return $http.post('/InventoryType/Add', inventoryType) + .success(function(inventoryType) { + inventoryTypes.unshift(inventoryType); + }); + } - function add(inventoryType) { - return $http.post('/InventoryType/Add', inventoryType) - .success(function (inventoryType) { - inventoryTypes.unshift(inventoryType); - }); - } - - function update(existingInventoryType, updatedInventoryType) { - return $http.post('/InventoryType/Update', updatedInventoryType) - .success(function (inventoryType) { - angular.extend(existingInventoryType, inventoryType); - }); - } - } + function update(existingInventoryType, updatedInventoryType) { + return $http.post('/InventoryType/Update', updatedInventoryType) + .success(function(inventoryType) { + angular.extend(existingInventoryType, inventoryType); + }); + } + }); })(); \ No newline at end of file diff --git a/InventoryTraker.Web/js/profile/EditProfileController.js b/InventoryTraker.Web/js/profile/EditProfileController.js index 1a1243f..b3993de 100644 --- a/InventoryTraker.Web/js/profile/EditProfileController.js +++ b/InventoryTraker.Web/js/profile/EditProfileController.js @@ -1,30 +1,28 @@ (function() { 'use strict'; - window.app.controller('EditProfileController', EditProfileController); + window.app.controller('EditProfileController', + function($http, editProfileConfig, model) { + var vm = this; - EditProfileController.$inject = ['$http', 'editProfileConfig', 'model']; - function EditProfileController($http, editProfileConfig, model) { - var vm = this; + vm.profile = model; + vm.save = save; - vm.profile = model; - vm.save = save; + function save() { + vm.saving = true; + vm.errorMessage = null; + vm.success = false; - function save() { - vm.saving = true; - vm.errorMessage = null; - vm.success = false; - - $http.post(editProfileConfig.saveUrl, vm.profile) - .success(function() { - vm.success = true; - }) - .error(function(msg) { - vm.errorMessage = msg; - }) - .finally(function() { - vm.saving = false; - }); - } - } + $http.post(editProfileConfig.saveUrl, vm.profile) + .success(function() { + vm.success = true; + }) + .error(function(msg) { + vm.errorMessage = msg; + }) + .finally(function() { + vm.saving = false; + }); + } + }); })(); \ No newline at end of file diff --git a/InventoryTraker.Web/js/report/DistributionReportController.js b/InventoryTraker.Web/js/report/DistributionReportController.js index 21ca2ae..c4e92ce 100644 --- a/InventoryTraker.Web/js/report/DistributionReportController.js +++ b/InventoryTraker.Web/js/report/DistributionReportController.js @@ -1,17 +1,15 @@ (function () { 'use strict'; - window.app.controller('DistributionReportController', DistributionReportController); - - DistributionReportController.$inject = ['$scope', 'reportSvc', 'downloadSvc']; - function DistributionReportController($scope, reportSvc, downloadSvc) { - var vm = this; - vm.loadData = reportSvc.loadDistributionReport; - vm.query = reportSvc.distributionQuery; - vm.distributionData = reportSvc.distributionData; - vm.export = function (params) { - reportSvc.exportDistributionReport(params) - .success(downloadSvc.success); - } - } + window.app.controller('DistributionReportController', + function($scope, reportSvc, downloadSvc) { + var vm = this; + vm.loadData = reportSvc.loadDistributionReport; + vm.query = reportSvc.distributionQuery; + vm.distributionData = reportSvc.distributionData; + vm.export = function(params) { + reportSvc.exportDistributionReport(params) + .success(downloadSvc.success); + } + }); })(); \ No newline at end of file diff --git a/InventoryTraker.Web/js/report/DistributionReportDirective.js b/InventoryTraker.Web/js/report/DistributionReportDirective.js index bb38b57..279f632 100644 --- a/InventoryTraker.Web/js/report/DistributionReportDirective.js +++ b/InventoryTraker.Web/js/report/DistributionReportDirective.js @@ -1,17 +1,16 @@ (function() { 'use strict'; - window.app.directive('distributionReport', distributionReport); - function distributionReport() { - return { - scope: {distributionData: "="}, - templateUrl: '/report/template/distributionReport.tmpl.cshtml', - controller: controller, - controllerAs: 'vm' - } - } + window.app.directive('distributionReport', + function () { + return { + scope: {distributionData: "="}, + templateUrl: '/report/template/distributionReport.tmpl.cshtml', + controller: controller, + controllerAs: 'vm' + } + }); - controller.$inject = ['$scope']; function controller($scope) { var vm = this; vm.distributionData = $scope.distributionData; diff --git a/InventoryTraker.Web/js/report/MovementReportController.js b/InventoryTraker.Web/js/report/MovementReportController.js index 799ba73..5f94fa5 100644 --- a/InventoryTraker.Web/js/report/MovementReportController.js +++ b/InventoryTraker.Web/js/report/MovementReportController.js @@ -1,16 +1,14 @@ (function () { 'use strict'; - window.app.controller('MovementReportController', MovementReportController); - - MovementReportController.$inject = ['$scope', 'reportSvc', 'downloadSvc']; - function MovementReportController($scope, reportSvc, downloadSvc) { - var vm = this; - vm.loadData = reportSvc.loadMovementData; - vm.movementData = reportSvc.movementData; - vm.export = function(month) { - reportSvc.exportMovementData({month: month}) - .success(downloadSvc.success); - } - } + window.app.controller('MovementReportController', + function($scope, reportSvc, downloadSvc) { + var vm = this; + vm.loadData = reportSvc.loadMovementData; + vm.movementData = reportSvc.movementData; + vm.export = function(month) { + reportSvc.exportMovementData({ month: month }) + .success(downloadSvc.success); + } + }); })(); \ No newline at end of file diff --git a/InventoryTraker.Web/js/report/MovementReportDirective.js b/InventoryTraker.Web/js/report/MovementReportDirective.js index 186ecfa..e84820e 100644 --- a/InventoryTraker.Web/js/report/MovementReportDirective.js +++ b/InventoryTraker.Web/js/report/MovementReportDirective.js @@ -1,17 +1,16 @@ (function() { 'use strict'; - window.app.directive('movementReport', movementReport); - function movementReport() { - return { - scope: { movementData: "=" }, - templateUrl: '/report/template/movementReport.tmpl.cshtml', - controller: controller, - controllerAs: 'vm' - } - } + window.app.directive('movementReport', + function() { + return { + scope: { movementData: "=" }, + templateUrl: '/report/template/movementReport.tmpl.cshtml', + controller: controller, + controllerAs: 'vm' + } + }); - controller.$inject = ['$scope', '$uibModal', 'inventorySvc']; function controller($scope, $uibModal, inventorySvc) { var vm = this; vm.movementData = $scope.movementData; diff --git a/InventoryTraker.Web/js/report/reportSvc.js b/InventoryTraker.Web/js/report/reportSvc.js index 180124e..44fab75 100644 --- a/InventoryTraker.Web/js/report/reportSvc.js +++ b/InventoryTraker.Web/js/report/reportSvc.js @@ -1,45 +1,43 @@ (function () { - window.app.factory('reportSvc', reportSvc); + window.app.factory('reportSvc', + function($http) { + var distributionData = []; + var distributionQuery = {}; + var movementData = {}; - reportSvc.$inject = ['$http']; - function reportSvc($http) { - var distributionData = []; - var distributionQuery = {}; - var movementData = {}; + var svc = { + distributionData: distributionData, + distributionQuery: distributionQuery, + loadDistributionReport: loadDistributionReport, + exportDistributionReport: exportDistributionReport, + movementData: movementData, + loadMovementData: loadMovementData, + exportMovementData: exportMovementData + }; - var svc = { - distributionData: distributionData, - distributionQuery: distributionQuery, - loadDistributionReport: loadDistributionReport, - exportDistributionReport: exportDistributionReport, - movementData: movementData, - loadMovementData: loadMovementData, - exportMovementData: exportMovementData - }; + return svc; - return svc; + function loadDistributionReport(query) { + return $http.post('/Report/Distribution', query) + .success(function(data) { + distributionQuery = angular.copy(query, distributionQuery); + angular.copy(data, distributionData); + }); + } - function loadDistributionReport(query) { - return $http.post('/Report/Distribution', query) - .success(function (data) { - distributionQuery = angular.copy(query, distributionQuery); - angular.copy(data, distributionData); - }); - } + function exportDistributionReport(query) { + return $http.post('/Report/DistributionExcel', query, { responseType: 'arraybuffer' }); + } - function exportDistributionReport(query) { - return $http.post('/Report/DistributionExcel', query, { responseType: 'arraybuffer' }); - } + function loadMovementData(query) { + return $http.post('/Report/Movement', query) + .success(function(data) { + angular.copy(data, movementData); + }); + } - function loadMovementData(query) { - return $http.post('/Report/Movement', query) - .success(function (data) { - angular.copy(data, movementData); - }); - } - - function exportMovementData(query) { - return $http.post('/Report/MovementExcel', query, { responseType: 'arraybuffer' }); - } - } + function exportMovementData(query) { + return $http.post('/Report/MovementExcel', query, { responseType: 'arraybuffer' }); + } + }); })(); \ No newline at end of file diff --git a/InventoryTraker.Web/js/transaction/TransactionController.js b/InventoryTraker.Web/js/transaction/TransactionController.js index 23012a9..705ecaa 100644 --- a/InventoryTraker.Web/js/transaction/TransactionController.js +++ b/InventoryTraker.Web/js/transaction/TransactionController.js @@ -1,82 +1,81 @@ (function() { 'use strict'; - window.app.controller('TransactionController', TransactionController); + window.app.controller('TransactionController', + function($scope, $uibModal, transactionSvc, inventorySvc, uiGridConstants) { + var vm = this; - TransactionController.$inject = ['$scope', '$uibModal', 'transactionSvc', 'inventorySvc', 'uiGridConstants']; - function TransactionController($scope, $uibModal, transactionSvc, inventorySvc, uiGridConstants) { - var vm = this; + var paginationOptions = { + pageNumber: 1, + pageSize: 20, + pageSizes: [20, 50, 100], + sort: null + }; - var paginationOptions = { - pageNumber: 1, - pageSize: 20, - pageSizes: [20,50,100], - sort: null - }; - - vm.gridOptions = { - enablePaginationControls: true, - paginationPageSize: paginationOptions.pageSize, - paginationPageSizes: paginationOptions.pageSizes, - useExternalPagination: true, - enableSorting: false, - columnDefs: [ - { - field: 'name', - cellTooltip: function(row) { - return row.entity.name + "\r" + row.entity.unitsPerCase + " / " + row.entity.containerType; + vm.gridOptions = { + enablePaginationControls: true, + paginationPageSize: paginationOptions.pageSize, + paginationPageSizes: paginationOptions.pageSizes, + useExternalPagination: true, + enableSorting: false, + columnDefs: [ + { + field: 'name', + cellTooltip: function(row) { + return row.entity.name + "\r" + row.entity.unitsPerCase + " / " + row.entity.containerType; + }, + cellTemplate: '
    ' + + ' ' + + '{{row.entity.name}}
    ', + width: "20%" }, - cellTemplate: '
    ' + - ' ' + - '{{row.entity.name}}
    ', - width: "20%" - }, - { field: 'transactionType', name: 'Type', width: "10%" }, - { field: 'destination', cellTooltip: true, width: "10%" }, - { field: 'memo', cellTooltip: true, width: "15%" }, - { field: 'transactionDate', name: 'Transaction Date', cellFilter: "date:'shortDate'", width: "10%" }, - { field: 'previousQuantity', name: 'Prev Qty', width: "10%", enableSorting: false }, - { field: 'addedQuantity', name: 'Add Qty', width: "10%", enableSorting: false, cellFilter: "hideZero" }, - { field: 'removedQuantity', name: 'Remove Qty', width: "10%", enableSorting: false, cellFilter: "hideZero" }, - { field: 'currentQuantity', name: 'Current Qty', width: "10%", enableSorting: false } - ], - onRegisterApi: function(gridApi) { - vm.gridApi = gridApi; - vm.gridApi.pagination - .on.paginationChanged($scope, function(pageNumber, pageSize) { - paginationOptions.pageNumber = pageNumber; - paginationOptions.pageSize = pageSize; - updateData(); + { field: 'transactionType', name: 'Type', width: "10%" }, + { field: 'destination', cellTooltip: true, width: "10%" }, + { field: 'memo', cellTooltip: true, width: "15%" }, + { field: 'transactionDate', name: 'Transaction Date', cellFilter: "date:'shortDate'", width: "10%" }, + { field: 'previousQuantity', name: 'Prev Qty', width: "10%", enableSorting: false }, + { field: 'addedQuantity', name: 'Add Qty', width: "10%", enableSorting: false, cellFilter: "hideZero" }, + { field: 'removedQuantity', name: 'Remove Qty', width: "10%", enableSorting: false, cellFilter: "hideZero" }, + { field: 'currentQuantity', name: 'Current Qty', width: "10%", enableSorting: false } + ], + onRegisterApi: function(gridApi) { + vm.gridApi = gridApi; + vm.gridApi.pagination + .on.paginationChanged($scope, + function(pageNumber, pageSize) { + paginationOptions.pageNumber = pageNumber; + paginationOptions.pageSize = pageSize; + updateData(); + }); + } + }; + + function updateData() { + transactionSvc + .filterByPage(paginationOptions.pageNumber, paginationOptions.pageSize) + .success(function(data) { + vm.gridOptions.data = data.transactions; + vm.gridOptions.totalItems = data.totalItems; }); } - }; - function updateData() { - transactionSvc - .filterByPage(paginationOptions.pageNumber, paginationOptions.pageSize) - .success(function (data) { - vm.gridOptions.data = data.transactions; - vm.gridOptions.totalItems = data.totalItems; - }); - } + updateData(); - updateData(); - - $scope.editInventory = function (inventoryId) { - inventorySvc.find(inventoryId) - .success(function(inventory) { - $uibModal.open({ - template: '', - scope: angular.extend($scope.$new(true), { inventory: inventory }) - }) - .closed.then(function() { - updateData(); - }); - }); - } - } + $scope.editInventory = function(inventoryId) { + inventorySvc.find(inventoryId) + .success(function(inventory) { + $uibModal.open({ + template: '', + scope: angular.extend($scope.$new(true), { inventory: inventory }) + }) + .closed.then(function() { + updateData(); + }); + }); + } + }); })(); \ No newline at end of file diff --git a/InventoryTraker.Web/js/transaction/transactionSvc.js b/InventoryTraker.Web/js/transaction/transactionSvc.js index 1ddc92c..3911470 100644 --- a/InventoryTraker.Web/js/transaction/transactionSvc.js +++ b/InventoryTraker.Web/js/transaction/transactionSvc.js @@ -1,37 +1,35 @@ (function() { - window.app.factory('transactionSvc', transactionSvc); + window.app.factory('transactionSvc', + function($http, inventorySvc) { - transactionSvc.$inject = ['$http', 'inventorySvc']; - function transactionSvc($http, inventorySvc) { + var svc = { + filterByPage: filterByPage, + filterByInventoryId: filterByInventoryId, + deleteTransaction: deleteTransaction + }; - var svc = { - filterByPage: filterByPage, - filterByInventoryId: filterByInventoryId, - deleteTransaction: deleteTransaction - }; + return svc; - return svc; - - function filterByPage(pageNumber, pageSize) { - return getTransactions({ pageNumber: pageNumber, pageSize: pageSize }); - } + function filterByPage(pageNumber, pageSize) { + return getTransactions({ pageNumber: pageNumber, pageSize: pageSize }); + } - function filterByInventoryId(inventoryId) { - return getTransactions({ inventoryId: inventoryId }); - } + function filterByInventoryId(inventoryId) { + return getTransactions({ inventoryId: inventoryId }); + } - function getTransactions(params) { - var url = '/Transaction/Get'; - return $http.post(url, params) - .success(function (data) { - }); - } + function getTransactions(params) { + var url = '/Transaction/Get'; + return $http.post(url, params) + .success(function(data) { + }); + } - function deleteTransaction(transactionId) { - return $http.post('/Transaction/Delete', { transactionId: transactionId }) - .success(function (data) { - inventorySvc.refresh(data.inventoryId); - }); - } - } + function deleteTransaction(transactionId) { + return $http.post('/Transaction/Delete', { transactionId: transactionId }) + .success(function(data) { + inventorySvc.refresh(data.inventoryId); + }); + } + }); })(); \ No newline at end of file diff --git a/InventoryTraker.Web/js/user/UserController.js b/InventoryTraker.Web/js/user/UserController.js new file mode 100644 index 0000000..fa4f16e --- /dev/null +++ b/InventoryTraker.Web/js/user/UserController.js @@ -0,0 +1,29 @@ +(function() { + 'use strict'; + + window.app.controller('UserController', + function($uibModal, userSvc, downloadSvc) { + var vm = this; + + vm.users = userSvc.users; + + vm.create = function() { + $uibModal.open({ + template: '', + backdrop: 'static' + }); + } + + vm.edit = function() { + $uibModal.open({ + template: '', + backdrop: 'static' + }); + } + + vm.export = function() { + userSvc.exportUsers() + .success(downloadSvc.success); + } + }); +})(); \ No newline at end of file diff --git a/InventoryTraker.Web/js/user/UserCreateDirective.js b/InventoryTraker.Web/js/user/UserCreateDirective.js new file mode 100644 index 0000000..086f582 --- /dev/null +++ b/InventoryTraker.Web/js/user/UserCreateDirective.js @@ -0,0 +1,37 @@ +(function() { + "use strict"; + + window.app.directive('userCreate', function() { + return { + templateUrl: '/user/template/userCreate.tmpl.cshtml', + controller: controller, + controllerAs: 'vm' + } + }); + + function controller($scope, userSvc){ + var vm = this; + + vm.saving = false; + vm.user = {}; + + vm.statusMessage = "Create a user"; + vm.errorMessages = []; + + vm.create = function() { + vm.statusMessage = null; + vm.saving = true; + userSvc.create(vm.user) + .success(function() { + //Close the modal + $scope.$close(); + }) + .error(function(data) { + vm.errorMessages = angular.copy(data.errorMessages, vm.errorMessages); + }) + .finally(function() { + vm.saving = false; + }); + }; + } +})(); \ No newline at end of file diff --git a/InventoryTraker.Web/js/user/UserEditDirective.js b/InventoryTraker.Web/js/user/UserEditDirective.js new file mode 100644 index 0000000..6c0b9d9 --- /dev/null +++ b/InventoryTraker.Web/js/user/UserEditDirective.js @@ -0,0 +1,42 @@ +(function() { + "use strict"; + + window.app.directive('userEdit', function (){ + return { + scope: { + user: "=" + }, + templateUrl: '/user/template/userEdit.tmpl.cshtml', + controller: controller, + controllerAs: 'vm' + } + }); + + function controller($scope, userSvc) { + var vm = this; + vm.user = angular.copy($scope.user); + vm.save = save; + + vm.saving = false; + vm.userSvc = userSvc; + + vm.statusMessage = "Edit this user"; + vm.errorMessages = []; + + function save() { + vm.statusMessage = null; + vm.saving = true; + userSvc.edit($scope.user, vm.user) + .success(function () { + //Close the modal + $scope.$parent.$close(); + }) + .error(function(data) { + vm.errorMessages = angular.copy(data.errorMessages, vm.errorMessages); + }) + .finally(function() { + vm.saving = false; + }); + } + } +})(); \ No newline at end of file diff --git a/InventoryTraker.Web/js/user/UserListDirective.js b/InventoryTraker.Web/js/user/UserListDirective.js new file mode 100644 index 0000000..76e55e2 --- /dev/null +++ b/InventoryTraker.Web/js/user/UserListDirective.js @@ -0,0 +1,27 @@ +(function() { + 'use strict'; + + window.app.directive('userList', function () { + return { + scope: { "users": "=" }, + templateUrl: '/user/template/userList.tmpl.cshtml', + controller: controller, + controllerAs: 'vm' + } + }); + + controller.$inject = ['$scope', '$uibModal']; + function controller($scope, $uibModal) { + var vm = this; + + vm.users = $scope.users; + vm.edit = edit; + + function edit(user) { + $uibModal.open({ + template: '', + scope: angular.extend($scope.$new(true), { user: user }) + }); + } + } +})(); \ No newline at end of file diff --git a/InventoryTraker.Web/js/user/templates/userCreate.tmpl.cshtml b/InventoryTraker.Web/js/user/templates/userCreate.tmpl.cshtml new file mode 100644 index 0000000..992be44 --- /dev/null +++ b/InventoryTraker.Web/js/user/templates/userCreate.tmpl.cshtml @@ -0,0 +1,27 @@ +@using InventoryTraker.Web.Helpers +@model InventoryTraker.Web.Models.UserEditForm + +
    +
    + +
    +

    Create User

    +
    + +
    + + + + @Html.Angular().FormForModel("vm.user") + +
    + +
    + + +
    + +
    +
    \ No newline at end of file diff --git a/InventoryTraker.Web/js/user/templates/userEdit.tmpl.cshtml b/InventoryTraker.Web/js/user/templates/userEdit.tmpl.cshtml new file mode 100644 index 0000000..fec5e3e --- /dev/null +++ b/InventoryTraker.Web/js/user/templates/userEdit.tmpl.cshtml @@ -0,0 +1,27 @@ +@using InventoryTraker.Web.Helpers +@model InventoryTraker.Web.Models.UserEditForm +
    +
    + +
    +

    Edit User

    +
    + +
    + + + + + @Html.Angular().FormForModel("vm.user") + +
    + +
    + + +
    + +
    +
    \ No newline at end of file diff --git a/InventoryTraker.Web/js/user/templates/userList.tmpl.cshtml b/InventoryTraker.Web/js/user/templates/userList.tmpl.cshtml new file mode 100644 index 0000000..c4b55e3 --- /dev/null +++ b/InventoryTraker.Web/js/user/templates/userList.tmpl.cshtml @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + +
    NameEmail
    {{user.userName}}{{user.email}}
    diff --git a/InventoryTraker.Web/js/user/userSvc.js b/InventoryTraker.Web/js/user/userSvc.js new file mode 100644 index 0000000..fa3bcd0 --- /dev/null +++ b/InventoryTraker.Web/js/user/userSvc.js @@ -0,0 +1,42 @@ +(function () { + window.app.factory('userSvc', + function($http) { + var users = []; + + loadUsers(); + + var svc = { + create: create, + edit: edit, + users: users, + exportusers: exportusers + }; + + return svc; + + function loadUsers() { + $http.post('/User/All') + .success(function(data) { + users.addRange(data); + }); + } + + function exportusers() { + return $http.post('/User/Export', {}, { responseType: 'arraybuffer' }); + } + + function create(user) { + return $http.post('/User/Create', user) + .success(function(user) { + users.unshift(user); + }); + } + + function edit(existingUser, editedUser) { + return $http.post('/User/Edit', editedUser) + .success(function(user) { + angular.copy(user, existingUser); + }); + } + }); +})(); \ No newline at end of file diff --git a/InventoryTraker.Web/js/utility/DateRangeQueryDirective.js b/InventoryTraker.Web/js/utility/DateRangeQueryDirective.js index 096b7bb..ca3d230 100644 --- a/InventoryTraker.Web/js/utility/DateRangeQueryDirective.js +++ b/InventoryTraker.Web/js/utility/DateRangeQueryDirective.js @@ -13,7 +13,6 @@ } } - controller.$inject = ['$scope']; function controller($scope) { var vm = this; vm.query = {}; diff --git a/InventoryTraker.Web/js/utility/DownloadService.js b/InventoryTraker.Web/js/utility/DownloadService.js index 6e30c46..f87d841 100644 --- a/InventoryTraker.Web/js/utility/DownloadService.js +++ b/InventoryTraker.Web/js/utility/DownloadService.js @@ -1,17 +1,15 @@ (function () { - window.app.factory('downloadSvc', downloadSvc); + window.app.factory('downloadSvc', + function($http) { - downloadSvc.$inject = ['$http']; - function downloadSvc($http) { + var svc = { + success: function(data, status, headers, config) { + var file = new Blob([data], { type: headers('Content-Type') }); + var match = /filename[^;=\n]*=((['"]).*?\2|[^;\n]*)/.exec(headers('Content-Disposition')); + saveAs(file, match[1]); + } + }; - var svc = { - success: function (data, status, headers, config) { - var file = new Blob([data], { type: headers('Content-Type') }); - var match = /filename[^;=\n]*=((['"]).*?\2|[^;\n]*)/.exec(headers('Content-Disposition')); - saveAs(file, match[1]); - } - }; - - return svc; - } + return svc; + }); })(); \ No newline at end of file diff --git a/InventoryTraker.Web/js/utility/ErrorList.js b/InventoryTraker.Web/js/utility/ErrorList.js index 1aa671a..89e2d9c 100644 --- a/InventoryTraker.Web/js/utility/ErrorList.js +++ b/InventoryTraker.Web/js/utility/ErrorList.js @@ -1,20 +1,19 @@ (function() { 'use strict'; - window.app.directive('errorList', errorList); - function errorList() { - return { - scope: { - errors: "=", - editMsg: "=" - }, - templateUrl: '/utility/template/errorList.tmpl.cshtml', - controller: controller, - controllerAs: 'vm' - } - } + window.app.directive('errorList', + function() { + return { + scope: { + errors: "=", + editMsg: "=" + }, + templateUrl: '/utility/template/errorList.tmpl.cshtml', + controller: controller, + controllerAs: 'vm' + } + }); - controller.$inject = ['$scope']; function controller($scope) { var vm = this; vm.errors = $scope.errors; diff --git a/InventoryTraker.Web/js/utility/FormGroupValidationDirective.js b/InventoryTraker.Web/js/utility/FormGroupValidationDirective.js index 51530f7..046f462 100644 --- a/InventoryTraker.Web/js/utility/FormGroupValidationDirective.js +++ b/InventoryTraker.Web/js/utility/FormGroupValidationDirective.js @@ -1,30 +1,28 @@ (function () { 'use strict'; - window.app.directive('formGroupValidation', formGroupValidation); - - function formGroupValidation() { - return { - require: '^form', - replace: true, - transclude: true, - template: - '
    ' + - '' + - //'' + - '
    ', - scope: { - field: '@formGroupValidation' - }, - controller: controller, - controllerAs: 'vm', - link: function (scope, element, attrs, formCtrl) { - scope.form = formCtrl; + window.app.directive('formGroupValidation', + function() { + return { + require: '^form', + replace: true, + transclude: true, + template: + '
    ' + + '' + + //'' + + '
    ', + scope: { + field: '@formGroupValidation' + }, + controller: controller, + controllerAs: 'vm', + link: function(scope, element, attrs, formCtrl) { + scope.form = formCtrl; + } } - } - } + }); - controller.$inject = ['$scope']; function controller($scope) { var vm = this; diff --git a/InventoryTraker.Web/js/utility/FormatCases.js b/InventoryTraker.Web/js/utility/FormatCases.js index 8bb2d20..ad321ad 100644 --- a/InventoryTraker.Web/js/utility/FormatCases.js +++ b/InventoryTraker.Web/js/utility/FormatCases.js @@ -1,12 +1,11 @@ (function() { - window.app.filter('formatCases', formatCases); + window.app.filter('formatCases', + function() { + return function(qty) { + if (qty === '' || !isFinite(qty)) + return ''; - function formatCases() { - return function (qty) { - if (qty === '' || !isFinite(qty)) - return ''; - - return '(' + qty + ' cs)'; - } - } + return '(' + qty + ' cs)'; + } + }); })(); \ No newline at end of file diff --git a/InventoryTraker.Web/js/utility/HideZeroFilter.js b/InventoryTraker.Web/js/utility/HideZeroFilter.js index 8ce30a4..4caf077 100644 --- a/InventoryTraker.Web/js/utility/HideZeroFilter.js +++ b/InventoryTraker.Web/js/utility/HideZeroFilter.js @@ -1,10 +1,9 @@ (function () { - window.app.filter('hideZero', hideZero); + window.app.filter('hideZero', + function() { + return function(input) { - function hideZero() { - return function (input) { - - return input > 0 ? input : ''; - } - } + return input > 0 ? input : ""; + } + }); })(); \ No newline at end of file diff --git a/InventoryTraker.Web/js/utility/InputValidationIconsDirective.js b/InventoryTraker.Web/js/utility/InputValidationIconsDirective.js index 9e27cfd..6de84e0 100644 --- a/InventoryTraker.Web/js/utility/InputValidationIconsDirective.js +++ b/InventoryTraker.Web/js/utility/InputValidationIconsDirective.js @@ -1,28 +1,26 @@ (function () { 'use strict'; - window.app.directive('inputValidationIcons', inputValidationIcons); - - function inputValidationIcons() { - return { - require: '^form', - scope: { - field: '=' - }, - template: - '' + - '', - controller: controller, - controllerAs: 'vm', - link: function (scope, element, attrs, formCtrl) { - scope.form = formCtrl; + window.app.directive('inputValidationIcons', + function() { + return { + require: '^form', + scope: { + field: '=' + }, + template: + '' + + '', + controller: controller, + controllerAs: 'vm', + link: function(scope, element, attrs, formCtrl) { + scope.form = formCtrl; + } } - } - } + }); - controller.$inject = ['$scope']; function controller($scope) { var vm = this; diff --git a/InventoryTraker.Web/js/utility/MonthQueryDirective.js b/InventoryTraker.Web/js/utility/MonthQueryDirective.js index 0f47cf5..247bf58 100644 --- a/InventoryTraker.Web/js/utility/MonthQueryDirective.js +++ b/InventoryTraker.Web/js/utility/MonthQueryDirective.js @@ -1,35 +1,34 @@ (function() { 'use strict'; - window.app.directive('monthQuery', monthQuery); - function monthQuery() { - return { - scope: { - queryFn: '=' - }, - templateUrl: '/utility/template/monthQuery.tmpl.cshtml', - controller: controller, - controllerAs: 'vm' - } - } + window.app.directive('monthQuery', + function() { + return { + scope: { + queryFn: '=' + }, + templateUrl: '/utility/template/monthQuery.tmpl.cshtml', + controller: controller, + controllerAs: 'vm' + } + }); - controller.$inject = ['$scope']; function controller($scope) { var vm = this; vm.query = {}; vm.submitting = false; vm.errorMessages = []; - vm.submit = submit; - - function submit() { - vm.submitting = true; - $scope.queryFn({ month: vm.query }) - .error(function (data) { - vm.errorMessages = angular.copy(data.errorMessages, vm.errorMessages); - }) - .finally(function () { - vm.submitting = false; - }); - } + vm.submit = + function() { + vm.submitting = true; + $scope.queryFn({ month: vm.query }) + .error(function(data) { + vm.errorMessages + = angular.copy(data.errorMessages, vm.errorMessages); + }) + .finally(function() { + vm.submitting = false; + }); + }; } })(); \ No newline at end of file diff --git a/InventoryTraker.Web/js/utility/MvcGridDirective.js b/InventoryTraker.Web/js/utility/MvcGridDirective.js deleted file mode 100644 index 6bb8295..0000000 --- a/InventoryTraker.Web/js/utility/MvcGridDirective.js +++ /dev/null @@ -1,46 +0,0 @@ -(function () { - - window.app.directive('mvcGrid', mvcGrid); - function mvcGrid() { - return { - scope: { - gridDataUrl: '@', - title: '@', - columns: '@?' - }, - template: - '
    ' + - '

    {{vm.title}}

    ' + - '
    ' + - '

    Loading...

    ' + - '
    ' + - '
    ' + - '
    ', - controllerAs: 'vm', - controller: controller - } - } - - controller.$inject = ['$scope', '$http']; - function controller($scope, $http) { - var vm = this; - - vm.gridOptions = { - enableHorizontalScrollbar: 0 - } - - vm.loading = true; - - vm.title = $scope.title; - - if ($scope.columns) - vm.gridOptions.columnDefs = angular.fromJson($scope.columns); - - $http.post($scope.gridDataUrl) - .success(function (data) { - vm.gridOptions.data = data; - vm.loading = false; - }); - } - -})(); diff --git a/InventoryTraker.Web/js/utility/ParseDateFilter.js b/InventoryTraker.Web/js/utility/ParseDateFilter.js index fd0eb5d..6462223 100644 --- a/InventoryTraker.Web/js/utility/ParseDateFilter.js +++ b/InventoryTraker.Web/js/utility/ParseDateFilter.js @@ -1,11 +1,10 @@ (function() { - window.app.filter('parseDate', parseDate); + window.app.filter("parseDate", + function() { + return function(input) { + if (typeof input != 'string' || input.indexOf("/Date") === -1) return input; - function parseDate() { - return function(input) { - if (typeof input != 'string' || input.indexOf('/Date') === -1) return input; - - return new Date(parseInt(input.substr(6))); - } - } + return new Date(parseInt(input.substr(6))); + } + }); })(); \ No newline at end of file diff --git a/InventoryTraker.Web/js/utility/StatusMessage.js b/InventoryTraker.Web/js/utility/StatusMessage.js index 6db0ee5..7007f03 100644 --- a/InventoryTraker.Web/js/utility/StatusMessage.js +++ b/InventoryTraker.Web/js/utility/StatusMessage.js @@ -1,20 +1,19 @@ (function() { 'use strict'; - window.app.directive('statusMessage', statusMessage); - function statusMessage() { - return { - scope: { - message: "=", - severity: "=?" - }, - templateUrl: '/utility/template/statusMessage.tmpl.cshtml', - controller: controller, - controllerAs: 'vm' - } - } + window.app.directive('statusMessage', + function() { + return { + scope: { + message: "=", + severity: "=?" + }, + templateUrl: '/utility/template/statusMessage.tmpl.cshtml', + controller: controller, + controllerAs: 'vm' + } + }); - controller.$inject = ['$scope']; function controller($scope) { } })(); \ No newline at end of file diff --git a/InventoryTraker.Web/js/utility/ToUnits.js b/InventoryTraker.Web/js/utility/ToUnits.js index 65421f8..2553d3e 100644 --- a/InventoryTraker.Web/js/utility/ToUnits.js +++ b/InventoryTraker.Web/js/utility/ToUnits.js @@ -1,13 +1,12 @@ (function() { - window.app.filter('toUnits', toUnits); + window.app.filter('toUnits', + function() { + return function(caseQty, unitsPerCase) { + if (caseQty === "" || !isFinite(caseQty) || !isFinite(unitsPerCase)) + return ""; - function toUnits() { - return function (caseQty, unitsPerCase) { - if (caseQty === '' || !isFinite(caseQty) || !isFinite(unitsPerCase)) - return ''; - - return caseQty * unitsPerCase; - } - } + return caseQty * unitsPerCase; + } + }); })(); \ No newline at end of file