From ab3ad25944aabeb940403f136b5c2fb61cebe1d3 Mon Sep 17 00:00:00 2001 From: Gary Sharp Date: Mon, 22 Jul 2013 17:26:28 +1000 Subject: [PATCH] Update: Computer Name in Tech Held Devices Requested by Rohan Beckett representing non-1:1 primary schools. http://discoict.com.au/forum/support/disco-jobs/2013/3/public-reports-not-working.aspx --- Disco.BI/Properties/AssemblyInfo.cs | 4 ++-- Disco.Client/Properties/AssemblyInfo.cs | 4 ++-- .../Properties/AssemblyInfo.cs | 4 ++-- Disco.Data/Properties/AssemblyInfo.cs | 4 ++-- Disco.Models/Properties/AssemblyInfo.cs | 4 ++-- Disco.Services/Properties/AssemblyInfo.cs | 4 ++-- Disco.Web.Extensions/Properties/AssemblyInfo.cs | 4 ++-- .../Public/Models/HeldDevices/HeldDeviceModel.cs | 4 ++-- .../Areas/Public/Views/HeldDevices/Index.cshtml | 12 ++++++------ .../Public/Views/HeldDevices/Index.generated.cs | 14 +++++++------- Disco.Web/Disco.Web.csproj | 2 +- Disco.Web/Properties/AssemblyInfo.cs | 4 ++-- 12 files changed, 32 insertions(+), 32 deletions(-) diff --git a/Disco.BI/Properties/AssemblyInfo.cs b/Disco.BI/Properties/AssemblyInfo.cs index d79c6a89..91f8c28f 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.0715.2224")] -[assembly: AssemblyFileVersion("1.2.0715.2224")] \ No newline at end of file +[assembly: AssemblyVersion("1.2.0722.1715")] +[assembly: AssemblyFileVersion("1.2.0722.1715")] \ No newline at end of file diff --git a/Disco.Client/Properties/AssemblyInfo.cs b/Disco.Client/Properties/AssemblyInfo.cs index 46da43b6..1659d342 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.0715.2224")] -[assembly: AssemblyFileVersion("1.2.0715.2224")] \ No newline at end of file +[assembly: AssemblyVersion("1.2.0722.1715")] +[assembly: AssemblyFileVersion("1.2.0722.1715")] \ No newline at end of file diff --git a/Disco.ClientBootstrapper/Properties/AssemblyInfo.cs b/Disco.ClientBootstrapper/Properties/AssemblyInfo.cs index 9b9c76c3..d3aedc4e 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.0715.2224")] -[assembly: AssemblyFileVersion("1.2.0715.2224")] \ No newline at end of file +[assembly: AssemblyVersion("1.2.0722.1715")] +[assembly: AssemblyFileVersion("1.2.0722.1715")] \ No newline at end of file diff --git a/Disco.Data/Properties/AssemblyInfo.cs b/Disco.Data/Properties/AssemblyInfo.cs index c73c5238..e1159a81 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.0715.2224")] -[assembly: AssemblyFileVersion("1.2.0715.2224")] \ No newline at end of file +[assembly: AssemblyVersion("1.2.0722.1715")] +[assembly: AssemblyFileVersion("1.2.0722.1715")] \ No newline at end of file diff --git a/Disco.Models/Properties/AssemblyInfo.cs b/Disco.Models/Properties/AssemblyInfo.cs index 7a3cca25..14340436 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.0715.2224")] -[assembly: AssemblyFileVersion("1.2.0715.2224")] \ No newline at end of file +[assembly: AssemblyVersion("1.2.0722.1715")] +[assembly: AssemblyFileVersion("1.2.0722.1715")] \ No newline at end of file diff --git a/Disco.Services/Properties/AssemblyInfo.cs b/Disco.Services/Properties/AssemblyInfo.cs index eb8c175f..7d4b100a 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.0715.2224")] -[assembly: AssemblyFileVersion("1.2.0715.2224")] \ No newline at end of file +[assembly: AssemblyVersion("1.2.0722.1715")] +[assembly: AssemblyFileVersion("1.2.0722.1715")] \ No newline at end of file diff --git a/Disco.Web.Extensions/Properties/AssemblyInfo.cs b/Disco.Web.Extensions/Properties/AssemblyInfo.cs index b18de56f..46179a77 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.0715.2224")] -[assembly: AssemblyFileVersion("1.2.0715.2224")] \ No newline at end of file +[assembly: AssemblyVersion("1.2.0722.1715")] +[assembly: AssemblyFileVersion("1.2.0722.1715")] \ No newline at end of file diff --git a/Disco.Web/Areas/Public/Models/HeldDevices/HeldDeviceModel.cs b/Disco.Web/Areas/Public/Models/HeldDevices/HeldDeviceModel.cs index dabccc56..bb5c0fa6 100644 --- a/Disco.Web/Areas/Public/Models/HeldDevices/HeldDeviceModel.cs +++ b/Disco.Web/Areas/Public/Models/HeldDevices/HeldDeviceModel.cs @@ -17,7 +17,7 @@ namespace Disco.Web.Areas.Public.Models.HeldDevices { get { - StringBuilder sb = new StringBuilder(this.DeviceSerialNumber); + StringBuilder sb = new StringBuilder(this.DeviceComputerName); if (UserId != null) sb.Append(" - ").Append(this.UserDisplayName).Append(" (").Append(this.UserId).Append(")"); @@ -25,7 +25,7 @@ namespace Disco.Web.Areas.Public.Models.HeldDevices if (!string.IsNullOrWhiteSpace(this.DeviceLocation)) sb.Append(" - ").Append(this.DeviceLocation); else if (UserId == null) - sb.Append(" - ").Append(this.DeviceComputerName); + sb.Append(" - ").Append(this.DeviceSerialNumber); return sb.ToString(); } diff --git a/Disco.Web/Areas/Public/Views/HeldDevices/Index.cshtml b/Disco.Web/Areas/Public/Views/HeldDevices/Index.cshtml index 753709f8..3e9f8428 100644 --- a/Disco.Web/Areas/Public/Views/HeldDevices/Index.cshtml +++ b/Disco.Web/Areas/Public/Views/HeldDevices/Index.cshtml @@ -14,7 +14,7 @@ { - @item.DeviceSerialNumber + @item.DeviceComputerName @if (item.UserId != null) @@ -33,7 +33,7 @@ { if (item.UserId == null) { - @item.DeviceComputerName + @item.DeviceSerialNumber } } @if (!string.IsNullOrEmpty(item.EstimatedReturnTime)) @@ -55,7 +55,7 @@ { - @item.DeviceSerialNumber + @item.DeviceComputerName @if (item.UserId != null) @@ -74,7 +74,7 @@ { if (item.UserId == null) { - @item.DeviceComputerName + @item.DeviceSerialNumber } } @@ -93,7 +93,7 @@ { - @item.DeviceSerialNumber + @item.DeviceComputerName @if (item.UserId != null) @@ -112,7 +112,7 @@ { if (item.UserId == null) { - @item.DeviceComputerName + @item.DeviceSerialNumber } } diff --git a/Disco.Web/Areas/Public/Views/HeldDevices/Index.generated.cs b/Disco.Web/Areas/Public/Views/HeldDevices/Index.generated.cs index 00dfe132..2f44294c 100644 --- a/Disco.Web/Areas/Public/Views/HeldDevices/Index.generated.cs +++ b/Disco.Web/Areas/Public/Views/HeldDevices/Index.generated.cs @@ -2,7 +2,7 @@ //------------------------------------------------------------------------------ // // This code was generated by a tool. -// Runtime Version:4.0.30319.18033 +// Runtime Version:4.0.30319.18051 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. @@ -112,7 +112,7 @@ WriteLiteral(" "); #line 17 "..\..\Areas\Public\Views\HeldDevices\Index.cshtml" - Write(item.DeviceSerialNumber); + Write(item.DeviceComputerName); #line default @@ -214,7 +214,7 @@ WriteLiteral("\r\n"); #line hidden #line 36 "..\..\Areas\Public\Views\HeldDevices\Index.cshtml" - Write(item.DeviceComputerName); + Write(item.DeviceSerialNumber); #line default @@ -328,7 +328,7 @@ WriteLiteral(" "); #line 58 "..\..\Areas\Public\Views\HeldDevices\Index.cshtml" - Write(item.DeviceSerialNumber); + Write(item.DeviceComputerName); #line default @@ -430,7 +430,7 @@ WriteLiteral("\r\n"); #line hidden #line 77 "..\..\Areas\Public\Views\HeldDevices\Index.cshtml" - Write(item.DeviceComputerName); + Write(item.DeviceSerialNumber); #line default @@ -530,7 +530,7 @@ WriteLiteral(" "); #line 96 "..\..\Areas\Public\Views\HeldDevices\Index.cshtml" - Write(item.DeviceSerialNumber); + Write(item.DeviceComputerName); #line default @@ -632,7 +632,7 @@ WriteLiteral("\r\n"); #line hidden #line 115 "..\..\Areas\Public\Views\HeldDevices\Index.cshtml" - Write(item.DeviceComputerName); + Write(item.DeviceSerialNumber); #line default diff --git a/Disco.Web/Disco.Web.csproj b/Disco.Web/Disco.Web.csproj index 7bcb8b58..b491c2bf 100644 --- a/Disco.Web/Disco.Web.csproj +++ b/Disco.Web/Disco.Web.csproj @@ -1911,7 +1911,7 @@ False - + diff --git a/Disco.Web/Properties/AssemblyInfo.cs b/Disco.Web/Properties/AssemblyInfo.cs index 394216e2..06878c33 100644 --- a/Disco.Web/Properties/AssemblyInfo.cs +++ b/Disco.Web/Properties/AssemblyInfo.cs @@ -31,5 +31,5 @@ using System.Runtime.InteropServices; // // You can specify all the values or you can default the Revision and Build Numbers // by using the '*' as shown below: -[assembly: AssemblyVersion("1.2.0715.2224")] -[assembly: AssemblyFileVersion("1.2.0715.2224")] \ No newline at end of file +[assembly: AssemblyVersion("1.2.0722.1715")] +[assembly: AssemblyFileVersion("1.2.0722.1715")] \ No newline at end of file