Kolpack-Software-Consulting/InventoryTracker
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Initiate InventoyTypes from a xlxs

Browse Source 
Arrival mostly working
This commit is contained in:
James Kolpack
2016-08-22 11:03:00 -04:00
parent 7e4d8a6d2a
commit 53ed1b3af9
40 changed files with 798 additions and 208 deletions
Download Patch File Download Diff File Expand all files Collapse all files
InventoryTraker.Web.Tests/App_Start/AutoMapperConfig.cs
+19
View File
@@ -0,0 +1,19 @@
using Heroic.AutoMapper;
[assembly: WebActivatorEx.PreApplicationStartMethod(typeof(InventoryTraker.Web.Tests.AutoMapperConfig), "Configure")]
namespace InventoryTraker.Web.Tests
{
public static class AutoMapperConfig
{
public static void Configure()
{
//NOTE: By default, the current project and all referenced projects will be scanned.
// You can customize this by passing in a lambda to filter the assemblies by name,
// like so:
//HeroicAutoMapperConfigurator.LoadMapsFromCallerAndReferencedAssemblies(x => x.Name.StartsWith("YourPrefix"));
HeroicAutoMapperConfigurator.LoadMapsFromCallerAndReferencedAssemblies();
//If you run into issues with the maps not being located at runtime, try using this method instead:
//HeroicAutoMapperConfigurator.LoadMapsFromAssemblyContainingTypeAndReferencedAssemblies<SomeControllerOrTypeInYourWebProject>();
}
}
}
InventoryTraker.Web.Tests/InventoryTraker.Web.Tests.csproj
+89
View File
@@ -0,0 +1,89 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProjectGuid>{03B3BDF2-B2BE-42C1-8D6F-2B4E106A1D4B}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>InventoryTraker.Web.Tests</RootNamespace>
<AssemblyName>InventoryTraker.Web.Tests</AssemblyName>
<TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
<Reference Include="AutoMapper, Version=4.2.0.0, Culture=neutral, PublicKeyToken=be96cd2c38ef1005, processorArchitecture=MSIL">
<HintPath>..\packages\AutoMapper.4.2.0\lib\net45\AutoMapper.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Heroic.AutoMapper, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Heroic.AutoMapper.2.0.0\lib\net45\Heroic.AutoMapper.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Microsoft.Web.Infrastructure, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="nunit.framework, Version=3.4.1.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
<HintPath>..\packages\NUnit.3.4.1\lib\net45\nunit.framework.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Xml.Linq" />
<Reference Include="System.Data.DataSetExtensions" />
<Reference Include="Microsoft.CSharp" />
<Reference Include="System.Data" />
<Reference Include="System.Net.Http" />
<Reference Include="System.Xml" />
<Reference Include="WebActivatorEx, Version=2.0.0.0, Culture=neutral, PublicKeyToken=7b26dc2a43f6a0d4, processorArchitecture=MSIL">
<HintPath>..\packages\WebActivatorEx.2.1.0\lib\net40\WebActivatorEx.dll</HintPath>
<Private>True</Private>
</Reference>
</ItemGroup>
<ItemGroup>
<Compile Include="App_Start\AutoMapperConfig.cs" />
<Compile Include="Models\InventoryAddForm.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="Utilities\InventoryTypeParserTests.cs" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\InventoryTraker.Web\InventoryTraker.Web.csproj">
<Project>{5e5867a4-6152-4655-a04b-1737df493a41}</Project>
<Name>InventoryTraker.Web</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<None Include="app.config" />
<None Include="packages.config" />
<Content Include="Utilities\Documents\InventoryTypeData.xlsx">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
</Target>
<Target Name="AfterBuild">
</Target>
-->
</Project>
InventoryTraker.Web.Tests/InventoryTraker.Web.Tests.csproj.DotSettings
+2
View File
@@ -0,0 +1,2 @@
<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=utilities_005Cdocuments/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>
InventoryTraker.Web.Tests/Models/InventoryAddForm.cs
+40
View File
@@ -0,0 +1,40 @@
using System;
using AutoMapper;
using Heroic.AutoMapper;
using InventoryTraker.Web.Controllers;
using InventoryTraker.Web.Core;
using InventoryTraker.Web.Models;
using NUnit.Framework;
namespace InventoryTraker.Web.Tests.Models
{
[TestFixture]
public class InventoryAddFormTests
{
[OneTimeSetUp]
public void StartUp()
{
HeroicAutoMapperConfigurator.LoadMapsFromAssemblyContainingTypeAndReferencedAssemblies<Inventory>();
}
[Test]
public void Convert()
{
var form = new InventoryAddForm
{
AddedDate = DateTime.Today,
ExpirationDate = DateTime.Today.AddDays(3),
InventoryTypeId = "1",
Memo = "My Memo",
Quantity = 32
};
var inventory = Mapper.Map<Inventory>(form);
Assert.That(inventory.AddedDate, Is.EqualTo(form.AddedDate));
Assert.That(inventory.ExpirationDate, Is.EqualTo(form.ExpirationDate));
Assert.That(inventory.Memo, Is.EqualTo(form.Memo));
Assert.That(inventory.Quantity, Is.EqualTo(form.Quantity));
}
}
}
InventoryTraker.Web.Tests/Properties/AssemblyInfo.cs
+36
View File
@@ -0,0 +1,36 @@
using System.Reflection;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
// General Information about an assembly is controlled through the following
// set of attributes. Change these attribute values to modify the information
// associated with an assembly.
[assembly: AssemblyTitle("InventoryTraker.Web.Tests")]
[assembly: AssemblyDescription("")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")]
[assembly: AssemblyProduct("InventoryTraker.Web.Tests")]
[assembly: AssemblyCopyright("Copyright © 2016")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
// Setting ComVisible to false makes the types in this assembly not visible
// to COM components. If you need to access a type in this assembly from
// COM, set the ComVisible attribute to true on that type.
[assembly: ComVisible(false)]
// The following GUID is for the ID of the typelib if this project is exposed to COM
[assembly: Guid("03b3bdf2-b2be-42c1-8d6f-2b4e106a1d4b")]
// Version information for an assembly consists of the following four values:
//
// Major Version
// Minor Version
// Build Number
// Revision
//
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.0.0.0")]
[assembly: AssemblyFileVersion("1.0.0.0")]
InventoryTraker.Web.Tests/Utilities/Documents/InventoryTypeData.xlsx
BIN
View File
Binary file not shown.
InventoryTraker.Web.Tests/Utilities/InventoryTypeParserTests.cs
+29
View File
@@ -0,0 +1,29 @@
using System;
using System.IO;
using InventoryTraker.Web.Utilities;
using NUnit.Framework;
namespace InventoryTraker.Web.Tests.Utilities
{
[TestFixture]
public class InventoryTypeParserTests
{
private readonly string _documentFolder =
AppDomain.CurrentDomain.BaseDirectory + @"\Utilities\Documents\";
[Test]
public void Parse()
{
var fileInfo = new FileInfo(Path.Combine(_documentFolder, "InventoryTypeData.xlsx"));
var parser = new InventoryTypeParser(fileInfo);
var inventoryTypes = parser.Parse();
foreach (var inventoryType in inventoryTypes)
{
Console.WriteLine($"{inventoryType.Identifier} {inventoryType.Name} {inventoryType.PricePerCase}");
}
}
}
}
InventoryTraker.Web.Tests/app.config
+43
View File
@@ -0,0 +1,43 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-5.2.3.0" newVersion="5.2.3.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Web.Http" publicKeyToken="31bf3856ad364e35" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-5.2.3.0" newVersion="5.2.3.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Microsoft.Owin" publicKeyToken="31bf3856ad364e35" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-3.0.1.0" newVersion="3.0.1.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Microsoft.Owin.Security.OAuth" publicKeyToken="31bf3856ad364e35" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-3.0.1.0" newVersion="3.0.1.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Microsoft.Owin.Security" publicKeyToken="31bf3856ad364e35" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-3.0.1.0" newVersion="3.0.1.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Microsoft.Owin.Security.Cookies" publicKeyToken="31bf3856ad364e35" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-3.0.1.0" newVersion="3.0.1.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="WebGrease" publicKeyToken="31bf3856ad364e35" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-1.6.5135.21930" newVersion="1.6.5135.21930" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Antlr3.Runtime" publicKeyToken="eb42632606e9261f" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-3.5.0.2" newVersion="3.5.0.2" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
</dependentAssembly>
</assemblyBinding>
</runtime>
</configuration>
InventoryTraker.Web.Tests/packages.config
+8
View File
@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="AutoMapper" version="4.2.0" targetFramework="net452" />
<package id="Heroic.AutoMapper" version="2.0.0" targetFramework="net452" />
<package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net452" />
<package id="NUnit" version="3.4.1" targetFramework="net452" />
<package id="WebActivatorEx" version="2.1.0" targetFramework="net452" />
</packages>
InventoryTraker.Web/App_Start/AutoMapperConfig.cs
+3 -2
View File
@@ -1,5 +1,6 @@
using Heroic.AutoMapper; using Heroic.AutoMapper;
using InventoryTraker.Web; using InventoryTraker.Web;
using InventoryTraker.Web.Controllers;
[assembly: WebActivatorEx.PreApplicationStartMethod(typeof(AutoMapperConfig), "Configure")] [assembly: WebActivatorEx.PreApplicationStartMethod(typeof(AutoMapperConfig), "Configure")]
namespace InventoryTraker.Web namespace InventoryTraker.Web
@@ -12,9 +13,9 @@ namespace InventoryTraker.Web
// You can customize this by passing in a lambda to filter the assemblies by name, // You can customize this by passing in a lambda to filter the assemblies by name,
// like so: // like so:
//HeroicAutoMapperConfigurator.LoadMapsFromCallerAndReferencedAssemblies(x => x.Name.StartsWith("YourPrefix")); //HeroicAutoMapperConfigurator.LoadMapsFromCallerAndReferencedAssemblies(x => x.Name.StartsWith("YourPrefix"));
HeroicAutoMapperConfigurator.LoadMapsFromCallerAndReferencedAssemblies(); //HeroicAutoMapperConfigurator.LoadMapsFromCallerAndReferencedAssemblies();
//If you run into issues with the maps not being located at runtime, try using this method instead: //If you run into issues with the maps not being located at runtime, try using this method instead:
//HeroicAutoMapperConfigurator.LoadMapsFromAssemblyContainingTypeAndReferencedAssemblies<SomeControllerOrTypeInYourWebProject>(); HeroicAutoMapperConfigurator.LoadMapsFromAssemblyContainingTypeAndReferencedAssemblies<ControllerBase>();
} }
} }
} }
InventoryTraker.Web/App_Start/BundleConfig.cs
+2 -2
View File
@@ -6,7 +6,7 @@ namespace InventoryTraker.Web
{ {
public static void RegisterBundles(BundleCollection bundles) public static void RegisterBundles(BundleCollection bundles)
{ {
bundles.Add(new StyleBundle("~/Content/all.css") bundles.Add(new StyleBundle("~/Content/all-styles")
.Include("~/Content/font-awesome.css") .Include("~/Content/font-awesome.css")
.Include("~/Content/bootstrap.css") .Include("~/Content/bootstrap.css")
.Include("~/Content/sb-admin.css") .Include("~/Content/sb-admin.css")
@@ -14,7 +14,7 @@ namespace InventoryTraker.Web
.Include("~/Content/ui-grid.css") .Include("~/Content/ui-grid.css")
); );
bundles.Add(new ScriptBundle("~/js/all.js") bundles.Add(new ScriptBundle("~/js/all-javascript")
.Include("~/Scripts/jquery-1.9.1.js") .Include("~/Scripts/jquery-1.9.1.js")
.Include("~/Scripts/bootstrap.js") .Include("~/Scripts/bootstrap.js")
.Include("~/Scripts/angular.js") .Include("~/Scripts/angular.js")
InventoryTraker.Web/App_Start/SeedData.cs
+52 -35
View File
@@ -1,6 +1,8 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.IO;
using System.Linq; using System.Linq;
using System.Web;
using Humanizer; using Humanizer;
using InventoryTraker.Web.Core; using InventoryTraker.Web.Core;
using InventoryTraker.Web.Data; using InventoryTraker.Web.Data;
@@ -47,6 +49,10 @@ namespace InventoryTraker.Web
if (!context.Inventories.Any()) if (!context.Inventories.Any())
{ {
AddInventoryTypes(context);
context.SaveChanges();
AddInventory(context); AddInventory(context);
context.SaveChanges(); context.SaveChanges();
@@ -65,48 +71,59 @@ namespace InventoryTraker.Web
} }
} }
private static void AddInventoryTypes(AppDbContext context)
{
var folder = HttpContext.Current.Server.MapPath("~/App_Data");
var inventoryTypeFile = Path.Combine(folder, "InventoryTypeSeedData.xlsx");
var parser = new InventoryTypeParser(new FileInfo(inventoryTypeFile));
foreach (var inventoryType in parser.Parse())
{
context.InventoryTypes.Add(inventoryType);
}
}
private static void AddInventory(AppDbContext context) private static void AddInventory(AppDbContext context)
{ {
var peanutButterSmooth = new InventoryType var pork = context.InventoryTypes.First(it => it.Identifier == "100139");
{ var beans = context.InventoryTypes.First(it => it.Identifier == "100363");
ContainerType = "18 oz jars", var pb = context.InventoryTypes.First(it => it.Identifier == "100395");
Name = "Peanut Butter Smth 18",
Id = "100395",
UnitsPerCase = 12,
PricePerCase = 14.55M,
WeightPerCase = 13.5
};
context.InventoryTypes.Add(peanutButterSmooth);
var beanInventoryType = new InventoryType
{
ContainerType = "#300 cans",
Name = "Beans, Veg 300",
Id = "100363",
UnitsPerCase = 24,
PricePerCase = 10.18M,
WeightPerCase = 24
};
context.InventoryTypes.Add(beanInventoryType);
var corn = new InventoryType
{
ContainerType = "#300 cans",
Name = "Corn Kernel 300",
Id = "100311",
UnitsPerCase = 24,
PricePerCase = 10.03M,
WeightPerCase = 22.9
};
context.InventoryTypes.Add(corn);
context.Inventories.Add(new Inventory context.Inventories.Add(new Inventory
{ {
InventoryType = beanInventoryType, InventoryType = pork,
ExpirationDate = DateTime.Now.AddYears(1).AtMidnight(), ExpirationDate = DateTime.Now.AddYears(1).AtMidnight(),
Memo = "French cut", AddedDate = DateTime.Now.AddDays(-1).AtMidnight(),
Memo = "Hormel",
Quantity = 10, Quantity = 10,
Transactions = new List<Transaction> { new Transaction { AddedQuantity = 10, Memo = "arrival", TransactionDate = DateTime.Now} } Transactions = new List<Transaction> { new Transaction
{
AddedQuantity = 10, Memo = "arrival", TransactionDate = DateTime.Now.AddDays(-1).AtMidnight(), Timestamp = DateTime.Now
}}
});
context.Inventories.Add(new Inventory
{
InventoryType = beans,
ExpirationDate = DateTime.Now.AddMonths(4).AtMidnight(),
AddedDate = DateTime.Now.AddMonths(-2).AtMidnight(),
Memo = "Cut",
Quantity = 15,
Transactions = new List<Transaction> { new Transaction
{
AddedQuantity = 15, Memo = "arrival", TransactionDate = DateTime.Now.AddMonths(-2).AtMidnight(), Timestamp = DateTime.Now
}}
});
context.Inventories.Add(new Inventory
{
InventoryType = pb,
ExpirationDate = DateTime.Now.AddDays(300).AtMidnight(),
AddedDate = DateTime.Now.AddDays(-34).AtMidnight(),
Quantity = 700,
Transactions = new List<Transaction> { new Transaction
{
AddedQuantity = 700, Memo = "arrival", TransactionDate = DateTime.Now.AddDays(-34).AtMidnight(), Timestamp = DateTime.Now
}}
}); });
} }
InventoryTraker.Web/Controllers/AuthenticationController.cs
+1 -1
View File
@@ -38,7 +38,7 @@ namespace InventoryTraker.Web.Controllers
var identity = _userManager.CreateIdentity(user, DefaultAuthenticationTypes.ApplicationCookie); var identity = _userManager.CreateIdentity(user, DefaultAuthenticationTypes.ApplicationCookie);
_authManager.SignIn(new AuthenticationProperties { IsPersistent = false }, identity); _authManager.SignIn(new AuthenticationProperties { IsPersistent = true }, identity);
return Json(true); return Json(true);
} }
InventoryTraker.Web/Controllers/ControllerBase.cs
+13 -1
View File
@@ -1,4 +1,5 @@
using System.Web.Mvc; using System.Linq;
using System.Web.Mvc;
using InventoryTraker.Web.ActionResults; using InventoryTraker.Web.ActionResults;
namespace InventoryTraker.Web.Controllers namespace InventoryTraker.Web.Controllers
@@ -9,5 +10,16 @@ namespace InventoryTraker.Web.Controllers
{ {
return new BetterJsonResult<T>() {Data = model}; return new BetterJsonResult<T>() {Data = model};
} }
protected JsonResult PackageModelStateErrors()
{
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)));
}
return betterJsonResult;
}
} }
} }
InventoryTraker.Web/Controllers/InventoryController.cs
+15 -21
View File
@@ -1,4 +1,6 @@
using System.Linq; using System;
using System.Collections.Generic;
using System.Linq;
using System.Web.Mvc; using System.Web.Mvc;
using AutoMapper; using AutoMapper;
using AutoMapper.QueryableExtensions; using AutoMapper.QueryableExtensions;
@@ -8,25 +10,6 @@ using InventoryTraker.Web.Models;
namespace InventoryTraker.Web.Controllers namespace InventoryTraker.Web.Controllers
{ {
public class InventoryTypeController : ControllerBase
{
private readonly AppDbContext _context;
public InventoryTypeController(AppDbContext context)
{
_context = context;
}
public JsonResult All()
{
var viewModels = _context.InventoryTypes
.OrderByDescending(x => x.Name)
.ProjectTo<InventoryTypeViewModel>();
return BetterJson(viewModels.ToArray());
}
}
public class InventoryController : ControllerBase public class InventoryController : ControllerBase
{ {
private readonly AppDbContext _context; private readonly AppDbContext _context;
@@ -44,7 +27,7 @@ namespace InventoryTraker.Web.Controllers
public JsonResult All() public JsonResult All()
{ {
var viewModels = _context.Inventories var viewModels = _context.Inventories
.OrderByDescending(x => x.InventoryType.Name) .OrderBy(x => x.InventoryType.Name)
.ProjectTo<InventoryViewModel>() .ProjectTo<InventoryViewModel>()
.ToArray(); .ToArray();
@@ -53,9 +36,20 @@ namespace InventoryTraker.Web.Controllers
public JsonResult Add(InventoryAddForm form) public JsonResult Add(InventoryAddForm form)
{ {
if (!ModelState.IsValid)
return PackageModelStateErrors();
var inventory = Mapper.Map<Inventory>(form); var inventory = Mapper.Map<Inventory>(form);
inventory.InventoryType = _context.InventoryTypes.Find(form.InventoryTypeId); inventory.InventoryType = _context.InventoryTypes.Find(form.InventoryTypeId);
_context.Inventories.Add(inventory); _context.Inventories.Add(inventory);
inventory.Transactions = new List<Transaction>();
inventory.Transactions.Add(new Transaction
{
AddedQuantity = inventory.Quantity,
Memo = "Arrival",
Timestamp = DateTime.Now,
TransactionDate = inventory.AddedDate
});
_context.SaveChanges(); _context.SaveChanges();
var model = Mapper.Map<InventoryViewModel>(inventory); var model = Mapper.Map<InventoryViewModel>(inventory);
InventoryTraker.Web/Controllers/InventoryTypeController.cs
+27
View File
@@ -0,0 +1,27 @@
using System.Linq;
using System.Web.Mvc;
using AutoMapper.QueryableExtensions;
using InventoryTraker.Web.Data;
using InventoryTraker.Web.Models;
namespace InventoryTraker.Web.Controllers
{
public class InventoryTypeController : ControllerBase
{
private readonly AppDbContext _context;
public InventoryTypeController(AppDbContext context)
{
_context = context;
}
public JsonResult All()
{
var viewModels = _context.InventoryTypes
.OrderByDescending(x => x.Name)
.ProjectTo<InventoryTypeViewModel>();
return BetterJson(viewModels.ToArray());
}
}
}
InventoryTraker.Web/Core/Inventory.cs
+4 -38
View File
@@ -1,61 +1,27 @@
using System; using System;
using System.Collections;
using System.Collections.Generic; using System.Collections.Generic;
using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
namespace InventoryTraker.Web.Core namespace InventoryTraker.Web.Core
{ {
// AKA Commodity // AKA Commodity
public class InventoryType
{
[DatabaseGenerated(DatabaseGeneratedOption.None)]
public string Id { get; set; }
[Required]
public string Name { get; set; }
[Required]
public int UnitsPerCase { get; set; }
[Required]
public string ContainerType { get; set; }
public double WeightPerCase { get; set; }
public decimal PricePerCase { get; set; }
}
public class Inventory public class Inventory
{ {
public int Id { get; set; } public int Id { get; set; }
public virtual InventoryType InventoryType { get; set; } public virtual InventoryType InventoryType { get; set; }
public virtual ICollection<Transaction> Transactions { get; set; } public virtual ICollection<Transaction> Transactions { get; set; }
[Required] [Required]
public DateTime ExpirationDate { get; set; } public DateTime ExpirationDate { get; set; }
[Required]
public DateTime AddedDate { get; set; }
[Required] [Required]
public int Quantity { get; set; } public int Quantity { get; set; }
public string Memo { get; set; } public string Memo { get; set; }
} }
public class Transaction
{
public int Id { get; set; }
public virtual Inventory Inventory { get; set; }
public int AddedQuantity { get; set; }
public int RemovedQuantity { get; set; }
public DateTime TransactionDate { get; set; }
public string Memo { get; set; }
}
} }
InventoryTraker.Web/Core/InventoryType.cs
+25
View File
@@ -0,0 +1,25 @@
using System.ComponentModel.DataAnnotations;
namespace InventoryTraker.Web.Core
{
public class InventoryType
{
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; }
public double WeightPerCase { get; set; }
public decimal PricePerCase { get; set; }
}
}
InventoryTraker.Web/Core/Transaction.cs
+26
View File
@@ -0,0 +1,26 @@
using System;
using System.ComponentModel.DataAnnotations;
namespace InventoryTraker.Web.Core
{
public class Transaction
{
public int Id { get; set; }
public virtual Inventory Inventory { get; set; }
[Required]
public int AddedQuantity { get; set; }
[Required]
public int RemovedQuantity { get; set; }
[Required]
public DateTime TransactionDate { get; set; }
public string Memo { get; set; }
[Required]
public DateTime Timestamp { get; set; }
}
}
InventoryTraker.Web/Helpers/AngularModelHelper.cs
+6 -3
View File
@@ -35,9 +35,12 @@ namespace InventoryTraker.Web.Helpers
/// Converts a lambda expression into a camel-cased AngularJS binding expression, ie: /// Converts a lambda expression into a camel-cased AngularJS binding expression, ie:
/// {{vm.model.parentProperty.childProperty}} /// {{vm.model.parentProperty.childProperty}}
/// </summary> /// </summary>
public IHtmlString BindingFor<TProp>(Expression<Func<TModel, TProp>> property) public IHtmlString BindingFor<TProp>(Expression<Func<TModel, TProp>> property, string filter = "")
{ {
return MvcHtmlString.Create("{{" + ExpressionForInternal(property) + "}}"); return MvcHtmlString.Create("{{"
+ ExpressionForInternal(property)
+ (!string.IsNullOrEmpty(filter) ? " | " + filter : string.Empty)
+ "}}");
} }
/// <summary> /// <summary>
@@ -120,7 +123,7 @@ namespace InventoryTraker.Web.Helpers
{ {
//input.Attr("type", "date"); //input.Attr("type", "date");
input.Attr("bs-datepicker"); input.Attr("bs-datepicker");
input.Attr("data-date-format", "dd/MM/yyyy"); input.Attr("data-date-format", "d/M/yyyy");
} }
if (metadata.DataTypeName == "PhoneNumber") if (metadata.DataTypeName == "PhoneNumber")
InventoryTraker.Web/InventoryTraker.Web.csproj
+34 -10
View File
@@ -47,6 +47,22 @@
<HintPath>..\packages\AutoMapper.4.2.0\lib\net45\AutoMapper.dll</HintPath> <HintPath>..\packages\AutoMapper.4.2.0\lib\net45\AutoMapper.dll</HintPath>
<Private>True</Private> <Private>True</Private>
</Reference> </Reference>
<Reference Include="ClosedXML, Version=0.76.0.0, Culture=neutral, PublicKeyToken=fd1eb21b62ae805b, processorArchitecture=MSIL">
<HintPath>..\packages\ClosedXML.0.76.0\lib\net40-client\ClosedXML.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="CsvHelper, Version=2.0.0.0, Culture=neutral, PublicKeyToken=8c4959082be5c823, processorArchitecture=MSIL">
<HintPath>..\packages\CsvHelper.2.11.0\lib\net40-client\CsvHelper.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="CsvHelper.Excel, Version=1.0.5.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\CsvHelper.Excel.1.0.5\lib\net40-client\CsvHelper.Excel.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="DocumentFormat.OpenXml, Version=2.5.5631.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\DocumentFormat.OpenXml.2.5\lib\DocumentFormat.OpenXml.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL"> <Reference Include="EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
<HintPath>..\packages\EntityFramework.6.1.3\lib\net45\EntityFramework.dll</HintPath> <HintPath>..\packages\EntityFramework.6.1.3\lib\net45\EntityFramework.dll</HintPath>
<Private>True</Private> <Private>True</Private>
@@ -211,6 +227,7 @@
<Content Include="js\inventory\InventoryAddDirective.js" /> <Content Include="js\inventory\InventoryAddDirective.js" />
<Content Include="js\inventory\InventoryDetailsDirective.js" /> <Content Include="js\inventory\InventoryDetailsDirective.js" />
<Content Include="js\inventory\InventoryListController.js" /> <Content Include="js\inventory\InventoryListController.js" />
<Content Include="js\inventory\inventoryTypeSvc.js" />
<Content Include="js\inventory\inventorySvc.js" /> <Content Include="js\inventory\inventorySvc.js" />
<Content Include="js\inventory\InventoryEditDirective.js" /> <Content Include="js\inventory\InventoryEditDirective.js" />
<Content Include="js\customer\EditCustomerDirective.js" /> <Content Include="js\customer\EditCustomerDirective.js" />
@@ -234,7 +251,6 @@
<Content Include="js\utility\FormGroupValidationDirective.js" /> <Content Include="js\utility\FormGroupValidationDirective.js" />
<Content Include="js\utility\InputValidationIconsDirective.js" /> <Content Include="js\utility\InputValidationIconsDirective.js" />
<Content Include="js\utility\MvcGridDirective.js" /> <Content Include="js\utility\MvcGridDirective.js" />
<Content Include="js\utility\DatePickerDirective.js" />
<Content Include="js\utility\ParseDateFilter.js" /> <Content Include="js\utility\ParseDateFilter.js" />
<Content Include="Scripts\angular-animate.js" /> <Content Include="Scripts\angular-animate.js" />
<Content Include="Scripts\angular-animate.min.js" /> <Content Include="Scripts\angular-animate.min.js" />
@@ -263,6 +279,10 @@
<Content Include="fonts\fontawesome-webfont.eot" /> <Content Include="fonts\fontawesome-webfont.eot" />
<Content Include="Scripts\angular-strap.min.js.map" /> <Content Include="Scripts\angular-strap.min.js.map" />
<Content Include="fonts\glyphicons-halflings-regular.woff2" /> <Content Include="fonts\glyphicons-halflings-regular.woff2" />
<Content Include="App_Data\InventoryTypeSeedData.xlsx">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<None Include="Properties\PublishProfiles\ETHRA.pubxml" />
<None Include="Scripts\jquery-1.9.1.intellisense.js" /> <None Include="Scripts\jquery-1.9.1.intellisense.js" />
<Content Include="Scripts\bootstrap.js" /> <Content Include="Scripts\bootstrap.js" />
<Content Include="Scripts\bootstrap.min.js" /> <Content Include="Scripts\bootstrap.min.js" />
@@ -289,6 +309,7 @@
<Compile Include="Controllers\CustomerController.cs" /> <Compile Include="Controllers\CustomerController.cs" />
<Compile Include="Controllers\ControllerBase.cs" /> <Compile Include="Controllers\ControllerBase.cs" />
<Compile Include="Controllers\HomeController.cs" /> <Compile Include="Controllers\HomeController.cs" />
<Compile Include="Controllers\InventoryTypeController.cs" />
<Compile Include="Controllers\OpportunityController.cs" /> <Compile Include="Controllers\OpportunityController.cs" />
<Compile Include="Controllers\ProfileController.cs" /> <Compile Include="Controllers\ProfileController.cs" />
<Compile Include="Controllers\ReportController.cs" /> <Compile Include="Controllers\ReportController.cs" />
@@ -296,8 +317,10 @@
<Compile Include="Controllers\TemplateController.cs" /> <Compile Include="Controllers\TemplateController.cs" />
<Compile Include="Core\Customer.cs" /> <Compile Include="Core\Customer.cs" />
<Compile Include="Core\Inventory.cs" /> <Compile Include="Core\Inventory.cs" />
<Compile Include="Core\InventoryType.cs" />
<Compile Include="Core\Opportunity.cs" /> <Compile Include="Core\Opportunity.cs" />
<Compile Include="Core\Risk.cs" /> <Compile Include="Core\Risk.cs" />
<Compile Include="Core\Transaction.cs" />
<Compile Include="Core\User.cs" /> <Compile Include="Core\User.cs" />
<Compile Include="Data\AppDbContext.cs" /> <Compile Include="Data\AppDbContext.cs" />
<Compile Include="Global.asax.cs"> <Compile Include="Global.asax.cs">
@@ -329,6 +352,8 @@
<Compile Include="Models\ProfileForm.cs" /> <Compile Include="Models\ProfileForm.cs" />
<Compile Include="Models\RiskViewModel.cs" /> <Compile Include="Models\RiskViewModel.cs" />
<Compile Include="Properties\AssemblyInfo.cs" /> <Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="Utilities\ExcelParserBase.cs" />
<Compile Include="Utilities\InventoryTypeParser.cs" />
<Compile Include="Utilities\DateExtensions.cs" /> <Compile Include="Utilities\DateExtensions.cs" />
<Compile Include="Utilities\JsonExtensions.cs" /> <Compile Include="Utilities\JsonExtensions.cs" />
</ItemGroup> </ItemGroup>
@@ -343,17 +368,17 @@
<Content Include="Scripts\angular.min.js.map" /> <Content Include="Scripts\angular.min.js.map" />
<Content Include="Scripts\angular-animate.min.js.map" /> <Content Include="Scripts\angular-animate.min.js.map" />
<Content Include="Scripts\jquery-1.9.1.min.map" /> <Content Include="Scripts\jquery-1.9.1.min.map" />
<None Include="Views\Authentication\Login.cshtml" /> <Content Include="Views\Authentication\Login.cshtml" />
<None Include="Views\Customer\Index.cshtml" /> <Content Include="Views\Customer\Index.cshtml" />
<None Include="Views\Home\Index.cshtml" /> <Content Include="Views\Home\Index.cshtml" />
<Content Include="Views\Inventory\Index.cshtml" /> <Content Include="Views\Inventory\Index.cshtml" />
<None Include="Views\Opportunity\Index.cshtml" /> <Content Include="Views\Opportunity\Index.cshtml" />
<None Include="Views\Profile\Index.cshtml" /> <Content Include="Views\Profile\Index.cshtml" />
<None Include="Views\Report\Index.cshtml" /> <Content Include="Views\Report\Index.cshtml" />
<None Include="Views\Risk\Index.cshtml" /> <Content Include="Views\Risk\Index.cshtml" />
<Content Include="Views\Shared\_NavigationNoAuth.cshtml" /> <Content Include="Views\Shared\_NavigationNoAuth.cshtml" />
<Content Include="Views\Shared\_NavigationHero.cshtml" /> <Content Include="Views\Shared\_NavigationHero.cshtml" />
<None Include="Views\Shared\_Navigation.cshtml" /> <Content Include="Views\Shared\_Navigation.cshtml" />
<Content Include="Views\_ViewStart.cshtml" /> <Content Include="Views\_ViewStart.cshtml" />
<None Include="Web.Debug.config"> <None Include="Web.Debug.config">
<DependentUpon>Web.config</DependentUpon> <DependentUpon>Web.config</DependentUpon>
@@ -363,7 +388,6 @@
</None> </None>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Folder Include="App_Data\" />
<Folder Include="js\app\" /> <Folder Include="js\app\" />
</ItemGroup> </ItemGroup>
<PropertyGroup> <PropertyGroup>
InventoryTraker.Web/Models/InventoryAddForm.cs
+3 -2
View File
@@ -9,12 +9,13 @@ namespace InventoryTraker.Web.Models
public class InventoryAddForm : IMapTo<Inventory> public class InventoryAddForm : IMapTo<Inventory>
{ {
[HiddenInput(DisplayValue = false)] [HiddenInput(DisplayValue = false)]
public string InventoryTypeId { get; set; } [Required]
public int InventoryTypeId { get; set; }
[Required] [Required]
public DateTime ExpirationDate { get; set; } public DateTime ExpirationDate { get; set; }
[Required] [Required, Range(1, int.MaxValue, ErrorMessage = "Quantity must be greater than 0")]
public int Quantity { get; set; } public int Quantity { get; set; }
[Required, Display(Name = "Arrival Date")] [Required, Display(Name = "Arrival Date")]
InventoryTraker.Web/Models/InventoryTypeViewModel.cs
+3 -1
View File
@@ -5,7 +5,9 @@ namespace InventoryTraker.Web.Models
{ {
public class InventoryTypeViewModel : IMapFrom<InventoryType> public class InventoryTypeViewModel : IMapFrom<InventoryType>
{ {
public string Id { get; set; } public int Id { get; set; }
public string Identifier { get; set; }
public string Name { get; set; } public string Name { get; set; }
InventoryTraker.Web/Models/InventoryViewModel.cs
+8 -1
View File
@@ -1,4 +1,5 @@
using System; using System;
using System.Linq;
using AutoMapper; using AutoMapper;
using Heroic.AutoMapper; using Heroic.AutoMapper;
using InventoryTraker.Web.Core; using InventoryTraker.Web.Core;
@@ -23,13 +24,19 @@ namespace InventoryTraker.Web.Models
public DateTime ExpirationDate { get; set; } public DateTime ExpirationDate { get; set; }
public DateTime AddedDate { get; set; }
public string Memo { get; set; }
public void CreateMappings(IMapperConfiguration configuration) public void CreateMappings(IMapperConfiguration configuration)
{ {
configuration.CreateMap<Inventory, InventoryViewModel>() configuration.CreateMap<Inventory, InventoryViewModel>()
.ForMember(d => d.Name, opt => opt.MapFrom(s => s.InventoryType.Name)) .ForMember(d => d.Name, opt => opt.MapFrom(s => s.InventoryType.Name))
.ForMember(d => d.UnitsPerCase, opt => opt.MapFrom(s => s.InventoryType.UnitsPerCase)) .ForMember(d => d.UnitsPerCase, opt => opt.MapFrom(s => s.InventoryType.UnitsPerCase))
.ForMember(d => d.ContainerType, opt => opt.MapFrom(s => s.InventoryType.ContainerType))
.ForMember(d => d.WeightPerCase, opt => opt.MapFrom(s => s.InventoryType.WeightPerCase)) .ForMember(d => d.WeightPerCase, opt => opt.MapFrom(s => s.InventoryType.WeightPerCase))
.ForMember(d => d.PricePerCase, opt => opt.MapFrom(s => s.InventoryType.PricePerCase)); .ForMember(d => d.PricePerCase, opt => opt.MapFrom(s => s.InventoryType.PricePerCase))
.ForMember(d => d.AddedDate, opt => opt.MapFrom(s => s.AddedDate));
} }
} }
} }
InventoryTraker.Web/Properties/PublishProfiles/ETHRA.pubxml
+33
View File
@@ -0,0 +1,33 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
This file is used by the publish/package process of your Web project. You can customize the behavior of this process
by editing this MSBuild file. In order to learn more about this please visit http://go.microsoft.com/fwlink/?LinkID=208121.
-->
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<WebPublishMethod>Package</WebPublishMethod>
<LastUsedBuildConfiguration>Release</LastUsedBuildConfiguration>
<LastUsedPlatform>Any CPU</LastUsedPlatform>
<SiteUrlToLaunchAfterPublish />
<LaunchSiteAfterPublish>True</LaunchSiteAfterPublish>
<ExcludeApp_Data>False</ExcludeApp_Data>
<DesktopBuildPackageLocation>C:\Users\poprhythm\Documents\code\PublishPackages\InventoryTraker.Web.zip</DesktopBuildPackageLocation>
<PackageAsSingleFile>true</PackageAsSingleFile>
<DeployIisAppPath>Default Web Site</DeployIisAppPath>
<PublishDatabaseSettings>
<Objects xmlns="">
<ObjectGroup Name="DefaultConnection" Order="1" Enabled="True">
<Destination Path="Data Source=localhost;Initial Catalog=InventoryTraker;User ID=InventoryTrakerUser;Password=QcXxvpztGp1;Connect Timeout=60" Name="Data Source=localhost;Initial Catalog=InventoryTraker;User Id=InventoryTrakerUser;Password=QcXxvpztGp1;Connect Timeout=60" />
<Object Type="DbCodeFirst">
<Source Path="DBMigration" DbContext="InventoryTraker.Web.Data.AppDbContext, InventoryTraker.Web" MigrationConfiguration="InventoryTraker.Web.Migrations.Configuration, InventoryTraker.Web" Origin="Convention" />
</Object>
</ObjectGroup>
</Objects>
</PublishDatabaseSettings>
</PropertyGroup>
<ItemGroup>
<MSDeployParameterValue Include="$(DeployParameterPrefix)DefaultConnection-Web.config Connection String">
<ParameterValue>Data Source=localhost;Initial Catalog=InventoryTraker;User Id=InventoryTrakerUser;Password=QcXxvpztGp1;Connect Timeout=60</ParameterValue>
</MSDeployParameterValue>
</ItemGroup>
</Project>
InventoryTraker.Web/Utilities/ExcelParserBase.cs
+55
View File
@@ -0,0 +1,55 @@
using System;
using System.IO;
using CsvHelper;
using CsvHelper.Configuration;
using CsvHelper.Excel;
namespace InventoryTraker.Web.Utilities
{
public class ExcelParserBase : IDisposable
{
protected readonly CsvReader CsvReader;
protected ExcelParserBase(FileSystemInfo excelFile, CsvConfiguration csvConfiguration)
{
CsvReader = OpenExcel(excelFile, csvConfiguration);
}
protected ExcelParserBase(FileSystemInfo excelFile) :
this(excelFile,
new CsvConfiguration
{
HasHeaderRecord = false,
IgnoreBlankLines = false,
IgnoreReadingExceptions = true
})
{
}
internal static CsvReader OpenExcel(FileSystemInfo excelFile, CsvConfiguration csvConfiguration = null)
{
if (!excelFile.Exists)
throw new FileNotFoundException($"Cannot find file '{excelFile.Name}'");
var excelParser =
csvConfiguration != null
? new ExcelParser(excelFile.FullName, csvConfiguration)
: new ExcelParser(excelFile.FullName);
return new CsvReader(excelParser);
}
protected string[] GetNextCsvRowValues()
{
// get values from row
if (!CsvReader.Read())
return null;
return CsvReader.CurrentRecord;
}
public void Dispose()
{
CsvReader.Dispose();
}
}
}
InventoryTraker.Web/Utilities/InventoryTypeParser.cs
+43
View File
@@ -0,0 +1,43 @@
using System.Collections.Generic;
using System.IO;
using System.Linq;
using ClosedXML.Excel;
using CsvHelper.Configuration;
using InventoryTraker.Web.Core;
namespace InventoryTraker.Web.Utilities
{
public class InventoryTypeParser
{
private readonly FileSystemInfo _excelFile;
private sealed class InventoryTypeMap : CsvClassMap<InventoryType>
{
public InventoryTypeMap()
{
Map(m => m.Identifier);
Map(m => m.Name);
Map(m => m.UnitsPerCase);
Map(m => m.ContainerType);
Map(m => m.WeightPerCase);
Map(m => m.PricePerCase);
}
}
public InventoryTypeParser(FileSystemInfo excelFile)
{
_excelFile = excelFile;
}
public IList<InventoryType> Parse()
{
var csvConfiguration =
new CsvConfiguration { IsHeaderCaseSensitive = false, IgnoreReadingExceptions = true};
csvConfiguration.RegisterClassMap<InventoryTypeMap>();
using (var reader = ExcelParserBase.OpenExcel(_excelFile, csvConfiguration))
{
return reader.GetRecords<InventoryType>().ToList();
}
}
}
}
InventoryTraker.Web/Views/Inventory/Index.cshtml
+1 -3
View File
@@ -9,7 +9,5 @@
Inventory Inventory
<a class="pull-right" href="" ng-click="vm.add()"><i class="fa fa-plus-circle"></i></a> <a class="pull-right" href="" ng-click="vm.add()"><i class="fa fa-plus-circle"></i></a>
</h1> </h1>
<div class="inventory-list"> <inventory-details inventories="vm.inventories"></inventory-details>
<inventory-details ng-repeat="inventory in vm.inventories" inventory="inventory"></inventory-details>
</div>
</div> </div>
InventoryTraker.Web/Views/Shared/_Layout.cshtml
+3 -3
View File
@@ -6,7 +6,7 @@
<meta http-equiv="X-UA-Compatible" content="IE=edge"> <meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1"> <meta name="viewport" content="width=device-width, initial-scale=1">
<title>@ViewBag.Title - InventoryTraker</title> <title>@ViewBag.Title - InventoryTraker</title>
@Styles.Render("~/Content/all.css") @Styles.Render("~/Content/all-styles")
@RenderSection("Styles", required: false) @RenderSection("Styles", required: false)
<!-- HTML5 Shim and Respond.js IE8 support of HTML5 elements and media queries --> <!-- HTML5 Shim and Respond.js IE8 support of HTML5 elements and media queries -->
<!-- WARNING: Respond.js doesn't work if you view the page via file:// --> <!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
@@ -17,7 +17,7 @@
</head> </head>
<body> <body>
<div id="wrapper" ng-cloak> <div id="wrapper" ng-cloak>
@(Request.IsAuthenticated ? Html.Partial("_NavigationHero") : Html.Partial("_NavigationNoAuth")) @(Request.IsAuthenticated ? Html.Partial("_Navigation") : Html.Partial("_NavigationNoAuth"))
<div id="page-wrapper"> <div id="page-wrapper">
<div class="container-fluid"> <div class="container-fluid">
@RenderBody() @RenderBody()
@@ -26,7 +26,7 @@
<!-- /#page-wrapper --> <!-- /#page-wrapper -->
</div> </div>
<!-- /#wrapper --> <!-- /#wrapper -->
@Scripts.Render("~/js/all.js") @Scripts.Render("~/js/all-javascript")
@RenderSection("Scripts", required: false) @RenderSection("Scripts", required: false)
</body> </body>
</html> </html>
InventoryTraker.Web/js/inventory/InventoryAddDirective.js
+13 -5
View File
@@ -14,18 +14,25 @@
controller.$inject = ['$scope', 'inventorySvc', 'inventoryTypeSvc']; controller.$inject = ['$scope', 'inventorySvc', 'inventoryTypeSvc'];
function controller($scope, inventorySvc, inventoryTypeSvc) { function controller($scope, inventorySvc, inventoryTypeSvc) {
var vm = this; var vm = this;
vm.add = add;
vm.add = add;
vm.saving = false; vm.saving = false;
vm.inventory = {}; vm.inventory = {};
vm.inventoryTypes = inventoryTypeSvc.inventoryTypes; vm.inventoryTypes = inventoryTypeSvc.inventoryTypes;
vm.errorMessage = null; vm.errorMessage = null;
vm.quantity = quantity; vm.quantity = quantity;
function zeroNaN(v) {
return isNaN(v) ? 0 : v;
}
function quantity() { function quantity() {
vm.inventory.quantity = vm.inventory.quantity =
$scope.palletCount * $scope.casesPerPallet + $scope.caseCount; zeroNaN($scope.palletCount)
return vm.inventory.quantity; * zeroNaN($scope.casesPerPallet)
+ zeroNaN($scope.caseCount);
return vm.inventory.quantity > 0 ? vm.inventory.quantity : "";
} }
function add() { function add() {
@@ -36,14 +43,15 @@
$scope.$close(); $scope.$close();
}) })
.error(function(data) { .error(function(data) {
vm.errorMessage = 'There was a problem adding the inventory: ' + data; vm.errorMessage =
'There was a problem adding the inventory: ' + data.errorMessage;
}) })
.finally(function() { .finally(function() {
vm.saving = false; vm.saving = false;
}); });
} }
$scope.$watch('commodity', function (newValue, oldValue) { $scope.$watch('vm.commodity', function (newValue, oldValue) {
if (newValue) if (newValue)
vm.inventory.inventoryTypeId = newValue.id; vm.inventory.inventoryTypeId = newValue.id;
}); });
InventoryTraker.Web/js/inventory/InventoryDetailsDirective.js
+3 -5
View File
@@ -4,9 +4,7 @@
window.app.directive('inventoryDetails', inventoryDetails); window.app.directive('inventoryDetails', inventoryDetails);
function inventoryDetails() { function inventoryDetails() {
return { return {
scope: { scope: {"inventories" : "="},
inventory: '='
},
templateUrl: '/inventory/template/inventoryDetails.tmpl.cshtml', templateUrl: '/inventory/template/inventoryDetails.tmpl.cshtml',
controller: controller, controller: controller,
controllerAs: 'vm' controllerAs: 'vm'
@@ -17,9 +15,9 @@
function controller($scope, $uibModal) { function controller($scope, $uibModal) {
var vm = this; var vm = this;
vm.inventory = $scope.inventory; vm.inventories = $scope.inventories;
vm.edit = edit; vm.edit = edit;
function edit() { function edit() {
$uibModal.open({ $uibModal.open({
template: '<editInventory inventory="inventory" />', template: '<editInventory inventory="inventory" />',
InventoryTraker.Web/js/inventory/InventoryListController.js
+2 -1
View File
@@ -11,7 +11,8 @@
function add() { function add() {
$uibModal.open({ $uibModal.open({
template: '<inventory-add />' template: '<inventory-add />',
backdrop: 'static'
}); });
} }
} }
InventoryTraker.Web/js/inventory/inventorySvc.js
-50
View File
@@ -42,56 +42,6 @@
if (inventories[i].Id == id) return inventories[i]; if (inventories[i].Id == id) return inventories[i];
} }
return null;
}
}
})();
(function () {
window.app.factory('inventoryTypeSvc', inventoryTypeSvc);
inventoryTypeSvc.$inject = ['$http'];
function inventoryTypeSvc($http) {
var inventoryTypes = [];
loadInventoryTypes();
var svc = {
add: add,
update: update,
inventoryTypes: inventoryTypes,
getInventoryType: getInventoryType
};
return svc;
function loadInventoryTypes() {
$http.post('/InventoryType/All')
.success(function (data) {
inventoryTypes.addRange(data);
});
}
function add(inventoryType) {
return $http.post('/InventoryType/Add', inventoryType)
.success(function (inventoryType) {
inventoryTypes.unshift(inventoryType);
});
}
function update(existingInventory, updatedInventory) {
return $http.post('/InventoryType/Update', updatedInventory)
.success(function (inventory) {
angular.extend(existingInventory, inventory);
});
}
function getInventoryType(id) {
for (var i = 0; i < inventoryTypes.length; i++) {
if (inventoryTypes[i].Id == id) return inventoryTypes[i];
}
return null; return null;
} }
} }
InventoryTraker.Web/js/inventory/inventoryTypeSvc.js
+48
View File
@@ -0,0 +1,48 @@
(function () {
window.app.factory('inventoryTypeSvc', inventoryTypeSvc);
inventoryTypeSvc.$inject = ['$http'];
function inventoryTypeSvc($http) {
var inventoryTypes = [];
loadInventoryTypes();
var svc = {
add: add,
update: update,
inventoryTypes: inventoryTypes,
getInventoryType: getInventoryType
};
return svc;
function loadInventoryTypes() {
$http.post('/InventoryType/All')
.success(function (data) {
inventoryTypes.addRange(data);
});
}
function add(inventoryType) {
return $http.post('/InventoryType/Add', inventoryType)
.success(function (inventoryType) {
inventoryTypes.unshift(inventoryType);
});
}
function update(existingInventory, updatedInventory) {
return $http.post('/InventoryType/Update', updatedInventory)
.success(function (inventory) {
angular.extend(existingInventory, inventory);
});
}
function getInventoryType(id) {
for (var i = 0; i < inventoryTypes.length; i++) {
if (inventoryTypes[i].Id == id) return inventoryTypes[i];
}
return null;
}
}
})();
InventoryTraker.Web/js/inventory/templates/inventoryAdd.tmpl.cshtml
+16 -16
View File
@@ -30,22 +30,22 @@
<div class="form-group has-feedback" ng-class="vm.getValidationClass()" form-group-validation="Commodity"> <div class="form-group has-feedback" ng-class="vm.getValidationClass()" form-group-validation="Commodity">
<label for="Commodity" class="control-label">Commodity</label> <label for="Commodity" class="control-label">Commodity</label>
<input name="Commodity" type="text" <input name="Commodity" type="text"
ng-model="commodity" ng-model="vm.commodity"
required required
uib-typeahead="inventoryType as inventoryType.name for inventoryType in vm.inventoryTypes | filter:{name:$viewValue} | limitTo:8" uib-typeahead=
"inventoryType as inventoryType.name for inventoryType in vm.inventoryTypes
| filter:{name:$viewValue}
| limitTo:8"
typeahead-editable='false' typeahead-editable='false'
class="form-control"> class="form-control">
<i class="fa fa-search form-control-feedback"></i> <i class="fa fa-search form-control-feedback"></i>
<div class="panel panel-default" ng-show="commodity.id"> <div class="panel panel-default" ng-show="vm.commodity.id">
<div class="panel-heading">Selected Commodity</div>
<div class="panel-body"> <div class="panel-body">
<dl class="dl-horizontal"> <dl class="dl-horizontal">
<dt>Commodity ID</dt> <dt>Commodity ID</dt>
<dd>{{commodity.id}}</dd> <dd>{{vm.commodity.identifier}}</dd>
<dt>Name</dt>
<dd>{{commodity.name}}</dd>
<dt>Units per Case</dt> <dt>Units per Case</dt>
<dd>{{commodity.unitsPerCase}} / {{commodity.containerType}}</dd> <dd>{{vm.commodity.unitsPerCase}} / {{vm.commodity.containerType}}</dd>
</dl> </dl>
</div> </div>
</div> </div>
@@ -57,28 +57,28 @@
<div class="panel-heading"><label>Quantity</label></div> <div class="panel-heading"><label>Quantity</label></div>
<div class="panel-body container-fluid"> <div class="panel-body container-fluid">
<div class="row"> <div class="row">
<div class="col-sm-5">Pallets</div> <div class="col-sm-5"><label for="PalletCount">Pallets</label></div>
<div class="col-sm-3"> <div class="col-sm-3">
<input type="number" class="form-control" ng-model="palletCount" /> <input ng-model="palletCount" name="PalletCount" type="number" class="form-control" />
</div> </div>
</div> </div>
<div class="row"> <div class="row">
<div class="col-sm-4 col-sm-offset-1">Cases per Pallet</div> <div class="col-sm-4 col-sm-offset-1"><label for="CasesPerPallet">Cases per Pallet</label></div>
<div class="col-sm-3"> <div class="col-sm-3">
<input type="number" class="form-control" ng-model="casesPerPallet" /> <input ng-model="casesPerPallet" name="CasesPerPallet" type="number" class="form-control" />
</div> </div>
</div> </div>
<hr /> <hr />
<div class="row"> <div class="row">
<div class="col-sm-5">Individual Cases</div> <div class="col-sm-5"><label for="CaseCount">Individual Cases</label></div>
<div class="col-sm-3"> <div class="col-sm-3">
<input type="number" class="form-control" ng-model="caseCount" /> <input ng-model="caseCount" name="CaseCount" type="number" class="form-control" />
</div> </div>
</div> </div>
<hr /> <hr />
<div class="row"> <div class="row">
<div class="col-sm-5">Total Units</div> <div class="col-sm-5"><strong>Total Units</strong></div>
<div class="col-sm-3">{{vm.quantity()}}</div> <div class="col-sm-3"><strong>{{vm.quantity()}}</strong></div>
</div> </div>
</div> </div>
</div> </div>
InventoryTraker.Web/js/inventory/templates/inventoryDetails.tmpl.cshtml
+26 -8
View File
@@ -1,12 +1,30 @@
@using InventoryTraker.Web.Helpers @using InventoryTraker.Web.Helpers
@model InventoryTraker.Web.Models.InventoryViewModel @model InventoryTraker.Web.Models.InventoryViewModel
@{ @{
var inventory = Html.Angular().ModelFor("vm.inventory"); var inventory = Html.Angular().ModelFor("inventory");
} }
<div class="panel panel-default">
<div class="panel-heading"> <table class="table">
@inventory.BindingFor(x => x.Name) <a href="" ng-click="vm.edit()"><i class="fa fa-edit"></i></a> <thead>
</div> <tr>
Quantity <th>Name</th>
@inventory.BindingFor(x => x.Quantity) <th>Units per Case</th>
</div> <th>Case Qty</th>
<th>Unit Qty</th>
<th>Exp Date</th>
<th>Added Date</th>
<th>Memo</th>
</tr>
</thead>
<tbody>
<tr ng-repeat="inventory in vm.inventories" inventory="inventory">
<td><strong>@inventory.BindingFor(x => x.Name)</strong> <a href="" ng-click="vm.edit()"><i class="fa fa-edit"></i></a></td>
<td>@inventory.BindingFor(x => x.UnitsPerCase) / @inventory.BindingFor(x => x.ContainerType)</td>
<td>@inventory.BindingFor(x => x.Quantity)</td>
<td>{{inventory.quantity * inventory.unitsPerCase}}</td>
<td>@inventory.BindingFor(x => x.ExpirationDate, "date:'shortDate'")</td>
<td>@inventory.BindingFor(x => x.AddedDate, "date:'shortDate'")</td>
<td>@inventory.BindingFor(x => x.Memo)</td>
</tr>
</tbody>
</table>
InventoryTraker.Web/packages.config
+4
View File
@@ -8,6 +8,10 @@
<package id="Antlr" version="3.5.0.2" targetFramework="net451" /> <package id="Antlr" version="3.5.0.2" targetFramework="net451" />
<package id="AutoMapper" version="4.2.0" targetFramework="net451" /> <package id="AutoMapper" version="4.2.0" targetFramework="net451" />
<package id="bootstrap" version="3.3.7" targetFramework="net451" /> <package id="bootstrap" version="3.3.7" targetFramework="net451" />
<package id="ClosedXML" version="0.76.0" targetFramework="net451" />
<package id="CsvHelper" version="2.11.0" targetFramework="net451" />
<package id="CsvHelper.Excel" version="1.0.5" targetFramework="net451" />
<package id="DocumentFormat.OpenXml" version="2.5" targetFramework="net451" />
<package id="EntityFramework" version="6.1.3" targetFramework="net451" /> <package id="EntityFramework" version="6.1.3" targetFramework="net451" />
<package id="FontAwesome" version="4.6.3" targetFramework="net451" /> <package id="FontAwesome" version="4.6.3" targetFramework="net451" />
<package id="Heroic.AutoMapper" version="2.0.0" targetFramework="net451" /> <package id="Heroic.AutoMapper" version="2.0.0" targetFramework="net451" />
InventoryTraker.sln
+6
View File
@@ -5,6 +5,8 @@ VisualStudioVersion = 14.0.25123.0
MinimumVisualStudioVersion = 10.0.40219.1 MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "InventoryTraker.Web", "InventoryTraker.Web\InventoryTraker.Web.csproj", "{5E5867A4-6152-4655-A04B-1737DF493A41}" Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "InventoryTraker.Web", "InventoryTraker.Web\InventoryTraker.Web.csproj", "{5E5867A4-6152-4655-A04B-1737DF493A41}"
EndProject EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "InventoryTraker.Web.Tests", "InventoryTraker.Web.Tests\InventoryTraker.Web.Tests.csproj", "{03B3BDF2-B2BE-42C1-8D6F-2B4E106A1D4B}"
EndProject
Global Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU Debug|Any CPU = Debug|Any CPU
@@ -15,6 +17,10 @@ Global
{5E5867A4-6152-4655-A04B-1737DF493A41}.Debug|Any CPU.Build.0 = Debug|Any CPU {5E5867A4-6152-4655-A04B-1737DF493A41}.Debug|Any CPU.Build.0 = Debug|Any CPU
{5E5867A4-6152-4655-A04B-1737DF493A41}.Release|Any CPU.ActiveCfg = Release|Any CPU {5E5867A4-6152-4655-A04B-1737DF493A41}.Release|Any CPU.ActiveCfg = Release|Any CPU
{5E5867A4-6152-4655-A04B-1737DF493A41}.Release|Any CPU.Build.0 = Release|Any CPU {5E5867A4-6152-4655-A04B-1737DF493A41}.Release|Any CPU.Build.0 = Release|Any CPU
{03B3BDF2-B2BE-42C1-8D6F-2B4E106A1D4B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{03B3BDF2-B2BE-42C1-8D6F-2B4E106A1D4B}.Debug|Any CPU.Build.0 = Debug|Any CPU
{03B3BDF2-B2BE-42C1-8D6F-2B4E106A1D4B}.Release|Any CPU.ActiveCfg = Release|Any CPU
{03B3BDF2-B2BE-42C1-8D6F-2B4E106A1D4B}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection EndGlobalSection
GlobalSection(SolutionProperties) = preSolution GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE HideSolutionNode = FALSE
global.json
+5
View File
@@ -0,0 +1,5 @@
{
"projects": [
"wrap"
]
}
wrap/InventoryTraker.Web/project.json
+52
View File
@@ -0,0 +1,52 @@
{
"version": "1.0.0-*",
"frameworks": {
"net451": {
"wrappedProject": "../../InventoryTraker.Web/InventoryTraker.Web.csproj",
"bin": {
"assembly": "../../InventoryTraker.Web/obj/{configuration}/InventoryTraker.Web.dll",
"pdb": "../../InventoryTraker.Web/obj/{configuration}/InventoryTraker.Web.pdb"
},
"dependencies": {
"Angular.UI.Bootstrap": "1.3.3",
"AngularJS.Animate": "1.5.8",
"AngularJS.Core": "1.5.8",
"angular-strap": "2.3.1",
"angular-ui-grid": "3.1.1",
"Antlr": "3.5.0.2",
"AutoMapper": "4.2.0",
"bootstrap": "3.3.7",
"EntityFramework": "6.1.3",
"FontAwesome": "4.6.3",
"Heroic.AutoMapper": "2.0.0",
"Heroic.Web.IoC": "4.1.2",
"HtmlTags": "3.0.0.186",
"Humanizer": "1.33.7",
"jQuery": "1.9.1",
"Microsoft.AspNet.Identity.Core": "2.2.1",
"Microsoft.AspNet.Identity.EntityFramework": "2.2.1",
"Microsoft.AspNet.Identity.Owin": "2.2.1",
"Microsoft.AspNet.Mvc": "5.2.3",
"Microsoft.AspNet.Mvc.Futures": "5.0.0",
"Microsoft.AspNet.Razor": "3.2.3",
"Microsoft.AspNet.Web.Optimization": "1.1.3",
"Microsoft.AspNet.WebApi": "5.2.3",
"Microsoft.AspNet.WebApi.Client": "5.2.3",
"Microsoft.AspNet.WebApi.Core": "5.2.3",
"Microsoft.AspNet.WebApi.WebHost": "5.2.3",
"Microsoft.AspNet.WebPages": "3.2.3",
"Microsoft.Owin": "3.0.1",
"Microsoft.Owin.Host.SystemWeb": "3.0.1",
"Microsoft.Owin.Security": "3.0.1",
"Microsoft.Owin.Security.Cookies": "3.0.1",
"Microsoft.Owin.Security.OAuth": "3.0.1",
"Microsoft.Web.Infrastructure": "1.0.0.0",
"Newtonsoft.Json": "6.0.7",
"Owin": "1.0",
"StructureMap": "4.4.0",
"WebActivatorEx": "2.1.0",
"WebGrease": "1.6.0"
}
}
}
}