diff --git a/Disco.BI/Properties/AssemblyInfo.cs b/Disco.BI/Properties/AssemblyInfo.cs index fe46be1e..dec94cdc 100644 --- a/Disco.BI/Properties/AssemblyInfo.cs +++ b/Disco.BI/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ using System.Runtime.InteropServices; // 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.2.0219.1605")] -[assembly: AssemblyFileVersion("1.2.0219.1605")] +[assembly: AssemblyVersion("1.2.0219.1854")] +[assembly: AssemblyFileVersion("1.2.0219.1854")] diff --git a/Disco.Client/Package Creation/PreparationClient.zip b/Disco.Client/Package Creation/PreparationClient.zip index 4b14ba2e..9246c829 100644 Binary files a/Disco.Client/Package Creation/PreparationClient.zip and b/Disco.Client/Package Creation/PreparationClient.zip differ diff --git a/Disco.Client/Properties/AssemblyInfo.cs b/Disco.Client/Properties/AssemblyInfo.cs index cbb52069..c9a53cf1 100644 --- a/Disco.Client/Properties/AssemblyInfo.cs +++ b/Disco.Client/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ using System.Runtime.InteropServices; // 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.2.0219.1551")] -[assembly: AssemblyFileVersion("1.2.0219.1551")] +[assembly: AssemblyVersion("1.2.0219.1813")] +[assembly: AssemblyFileVersion("1.2.0219.1813")] diff --git a/Disco.ClientBootstrapper/Properties/AssemblyInfo.cs b/Disco.ClientBootstrapper/Properties/AssemblyInfo.cs index c5ecdbd5..0d43e443 100644 --- a/Disco.ClientBootstrapper/Properties/AssemblyInfo.cs +++ b/Disco.ClientBootstrapper/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ using System.Runtime.InteropServices; // 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.2.0219.1551")] -[assembly: AssemblyFileVersion("1.2.0219.1551")] +[assembly: AssemblyVersion("1.2.0219.1813")] +[assembly: AssemblyFileVersion("1.2.0219.1813")] diff --git a/Disco.Data/Properties/AssemblyInfo.cs b/Disco.Data/Properties/AssemblyInfo.cs index 42b358f9..9b6faf9e 100644 --- a/Disco.Data/Properties/AssemblyInfo.cs +++ b/Disco.Data/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ using System.Runtime.InteropServices; // 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.2.0219.1605")] -[assembly: AssemblyFileVersion("1.2.0219.1605")] +[assembly: AssemblyVersion("1.2.0219.1854")] +[assembly: AssemblyFileVersion("1.2.0219.1854")] diff --git a/Disco.Models/Properties/AssemblyInfo.cs b/Disco.Models/Properties/AssemblyInfo.cs index 32b65cde..5a31b8a1 100644 --- a/Disco.Models/Properties/AssemblyInfo.cs +++ b/Disco.Models/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ using System.Runtime.InteropServices; // 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.2.0219.1605")] -[assembly: AssemblyFileVersion("1.2.0219.1605")] +[assembly: AssemblyVersion("1.2.0219.1854")] +[assembly: AssemblyFileVersion("1.2.0219.1854")] diff --git a/Disco.Services/Properties/AssemblyInfo.cs b/Disco.Services/Properties/AssemblyInfo.cs index f817e151..c723a024 100644 --- a/Disco.Services/Properties/AssemblyInfo.cs +++ b/Disco.Services/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ using System.Runtime.InteropServices; // 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.2.0219.1605")] -[assembly: AssemblyFileVersion("1.2.0219.1605")] +[assembly: AssemblyVersion("1.2.0219.1854")] +[assembly: AssemblyFileVersion("1.2.0219.1854")] diff --git a/Disco.Web.Extensions/Properties/AssemblyInfo.cs b/Disco.Web.Extensions/Properties/AssemblyInfo.cs index 02c7a04a..235458e3 100644 --- a/Disco.Web.Extensions/Properties/AssemblyInfo.cs +++ b/Disco.Web.Extensions/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ using System.Runtime.InteropServices; // 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.2.0219.1605")] -[assembly: AssemblyFileVersion("1.2.0219.1605")] +[assembly: AssemblyVersion("1.2.0219.1854")] +[assembly: AssemblyFileVersion("1.2.0219.1854")] diff --git a/Disco.Web/Areas/Config/Views/DeviceModel/_DeviceComponentsTable.cshtml b/Disco.Web/Areas/Config/Views/DeviceModel/_DeviceComponentsTable.cshtml index 25f632c3..9ff9916f 100644 --- a/Disco.Web/Areas/Config/Views/DeviceModel/_DeviceComponentsTable.cshtml +++ b/Disco.Web/Areas/Config/Views/DeviceModel/_DeviceComponentsTable.cshtml @@ -1,270 +1,271 @@ -@model Disco.Web.Areas.Config.Models.DeviceModel.DeviceComponentsModel -@{ - Html.BundleDeferred("~/ClientScripts/Modules/Disco-jQueryExtensions"); -} - - - - - - - - @foreach (var item in Model.DeviceComponents) - { - - - - - - - } - - - -
- Description - - Cost - - Job Types - -   -
- - - - - - - -
- Add Component -
- -
-
-

- Hardware Non-Warranty Job Types

- @CommonHelpers.CheckBoxList("SubTypes", Model.JobSubTypes.ToSelectListItems(), 2) -
- - -
-
-
-

- - This item will be permanently deleted and cannot be recovered. Are you sure?

-
+@model Disco.Web.Areas.Config.Models.DeviceModel.DeviceComponentsModel +@{ + Html.BundleDeferred("~/ClientScripts/Modules/Disco-jQueryExtensions"); +} + + + + + + + + @foreach (var item in Model.DeviceComponents) + { + + + + + + + } + + + +
+ Description + + Cost + + Job Types + +   +
+ + + + + + + +
+ Add Component +
+ +
+
+

+ Hardware Non-Warranty Job Types

+ @CommonHelpers.CheckBoxList("SubTypes", Model.JobSubTypes.ToSelectListItems(), 2) +
+ + +
+
+
+

+ + This item will be permanently deleted and cannot be recovered. Are you sure?

+
diff --git a/Disco.Web/Areas/Config/Views/DeviceModel/_DeviceComponentsTable.generated.cs b/Disco.Web/Areas/Config/Views/DeviceModel/_DeviceComponentsTable.generated.cs index 4a178750..9f877b30 100644 --- a/Disco.Web/Areas/Config/Views/DeviceModel/_DeviceComponentsTable.generated.cs +++ b/Disco.Web/Areas/Config/Views/DeviceModel/_DeviceComponentsTable.generated.cs @@ -1,412 +1,412 @@ -#pragma warning disable 1591 -//------------------------------------------------------------------------------ -// -// This code was generated by a tool. -// Runtime Version:4.0.30319.17929 -// -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. -// -//------------------------------------------------------------------------------ - -namespace Disco.Web.Areas.Config.Views.DeviceModel -{ - using System; - using System.Collections.Generic; - using System.IO; - using System.Linq; - using System.Net; - using System.Text; - using System.Web; - using System.Web.Helpers; - using System.Web.Mvc; - using System.Web.Mvc.Ajax; - using System.Web.Mvc.Html; - using System.Web.Routing; - using System.Web.Security; - using System.Web.UI; - using System.Web.WebPages; - using Disco.BI.Extensions; - using Disco.Models.Repository; - using Disco.Web; - using Disco.Web.Extensions; - - [System.CodeDom.Compiler.GeneratedCodeAttribute("RazorGenerator", "1.5.0.0")] - [System.Web.WebPages.PageVirtualPathAttribute("~/Areas/Config/Views/DeviceModel/_DeviceComponentsTable.cshtml")] - public class DeviceComponentsTable : System.Web.Mvc.WebViewPage - { - public DeviceComponentsTable() - { - } - public override void Execute() - { - - #line 2 "..\..\Areas\Config\Views\DeviceModel\_DeviceComponentsTable.cshtml" - - Html.BundleDeferred("~/ClientScripts/Modules/Disco-jQueryExtensions"); - - - #line default - #line hidden -WriteLiteral("\r\n