From f975c55b8a40ef1914ad2cf08199fe78fa4828be Mon Sep 17 00:00:00 2001 From: Gary Sharp Date: Wed, 10 Dec 2025 14:38:58 +1100 Subject: [PATCH] bug: whitespace missing in device/user flag tooltips --- .../Views/Device/DeviceParts/_Subject.cshtml | 5 +- .../Device/DeviceParts/_Subject.generated.cs | 484 ++++++++-------- Disco.Web/Views/Device/Show.cshtml | 5 +- Disco.Web/Views/Device/Show.generated.cs | 74 +-- Disco.Web/Views/Device/_DeviceTable.cshtml | 5 +- .../Views/Device/_DeviceTable.generated.cs | 99 ++-- Disco.Web/Views/Job/JobParts/_Subject.cshtml | 10 +- .../Views/Job/JobParts/_Subject.generated.cs | 534 +++++++++--------- Disco.Web/Views/User/Show.cshtml | 5 +- Disco.Web/Views/User/Show.generated.cs | 68 ++- .../Views/User/UserParts/_Subject.cshtml | 5 +- .../User/UserParts/_Subject.generated.cs | 35 +- Disco.Web/Views/User/_UserTable.cshtml | 5 +- Disco.Web/Views/User/_UserTable.generated.cs | 50 +- 14 files changed, 720 insertions(+), 664 deletions(-) diff --git a/Disco.Web/Views/Device/DeviceParts/_Subject.cshtml b/Disco.Web/Views/Device/DeviceParts/_Subject.cshtml index af44e6de..b8fc67a4 100644 --- a/Disco.Web/Views/Device/DeviceParts/_Subject.cshtml +++ b/Disco.Web/Views/Device/DeviceParts/_Subject.cshtml @@ -248,8 +248,9 @@ { - @flag.Item2.flag.Name@if (flag.Item1.Comments != null) - {@flag.Item1.Comments.ToHtmlComment()}@CommonHelpers.FriendlyDateAndUser(flag.Item1.AddedDate, flag.Item1.AddedUserId) + @flag.Item2.flag.Name + @if (flag.Item1.Comments != null) {@flag.Item1.Comments.ToHtmlComment()} + @CommonHelpers.FriendlyDateAndUser(flag.Item1.AddedDate, flag.Item1.AddedUserId) } diff --git a/Disco.Web/Views/Device/DeviceParts/_Subject.generated.cs b/Disco.Web/Views/Device/DeviceParts/_Subject.generated.cs index b3539d3a..2fe31499 100644 --- a/Disco.Web/Views/Device/DeviceParts/_Subject.generated.cs +++ b/Disco.Web/Views/Device/DeviceParts/_Subject.generated.cs @@ -1142,12 +1142,17 @@ WriteLiteral(">"); #line default #line hidden -WriteLiteral(""); +WriteLiteral("\r\n"); - #line 251 "..\..\Views\Device\DeviceParts\_Subject.cshtml" - if (flag.Item1.Comments != null) - { + #line 252 "..\..\Views\Device\DeviceParts\_Subject.cshtml" + + + #line default + #line hidden + + #line 252 "..\..\Views\Device\DeviceParts\_Subject.cshtml" + if (flag.Item1.Comments != null) { #line default #line hidden @@ -1159,7 +1164,7 @@ WriteLiteral(">"); #line 252 "..\..\Views\Device\DeviceParts\_Subject.cshtml" - Write(flag.Item1.Comments.ToHtmlComment()); + Write(flag.Item1.Comments.ToHtmlComment()); #line default @@ -1168,19 +1173,20 @@ WriteLiteral(""); #line 252 "..\..\Views\Device\DeviceParts\_Subject.cshtml" - } + } + #line default #line hidden -WriteLiteral(""); - #line 252 "..\..\Views\Device\DeviceParts\_Subject.cshtml" - Write(CommonHelpers.FriendlyDateAndUser(flag.Item1.AddedDate, flag.Item1.AddedUserId)); + #line 253 "..\..\Views\Device\DeviceParts\_Subject.cshtml" + Write(CommonHelpers.FriendlyDateAndUser(flag.Item1.AddedDate, flag.Item1.AddedUserId)); #line default @@ -1189,7 +1195,7 @@ WriteLiteral("\r\n " \r\n"); - #line 255 "..\..\Views\Device\DeviceParts\_Subject.cshtml" + #line 256 "..\..\Views\Device\DeviceParts\_Subject.cshtml" } } @@ -1233,7 +1239,7 @@ WriteLiteral(">\r\n $(functio "cript>\r\n \r\n"); - #line 288 "..\..\Views\Device\DeviceParts\_Subject.cshtml" + #line 289 "..\..\Views\Device\DeviceParts\_Subject.cshtml" } @@ -1242,7 +1248,7 @@ WriteLiteral(">\r\n $(functio WriteLiteral(" "); - #line 289 "..\..\Views\Device\DeviceParts\_Subject.cshtml" + #line 290 "..\..\Views\Device\DeviceParts\_Subject.cshtml" if (Model.AssignedUserDetails != null && Model.AssignedUserDetails.Count(d => !d.Key.EndsWith("&")) > 0) { @@ -1258,13 +1264,13 @@ WriteLiteral(" class=\"status clearfix\""); WriteLiteral(">\r\n"); - #line 292 "..\..\Views\Device\DeviceParts\_Subject.cshtml" + #line 293 "..\..\Views\Device\DeviceParts\_Subject.cshtml" #line default #line hidden - #line 292 "..\..\Views\Device\DeviceParts\_Subject.cshtml" + #line 293 "..\..\Views\Device\DeviceParts\_Subject.cshtml" foreach (var detail in Model.AssignedUserDetails.Where(d => !d.Key.EndsWith("&"))) { @@ -1275,7 +1281,7 @@ WriteLiteral("
\r\n " "); - #line 295 "..\..\Views\Device\DeviceParts\_Subject.cshtml" + #line 296 "..\..\Views\Device\DeviceParts\_Subject.cshtml" Write(detail.Key.TrimEnd('*')); @@ -1284,13 +1290,13 @@ WriteLiteral("
\r\n WriteLiteral(":\r\n"); - #line 296 "..\..\Views\Device\DeviceParts\_Subject.cshtml" + #line 297 "..\..\Views\Device\DeviceParts\_Subject.cshtml" #line default #line hidden - #line 296 "..\..\Views\Device\DeviceParts\_Subject.cshtml" + #line 297 "..\..\Views\Device\DeviceParts\_Subject.cshtml" if (detail.Key.EndsWith("*")) { @@ -1312,7 +1318,7 @@ WriteLiteral(" class=\"reveal hidden\""); WriteLiteral(">"); - #line 299 "..\..\Views\Device\DeviceParts\_Subject.cshtml" + #line 300 "..\..\Views\Device\DeviceParts\_Subject.cshtml" Write(Html.Partial(MVC.Shared.Views._CustomDetailValueRender, detail)); @@ -1321,7 +1327,7 @@ WriteLiteral(">"); WriteLiteral("\r\n"); - #line 300 "..\..\Views\Device\DeviceParts\_Subject.cshtml" + #line 301 "..\..\Views\Device\DeviceParts\_Subject.cshtml" } else { @@ -1330,14 +1336,14 @@ WriteLiteral("\r\n"); #line default #line hidden - #line 303 "..\..\Views\Device\DeviceParts\_Subject.cshtml" + #line 304 "..\..\Views\Device\DeviceParts\_Subject.cshtml" Write(Html.Partial(MVC.Shared.Views._CustomDetailValueRender, detail)); #line default #line hidden - #line 303 "..\..\Views\Device\DeviceParts\_Subject.cshtml" + #line 304 "..\..\Views\Device\DeviceParts\_Subject.cshtml" } @@ -1347,7 +1353,7 @@ WriteLiteral("\r\n"); WriteLiteral("
\r\n"); - #line 306 "..\..\Views\Device\DeviceParts\_Subject.cshtml" + #line 307 "..\..\Views\Device\DeviceParts\_Subject.cshtml" } @@ -1372,7 +1378,7 @@ WriteLiteral(@"> "); - #line 319 "..\..\Views\Device\DeviceParts\_Subject.cshtml" + #line 320 "..\..\Views\Device\DeviceParts\_Subject.cshtml" } @@ -1381,7 +1387,7 @@ WriteLiteral(@"> WriteLiteral("
\r\n"); - #line 321 "..\..\Views\Device\DeviceParts\_Subject.cshtml" + #line 322 "..\..\Views\Device\DeviceParts\_Subject.cshtml" } else { @@ -1396,7 +1402,7 @@ WriteLiteral(" class=\"smallMessage\""); WriteLiteral(">Not Assigned\r\n"); - #line 325 "..\..\Views\Device\DeviceParts\_Subject.cshtml" + #line 326 "..\..\Views\Device\DeviceParts\_Subject.cshtml" } @@ -1406,13 +1412,13 @@ WriteLiteral(" \r\n " \r\n \r\n"); - #line 330 "..\..\Views\Device\DeviceParts\_Subject.cshtml" + #line 331 "..\..\Views\Device\DeviceParts\_Subject.cshtml" #line default #line hidden - #line 330 "..\..\Views\Device\DeviceParts\_Subject.cshtml" + #line 331 "..\..\Views\Device\DeviceParts\_Subject.cshtml" if (Authorization.Has(Claims.Device.Actions.GenerateDocuments)) { @@ -1430,7 +1436,7 @@ WriteLiteral(">\r\n"); WriteLiteral(" "); - #line 333 "..\..\Views\Device\DeviceParts\_Subject.cshtml" + #line 334 "..\..\Views\Device\DeviceParts\_Subject.cshtml" Write(Html.Partial(MVC.Shared.Views._GenerateDocumentControl, Model.GenerateDocumentControlModel)); @@ -1439,7 +1445,7 @@ WriteLiteral(" "); WriteLiteral("\r\n \r\n"); - #line 335 "..\..\Views\Device\DeviceParts\_Subject.cshtml" + #line 336 "..\..\Views\Device\DeviceParts\_Subject.cshtml" } @@ -1462,13 +1468,13 @@ WriteLiteral(" title=\"Device Profile\""); WriteLiteral(">\r\n"); - #line 342 "..\..\Views\Device\DeviceParts\_Subject.cshtml" + #line 343 "..\..\Views\Device\DeviceParts\_Subject.cshtml" #line default #line hidden - #line 342 "..\..\Views\Device\DeviceParts\_Subject.cshtml" + #line 343 "..\..\Views\Device\DeviceParts\_Subject.cshtml" if (Authorization.Has(Claims.Config.DeviceProfile.Show)) { @@ -1476,14 +1482,14 @@ WriteLiteral(">\r\n"); #line default #line hidden - #line 344 "..\..\Views\Device\DeviceParts\_Subject.cshtml" + #line 345 "..\..\Views\Device\DeviceParts\_Subject.cshtml" Write(Html.ActionLink(Model.Device.DeviceProfile.Name, MVC.Config.DeviceProfile.Index(Model.Device.DeviceProfileId))); #line default #line hidden - #line 344 "..\..\Views\Device\DeviceParts\_Subject.cshtml" + #line 345 "..\..\Views\Device\DeviceParts\_Subject.cshtml" } else @@ -1493,14 +1499,14 @@ WriteLiteral(">\r\n"); #line default #line hidden - #line 348 "..\..\Views\Device\DeviceParts\_Subject.cshtml" + #line 349 "..\..\Views\Device\DeviceParts\_Subject.cshtml" Write(Model.Device.DeviceProfile.Name); #line default #line hidden - #line 348 "..\..\Views\Device\DeviceParts\_Subject.cshtml" + #line 349 "..\..\Views\Device\DeviceParts\_Subject.cshtml" } @@ -1522,7 +1528,7 @@ WriteLiteral(">Distribution:\r\n \r\n WriteLiteral(" "); - #line 357 "..\..\Views\Device\DeviceParts\_Subject.cshtml" + #line 358 "..\..\Views\Device\DeviceParts\_Subject.cshtml" Write(Model.Device.DeviceProfile.DistributionType.ToString()); @@ -1538,13 +1544,13 @@ WriteLiteral(">Address:\r\n \r\n "\r\n"); - #line 365 "..\..\Views\Device\DeviceParts\_Subject.cshtml" + #line 366 "..\..\Views\Device\DeviceParts\_Subject.cshtml" #line default #line hidden - #line 365 "..\..\Views\Device\DeviceParts\_Subject.cshtml" + #line 366 "..\..\Views\Device\DeviceParts\_Subject.cshtml" if (Model.DeviceProfileDefaultOrganisationAddress != null) { @@ -1559,7 +1565,7 @@ WriteLiteral(" id=\"Device_Show_Policies_Profile_Address\""); WriteLiteral(">"); - #line 368 "..\..\Views\Device\DeviceParts\_Subject.cshtml" + #line 369 "..\..\Views\Device\DeviceParts\_Subject.cshtml" Write(Model.DeviceProfileDefaultOrganisationAddress.Name); @@ -1568,7 +1574,7 @@ WriteLiteral(">"); WriteLiteral("\r\n"); - #line 369 "..\..\Views\Device\DeviceParts\_Subject.cshtml" + #line 370 "..\..\Views\Device\DeviceParts\_Subject.cshtml" } else { @@ -1585,7 +1591,7 @@ WriteLiteral(" class=\"smallMessage\""); WriteLiteral(">None\r\n"); - #line 373 "..\..\Views\Device\DeviceParts\_Subject.cshtml" + #line 374 "..\..\Views\Device\DeviceParts\_Subject.cshtml" } @@ -1603,7 +1609,7 @@ WriteLiteral(">Provision Account:\r\n \r\ WriteLiteral(" "); - #line 382 "..\..\Views\Device\DeviceParts\_Subject.cshtml" + #line 383 "..\..\Views\Device\DeviceParts\_Subject.cshtml" Write(Model.Device.DeviceProfile.ProvisionADAccount ? "Active Directory" : "No"); @@ -1621,7 +1627,7 @@ WriteLiteral(">Certificates:\r\n \r\n WriteLiteral(" "); - #line 390 "..\..\Views\Device\DeviceParts\_Subject.cshtml" + #line 391 "..\..\Views\Device\DeviceParts\_Subject.cshtml" Write(Model.DeviceProfileCertificateProviders != null ? string.Join(", ", Model.DeviceProfileCertificateProviders.Select(c => c.Name)) : "None Provisioned"); @@ -1638,7 +1644,7 @@ WriteLiteral(">Wireless Profiles:\r\n \r\ WriteLiteral(" "); - #line 397 "..\..\Views\Device\DeviceParts\_Subject.cshtml" + #line 398 "..\..\Views\Device\DeviceParts\_Subject.cshtml" Write(Model.DeviceProfileWirelessProfileProviders != null ? string.Join(", ", Model.DeviceProfileWirelessProfileProviders.Select(c => c.Name)) : "None Provisioned"); @@ -1648,13 +1654,13 @@ WriteLiteral("\r\n \r\n < " \r\n"); - #line 401 "..\..\Views\Device\DeviceParts\_Subject.cshtml" + #line 402 "..\..\Views\Device\DeviceParts\_Subject.cshtml" #line default #line hidden - #line 401 "..\..\Views\Device\DeviceParts\_Subject.cshtml" + #line 402 "..\..\Views\Device\DeviceParts\_Subject.cshtml" if (Model.Device.CanUpdateDeviceProfile()) { @@ -1670,7 +1676,7 @@ WriteLiteral(" class=\"button small\""); WriteLiteral(">Update Profile\r\n"); - #line 404 "..\..\Views\Device\DeviceParts\_Subject.cshtml" + #line 405 "..\..\Views\Device\DeviceParts\_Subject.cshtml" @@ -1687,13 +1693,13 @@ WriteLiteral(" title=\"Assign to Device Profile\""); WriteLiteral(">\r\n"); - #line 406 "..\..\Views\Device\DeviceParts\_Subject.cshtml" + #line 407 "..\..\Views\Device\DeviceParts\_Subject.cshtml" #line default #line hidden - #line 406 "..\..\Views\Device\DeviceParts\_Subject.cshtml" + #line 407 "..\..\Views\Device\DeviceParts\_Subject.cshtml" using (Html.BeginForm(MVC.API.Device.UpdateDeviceProfileId(Model.Device.SerialNumber, redirect: true))) { @@ -1709,7 +1715,7 @@ WriteLiteral(">\r\n"); WriteLiteral(" "); - #line 409 "..\..\Views\Device\DeviceParts\_Subject.cshtml" + #line 410 "..\..\Views\Device\DeviceParts\_Subject.cshtml" Write(Html.AntiForgeryToken()); @@ -1722,13 +1728,13 @@ WriteLiteral(" class=\"none\""); WriteLiteral(">\r\n"); - #line 411 "..\..\Views\Device\DeviceParts\_Subject.cshtml" + #line 412 "..\..\Views\Device\DeviceParts\_Subject.cshtml" #line default #line hidden - #line 411 "..\..\Views\Device\DeviceParts\_Subject.cshtml" + #line 412 "..\..\Views\Device\DeviceParts\_Subject.cshtml" foreach (var dp in Model.DeviceProfiles.OrderBy(i => i.Name)) { var isDecommissioned = Model.DecommissionedDeviceProfileIds.Contains(dp.Id); @@ -1738,27 +1744,27 @@ WriteLiteral(">\r\n"); #line hidden WriteLiteral(" (isDecommissioned ? "hidden" : null + #line 415 "..\..\Views\Device\DeviceParts\_Subject.cshtml" +, Tuple.Create(Tuple.Create("", 26787), Tuple.Create(isDecommissioned ? "hidden" : null #line default #line hidden -, 26720), false) +, 26787), false) ); WriteLiteral(">\r\n (dp.DistributionType + #line 416 "..\..\Views\Device\DeviceParts\_Subject.cshtml" +, Tuple.Create(Tuple.Create(" ", 26903), Tuple.Create(dp.DistributionType #line default #line hidden -, 26837), false) +, 26904), false) ); WriteLiteral(">\r\n (dp.Id + #line 417 "..\..\Views\Device\DeviceParts\_Subject.cshtml" + , Tuple.Create(Tuple.Create("", 27032), Tuple.Create(dp.Id #line default #line hidden -, 26965), false) +, 27032), false) ); WriteLiteral(" data-ouenforced=\""); - #line 416 "..\..\Views\Device\DeviceParts\_Subject.cshtml" + #line 417 "..\..\Views\Device\DeviceParts\_Subject.cshtml" Write(dp.EnforceOrganisationalUnit); @@ -1791,7 +1797,7 @@ WriteLiteral("\""); WriteLiteral(" "); - #line 416 "..\..\Views\Device\DeviceParts\_Subject.cshtml" + #line 417 "..\..\Views\Device\DeviceParts\_Subject.cshtml" Write(Model.Device.DeviceProfileId == dp.Id ? "checked " : null); @@ -1802,7 +1808,7 @@ WriteLiteral(" />\r\n"); WriteLiteral(" "); - #line 417 "..\..\Views\Device\DeviceParts\_Subject.cshtml" + #line 418 "..\..\Views\Device\DeviceParts\_Subject.cshtml" Write(dp.Name); @@ -1812,7 +1818,7 @@ WriteLiteral("\r\n \r\n " \r\n"); - #line 420 "..\..\Views\Device\DeviceParts\_Subject.cshtml" + #line 421 "..\..\Views\Device\DeviceParts\_Subject.cshtml" if (isDecommissioned) { @@ -1826,7 +1832,7 @@ WriteLiteral(" class=\"hidden decommissioned-padding\""); WriteLiteral(">\r\n"); - #line 423 "..\..\Views\Device\DeviceParts\_Subject.cshtml" + #line 424 "..\..\Views\Device\DeviceParts\_Subject.cshtml" } } @@ -1836,13 +1842,13 @@ WriteLiteral(">\r\n"); WriteLiteral(" \r\n"); - #line 426 "..\..\Views\Device\DeviceParts\_Subject.cshtml" + #line 427 "..\..\Views\Device\DeviceParts\_Subject.cshtml" #line default #line hidden - #line 426 "..\..\Views\Device\DeviceParts\_Subject.cshtml" + #line 427 "..\..\Views\Device\DeviceParts\_Subject.cshtml" if (Model.DecommissionedDeviceProfileIds.Count > 0) { @@ -1858,7 +1864,7 @@ WriteLiteral(" href=\"#\""); WriteLiteral(">Show Decommissioned\r\n"); - #line 429 "..\..\Views\Device\DeviceParts\_Subject.cshtml" + #line 430 "..\..\Views\Device\DeviceParts\_Subject.cshtml" } @@ -1888,7 +1894,7 @@ WriteLiteral(">Move to Profiles Organisational Unit\r\n "div>\r\n"); - #line 434 "..\..\Views\Device\DeviceParts\_Subject.cshtml" + #line 435 "..\..\Views\Device\DeviceParts\_Subject.cshtml" } @@ -1900,7 +1906,7 @@ WriteLiteral(" \r\n"); - #line 501 "..\..\Views\Device\DeviceParts\_Subject.cshtml" + #line 502 "..\..\Views\Device\DeviceParts\_Subject.cshtml" } @@ -1978,13 +1984,13 @@ WriteLiteral(" class=\"status\""); WriteLiteral(">\r\n"); - #line 504 "..\..\Views\Device\DeviceParts\_Subject.cshtml" + #line 505 "..\..\Views\Device\DeviceParts\_Subject.cshtml" #line default #line hidden - #line 504 "..\..\Views\Device\DeviceParts\_Subject.cshtml" + #line 505 "..\..\Views\Device\DeviceParts\_Subject.cshtml" if (Model.Device.DeviceBatchId.HasValue) { @@ -1998,13 +2004,13 @@ WriteLiteral(" title=\"Device Batch\""); WriteLiteral(">\r\n"); - #line 507 "..\..\Views\Device\DeviceParts\_Subject.cshtml" + #line 508 "..\..\Views\Device\DeviceParts\_Subject.cshtml" #line default #line hidden - #line 507 "..\..\Views\Device\DeviceParts\_Subject.cshtml" + #line 508 "..\..\Views\Device\DeviceParts\_Subject.cshtml" if (Authorization.Has(Claims.Config.DeviceBatch.Show)) { @@ -2012,14 +2018,14 @@ WriteLiteral(">\r\n"); #line default #line hidden - #line 509 "..\..\Views\Device\DeviceParts\_Subject.cshtml" + #line 510 "..\..\Views\Device\DeviceParts\_Subject.cshtml" Write(Html.ActionLink(Model.Device.DeviceBatch.Name, MVC.Config.DeviceBatch.Index(Model.Device.DeviceBatchId.Value))); #line default #line hidden - #line 509 "..\..\Views\Device\DeviceParts\_Subject.cshtml" + #line 510 "..\..\Views\Device\DeviceParts\_Subject.cshtml" } else @@ -2029,14 +2035,14 @@ WriteLiteral(">\r\n"); #line default #line hidden - #line 513 "..\..\Views\Device\DeviceParts\_Subject.cshtml" + #line 514 "..\..\Views\Device\DeviceParts\_Subject.cshtml" Write(Model.Device.DeviceBatch.Name); #line default #line hidden - #line 513 "..\..\Views\Device\DeviceParts\_Subject.cshtml" + #line 514 "..\..\Views\Device\DeviceParts\_Subject.cshtml" } @@ -2060,7 +2066,7 @@ WriteLiteral(">Purchased:\r\n \r\n WriteLiteral(" "); - #line 522 "..\..\Views\Device\DeviceParts\_Subject.cshtml" + #line 523 "..\..\Views\Device\DeviceParts\_Subject.cshtml" Write(CommonHelpers.FriendlyDate(Model.Device.DeviceBatch.PurchaseDate)); @@ -2078,7 +2084,7 @@ WriteLiteral(">Supplier:\r\n \r\n WriteLiteral(" "); - #line 530 "..\..\Views\Device\DeviceParts\_Subject.cshtml" + #line 531 "..\..\Views\Device\DeviceParts\_Subject.cshtml" Write(Model.Device.DeviceBatch.Supplier ?? "Unknown"); @@ -2093,14 +2099,14 @@ WriteLiteral(" title=\"Warranty Valid Until\""); WriteLiteral(">Warranty Until:\r\n \r\n " + " (Model.Device.DeviceBatch.WarrantyValidUntil.HasValue && Model.Device.DeviceBatch.WarrantyValidUntil.Value < DateTime.Now ? "alert" : null + #line 538 "..\..\Views\Device\DeviceParts\_Subject.cshtml" +, Tuple.Create(Tuple.Create("", 34794), Tuple.Create(Model.Device.DeviceBatch.WarrantyValidUntil.HasValue && Model.Device.DeviceBatch.WarrantyValidUntil.Value < DateTime.Now ? "alert" : null #line default #line hidden -, 34727), false) +, 34794), false) ); WriteLiteral(">\r\n"); @@ -2108,7 +2114,7 @@ WriteLiteral(">\r\n"); WriteLiteral(" "); - #line 538 "..\..\Views\Device\DeviceParts\_Subject.cshtml" + #line 539 "..\..\Views\Device\DeviceParts\_Subject.cshtml" Write(CommonHelpers.FriendlyDate(Model.Device.DeviceBatch.WarrantyValidUntil, "Unknown", null)); @@ -2126,7 +2132,7 @@ WriteLiteral(">Insurance Supplier:\r\n Insured Until:\r\n \r\n " + " (Model.Device.DeviceBatch.InsuredUntil.HasValue && Model.Device.DeviceBatch.InsuredUntil.Value < DateTime.Now ? "alert" : null + #line 554 "..\..\Views\Device\DeviceParts\_Subject.cshtml" +, Tuple.Create(Tuple.Create("", 35796), Tuple.Create(Model.Device.DeviceBatch.InsuredUntil.HasValue && Model.Device.DeviceBatch.InsuredUntil.Value < DateTime.Now ? "alert" : null #line default #line hidden -, 35729), false) +, 35796), false) ); WriteLiteral(">\r\n"); @@ -2156,7 +2162,7 @@ WriteLiteral(">\r\n"); WriteLiteral(" "); - #line 554 "..\..\Views\Device\DeviceParts\_Subject.cshtml" + #line 555 "..\..\Views\Device\DeviceParts\_Subject.cshtml" Write(CommonHelpers.FriendlyDate(Model.Device.DeviceBatch.InsuredUntil, "Unknown", null)); @@ -2166,7 +2172,7 @@ WriteLiteral("\r\n \r\n " \r\n"); - #line 558 "..\..\Views\Device\DeviceParts\_Subject.cshtml" + #line 559 "..\..\Views\Device\DeviceParts\_Subject.cshtml" } else { @@ -2177,7 +2183,7 @@ WriteLiteral("\r\n \r\n WriteLiteral("

Batch: Not Associated

\r\n"); - #line 562 "..\..\Views\Device\DeviceParts\_Subject.cshtml" + #line 563 "..\..\Views\Device\DeviceParts\_Subject.cshtml" } @@ -2186,7 +2192,7 @@ WriteLiteral("

Batch: Not Associated

\r\ WriteLiteral(" "); - #line 563 "..\..\Views\Device\DeviceParts\_Subject.cshtml" + #line 564 "..\..\Views\Device\DeviceParts\_Subject.cshtml" if (Model.Device.CanUpdateDeviceBatch()) { @@ -2212,13 +2218,13 @@ WriteLiteral(" title=\"Assign to Device Batch\""); WriteLiteral(">\r\n
\r\n"); - #line 568 "..\..\Views\Device\DeviceParts\_Subject.cshtml" + #line 569 "..\..\Views\Device\DeviceParts\_Subject.cshtml" #line default #line hidden - #line 568 "..\..\Views\Device\DeviceParts\_Subject.cshtml" + #line 569 "..\..\Views\Device\DeviceParts\_Subject.cshtml" using (Html.BeginForm(MVC.API.Device.UpdateDeviceBatchId(Model.Device.SerialNumber, null, true))) { @@ -2226,14 +2232,14 @@ WriteLiteral(">\r\n
\r\n"); #line default #line hidden - #line 570 "..\..\Views\Device\DeviceParts\_Subject.cshtml" + #line 571 "..\..\Views\Device\DeviceParts\_Subject.cshtml" Write(Html.AntiForgeryToken()); #line default #line hidden - #line 570 "..\..\Views\Device\DeviceParts\_Subject.cshtml" + #line 571 "..\..\Views\Device\DeviceParts\_Subject.cshtml" @@ -2246,13 +2252,13 @@ WriteLiteral(" class=\"none\""); WriteLiteral(">\r\n"); - #line 572 "..\..\Views\Device\DeviceParts\_Subject.cshtml" + #line 573 "..\..\Views\Device\DeviceParts\_Subject.cshtml" #line default #line hidden - #line 572 "..\..\Views\Device\DeviceParts\_Subject.cshtml" + #line 573 "..\..\Views\Device\DeviceParts\_Subject.cshtml" foreach (var db in Model.DeviceBatches.OrderBy(i => i.Name)) { var isDecommissioned = Model.DecommissionedDeviceBatchIds.Contains(db.Id); @@ -2262,27 +2268,27 @@ WriteLiteral(">\r\n"); #line hidden WriteLiteral(" (isDecommissioned ? "hidden" : null + #line 576 "..\..\Views\Device\DeviceParts\_Subject.cshtml" +, Tuple.Create(Tuple.Create("", 37304), Tuple.Create(isDecommissioned ? "hidden" : null #line default #line hidden -, 37237), false) +, 37304), false) ); WriteLiteral(">\r\n (db.PurchaseDate.ToLongDateString() + #line 577 "..\..\Views\Device\DeviceParts\_Subject.cshtml" +, Tuple.Create(Tuple.Create(" ", 37417), Tuple.Create(db.PurchaseDate.ToLongDateString() #line default #line hidden -, 37351), false) +, 37418), false) ); WriteLiteral(">\r\n (db.Id + #line 578 "..\..\Views\Device\DeviceParts\_Subject.cshtml" + , Tuple.Create(Tuple.Create("", 37587), Tuple.Create(db.Id #line default #line hidden -, 37520), false) +, 37587), false) ); WriteLiteral(" />\r\n"); @@ -2317,7 +2323,7 @@ WriteLiteral(" />\r\n"); WriteLiteral(" "); - #line 578 "..\..\Views\Device\DeviceParts\_Subject.cshtml" + #line 579 "..\..\Views\Device\DeviceParts\_Subject.cshtml" Write(db.Name); @@ -2327,7 +2333,7 @@ WriteLiteral("\r\n \r\n " \r\n"); - #line 581 "..\..\Views\Device\DeviceParts\_Subject.cshtml" + #line 582 "..\..\Views\Device\DeviceParts\_Subject.cshtml" if (isDecommissioned) { @@ -2341,7 +2347,7 @@ WriteLiteral(" class=\"hidden decommissioned-padding\""); WriteLiteral(">\r\n"); - #line 584 "..\..\Views\Device\DeviceParts\_Subject.cshtml" + #line 585 "..\..\Views\Device\DeviceParts\_Subject.cshtml" } } @@ -2351,7 +2357,7 @@ WriteLiteral(">\r\n"); WriteLiteral(" \r\n"); - #line 587 "..\..\Views\Device\DeviceParts\_Subject.cshtml" + #line 588 "..\..\Views\Device\DeviceParts\_Subject.cshtml" } @@ -2360,7 +2366,7 @@ WriteLiteral(" \r\n"); WriteLiteral(" "); - #line 588 "..\..\Views\Device\DeviceParts\_Subject.cshtml" + #line 589 "..\..\Views\Device\DeviceParts\_Subject.cshtml" if (Model.DecommissionedDeviceBatchIds.Count > 0) { @@ -2376,7 +2382,7 @@ WriteLiteral(" href=\"#\""); WriteLiteral(">Show Decommissioned\r\n"); - #line 591 "..\..\Views\Device\DeviceParts\_Subject.cshtml" + #line 592 "..\..\Views\Device\DeviceParts\_Subject.cshtml" } @@ -2388,7 +2394,7 @@ WriteLiteral(" \r\n"); - #line 657 "..\..\Views\Device\DeviceParts\_Subject.cshtml" + #line 658 "..\..\Views\Device\DeviceParts\_Subject.cshtml" } @@ -2475,13 +2481,13 @@ WriteLiteral(" title=\"Model Description\""); WriteLiteral(">\r\n"); - #line 665 "..\..\Views\Device\DeviceParts\_Subject.cshtml" + #line 666 "..\..\Views\Device\DeviceParts\_Subject.cshtml" #line default #line hidden - #line 665 "..\..\Views\Device\DeviceParts\_Subject.cshtml" + #line 666 "..\..\Views\Device\DeviceParts\_Subject.cshtml" if (Authorization.Has(Claims.Config.DeviceModel.Show)) { @@ -2489,14 +2495,14 @@ WriteLiteral(">\r\n"); #line default #line hidden - #line 667 "..\..\Views\Device\DeviceParts\_Subject.cshtml" + #line 668 "..\..\Views\Device\DeviceParts\_Subject.cshtml" Write(Html.ActionLink(Model.Device.DeviceModel.ToString(), MVC.Config.DeviceModel.Index(Model.Device.DeviceModelId))); #line default #line hidden - #line 667 "..\..\Views\Device\DeviceParts\_Subject.cshtml" + #line 668 "..\..\Views\Device\DeviceParts\_Subject.cshtml" } else @@ -2506,14 +2512,14 @@ WriteLiteral(">\r\n"); #line default #line hidden - #line 671 "..\..\Views\Device\DeviceParts\_Subject.cshtml" + #line 672 "..\..\Views\Device\DeviceParts\_Subject.cshtml" Write(Model.Device.DeviceModel.ToString()); #line default #line hidden - #line 671 "..\..\Views\Device\DeviceParts\_Subject.cshtml" + #line 672 "..\..\Views\Device\DeviceParts\_Subject.cshtml" } @@ -2526,14 +2532,14 @@ WriteLiteral(" id=\"Device_Show_Aspects_Model_Image\""); WriteLiteral(" alt=\"Model Image\""); -WriteAttribute("src", Tuple.Create(" src=\"", 43527), Tuple.Create("\"", 43637) +WriteAttribute("src", Tuple.Create(" src=\"", 43594), Tuple.Create("\"", 43704) - #line 674 "..\..\Views\Device\DeviceParts\_Subject.cshtml" - , Tuple.Create(Tuple.Create("", 43533), Tuple.Create(Url.Action(MVC.API.DeviceModel.Image(Model.Device.DeviceModelId, Model.Device.DeviceModel.ImageHash())) + #line 675 "..\..\Views\Device\DeviceParts\_Subject.cshtml" + , Tuple.Create(Tuple.Create("", 43600), Tuple.Create(Url.Action(MVC.API.DeviceModel.Image(Model.Device.DeviceModelId, Model.Device.DeviceModel.ImageHash())) #line default #line hidden -, 43533), false) +, 43600), false) ); WriteLiteral(" />\r\n
\r\n
\r\n \r\n \r\n \r\n"); - #line 681 "..\..\Views\Device\DeviceParts\_Subject.cshtml" + #line 682 "..\..\Views\Device\DeviceParts\_Subject.cshtml" #line default #line hidden - #line 681 "..\..\Views\Device\DeviceParts\_Subject.cshtml" + #line 682 "..\..\Views\Device\DeviceParts\_Subject.cshtml" if (Model.Device.CanCreateJob()) { Html.BundleDeferred("~/ClientScripts/Modules/Disco-CreateJob"); @@ -2563,14 +2569,14 @@ WriteLiteral(">\r\n"); #line default #line hidden - #line 684 "..\..\Views\Device\DeviceParts\_Subject.cshtml" + #line 685 "..\..\Views\Device\DeviceParts\_Subject.cshtml" Write(Html.ActionLinkSmallButton("Create Job", MVC.Job.Create(Model.Device.SerialNumber, Model.Device.AssignedUserId), "buttonCreateJob")); #line default #line hidden - #line 684 "..\..\Views\Device\DeviceParts\_Subject.cshtml" + #line 685 "..\..\Views\Device\DeviceParts\_Subject.cshtml" } @@ -2580,7 +2586,7 @@ WriteLiteral(">\r\n"); WriteLiteral(" "); - #line 686 "..\..\Views\Device\DeviceParts\_Subject.cshtml" + #line 687 "..\..\Views\Device\DeviceParts\_Subject.cshtml" if (Model.Device.CanUpdateAssignment()) { @@ -2612,13 +2618,13 @@ WriteLiteral(" class=\"fa fa-info-circle information\""); WriteLiteral("> Assign to User:\r\n
\r\n"); - #line 692 "..\..\Views\Device\DeviceParts\_Subject.cshtml" + #line 693 "..\..\Views\Device\DeviceParts\_Subject.cshtml" #line default #line hidden - #line 692 "..\..\Views\Device\DeviceParts\_Subject.cshtml" + #line 693 "..\..\Views\Device\DeviceParts\_Subject.cshtml" using (Html.BeginForm(MVC.API.Device.UpdateAssignedUserId(Model.Device.SerialNumber, redirect: true))) { @@ -2626,14 +2632,14 @@ WriteLiteral("> Assign to User:\r\n
\r\n" #line default #line hidden - #line 694 "..\..\Views\Device\DeviceParts\_Subject.cshtml" + #line 695 "..\..\Views\Device\DeviceParts\_Subject.cshtml" Write(Html.AntiForgeryToken()); #line default #line hidden - #line 694 "..\..\Views\Device\DeviceParts\_Subject.cshtml" + #line 695 "..\..\Views\Device\DeviceParts\_Subject.cshtml" @@ -2650,7 +2656,7 @@ WriteLiteral(" type=\"text\""); WriteLiteral(" />\r\n"); - #line 696 "..\..\Views\Device\DeviceParts\_Subject.cshtml" + #line 697 "..\..\Views\Device\DeviceParts\_Subject.cshtml" } @@ -2672,13 +2678,13 @@ WriteLiteral(@"> "); - #line 705 "..\..\Views\Device\DeviceParts\_Subject.cshtml" + #line 706 "..\..\Views\Device\DeviceParts\_Subject.cshtml" #line default #line hidden - #line 705 "..\..\Views\Device\DeviceParts\_Subject.cshtml" + #line 706 "..\..\Views\Device\DeviceParts\_Subject.cshtml" if (assignedUser != null) { @@ -2702,7 +2708,7 @@ WriteLiteral(@" WriteLiteral("\r\n"); - #line 718 "..\..\Views\Device\DeviceParts\_Subject.cshtml" + #line 719 "..\..\Views\Device\DeviceParts\_Subject.cshtml" } @@ -2733,7 +2739,7 @@ WriteLiteral("\r\n \"Assign\": function () {\r\n " \'"); - #line 749 "..\..\Views\Device\DeviceParts\_Subject.cshtml" + #line 750 "..\..\Views\Device\DeviceParts\_Subject.cshtml" Write(Url.Action(MVC.API.Search.UsersUpstream())); @@ -2763,7 +2769,7 @@ WriteLiteral(@"', "); - #line 770 "..\..\Views\Device\DeviceParts\_Subject.cshtml" + #line 771 "..\..\Views\Device\DeviceParts\_Subject.cshtml" } @@ -2772,7 +2778,7 @@ WriteLiteral(@"', WriteLiteral(" "); - #line 771 "..\..\Views\Device\DeviceParts\_Subject.cshtml" + #line 772 "..\..\Views\Device\DeviceParts\_Subject.cshtml" if (Model.AvailableDeviceFlags != null && Model.AvailableDeviceFlags.Count > 0) { @@ -2800,13 +2806,13 @@ WriteLiteral(" title=\"Add Device Flag\""); WriteLiteral(">\r\n"); - #line 775 "..\..\Views\Device\DeviceParts\_Subject.cshtml" + #line 776 "..\..\Views\Device\DeviceParts\_Subject.cshtml" #line default #line hidden - #line 775 "..\..\Views\Device\DeviceParts\_Subject.cshtml" + #line 776 "..\..\Views\Device\DeviceParts\_Subject.cshtml" using (Html.BeginForm(MVC.API.DeviceFlagAssignment.AddDevice())) { @@ -2814,14 +2820,14 @@ WriteLiteral(">\r\n"); #line default #line hidden - #line 777 "..\..\Views\Device\DeviceParts\_Subject.cshtml" + #line 778 "..\..\Views\Device\DeviceParts\_Subject.cshtml" Write(Html.AntiForgeryToken()); #line default #line hidden - #line 777 "..\..\Views\Device\DeviceParts\_Subject.cshtml" + #line 778 "..\..\Views\Device\DeviceParts\_Subject.cshtml" @@ -2845,14 +2851,14 @@ WriteLiteral(" type=\"hidden\""); WriteLiteral(" name=\"deviceSerialNumber\""); -WriteAttribute("value", Tuple.Create(" value=\"", 49530), Tuple.Create("\"", 49564) +WriteAttribute("value", Tuple.Create(" value=\"", 49597), Tuple.Create("\"", 49631) - #line 779 "..\..\Views\Device\DeviceParts\_Subject.cshtml" - , Tuple.Create(Tuple.Create("", 49538), Tuple.Create(Model.Device.SerialNumber + #line 780 "..\..\Views\Device\DeviceParts\_Subject.cshtml" + , Tuple.Create(Tuple.Create("", 49605), Tuple.Create(Model.Device.SerialNumber #line default #line hidden -, 49538), false) +, 49605), false) ); WriteLiteral(" />\r\n"); @@ -2874,13 +2880,13 @@ WriteLiteral(" autocomplete=\"off\""); WriteLiteral(" />\r\n"); - #line 782 "..\..\Views\Device\DeviceParts\_Subject.cshtml" + #line 783 "..\..\Views\Device\DeviceParts\_Subject.cshtml" #line default #line hidden - #line 782 "..\..\Views\Device\DeviceParts\_Subject.cshtml" + #line 783 "..\..\Views\Device\DeviceParts\_Subject.cshtml" foreach (var flag in Model.AvailableDeviceFlags.OrderBy(jq => jq.Name)) { @@ -2894,7 +2900,7 @@ WriteLiteral(" class=\"flag\""); WriteLiteral(" data-flagid=\""); - #line 784 "..\..\Views\Device\DeviceParts\_Subject.cshtml" + #line 785 "..\..\Views\Device\DeviceParts\_Subject.cshtml" Write(flag.Id); @@ -2905,7 +2911,7 @@ WriteLiteral("\""); WriteLiteral(" data-flagname=\""); - #line 784 "..\..\Views\Device\DeviceParts\_Subject.cshtml" + #line 785 "..\..\Views\Device\DeviceParts\_Subject.cshtml" Write(flag.Name); @@ -2916,7 +2922,7 @@ WriteLiteral("\""); WriteLiteral(" data-flagcanremove=\""); - #line 784 "..\..\Views\Device\DeviceParts\_Subject.cshtml" + #line 785 "..\..\Views\Device\DeviceParts\_Subject.cshtml" Write(Model.Device.CanRemoveDeviceFlag(flag)); @@ -2927,7 +2933,7 @@ WriteLiteral("\""); WriteLiteral(" data-flagremovedays=\""); - #line 784 "..\..\Views\Device\DeviceParts\_Subject.cshtml" + #line 785 "..\..\Views\Device\DeviceParts\_Subject.cshtml" Write(flag.DefaultRemoveDays); @@ -2937,32 +2943,32 @@ WriteLiteral("\""); WriteLiteral(">\r\n (flag.Icon + #line 786 "..\..\Views\Device\DeviceParts\_Subject.cshtml" +, Tuple.Create(Tuple.Create("", 50229), Tuple.Create(flag.Icon #line default #line hidden -, 50162), false) -, Tuple.Create(Tuple.Create(" ", 50174), Tuple.Create("fa-fw", 50175), true) -, Tuple.Create(Tuple.Create(" ", 50180), Tuple.Create("fa-lg", 50181), true) -, Tuple.Create(Tuple.Create(" ", 50186), Tuple.Create("d-", 50187), true) +, 50229), false) +, Tuple.Create(Tuple.Create(" ", 50241), Tuple.Create("fa-fw", 50242), true) +, Tuple.Create(Tuple.Create(" ", 50247), Tuple.Create("fa-lg", 50248), true) +, Tuple.Create(Tuple.Create(" ", 50253), Tuple.Create("d-", 50254), true) - #line 785 "..\..\Views\Device\DeviceParts\_Subject.cshtml" -, Tuple.Create(Tuple.Create("", 50189), Tuple.Create(flag.IconColour + #line 786 "..\..\Views\Device\DeviceParts\_Subject.cshtml" +, Tuple.Create(Tuple.Create("", 50256), Tuple.Create(flag.IconColour #line default #line hidden -, 50189), false) +, 50256), false) ); WriteLiteral(">"); - #line 785 "..\..\Views\Device\DeviceParts\_Subject.cshtml" + #line 786 "..\..\Views\Device\DeviceParts\_Subject.cshtml" Write(flag.Name); @@ -2971,7 +2977,7 @@ WriteLiteral(">"); WriteLiteral("\r\n \r\n"); - #line 787 "..\..\Views\Device\DeviceParts\_Subject.cshtml" + #line 788 "..\..\Views\Device\DeviceParts\_Subject.cshtml" } @@ -3000,21 +3006,21 @@ WriteLiteral(" id=\"Device_Show_Details_Actions_AddFlag_Dialog_RemoveDate\""); WriteLiteral(" type=\"date\""); -WriteAttribute("min", Tuple.Create(" min=\"", 50839), Tuple.Create("\"", 50896) +WriteAttribute("min", Tuple.Create(" min=\"", 50906), Tuple.Create("\"", 50963) - #line 796 "..\..\Views\Device\DeviceParts\_Subject.cshtml" - , Tuple.Create(Tuple.Create("", 50845), Tuple.Create(DateTime.Today.AddDays(1).ToString("yyyy-MM-dd") + #line 797 "..\..\Views\Device\DeviceParts\_Subject.cshtml" + , Tuple.Create(Tuple.Create("", 50912), Tuple.Create(DateTime.Today.AddDays(1).ToString("yyyy-MM-dd") #line default #line hidden -, 50845), false) +, 50912), false) ); WriteLiteral(" />\r\n 12:00 AM\r\n " + " \r\n \r\n"); - #line 800 "..\..\Views\Device\DeviceParts\_Subject.cshtml" + #line 801 "..\..\Views\Device\DeviceParts\_Subject.cshtml" } @@ -3101,7 +3107,7 @@ WriteLiteral(">\r\n $(function () {\r\n " });\r\n });\r\n \r\n"); - #line 908 "..\..\Views\Device\DeviceParts\_Subject.cshtml" + #line 909 "..\..\Views\Device\DeviceParts\_Subject.cshtml" } @@ -3110,7 +3116,7 @@ WriteLiteral(">\r\n $(function () {\r\n WriteLiteral(" "); - #line 909 "..\..\Views\Device\DeviceParts\_Subject.cshtml" + #line 910 "..\..\Views\Device\DeviceParts\_Subject.cshtml" if (Model.Device.CanUpdateTrustEnrol()) { @@ -3138,13 +3144,13 @@ WriteLiteral(" title=\"Trust this Device?\""); WriteLiteral(">\r\n"); - #line 913 "..\..\Views\Device\DeviceParts\_Subject.cshtml" + #line 914 "..\..\Views\Device\DeviceParts\_Subject.cshtml" #line default #line hidden - #line 913 "..\..\Views\Device\DeviceParts\_Subject.cshtml" + #line 914 "..\..\Views\Device\DeviceParts\_Subject.cshtml" using (Html.BeginForm(MVC.API.Device.UpdateAllowUnauthenticatedEnrol(Model.Device.SerialNumber, true.ToString(), true))) { @@ -3152,14 +3158,14 @@ WriteLiteral(">\r\n"); #line default #line hidden - #line 915 "..\..\Views\Device\DeviceParts\_Subject.cshtml" + #line 916 "..\..\Views\Device\DeviceParts\_Subject.cshtml" Write(Html.AntiForgeryToken()); #line default #line hidden - #line 915 "..\..\Views\Device\DeviceParts\_Subject.cshtml" + #line 916 "..\..\Views\Device\DeviceParts\_Subject.cshtml" } @@ -3192,7 +3198,7 @@ WriteLiteral(">This action will allow a device claiming to have the "\'"); - #line 925 "..\..\Views\Device\DeviceParts\_Subject.cshtml" + #line 926 "..\..\Views\Device\DeviceParts\_Subject.cshtml" Write(Model.Device.SerialNumber); @@ -3240,7 +3246,7 @@ WriteLiteral(@"> "); - #line 958 "..\..\Views\Device\DeviceParts\_Subject.cshtml" + #line 959 "..\..\Views\Device\DeviceParts\_Subject.cshtml" } @@ -3249,7 +3255,7 @@ WriteLiteral(@"> WriteLiteral(" "); - #line 959 "..\..\Views\Device\DeviceParts\_Subject.cshtml" + #line 960 "..\..\Views\Device\DeviceParts\_Subject.cshtml" if (Model.Device.CanUpdateUntrustEnrol()) { @@ -3277,13 +3283,13 @@ WriteLiteral(" title=\"Untrust this Device?\""); WriteLiteral(">\r\n"); - #line 963 "..\..\Views\Device\DeviceParts\_Subject.cshtml" + #line 964 "..\..\Views\Device\DeviceParts\_Subject.cshtml" #line default #line hidden - #line 963 "..\..\Views\Device\DeviceParts\_Subject.cshtml" + #line 964 "..\..\Views\Device\DeviceParts\_Subject.cshtml" using (Html.BeginForm(MVC.API.Device.UpdateAllowUnauthenticatedEnrol(Model.Device.SerialNumber, false.ToString(), true))) { @@ -3291,14 +3297,14 @@ WriteLiteral(">\r\n"); #line default #line hidden - #line 965 "..\..\Views\Device\DeviceParts\_Subject.cshtml" + #line 966 "..\..\Views\Device\DeviceParts\_Subject.cshtml" Write(Html.AntiForgeryToken()); #line default #line hidden - #line 965 "..\..\Views\Device\DeviceParts\_Subject.cshtml" + #line 966 "..\..\Views\Device\DeviceParts\_Subject.cshtml" } @@ -3361,7 +3367,7 @@ WriteLiteral(@"> "); - #line 1002 "..\..\Views\Device\DeviceParts\_Subject.cshtml" + #line 1003 "..\..\Views\Device\DeviceParts\_Subject.cshtml" } @@ -3370,7 +3376,7 @@ WriteLiteral(@"> WriteLiteral(" "); - #line 1003 "..\..\Views\Device\DeviceParts\_Subject.cshtml" + #line 1004 "..\..\Views\Device\DeviceParts\_Subject.cshtml" if (Model.Device.CanDecommission()) { @@ -3398,13 +3404,13 @@ WriteLiteral(" title=\"Device Decommissioning\""); WriteLiteral(">\r\n"); - #line 1007 "..\..\Views\Device\DeviceParts\_Subject.cshtml" + #line 1008 "..\..\Views\Device\DeviceParts\_Subject.cshtml" #line default #line hidden - #line 1007 "..\..\Views\Device\DeviceParts\_Subject.cshtml" + #line 1008 "..\..\Views\Device\DeviceParts\_Subject.cshtml" using (Html.BeginForm(MVC.API.Device.Decommission(Model.Device.SerialNumber, null, true))) { @@ -3412,14 +3418,14 @@ WriteLiteral(">\r\n"); #line default #line hidden - #line 1009 "..\..\Views\Device\DeviceParts\_Subject.cshtml" + #line 1010 "..\..\Views\Device\DeviceParts\_Subject.cshtml" Write(Html.AntiForgeryToken()); #line default #line hidden - #line 1009 "..\..\Views\Device\DeviceParts\_Subject.cshtml" + #line 1010 "..\..\Views\Device\DeviceParts\_Subject.cshtml" @@ -3445,13 +3451,13 @@ WriteLiteral(" class=\"none\""); WriteLiteral(">\r\n"); - #line 1015 "..\..\Views\Device\DeviceParts\_Subject.cshtml" + #line 1016 "..\..\Views\Device\DeviceParts\_Subject.cshtml" #line default #line hidden - #line 1015 "..\..\Views\Device\DeviceParts\_Subject.cshtml" + #line 1016 "..\..\Views\Device\DeviceParts\_Subject.cshtml" foreach (DecommissionReasons decommissionReason in Enum.GetValues(typeof(DecommissionReasons)).Cast().OrderBy(r => r.ToString())) { @@ -3463,33 +3469,33 @@ WriteLiteral("
  • \r\n WriteLiteral(" type=\"radio\""); -WriteAttribute("id", Tuple.Create(" id=\"", 63637), Tuple.Create("\"", 63715) -, Tuple.Create(Tuple.Create("", 63642), Tuple.Create("Device_Show_Device_Actions_Decommission_Reason_", 63642), true) +WriteAttribute("id", Tuple.Create(" id=\"", 63704), Tuple.Create("\"", 63782) +, Tuple.Create(Tuple.Create("", 63709), Tuple.Create("Device_Show_Device_Actions_Decommission_Reason_", 63709), true) - #line 1018 "..\..\Views\Device\DeviceParts\_Subject.cshtml" - , Tuple.Create(Tuple.Create("", 63689), Tuple.Create((int)decommissionReason + #line 1019 "..\..\Views\Device\DeviceParts\_Subject.cshtml" + , Tuple.Create(Tuple.Create("", 63756), Tuple.Create((int)decommissionReason #line default #line hidden -, 63689), false) +, 63756), false) ); WriteLiteral("\r\n name=\"Reason\""); -WriteAttribute("value", Tuple.Create(" value=\"", 63778), Tuple.Create("\"", 63812) +WriteAttribute("value", Tuple.Create(" value=\"", 63845), Tuple.Create("\"", 63879) - #line 1019 "..\..\Views\Device\DeviceParts\_Subject.cshtml" -, Tuple.Create(Tuple.Create("", 63786), Tuple.Create((int)decommissionReason + #line 1020 "..\..\Views\Device\DeviceParts\_Subject.cshtml" +, Tuple.Create(Tuple.Create("", 63853), Tuple.Create((int)decommissionReason #line default #line hidden -, 63786), false) +, 63853), false) ); WriteLiteral(" "); - #line 1019 "..\..\Views\Device\DeviceParts\_Subject.cshtml" + #line 1020 "..\..\Views\Device\DeviceParts\_Subject.cshtml" Write((decommissionReason == DecommissionReasons.EndOfLife) ? "checked=\"checked\"" : string.Empty); @@ -3497,21 +3503,21 @@ WriteLiteral(" "); #line hidden WriteLiteral(" />\r\n ((int)decommissionReason + #line 1021 "..\..\Views\Device\DeviceParts\_Subject.cshtml" + , Tuple.Create(Tuple.Create("", 64080), Tuple.Create((int)decommissionReason #line default #line hidden -, 64013), false) +, 64080), false) ); WriteLiteral(">"); - #line 1020 "..\..\Views\Device\DeviceParts\_Subject.cshtml" + #line 1021 "..\..\Views\Device\DeviceParts\_Subject.cshtml" Write(decommissionReason.ReasonMessage()); @@ -3520,7 +3526,7 @@ WriteLiteral(">"); WriteLiteral("\r\n
    • \r\n"); - #line 1022 "..\..\Views\Device\DeviceParts\_Subject.cshtml" + #line 1023 "..\..\Views\Device\DeviceParts\_Subject.cshtml" } @@ -3529,7 +3535,7 @@ WriteLiteral("\r\n \r\n"); WriteLiteral(" \r\n \r\n"); - #line 1025 "..\..\Views\Device\DeviceParts\_Subject.cshtml" + #line 1026 "..\..\Views\Device\DeviceParts\_Subject.cshtml" } @@ -3570,7 +3576,7 @@ WriteLiteral(@"> "); - #line 1053 "..\..\Views\Device\DeviceParts\_Subject.cshtml" + #line 1054 "..\..\Views\Device\DeviceParts\_Subject.cshtml" } @@ -3579,7 +3585,7 @@ WriteLiteral(@"> WriteLiteral(" "); - #line 1054 "..\..\Views\Device\DeviceParts\_Subject.cshtml" + #line 1055 "..\..\Views\Device\DeviceParts\_Subject.cshtml" if (Model.Device.CanRecommission()) { @@ -3607,13 +3613,13 @@ WriteLiteral(" title=\"Recommission this Device?\""); WriteLiteral(">\r\n"); - #line 1058 "..\..\Views\Device\DeviceParts\_Subject.cshtml" + #line 1059 "..\..\Views\Device\DeviceParts\_Subject.cshtml" #line default #line hidden - #line 1058 "..\..\Views\Device\DeviceParts\_Subject.cshtml" + #line 1059 "..\..\Views\Device\DeviceParts\_Subject.cshtml" using (Html.BeginForm(MVC.API.Device.Recommission(Model.Device.SerialNumber, true))) { @@ -3621,14 +3627,14 @@ WriteLiteral(">\r\n"); #line default #line hidden - #line 1060 "..\..\Views\Device\DeviceParts\_Subject.cshtml" + #line 1061 "..\..\Views\Device\DeviceParts\_Subject.cshtml" Write(Html.AntiForgeryToken()); #line default #line hidden - #line 1060 "..\..\Views\Device\DeviceParts\_Subject.cshtml" + #line 1061 "..\..\Views\Device\DeviceParts\_Subject.cshtml" } @@ -3675,7 +3681,7 @@ WriteLiteral(@"> "); - #line 1093 "..\..\Views\Device\DeviceParts\_Subject.cshtml" + #line 1094 "..\..\Views\Device\DeviceParts\_Subject.cshtml" } @@ -3684,7 +3690,7 @@ WriteLiteral(@"> WriteLiteral(" "); - #line 1094 "..\..\Views\Device\DeviceParts\_Subject.cshtml" + #line 1095 "..\..\Views\Device\DeviceParts\_Subject.cshtml" if (Model.Device.CanDelete()) { @@ -3712,13 +3718,13 @@ WriteLiteral(" title=\"Delete this Device?\""); WriteLiteral(">\r\n"); - #line 1098 "..\..\Views\Device\DeviceParts\_Subject.cshtml" + #line 1099 "..\..\Views\Device\DeviceParts\_Subject.cshtml" #line default #line hidden - #line 1098 "..\..\Views\Device\DeviceParts\_Subject.cshtml" + #line 1099 "..\..\Views\Device\DeviceParts\_Subject.cshtml" using (Html.BeginForm(MVC.API.Device.Delete(Model.Device.SerialNumber, true))) { @@ -3726,14 +3732,14 @@ WriteLiteral(">\r\n"); #line default #line hidden - #line 1100 "..\..\Views\Device\DeviceParts\_Subject.cshtml" + #line 1101 "..\..\Views\Device\DeviceParts\_Subject.cshtml" Write(Html.AntiForgeryToken()); #line default #line hidden - #line 1100 "..\..\Views\Device\DeviceParts\_Subject.cshtml" + #line 1101 "..\..\Views\Device\DeviceParts\_Subject.cshtml" } @@ -3785,7 +3791,7 @@ WriteLiteral(@"> "); - #line 1135 "..\..\Views\Device\DeviceParts\_Subject.cshtml" + #line 1136 "..\..\Views\Device\DeviceParts\_Subject.cshtml" } diff --git a/Disco.Web/Views/Device/Show.cshtml b/Disco.Web/Views/Device/Show.cshtml index 6d0c4d43..c0098a10 100644 --- a/Disco.Web/Views/Device/Show.cshtml +++ b/Disco.Web/Views/Device/Show.cshtml @@ -28,8 +28,9 @@ { - @flag.Item2.flag.Name@if (flag.Item1.Comments != null) - {@flag.Item1.Comments.ToHtmlComment()}@CommonHelpers.FriendlyDateAndUser(flag.Item1.AddedDate, flag.Item1.AddedUser) + @flag.Item2.flag.Name + @if (flag.Item1.Comments != null) {@flag.Item1.Comments.ToHtmlComment()} + @CommonHelpers.FriendlyDateAndUser(flag.Item1.AddedDate, flag.Item1.AddedUser) } diff --git a/Disco.Web/Views/Device/Show.generated.cs b/Disco.Web/Views/Device/Show.generated.cs index ccb399e7..0b62f1b0 100644 --- a/Disco.Web/Views/Device/Show.generated.cs +++ b/Disco.Web/Views/Device/Show.generated.cs @@ -192,12 +192,17 @@ WriteLiteral(">"); #line default #line hidden -WriteLiteral(""); +WriteLiteral("\r\n"); - #line 31 "..\..\Views\Device\Show.cshtml" - if (flag.Item1.Comments != null) - { + #line 32 "..\..\Views\Device\Show.cshtml" + + + #line default + #line hidden + + #line 32 "..\..\Views\Device\Show.cshtml" + if (flag.Item1.Comments != null) { #line default #line hidden @@ -209,7 +214,7 @@ WriteLiteral(">"); #line 32 "..\..\Views\Device\Show.cshtml" - Write(flag.Item1.Comments.ToHtmlComment()); + Write(flag.Item1.Comments.ToHtmlComment()); #line default @@ -218,19 +223,20 @@ WriteLiteral(""); #line 32 "..\..\Views\Device\Show.cshtml" - } + } + #line default #line hidden -WriteLiteral(""); - #line 32 "..\..\Views\Device\Show.cshtml" - Write(CommonHelpers.FriendlyDateAndUser(flag.Item1.AddedDate, flag.Item1.AddedUser)); + #line 33 "..\..\Views\Device\Show.cshtml" + Write(CommonHelpers.FriendlyDateAndUser(flag.Item1.AddedDate, flag.Item1.AddedUser)); #line default @@ -238,7 +244,7 @@ WriteLiteral(">"); WriteLiteral("\r\n \r\n \r\n"); - #line 35 "..\..\Views\Device\Show.cshtml" + #line 36 "..\..\Views\Device\Show.cshtml" } } @@ -285,7 +291,7 @@ WriteLiteral(@"> "); - #line 69 "..\..\Views\Device\Show.cshtml" + #line 70 "..\..\Views\Device\Show.cshtml" } @@ -294,7 +300,7 @@ WriteLiteral(@"> WriteLiteral(" "); - #line 70 "..\..\Views\Device\Show.cshtml" + #line 71 "..\..\Views\Device\Show.cshtml" Write(Html.Partial(MVC.Device.Views.DeviceParts._Subject, Model)); @@ -335,13 +341,13 @@ WriteLiteral(" id=\"DeviceDetailTabItems\""); WriteLiteral(">\r\n"); - #line 106 "..\..\Views\Device\Show.cshtml" + #line 107 "..\..\Views\Device\Show.cshtml" #line default #line hidden - #line 106 "..\..\Views\Device\Show.cshtml" + #line 107 "..\..\Views\Device\Show.cshtml" if (Authorization.HasAny(Claims.Device.ShowComments, Claims.Device.ShowJobs)) { @@ -349,14 +355,14 @@ WriteLiteral(">\r\n"); #line default #line hidden - #line 108 "..\..\Views\Device\Show.cshtml" + #line 109 "..\..\Views\Device\Show.cshtml" Write(Html.Partial(MVC.Device.Views.DeviceParts._CommentsAndJobs, Model)); #line default #line hidden - #line 108 "..\..\Views\Device\Show.cshtml" + #line 109 "..\..\Views\Device\Show.cshtml" } @@ -366,7 +372,7 @@ WriteLiteral(">\r\n"); WriteLiteral(" "); - #line 110 "..\..\Views\Device\Show.cshtml" + #line 111 "..\..\Views\Device\Show.cshtml" if (Authorization.Has(Claims.Device.ShowDetails)) { @@ -374,14 +380,14 @@ WriteLiteral(" "); #line default #line hidden - #line 112 "..\..\Views\Device\Show.cshtml" + #line 113 "..\..\Views\Device\Show.cshtml" Write(Html.Partial(MVC.Device.Views.DeviceParts._Details, Model)); #line default #line hidden - #line 112 "..\..\Views\Device\Show.cshtml" + #line 113 "..\..\Views\Device\Show.cshtml" } @@ -391,7 +397,7 @@ WriteLiteral(" "); WriteLiteral(" "); - #line 114 "..\..\Views\Device\Show.cshtml" + #line 115 "..\..\Views\Device\Show.cshtml" if (Authorization.Has(Claims.Device.ShowAssignmentHistory)) { @@ -399,14 +405,14 @@ WriteLiteral(" "); #line default #line hidden - #line 116 "..\..\Views\Device\Show.cshtml" + #line 117 "..\..\Views\Device\Show.cshtml" Write(Html.Partial(MVC.Device.Views.DeviceParts._AssignmentHistory, Model)); #line default #line hidden - #line 116 "..\..\Views\Device\Show.cshtml" + #line 117 "..\..\Views\Device\Show.cshtml" } @@ -416,7 +422,7 @@ WriteLiteral(" "); WriteLiteral(" "); - #line 118 "..\..\Views\Device\Show.cshtml" + #line 119 "..\..\Views\Device\Show.cshtml" if (Authorization.Has(Claims.Device.ShowAttachments)) { @@ -424,14 +430,14 @@ WriteLiteral(" "); #line default #line hidden - #line 120 "..\..\Views\Device\Show.cshtml" + #line 121 "..\..\Views\Device\Show.cshtml" Write(Html.Partial(MVC.Device.Views.DeviceParts._Resources, Model)); #line default #line hidden - #line 120 "..\..\Views\Device\Show.cshtml" + #line 121 "..\..\Views\Device\Show.cshtml" } @@ -441,7 +447,7 @@ WriteLiteral(" "); WriteLiteral(" "); - #line 122 "..\..\Views\Device\Show.cshtml" + #line 123 "..\..\Views\Device\Show.cshtml" if (Authorization.Has(Claims.Device.ShowFlagAssignments) || Model.Device.DeviceFlagAssignments.CanShowAny()) { @@ -449,14 +455,14 @@ WriteLiteral(" "); #line default #line hidden - #line 124 "..\..\Views\Device\Show.cshtml" + #line 125 "..\..\Views\Device\Show.cshtml" Write(Html.Partial(MVC.Device.Views.DeviceParts._Flags, Model)); #line default #line hidden - #line 124 "..\..\Views\Device\Show.cshtml" + #line 125 "..\..\Views\Device\Show.cshtml" } @@ -466,7 +472,7 @@ WriteLiteral(" "); WriteLiteral(" "); - #line 126 "..\..\Views\Device\Show.cshtml" + #line 127 "..\..\Views\Device\Show.cshtml" if (Authorization.Has(Claims.Device.ShowCertificates)) { @@ -474,14 +480,14 @@ WriteLiteral(" "); #line default #line hidden - #line 128 "..\..\Views\Device\Show.cshtml" + #line 129 "..\..\Views\Device\Show.cshtml" Write(Html.Partial(MVC.Device.Views.DeviceParts._Certificates, Model)); #line default #line hidden - #line 128 "..\..\Views\Device\Show.cshtml" + #line 129 "..\..\Views\Device\Show.cshtml" } @@ -491,13 +497,13 @@ WriteLiteral(" "); WriteLiteral(" \r\n"); - #line 131 "..\..\Views\Device\Show.cshtml" + #line 132 "..\..\Views\Device\Show.cshtml" #line default #line hidden - #line 131 "..\..\Views\Device\Show.cshtml" + #line 132 "..\..\Views\Device\Show.cshtml" if (requiresLive) { @@ -536,7 +542,7 @@ WriteLiteral(" \r\n"); - #line 178 "..\..\Views\Device\Show.cshtml" + #line 179 "..\..\Views\Device\Show.cshtml" } diff --git a/Disco.Web/Views/Device/_DeviceTable.cshtml b/Disco.Web/Views/Device/_DeviceTable.cshtml index d1684f7a..6e4d19a2 100644 --- a/Disco.Web/Views/Device/_DeviceTable.cshtml +++ b/Disco.Web/Views/Device/_DeviceTable.cshtml @@ -41,8 +41,9 @@ { - @flag.Item2.flag.Name@if (flag.Item1.Comments != null) - {@flag.Item1.Comments.ToHtmlComment()}@CommonHelpers.FriendlyDateAndUser(flag.Item1.AddedDate, flag.Item1.AddedUserId) + @flag.Item2.flag.Name + @if (flag.Item1.Comments != null) {@flag.Item1.Comments.ToHtmlComment()} + @CommonHelpers.FriendlyDateAndUser(flag.Item1.AddedDate, flag.Item1.AddedUserId) } diff --git a/Disco.Web/Views/Device/_DeviceTable.generated.cs b/Disco.Web/Views/Device/_DeviceTable.generated.cs index a8edfe66..e832c673 100644 --- a/Disco.Web/Views/Device/_DeviceTable.generated.cs +++ b/Disco.Web/Views/Device/_DeviceTable.generated.cs @@ -250,12 +250,17 @@ WriteLiteral(">"); #line default #line hidden -WriteLiteral(""); +WriteLiteral("\r\n"); - #line 44 "..\..\Views\Device\_DeviceTable.cshtml" - if (flag.Item1.Comments != null) - { + #line 45 "..\..\Views\Device\_DeviceTable.cshtml" + + + #line default + #line hidden + + #line 45 "..\..\Views\Device\_DeviceTable.cshtml" + if (flag.Item1.Comments != null) { #line default #line hidden @@ -267,7 +272,7 @@ WriteLiteral(">"); #line 45 "..\..\Views\Device\_DeviceTable.cshtml" - Write(flag.Item1.Comments.ToHtmlComment()); + Write(flag.Item1.Comments.ToHtmlComment()); #line default @@ -276,19 +281,19 @@ WriteLiteral(""); #line 45 "..\..\Views\Device\_DeviceTable.cshtml" - } + } #line default #line hidden -WriteLiteral(""); - #line 45 "..\..\Views\Device\_DeviceTable.cshtml" - Write(CommonHelpers.FriendlyDateAndUser(flag.Item1.AddedDate, flag.Item1.AddedUserId)); + #line 46 "..\..\Views\Device\_DeviceTable.cshtml" + Write(CommonHelpers.FriendlyDateAndUser(flag.Item1.AddedDate, flag.Item1.AddedUserId)); #line default @@ -297,13 +302,13 @@ WriteLiteral("\r\n " \r\n"); - #line 48 "..\..\Views\Device\_DeviceTable.cshtml" + #line 49 "..\..\Views\Device\_DeviceTable.cshtml" } #line default #line hidden - #line 48 "..\..\Views\Device\_DeviceTable.cshtml" + #line 49 "..\..\Views\Device\_DeviceTable.cshtml" } @@ -313,7 +318,7 @@ WriteLiteral("\r\n WriteLiteral(" \r\n"); - #line 51 "..\..\Views\Device\_DeviceTable.cshtml" + #line 52 "..\..\Views\Device\_DeviceTable.cshtml" } @@ -324,7 +329,7 @@ WriteLiteral(" \r\n \r\n" WriteLiteral(" "); - #line 54 "..\..\Views\Device\_DeviceTable.cshtml" + #line 55 "..\..\Views\Device\_DeviceTable.cshtml" Write(item.AssetNumber); @@ -333,27 +338,27 @@ WriteLiteral(" "); WriteLiteral("\r\n \r\n \r\n"); - #line 57 "..\..\Views\Device\_DeviceTable.cshtml" + #line 58 "..\..\Views\Device\_DeviceTable.cshtml" #line default #line hidden - #line 57 "..\..\Views\Device\_DeviceTable.cshtml" + #line 58 "..\..\Views\Device\_DeviceTable.cshtml" if (item.DecommissionedDate.HasValue) { #line default #line hidden - #line 58 "..\..\Views\Device\_DeviceTable.cshtml" + #line 59 "..\..\Views\Device\_DeviceTable.cshtml" Write(CommonHelpers.FriendlyDate(item.DecommissionedDate.Value)); #line default #line hidden - #line 58 "..\..\Views\Device\_DeviceTable.cshtml" + #line 59 "..\..\Views\Device\_DeviceTable.cshtml" } @@ -362,13 +367,13 @@ WriteLiteral("\r\n \r\n \ WriteLiteral(" \r\n \r\n"); - #line 61 "..\..\Views\Device\_DeviceTable.cshtml" + #line 62 "..\..\Views\Device\_DeviceTable.cshtml" #line default #line hidden - #line 61 "..\..\Views\Device\_DeviceTable.cshtml" + #line 62 "..\..\Views\Device\_DeviceTable.cshtml" if (string.IsNullOrWhiteSpace(item.ComputerName)) { @@ -382,7 +387,7 @@ WriteLiteral(" class=\"smallMessage\""); WriteLiteral(">Unknown\r\n"); - #line 64 "..\..\Views\Device\_DeviceTable.cshtml" + #line 65 "..\..\Views\Device\_DeviceTable.cshtml" } else { @@ -391,14 +396,14 @@ WriteLiteral(">Unknown\r\n"); #line default #line hidden - #line 67 "..\..\Views\Device\_DeviceTable.cshtml" + #line 68 "..\..\Views\Device\_DeviceTable.cshtml" Write(item.ComputerName); #line default #line hidden - #line 67 "..\..\Views\Device\_DeviceTable.cshtml" + #line 68 "..\..\Views\Device\_DeviceTable.cshtml" } @@ -408,13 +413,13 @@ WriteLiteral(">Unknown\r\n"); WriteLiteral(" \r\n \r\n"); - #line 71 "..\..\Views\Device\_DeviceTable.cshtml" + #line 72 "..\..\Views\Device\_DeviceTable.cshtml" #line default #line hidden - #line 71 "..\..\Views\Device\_DeviceTable.cshtml" + #line 72 "..\..\Views\Device\_DeviceTable.cshtml" if (item.DeviceModelDescription != null) { @@ -424,7 +429,7 @@ WriteLiteral(" \r\n \r\n" WriteLiteral(" "); - #line 73 "..\..\Views\Device\_DeviceTable.cshtml" + #line 74 "..\..\Views\Device\_DeviceTable.cshtml" Write(item.DeviceModelDescription); @@ -433,7 +438,7 @@ WriteLiteral(" "); WriteLiteral("\r\n"); - #line 74 "..\..\Views\Device\_DeviceTable.cshtml" + #line 75 "..\..\Views\Device\_DeviceTable.cshtml" } else { @@ -448,7 +453,7 @@ WriteLiteral(" class=\"smallMessage\""); WriteLiteral(">Unknown\r\n"); - #line 78 "..\..\Views\Device\_DeviceTable.cshtml" + #line 79 "..\..\Views\Device\_DeviceTable.cshtml" } @@ -459,7 +464,7 @@ WriteLiteral(" \r\n \r\n" WriteLiteral(" "); - #line 81 "..\..\Views\Device\_DeviceTable.cshtml" + #line 82 "..\..\Views\Device\_DeviceTable.cshtml" Write(item.DeviceProfileName); @@ -468,13 +473,13 @@ WriteLiteral(" "); WriteLiteral("\r\n \r\n \r\n"); - #line 84 "..\..\Views\Device\_DeviceTable.cshtml" + #line 85 "..\..\Views\Device\_DeviceTable.cshtml" #line default #line hidden - #line 84 "..\..\Views\Device\_DeviceTable.cshtml" + #line 85 "..\..\Views\Device\_DeviceTable.cshtml" if (item.DeviceBatchName != null) { @@ -484,7 +489,7 @@ WriteLiteral("\r\n \r\n \ WriteLiteral(" "); - #line 86 "..\..\Views\Device\_DeviceTable.cshtml" + #line 87 "..\..\Views\Device\_DeviceTable.cshtml" Write(item.DeviceBatchName); @@ -493,7 +498,7 @@ WriteLiteral(" "); WriteLiteral("\r\n"); - #line 87 "..\..\Views\Device\_DeviceTable.cshtml" + #line 88 "..\..\Views\Device\_DeviceTable.cshtml" } else { @@ -508,7 +513,7 @@ WriteLiteral(" class=\"smallMessage\""); WriteLiteral(">N/A\r\n"); - #line 91 "..\..\Views\Device\_DeviceTable.cshtml" + #line 92 "..\..\Views\Device\_DeviceTable.cshtml" } @@ -517,13 +522,13 @@ WriteLiteral(">N/A\r\n"); WriteLiteral(" \r\n \r\n"); - #line 94 "..\..\Views\Device\_DeviceTable.cshtml" + #line 95 "..\..\Views\Device\_DeviceTable.cshtml" #line default #line hidden - #line 94 "..\..\Views\Device\_DeviceTable.cshtml" + #line 95 "..\..\Views\Device\_DeviceTable.cshtml" if (string.IsNullOrEmpty(item.AssignedUserId)) { @@ -537,7 +542,7 @@ WriteLiteral(" class=\"smallMessage\""); WriteLiteral(">N/A\r\n"); - #line 97 "..\..\Views\Device\_DeviceTable.cshtml" + #line 98 "..\..\Views\Device\_DeviceTable.cshtml" } else { @@ -548,13 +553,13 @@ WriteLiteral(">N/A\r\n"); WriteLiteral(" \r\n"); - #line 101 "..\..\Views\Device\_DeviceTable.cshtml" + #line 102 "..\..\Views\Device\_DeviceTable.cshtml" #line default #line hidden - #line 101 "..\..\Views\Device\_DeviceTable.cshtml" + #line 102 "..\..\Views\Device\_DeviceTable.cshtml" if (canShowUsers) { @@ -562,14 +567,14 @@ WriteLiteral(" \r\n"); #line default #line hidden - #line 103 "..\..\Views\Device\_DeviceTable.cshtml" + #line 104 "..\..\Views\Device\_DeviceTable.cshtml" Write(Html.ActionLink(item.AssignedUserDescription, MVC.User.Show(item.AssignedUserId))); #line default #line hidden - #line 103 "..\..\Views\Device\_DeviceTable.cshtml" + #line 104 "..\..\Views\Device\_DeviceTable.cshtml" } else @@ -579,14 +584,14 @@ WriteLiteral(" \r\n"); #line default #line hidden - #line 107 "..\..\Views\Device\_DeviceTable.cshtml" + #line 108 "..\..\Views\Device\_DeviceTable.cshtml" Write(item.AssignedUserDescription); #line default #line hidden - #line 107 "..\..\Views\Device\_DeviceTable.cshtml" + #line 108 "..\..\Views\Device\_DeviceTable.cshtml" } @@ -596,7 +601,7 @@ WriteLiteral(" \r\n"); WriteLiteral(" \r\n"); - #line 110 "..\..\Views\Device\_DeviceTable.cshtml" + #line 111 "..\..\Views\Device\_DeviceTable.cshtml" } @@ -607,7 +612,7 @@ WriteLiteral(" \r\n \r\n" WriteLiteral(" "); - #line 113 "..\..\Views\Device\_DeviceTable.cshtml" + #line 114 "..\..\Views\Device\_DeviceTable.cshtml" Write(item.JobCount); @@ -616,7 +621,7 @@ WriteLiteral(" "); WriteLiteral("\r\n \r\n \r\n"); - #line 116 "..\..\Views\Device\_DeviceTable.cshtml" + #line 117 "..\..\Views\Device\_DeviceTable.cshtml" } @@ -651,7 +656,7 @@ WriteLiteral(">\r\n $(function () {\r\n var userTable " });\r\n \r\n"); - #line 158 "..\..\Views\Device\_DeviceTable.cshtml" + #line 159 "..\..\Views\Device\_DeviceTable.cshtml" } else { @@ -666,7 +671,7 @@ WriteLiteral(" class=\"smallMessage\""); WriteLiteral(">No Devices Found\r\n"); - #line 162 "..\..\Views\Device\_DeviceTable.cshtml" + #line 163 "..\..\Views\Device\_DeviceTable.cshtml" } diff --git a/Disco.Web/Views/Job/JobParts/_Subject.cshtml b/Disco.Web/Views/Job/JobParts/_Subject.cshtml index 06f62891..c454505a 100644 --- a/Disco.Web/Views/Job/JobParts/_Subject.cshtml +++ b/Disco.Web/Views/Job/JobParts/_Subject.cshtml @@ -237,8 +237,9 @@ { - @flag.Item2.flag.Name@if (flag.Item1.Comments != null) - {@flag.Item1.Comments.ToHtmlComment()}@CommonHelpers.FriendlyDateAndUser(flag.Item1.AddedDate, flag.Item1.AddedUserId) + @flag.Item2.flag.Name + @if (flag.Item1.Comments != null) {@flag.Item1.Comments.ToHtmlComment()} + @CommonHelpers.FriendlyDateAndUser(flag.Item1.AddedDate, flag.Item1.AddedUserId) } @@ -488,8 +489,9 @@ { - @flag.Item2.flag.Name@if (flag.Item1.Comments != null) - {@flag.Item1.Comments.ToHtmlComment()}@CommonHelpers.FriendlyDateAndUser(flag.Item1.AddedDate, flag.Item1.AddedUserId) + @flag.Item2.flag.Name + @if (flag.Item1.Comments != null) {@flag.Item1.Comments.ToHtmlComment()} + @CommonHelpers.FriendlyDateAndUser(flag.Item1.AddedDate, flag.Item1.AddedUserId) } diff --git a/Disco.Web/Views/Job/JobParts/_Subject.generated.cs b/Disco.Web/Views/Job/JobParts/_Subject.generated.cs index 6de047d4..1a453a51 100644 --- a/Disco.Web/Views/Job/JobParts/_Subject.generated.cs +++ b/Disco.Web/Views/Job/JobParts/_Subject.generated.cs @@ -1145,12 +1145,17 @@ WriteLiteral(">"); #line default #line hidden -WriteLiteral(""); +WriteLiteral("\r\n"); - #line 240 "..\..\Views\Job\JobParts\_Subject.cshtml" - if (flag.Item1.Comments != null) - { + #line 241 "..\..\Views\Job\JobParts\_Subject.cshtml" + + + #line default + #line hidden + + #line 241 "..\..\Views\Job\JobParts\_Subject.cshtml" + if (flag.Item1.Comments != null) { #line default #line hidden @@ -1162,7 +1167,7 @@ WriteLiteral(">"); #line 241 "..\..\Views\Job\JobParts\_Subject.cshtml" - Write(flag.Item1.Comments.ToHtmlComment()); + Write(flag.Item1.Comments.ToHtmlComment()); #line default @@ -1171,19 +1176,20 @@ WriteLiteral(""); #line 241 "..\..\Views\Job\JobParts\_Subject.cshtml" - } + } + #line default #line hidden -WriteLiteral(""); - #line 241 "..\..\Views\Job\JobParts\_Subject.cshtml" - Write(CommonHelpers.FriendlyDateAndUser(flag.Item1.AddedDate, flag.Item1.AddedUserId)); + #line 242 "..\..\Views\Job\JobParts\_Subject.cshtml" + Write(CommonHelpers.FriendlyDateAndUser(flag.Item1.AddedDate, flag.Item1.AddedUserId)); #line default @@ -1192,7 +1198,7 @@ WriteLiteral("\r\n " \r\n"); - #line 244 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 245 "..\..\Views\Job\JobParts\_Subject.cshtml" } } @@ -1232,7 +1238,7 @@ WriteLiteral(">\r\n $(function () {\r\n " \r\n"); - #line 277 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 278 "..\..\Views\Job\JobParts\_Subject.cshtml" } @@ -1241,13 +1247,13 @@ WriteLiteral(">\r\n $(function () {\r\n WriteLiteral(" \r\n \r\n"); - #line 280 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 281 "..\..\Views\Job\JobParts\_Subject.cshtml" #line default #line hidden - #line 280 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 281 "..\..\Views\Job\JobParts\_Subject.cshtml" if (Model.Job.DeviceHeld.HasValue) { var canEditLocation = Authorization.Has(Claims.Job.Properties.DeviceHeldLocation); @@ -1274,7 +1280,7 @@ WriteLiteral(" id=\"Job_Show_Device_DeviceHeld_Location\""); WriteLiteral(" data-locationsurl=\""); - #line 288 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 289 "..\..\Views\Job\JobParts\_Subject.cshtml" Write(Url.Action(MVC.API.Job.DeviceHeldLocations())); @@ -1285,7 +1291,7 @@ WriteLiteral("\""); WriteLiteral(" data-updateurl=\""); - #line 288 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 289 "..\..\Views\Job\JobParts\_Subject.cshtml" Write(Url.Action(MVC.API.Job.UpdateDeviceHeldLocation(Model.Job.Id, null))); @@ -1296,13 +1302,13 @@ WriteLiteral("\""); WriteLiteral(">\r\n"); - #line 289 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 290 "..\..\Views\Job\JobParts\_Subject.cshtml" #line default #line hidden - #line 289 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 290 "..\..\Views\Job\JobParts\_Subject.cshtml" if (canEditLocation) { switch (Model.LocationMode) @@ -1314,14 +1320,14 @@ WriteLiteral(">\r\n"); #line default #line hidden - #line 295 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 296 "..\..\Views\Job\JobParts\_Subject.cshtml" Write(Html.TextBoxFor(m => m.Job.DeviceHeldLocation, new { @class = "small discreet" })); #line default #line hidden - #line 295 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 296 "..\..\Views\Job\JobParts\_Subject.cshtml" break; case LocationModes.RestrictedList: @@ -1336,14 +1342,14 @@ WriteLiteral(">\r\n"); #line default #line hidden - #line 304 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 305 "..\..\Views\Job\JobParts\_Subject.cshtml" Write(Html.DropDownListFor(m => m.Job.DeviceHeldLocation, listOptions, new { @class = "small discreet" })); #line default #line hidden - #line 304 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 305 "..\..\Views\Job\JobParts\_Subject.cshtml" ; break; } @@ -1352,27 +1358,27 @@ WriteLiteral(">\r\n"); #line default #line hidden - #line 307 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 308 "..\..\Views\Job\JobParts\_Subject.cshtml" Write(AjaxHelpers.AjaxSave()); #line default #line hidden - #line 307 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 308 "..\..\Views\Job\JobParts\_Subject.cshtml" #line default #line hidden - #line 307 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 308 "..\..\Views\Job\JobParts\_Subject.cshtml" Write(AjaxHelpers.AjaxLoader()); #line default #line hidden - #line 307 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 308 "..\..\Views\Job\JobParts\_Subject.cshtml" } else if (string.IsNullOrEmpty(Model.Job.DeviceHeldLocation)) @@ -1388,7 +1394,7 @@ WriteLiteral(" class=\"smallMessage\""); WriteLiteral("><None/Unknown>\r\n"); - #line 312 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 313 "..\..\Views\Job\JobParts\_Subject.cshtml" } else { @@ -1397,14 +1403,14 @@ WriteLiteral("><None/Unknown>\r\n"); #line default #line hidden - #line 315 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 316 "..\..\Views\Job\JobParts\_Subject.cshtml" Write(Model.Job.DeviceHeldLocation); #line default #line hidden - #line 315 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 316 "..\..\Views\Job\JobParts\_Subject.cshtml" } @@ -1423,7 +1429,7 @@ WriteLiteral(" id=\"Job_Show_Device_DeviceHeld_DeviceHeld\""); WriteLiteral(">"); - #line 322 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 323 "..\..\Views\Job\JobParts\_Subject.cshtml" Write(CommonHelpers.FriendlyDateAndTitleUser(Model.Job.DeviceHeld, Model.Job.DeviceHeldTechUser)); @@ -1432,13 +1438,13 @@ WriteLiteral(">"); WriteLiteral("\r\n \r\n"); - #line 324 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 325 "..\..\Views\Job\JobParts\_Subject.cshtml" #line default #line hidden - #line 324 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 325 "..\..\Views\Job\JobParts\_Subject.cshtml" if (Model.Job.DeviceReadyForReturn.HasValue) { @@ -1453,7 +1459,7 @@ WriteLiteral(" id=\"Job_Show_Device_DeviceHeld_DeviceReadyForReturn\""); WriteLiteral(">"); - #line 328 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 329 "..\..\Views\Job\JobParts\_Subject.cshtml" Write(CommonHelpers.FriendlyDateAndTitleUser(Model.Job.DeviceReadyForReturn, Model.Job.DeviceReadyForReturnTechUser)); @@ -1462,7 +1468,7 @@ WriteLiteral(">"); WriteLiteral("\r\n \r\n"); - #line 330 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 331 "..\..\Views\Job\JobParts\_Subject.cshtml" } @@ -1471,7 +1477,7 @@ WriteLiteral("\r\n \r\n"); WriteLiteral(" "); - #line 331 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 332 "..\..\Views\Job\JobParts\_Subject.cshtml" if (Model.Job.DeviceReturnedDate.HasValue) { @@ -1486,7 +1492,7 @@ WriteLiteral(" id=\"Job_Show_Device_DeviceHeld_DeviceReturnedDate\""); WriteLiteral(">"); - #line 335 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 336 "..\..\Views\Job\JobParts\_Subject.cshtml" Write(CommonHelpers.FriendlyDateAndTitleUser(Model.Job.DeviceReturnedDate, Model.Job.DeviceReturnedTechUser)); @@ -1495,7 +1501,7 @@ WriteLiteral(">"); WriteLiteral("\r\n \r\n"); - #line 337 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 338 "..\..\Views\Job\JobParts\_Subject.cshtml" } @@ -1504,13 +1510,13 @@ WriteLiteral("\r\n \r\n"); WriteLiteral(" \r\n"); - #line 339 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 340 "..\..\Views\Job\JobParts\_Subject.cshtml" #line default #line hidden - #line 339 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 340 "..\..\Views\Job\JobParts\_Subject.cshtml" if (canEditLocation) { @@ -1524,13 +1530,13 @@ WriteLiteral(" type=\"text/javascript\""); WriteLiteral(">\r\n $(function () {\r\n"); - #line 343 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 344 "..\..\Views\Job\JobParts\_Subject.cshtml" #line default #line hidden - #line 343 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 344 "..\..\Views\Job\JobParts\_Subject.cshtml" switch (Model.LocationMode) { case LocationModes.Unrestricted: @@ -1629,7 +1635,7 @@ WriteLiteral("\r\n const $deviceHeldLocat WriteLiteral("\r\n"); - #line 435 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 436 "..\..\Views\Job\JobParts\_Subject.cshtml" break; case LocationModes.RestrictedList: @@ -1645,7 +1651,7 @@ WriteLiteral(@" '"); - #line 441 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 442 "..\..\Views\Job\JobParts\_Subject.cshtml" Write(Url.Action(MVC.API.Job.UpdateDeviceHeldLocation(Model.Job.Id, null))); @@ -1657,7 +1663,7 @@ WriteLiteral("\',\r\n \'DeviceHeldLoc WriteLiteral("\r\n"); - #line 444 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 445 "..\..\Views\Job\JobParts\_Subject.cshtml" break; } @@ -1668,7 +1674,7 @@ WriteLiteral("\r\n\r\n });\r\n "ript>\r\n"); - #line 450 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 451 "..\..\Views\Job\JobParts\_Subject.cshtml" } @@ -1677,7 +1683,7 @@ WriteLiteral("\r\n\r\n });\r\n WriteLiteral(" \r\n"); - #line 452 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 453 "..\..\Views\Job\JobParts\_Subject.cshtml" } @@ -1686,7 +1692,7 @@ WriteLiteral(" \r\n"); WriteLiteral(" \r\n \r\n"); - #line 455 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 456 "..\..\Views\Job\JobParts\_Subject.cshtml" } @@ -1695,7 +1701,7 @@ WriteLiteral(" \r\n \r\n"); WriteLiteral(" "); - #line 456 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 457 "..\..\Views\Job\JobParts\_Subject.cshtml" if (Model.Job.User != null) { @@ -1709,13 +1715,13 @@ WriteLiteral(" id=\"Job_Show_User\""); WriteLiteral(">\r\n
    \r\n"); - #line 460 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 461 "..\..\Views\Job\JobParts\_Subject.cshtml" #line default #line hidden - #line 460 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 461 "..\..\Views\Job\JobParts\_Subject.cshtml" if (Model.HasUserPhoto) { @@ -1730,20 +1736,20 @@ WriteLiteral(">\r\n (Url.Action(MVC.API.User.Photo(Model.Job.UserId)) + #line 464 "..\..\Views\Job\JobParts\_Subject.cshtml" +, Tuple.Create(Tuple.Create("", 32179), Tuple.Create(Url.Action(MVC.API.User.Photo(Model.Job.UserId)) #line default #line hidden -, 32124), false) +, 32179), false) ); WriteLiteral(" />\r\n
    \r\n"); - #line 465 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 466 "..\..\Views\Job\JobParts\_Subject.cshtml" } @@ -1758,27 +1764,27 @@ WriteLiteral(" title=\"Display Name\""); WriteLiteral(">\r\n \r\n"); - #line 468 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 469 "..\..\Views\Job\JobParts\_Subject.cshtml" #line default #line hidden - #line 468 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 469 "..\..\Views\Job\JobParts\_Subject.cshtml" if (Authorization.Has(Claims.User.Show)) { #line default #line hidden - #line 469 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 470 "..\..\Views\Job\JobParts\_Subject.cshtml" Write(Html.ActionLink(Model.Job.User.DisplayName, MVC.User.Show(Model.Job.UserId))); #line default #line hidden - #line 469 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 470 "..\..\Views\Job\JobParts\_Subject.cshtml" } else { @@ -1786,14 +1792,14 @@ WriteLiteral(">\r\n \r\n"); #line default #line hidden - #line 471 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 472 "..\..\Views\Job\JobParts\_Subject.cshtml" Write(Model.Job.User.DisplayName); #line default #line hidden - #line 471 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 472 "..\..\Views\Job\JobParts\_Subject.cshtml" } @@ -1809,7 +1815,7 @@ WriteLiteral(" title=\"Id\""); WriteLiteral(">"); - #line 474 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 475 "..\..\Views\Job\JobParts\_Subject.cshtml" Write(Model.Job.User.FriendlyId()); @@ -1818,13 +1824,13 @@ WriteLiteral(">"); WriteLiteral("\r\n"); - #line 475 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 476 "..\..\Views\Job\JobParts\_Subject.cshtml" #line default #line hidden - #line 475 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 476 "..\..\Views\Job\JobParts\_Subject.cshtml" if (Authorization.Has(Claims.User.ShowDetails)) { if (!string.IsNullOrWhiteSpace(Model.Job.User.PhoneNumber)) @@ -1840,21 +1846,21 @@ WriteLiteral(" title=\"Phone Number\""); WriteLiteral(">Phone: (Model.Job.User.PhoneNumber + #line 479 "..\..\Views\Job\JobParts\_Subject.cshtml" + , Tuple.Create(Tuple.Create("", 33141), Tuple.Create(Model.Job.User.PhoneNumber #line default #line hidden -, 33086), false) +, 33141), false) ); WriteLiteral(" data-clipboard>"); - #line 478 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 479 "..\..\Views\Job\JobParts\_Subject.cshtml" Write(Model.Job.User.PhoneNumber); @@ -1863,7 +1869,7 @@ WriteLiteral(" data-clipboard>"); WriteLiteral(""); - #line 478 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 479 "..\..\Views\Job\JobParts\_Subject.cshtml" } if (!string.IsNullOrWhiteSpace(Model.Job.User.EmailAddress)) { @@ -1878,21 +1884,21 @@ WriteLiteral(" title=\"Email Address\""); WriteLiteral(">Email: (Model.Job.User.EmailAddress + #line 481 "..\..\Views\Job\JobParts\_Subject.cshtml" + , Tuple.Create(Tuple.Create("", 33410), Tuple.Create(Model.Job.User.EmailAddress #line default #line hidden -, 33355), false) +, 33410), false) ); WriteLiteral(" data-clipboard=\""); - #line 480 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 481 "..\..\Views\Job\JobParts\_Subject.cshtml" Write(Model.Job.User.DisplayName); @@ -1901,7 +1907,7 @@ WriteLiteral(" data-clipboard=\""); WriteLiteral(" <"); - #line 480 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 481 "..\..\Views\Job\JobParts\_Subject.cshtml" Write(Model.Job.User.EmailAddress); @@ -1912,7 +1918,7 @@ WriteLiteral(">\""); WriteLiteral(">"); - #line 480 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 481 "..\..\Views\Job\JobParts\_Subject.cshtml" Write(Model.Job.User.EmailAddress); @@ -1921,7 +1927,7 @@ WriteLiteral(">"); WriteLiteral(""); - #line 480 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 481 "..\..\Views\Job\JobParts\_Subject.cshtml" } } @@ -1931,7 +1937,7 @@ WriteLiteral(""); WriteLiteral(" "); - #line 482 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 483 "..\..\Views\Job\JobParts\_Subject.cshtml" if (Model.Job.User.UserFlagAssignments.CanShowAny()) { @@ -1945,13 +1951,13 @@ WriteLiteral(" id=\"Job_Show_User_Flags\""); WriteLiteral(">\r\n"); - #line 485 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 486 "..\..\Views\Job\JobParts\_Subject.cshtml" #line default #line hidden - #line 485 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 486 "..\..\Views\Job\JobParts\_Subject.cshtml" foreach (var flag in Model.Job.User.UserFlagAssignments.Where(f => !f.RemovedDate.HasValue).Select(f => Tuple.Create(f, UserFlagService.GetUserFlag(f.UserFlagId)))) { if (flag.Item2.permission.CanShow()) @@ -1962,26 +1968,26 @@ WriteLiteral(">\r\n"); #line hidden WriteLiteral(" (flag.Item2.flag.Icon + #line 490 "..\..\Views\Job\JobParts\_Subject.cshtml" +, Tuple.Create(Tuple.Create("", 34122), Tuple.Create(flag.Item2.flag.Icon #line default #line hidden -, 34067), false) -, Tuple.Create(Tuple.Create(" ", 34090), Tuple.Create("fa-fw", 34091), true) -, Tuple.Create(Tuple.Create(" ", 34096), Tuple.Create("d-", 34097), true) +, 34122), false) +, Tuple.Create(Tuple.Create(" ", 34145), Tuple.Create("fa-fw", 34146), true) +, Tuple.Create(Tuple.Create(" ", 34151), Tuple.Create("d-", 34152), true) - #line 489 "..\..\Views\Job\JobParts\_Subject.cshtml" - , Tuple.Create(Tuple.Create("", 34099), Tuple.Create(flag.Item2.flag.IconColour + #line 490 "..\..\Views\Job\JobParts\_Subject.cshtml" + , Tuple.Create(Tuple.Create("", 34154), Tuple.Create(flag.Item2.flag.IconColour #line default #line hidden -, 34099), false) +, 34154), false) ); WriteLiteral(">\r\n "); - #line 491 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 492 "..\..\Views\Job\JobParts\_Subject.cshtml" Write(flag.Item2.flag.Name); #line default #line hidden -WriteLiteral(""); +WriteLiteral("\r\n"); - #line 491 "..\..\Views\Job\JobParts\_Subject.cshtml" - if (flag.Item1.Comments != null) - { + #line 493 "..\..\Views\Job\JobParts\_Subject.cshtml" + + + #line default + #line hidden + + #line 493 "..\..\Views\Job\JobParts\_Subject.cshtml" + if (flag.Item1.Comments != null) { #line default #line hidden @@ -2017,8 +2028,8 @@ WriteLiteral(" class=\"comments\""); WriteLiteral(">"); - #line 492 "..\..\Views\Job\JobParts\_Subject.cshtml" - Write(flag.Item1.Comments.ToHtmlComment()); + #line 493 "..\..\Views\Job\JobParts\_Subject.cshtml" + Write(flag.Item1.Comments.ToHtmlComment()); #line default @@ -2026,20 +2037,21 @@ WriteLiteral(">"); WriteLiteral(""); - #line 492 "..\..\Views\Job\JobParts\_Subject.cshtml" - } + #line 493 "..\..\Views\Job\JobParts\_Subject.cshtml" + } + #line default #line hidden -WriteLiteral(""); - #line 492 "..\..\Views\Job\JobParts\_Subject.cshtml" - Write(CommonHelpers.FriendlyDateAndUser(flag.Item1.AddedDate, flag.Item1.AddedUserId)); + #line 494 "..\..\Views\Job\JobParts\_Subject.cshtml" + Write(CommonHelpers.FriendlyDateAndUser(flag.Item1.AddedDate, flag.Item1.AddedUserId)); #line default @@ -2048,7 +2060,7 @@ WriteLiteral("\r\n \r\n " \r\n"); - #line 495 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 497 "..\..\Views\Job\JobParts\_Subject.cshtml" } } @@ -2085,7 +2097,7 @@ WriteLiteral(">\r\n $(function () {\r\n " \r\n"); - #line 528 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 530 "..\..\Views\Job\JobParts\_Subject.cshtml" } @@ -2094,7 +2106,7 @@ WriteLiteral(">\r\n $(function () {\r\n WriteLiteral(" "); - #line 529 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 531 "..\..\Views\Job\JobParts\_Subject.cshtml" if (Model.Job.WaitingForUserAction.HasValue) { @@ -2113,7 +2125,7 @@ WriteLiteral(">\r\n

    Awaiting Action

    \r\n WriteLiteral(" data-livestamp=\""); - #line 533 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 535 "..\..\Views\Job\JobParts\_Subject.cshtml" Write(Model.Job.WaitingForUserAction.ToUnixEpoc()); @@ -2124,7 +2136,7 @@ WriteLiteral("\""); WriteLiteral(">"); - #line 533 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 535 "..\..\Views\Job\JobParts\_Subject.cshtml" Write(Model.Job.WaitingForUserAction.ToFullDateTime()); @@ -2133,7 +2145,7 @@ WriteLiteral(">"); WriteLiteral("\r\n \r\n"); - #line 535 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 537 "..\..\Views\Job\JobParts\_Subject.cshtml" } @@ -2142,7 +2154,7 @@ WriteLiteral("\r\n \r\n"); WriteLiteral(" "); - #line 536 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 538 "..\..\Views\Job\JobParts\_Subject.cshtml" if (Model.UserDetails != null && Model.UserDetails.Count(d => !d.Key.EndsWith("&")) > 0) { @@ -2158,13 +2170,13 @@ WriteLiteral(" class=\"status clearfix\""); WriteLiteral(">\r\n"); - #line 539 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 541 "..\..\Views\Job\JobParts\_Subject.cshtml" #line default #line hidden - #line 539 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 541 "..\..\Views\Job\JobParts\_Subject.cshtml" foreach (var detail in Model.UserDetails.Where(d => !d.Key.EndsWith("&"))) { @@ -2175,7 +2187,7 @@ WriteLiteral("
    \r\n "g>"); - #line 542 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 544 "..\..\Views\Job\JobParts\_Subject.cshtml" Write(detail.Key.TrimEnd('*')); @@ -2184,13 +2196,13 @@ WriteLiteral("
    \r\n WriteLiteral(":\r\n"); - #line 543 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 545 "..\..\Views\Job\JobParts\_Subject.cshtml" #line default #line hidden - #line 543 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 545 "..\..\Views\Job\JobParts\_Subject.cshtml" if (detail.Key.EndsWith("*")) { @@ -2212,7 +2224,7 @@ WriteLiteral(" class=\"reveal hidden\""); WriteLiteral(">"); - #line 546 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 548 "..\..\Views\Job\JobParts\_Subject.cshtml" Write(Html.Partial(MVC.Shared.Views._CustomDetailValueRender, detail)); @@ -2221,7 +2233,7 @@ WriteLiteral(">"); WriteLiteral("\r\n"); - #line 547 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 549 "..\..\Views\Job\JobParts\_Subject.cshtml" } else { @@ -2230,14 +2242,14 @@ WriteLiteral("\r\n"); #line default #line hidden - #line 550 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 552 "..\..\Views\Job\JobParts\_Subject.cshtml" Write(Html.Partial(MVC.Shared.Views._CustomDetailValueRender, detail)); #line default #line hidden - #line 550 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 552 "..\..\Views\Job\JobParts\_Subject.cshtml" } @@ -2247,7 +2259,7 @@ WriteLiteral("\r\n"); WriteLiteral("
    \r\n"); - #line 553 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 555 "..\..\Views\Job\JobParts\_Subject.cshtml" } @@ -2272,7 +2284,7 @@ WriteLiteral(@"> "); - #line 566 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 568 "..\..\Views\Job\JobParts\_Subject.cshtml" } @@ -2281,7 +2293,7 @@ WriteLiteral(@"> WriteLiteral("
    \r\n \r\n"); - #line 569 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 571 "..\..\Views\Job\JobParts\_Subject.cshtml" } @@ -2298,13 +2310,13 @@ WriteLiteral(" id=\"Job_Show_Job_Actions\""); WriteLiteral(">\r\n"); - #line 573 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 575 "..\..\Views\Job\JobParts\_Subject.cshtml" #line default #line hidden - #line 573 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 575 "..\..\Views\Job\JobParts\_Subject.cshtml" List CanCloseForcedReasons; if (Model.Job.CanCloseForced(out CanCloseForcedReasons)) @@ -2345,13 +2357,13 @@ WriteLiteral(">Are you sure?\r\n "
      \r\n"); - #line 584 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 586 "..\..\Views\Job\JobParts\_Subject.cshtml" #line default #line hidden - #line 584 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 586 "..\..\Views\Job\JobParts\_Subject.cshtml" foreach (var reason in CanCloseForcedReasons) { @@ -2361,7 +2373,7 @@ WriteLiteral(">Are you sure?\r\n WriteLiteral("
    • "); - #line 586 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 588 "..\..\Views\Job\JobParts\_Subject.cshtml" Write(reason); @@ -2370,7 +2382,7 @@ WriteLiteral("
    • "); WriteLiteral("
      • \r\n"); - #line 587 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 589 "..\..\Views\Job\JobParts\_Subject.cshtml" } @@ -2379,13 +2391,13 @@ WriteLiteral("\r\n"); WriteLiteral("
    \r\n \r\n"); - #line 590 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 592 "..\..\Views\Job\JobParts\_Subject.cshtml" #line default #line hidden - #line 590 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 592 "..\..\Views\Job\JobParts\_Subject.cshtml" using (Html.BeginForm(MVC.API.Job.ForceClose(Model.Job.Id, null, true))) { @@ -2393,14 +2405,14 @@ WriteLiteral(" \r\n \r\n

    \r\n"); - #line 597 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 599 "..\..\Views\Job\JobParts\_Subject.cshtml" } @@ -2452,7 +2464,7 @@ WriteLiteral(">\r\n $(function () {\r\n " \r\n"); - #line 630 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 632 "..\..\Views\Job\JobParts\_Subject.cshtml" } @@ -2461,13 +2473,13 @@ WriteLiteral(">\r\n $(function () {\r\n WriteLiteral("\r\n\r\n"); - #line 633 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 635 "..\..\Views\Job\JobParts\_Subject.cshtml" #line default #line hidden - #line 633 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 635 "..\..\Views\Job\JobParts\_Subject.cshtml" if (Model.Job.CanCloseNormally()) { @@ -2495,13 +2507,13 @@ WriteLiteral(" title=\"Close this Job?\""); WriteLiteral(">\r\n"); - #line 637 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 639 "..\..\Views\Job\JobParts\_Subject.cshtml" #line default #line hidden - #line 637 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 639 "..\..\Views\Job\JobParts\_Subject.cshtml" using (Html.BeginForm(MVC.API.Job.Close(Model.Job.Id, true))) { @@ -2509,14 +2521,14 @@ WriteLiteral(">\r\n"); #line default #line hidden - #line 639 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 641 "..\..\Views\Job\JobParts\_Subject.cshtml" Write(Html.AntiForgeryToken()); #line default #line hidden - #line 639 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 641 "..\..\Views\Job\JobParts\_Subject.cshtml" } @@ -2565,7 +2577,7 @@ WriteLiteral(@"> "); - #line 674 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 676 "..\..\Views\Job\JobParts\_Subject.cshtml" } @@ -2574,7 +2586,7 @@ WriteLiteral(@"> WriteLiteral(" "); - #line 675 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 677 "..\..\Views\Job\JobParts\_Subject.cshtml" if (Model.Job.CanReopen()) { @@ -2602,13 +2614,13 @@ WriteLiteral(" title=\"Reopen this Job?\""); WriteLiteral(">\r\n"); - #line 679 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 681 "..\..\Views\Job\JobParts\_Subject.cshtml" #line default #line hidden - #line 679 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 681 "..\..\Views\Job\JobParts\_Subject.cshtml" using (Html.BeginForm(MVC.API.Job.Reopen(Model.Job.Id, true))) { @@ -2616,14 +2628,14 @@ WriteLiteral(">\r\n"); #line default #line hidden - #line 681 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 683 "..\..\Views\Job\JobParts\_Subject.cshtml" Write(Html.AntiForgeryToken()); #line default #line hidden - #line 681 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 683 "..\..\Views\Job\JobParts\_Subject.cshtml" } @@ -2672,7 +2684,7 @@ WriteLiteral(@"> "); - #line 716 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 718 "..\..\Views\Job\JobParts\_Subject.cshtml" } @@ -2681,7 +2693,7 @@ WriteLiteral(@"> WriteLiteral(" "); - #line 717 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 719 "..\..\Views\Job\JobParts\_Subject.cshtml" if (Model.Job.CanDelete()) { @@ -2709,13 +2721,13 @@ WriteLiteral(" title=\"Delete this Job?\""); WriteLiteral(">\r\n"); - #line 721 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 723 "..\..\Views\Job\JobParts\_Subject.cshtml" #line default #line hidden - #line 721 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 723 "..\..\Views\Job\JobParts\_Subject.cshtml" using (Html.BeginForm(MVC.API.Job.Delete(Model.Job.Id, true))) { @@ -2723,14 +2735,14 @@ WriteLiteral(">\r\n"); #line default #line hidden - #line 723 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 725 "..\..\Views\Job\JobParts\_Subject.cshtml" Write(Html.AntiForgeryToken()); #line default #line hidden - #line 723 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 725 "..\..\Views\Job\JobParts\_Subject.cshtml" } @@ -2780,7 +2792,7 @@ WriteLiteral(@"> "); - #line 758 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 760 "..\..\Views\Job\JobParts\_Subject.cshtml" } @@ -2789,7 +2801,7 @@ WriteLiteral(@"> WriteLiteral(" "); - #line 759 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 761 "..\..\Views\Job\JobParts\_Subject.cshtml" if (Model.Job.CanAddQueues() && Model.AvailableQueues != null && Model.AvailableQueues.Count > 0) { @@ -2821,13 +2833,13 @@ WriteLiteral(" title=\"Add Job to Queue\""); WriteLiteral(">\r\n"); - #line 769 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 771 "..\..\Views\Job\JobParts\_Subject.cshtml" #line default #line hidden - #line 769 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 771 "..\..\Views\Job\JobParts\_Subject.cshtml" using (Html.BeginForm(MVC.API.JobQueueJob.AddJob())) { @@ -2835,14 +2847,14 @@ WriteLiteral(">\r\n"); #line default #line hidden - #line 771 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 773 "..\..\Views\Job\JobParts\_Subject.cshtml" Write(Html.AntiForgeryToken()); #line default #line hidden - #line 771 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 773 "..\..\Views\Job\JobParts\_Subject.cshtml" @@ -2866,14 +2878,14 @@ WriteLiteral(" type=\"hidden\""); WriteLiteral(" name=\"JobId\""); -WriteAttribute("value", Tuple.Create(" value=\"", 49706), Tuple.Create("\"", 49727) +WriteAttribute("value", Tuple.Create(" value=\"", 49808), Tuple.Create("\"", 49829) - #line 773 "..\..\Views\Job\JobParts\_Subject.cshtml" - , Tuple.Create(Tuple.Create("", 49714), Tuple.Create(Model.Job.Id + #line 775 "..\..\Views\Job\JobParts\_Subject.cshtml" + , Tuple.Create(Tuple.Create("", 49816), Tuple.Create(Model.Job.Id #line default #line hidden -, 49714), false) +, 49816), false) ); WriteLiteral(" />\r\n"); @@ -2885,13 +2897,13 @@ WriteLiteral(" class=\"queuePicker\""); WriteLiteral(">\r\n"); - #line 775 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 777 "..\..\Views\Job\JobParts\_Subject.cshtml" #line default #line hidden - #line 775 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 777 "..\..\Views\Job\JobParts\_Subject.cshtml" foreach (var jobQueue in Model.AvailableQueues.OrderBy(jq => jq.Name)) { @@ -2905,7 +2917,7 @@ WriteLiteral(" class=\"queue\""); WriteLiteral(" data-queueid=\""); - #line 777 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 779 "..\..\Views\Job\JobParts\_Subject.cshtml" Write(jobQueue.Id); @@ -2916,7 +2928,7 @@ WriteLiteral("\""); WriteLiteral(" data-queuesla=\""); - #line 777 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 779 "..\..\Views\Job\JobParts\_Subject.cshtml" Write(jobQueue.DefaultSLAExpiry.HasValue ? jobQueue.DefaultSLAExpiry.Value.ToString() : null); @@ -2927,7 +2939,7 @@ WriteLiteral("\""); WriteLiteral(" data-queuepriority=\""); - #line 777 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 779 "..\..\Views\Job\JobParts\_Subject.cshtml" Write(jobQueue.Priority.ToString()); @@ -2937,32 +2949,32 @@ WriteLiteral("\""); WriteLiteral(">\r\n (jobQueue.Icon + #line 780 "..\..\Views\Job\JobParts\_Subject.cshtml" +, Tuple.Create(Tuple.Create("", 50312), Tuple.Create(jobQueue.Icon #line default #line hidden -, 50210), false) -, Tuple.Create(Tuple.Create(" ", 50226), Tuple.Create("fa-fw", 50227), true) -, Tuple.Create(Tuple.Create(" ", 50232), Tuple.Create("fa-lg", 50233), true) -, Tuple.Create(Tuple.Create(" ", 50238), Tuple.Create("d-", 50239), true) +, 50312), false) +, Tuple.Create(Tuple.Create(" ", 50328), Tuple.Create("fa-fw", 50329), true) +, Tuple.Create(Tuple.Create(" ", 50334), Tuple.Create("fa-lg", 50335), true) +, Tuple.Create(Tuple.Create(" ", 50340), Tuple.Create("d-", 50341), true) - #line 778 "..\..\Views\Job\JobParts\_Subject.cshtml" - , Tuple.Create(Tuple.Create("", 50241), Tuple.Create(jobQueue.IconColour + #line 780 "..\..\Views\Job\JobParts\_Subject.cshtml" + , Tuple.Create(Tuple.Create("", 50343), Tuple.Create(jobQueue.IconColour #line default #line hidden -, 50241), false) +, 50343), false) ); WriteLiteral(">"); - #line 778 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 780 "..\..\Views\Job\JobParts\_Subject.cshtml" Write(jobQueue.Name); @@ -2971,7 +2983,7 @@ WriteLiteral(">"); WriteLiteral("\r\n \r\n"); - #line 780 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 782 "..\..\Views\Job\JobParts\_Subject.cshtml" } @@ -2989,7 +3001,7 @@ WriteLiteral(">\r\n
    \r\n WriteLiteral(" "); - #line 785 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 787 "..\..\Views\Job\JobParts\_Subject.cshtml" Write(Html.DropDownList("Priority", priorityItems, new { id = "Job_Show_Job_Actions_AddQueue_Priority" })); @@ -2997,27 +3009,27 @@ WriteLiteral(" "); #line hidden WriteLiteral(" (priorityValue.ToLower() + #line 787 "..\..\Views\Job\JobParts\_Subject.cshtml" + , Tuple.Create(Tuple.Create("", 50784), Tuple.Create(priorityValue.ToLower() #line default #line hidden -, 50682), false) +, 50784), false) ); -WriteAttribute("title", Tuple.Create(" title=\"", 50709), Tuple.Create("\"", 50742) +WriteAttribute("title", Tuple.Create(" title=\"", 50811), Tuple.Create("\"", 50844) - #line 785 "..\..\Views\Job\JobParts\_Subject.cshtml" - , Tuple.Create(Tuple.Create("", 50717), Tuple.Create(priorityValue + #line 787 "..\..\Views\Job\JobParts\_Subject.cshtml" + , Tuple.Create(Tuple.Create("", 50819), Tuple.Create(priorityValue #line default #line hidden -, 50717), false) -, Tuple.Create(Tuple.Create(" ", 50733), Tuple.Create("Priority", 50734), true) +, 50819), false) +, Tuple.Create(Tuple.Create(" ", 50835), Tuple.Create("Priority", 50836), true) ); WriteLiteral(">\r\n
    \r\n
    \r\n " + @@ -3026,7 +3038,7 @@ WriteLiteral(">\r\n
    \r\n WriteLiteral(" "); - #line 789 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 791 "..\..\Views\Job\JobParts\_Subject.cshtml" Write(Html.DropDownList("SLAExpiresMinutes", slaOptions, new { id = "Job_Show_Job_Actions_AddQueue_SLAExpiresMinutes" })); @@ -3044,7 +3056,7 @@ WriteLiteral(">\r\n \r\n "\n"); - #line 796 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 798 "..\..\Views\Job\JobParts\_Subject.cshtml" } @@ -3104,7 +3116,7 @@ WriteLiteral(">\r\n $(function () {\r\n " });\r\n \r\n"); - #line 871 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 873 "..\..\Views\Job\JobParts\_Subject.cshtml" } @@ -3113,7 +3125,7 @@ WriteLiteral(">\r\n $(function () {\r\n WriteLiteral(" "); - #line 872 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 874 "..\..\Views\Job\JobParts\_Subject.cshtml" if (Model.Job.CanLogWarranty()) { @@ -3121,14 +3133,14 @@ WriteLiteral(" "); #line default #line hidden - #line 874 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 876 "..\..\Views\Job\JobParts\_Subject.cshtml" Write(Html.ActionLinkSmallButton("Lodge Warranty", MVC.Job.LogWarranty(Model.Job.Id, null, null), "Job_Show_Job_Actions_LogWarranty_Button")); #line default #line hidden - #line 874 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 876 "..\..\Views\Job\JobParts\_Subject.cshtml" } @@ -3138,7 +3150,7 @@ WriteLiteral(" "); WriteLiteral(" "); - #line 876 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 878 "..\..\Views\Job\JobParts\_Subject.cshtml" if (Model.Job.CanWarrantyCompleted()) { using (Html.BeginForm(MVC.API.Job.UpdateWarrantyExternalCompletedDate(Model.Job.Id, "Now", true))) @@ -3148,14 +3160,14 @@ WriteLiteral(" "); #line default #line hidden - #line 880 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 882 "..\..\Views\Job\JobParts\_Subject.cshtml" Write(Html.AntiForgeryToken()); #line default #line hidden - #line 880 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 882 "..\..\Views\Job\JobParts\_Subject.cshtml" @@ -3172,7 +3184,7 @@ WriteLiteral(" type=\"submit\""); WriteLiteral(">Warranty Complete\r\n"); - #line 882 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 884 "..\..\Views\Job\JobParts\_Subject.cshtml" } } @@ -3182,7 +3194,7 @@ WriteLiteral(">Warranty Complete\r\n"); WriteLiteral(" "); - #line 884 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 886 "..\..\Views\Job\JobParts\_Subject.cshtml" if (Model.Job.CanLogInsurance()) { @@ -3190,14 +3202,14 @@ WriteLiteral(" "); #line default #line hidden - #line 886 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 888 "..\..\Views\Job\JobParts\_Subject.cshtml" Write(Html.ActionLinkSmallButton("Lodge Insurance", MVC.Job.LogInsurance(Model.Job.Id, null, null), "Job_Show_Job_Actions_LogInsurance_Button", "alert")); #line default #line hidden - #line 886 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 888 "..\..\Views\Job\JobParts\_Subject.cshtml" } @@ -3207,7 +3219,7 @@ WriteLiteral(" "); WriteLiteral(" "); - #line 888 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 890 "..\..\Views\Job\JobParts\_Subject.cshtml" if (Model.Job.CanLogRepair()) { @@ -3215,14 +3227,14 @@ WriteLiteral(" "); #line default #line hidden - #line 890 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 892 "..\..\Views\Job\JobParts\_Subject.cshtml" Write(Html.ActionLinkSmallButton("Lodge Repair", MVC.Job.LogRepair(Model.Job.Id, null, null), "Job_Show_Job_Actions_LogRepair_Button")); #line default #line hidden - #line 890 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 892 "..\..\Views\Job\JobParts\_Subject.cshtml" } @@ -3232,7 +3244,7 @@ WriteLiteral(" "); WriteLiteral(" "); - #line 892 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 894 "..\..\Views\Job\JobParts\_Subject.cshtml" if (Model.Job.CanRepairComplete()) { using (Html.BeginForm(MVC.API.Job.UpdateNonWarrantyRepairerCompletedDate(Model.Job.Id, "Now", true))) @@ -3242,14 +3254,14 @@ WriteLiteral(" "); #line default #line hidden - #line 896 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 898 "..\..\Views\Job\JobParts\_Subject.cshtml" Write(Html.AntiForgeryToken()); #line default #line hidden - #line 896 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 898 "..\..\Views\Job\JobParts\_Subject.cshtml" @@ -3266,7 +3278,7 @@ WriteLiteral(" type=\"submit\""); WriteLiteral(">Repairs Complete\r\n"); - #line 898 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 900 "..\..\Views\Job\JobParts\_Subject.cshtml" } } @@ -3276,7 +3288,7 @@ WriteLiteral(">Repairs Complete\r\n"); WriteLiteral(" "); - #line 900 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 902 "..\..\Views\Job\JobParts\_Subject.cshtml" if (Model.Job.CanConvertHWarToHNWar()) { @@ -3304,13 +3316,13 @@ WriteLiteral(" title=\"Convert this Job?\""); WriteLiteral(">\r\n"); - #line 904 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 906 "..\..\Views\Job\JobParts\_Subject.cshtml" #line default #line hidden - #line 904 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 906 "..\..\Views\Job\JobParts\_Subject.cshtml" using (Html.BeginForm(MVC.API.Job.ConvertHWarToHNWar(Model.Job.Id, true))) { @@ -3318,14 +3330,14 @@ WriteLiteral(">\r\n"); #line default #line hidden - #line 906 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 908 "..\..\Views\Job\JobParts\_Subject.cshtml" Write(Html.AntiForgeryToken()); #line default #line hidden - #line 906 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 908 "..\..\Views\Job\JobParts\_Subject.cshtml" } @@ -3376,7 +3388,7 @@ WriteLiteral(@"> "); - #line 943 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 945 "..\..\Views\Job\JobParts\_Subject.cshtml" } @@ -3385,13 +3397,13 @@ WriteLiteral(@"> WriteLiteral(" \r\n"); - #line 945 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 947 "..\..\Views\Job\JobParts\_Subject.cshtml" #line default #line hidden - #line 945 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 947 "..\..\Views\Job\JobParts\_Subject.cshtml" if (Model.Job.Device != null) { @@ -3405,13 +3417,13 @@ WriteLiteral(" id=\"Job_Show_Device_Actions\""); WriteLiteral(">\r\n"); - #line 948 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 950 "..\..\Views\Job\JobParts\_Subject.cshtml" #line default #line hidden - #line 948 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 950 "..\..\Views\Job\JobParts\_Subject.cshtml" if (Model.Job.CanDeviceHeld()) { using (Html.BeginForm(MVC.API.Job.DeviceHeld(Model.Job.Id, true))) @@ -3421,14 +3433,14 @@ WriteLiteral(">\r\n"); #line default #line hidden - #line 952 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 954 "..\..\Views\Job\JobParts\_Subject.cshtml" Write(Html.AntiForgeryToken()); #line default #line hidden - #line 952 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 954 "..\..\Views\Job\JobParts\_Subject.cshtml" @@ -3445,7 +3457,7 @@ WriteLiteral(" class=\"button small\""); WriteLiteral(">Device Held\r\n"); - #line 954 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 956 "..\..\Views\Job\JobParts\_Subject.cshtml" } } @@ -3455,7 +3467,7 @@ WriteLiteral(">Device Held\r\n"); WriteLiteral(" "); - #line 956 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 958 "..\..\Views\Job\JobParts\_Subject.cshtml" if (Model.Job.CanDeviceReadyForReturn()) { using (Html.BeginForm(MVC.API.Job.DeviceReadyForReturn(Model.Job.Id, true))) @@ -3465,14 +3477,14 @@ WriteLiteral(" "); #line default #line hidden - #line 960 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 962 "..\..\Views\Job\JobParts\_Subject.cshtml" Write(Html.AntiForgeryToken()); #line default #line hidden - #line 960 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 962 "..\..\Views\Job\JobParts\_Subject.cshtml" @@ -3489,7 +3501,7 @@ WriteLiteral(" class=\"button small alert\""); WriteLiteral(">Device Ready For Return\r\n"); - #line 962 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 964 "..\..\Views\Job\JobParts\_Subject.cshtml" } } @@ -3499,7 +3511,7 @@ WriteLiteral(">Device Ready For Return\r\n"); WriteLiteral(" "); - #line 964 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 966 "..\..\Views\Job\JobParts\_Subject.cshtml" if (Model.Job.CanDeviceReturned()) { using (Html.BeginForm(MVC.API.Job.DeviceReturned(Model.Job.Id, true))) @@ -3509,14 +3521,14 @@ WriteLiteral(" "); #line default #line hidden - #line 968 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 970 "..\..\Views\Job\JobParts\_Subject.cshtml" Write(Html.AntiForgeryToken()); #line default #line hidden - #line 968 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 970 "..\..\Views\Job\JobParts\_Subject.cshtml" @@ -3528,22 +3540,22 @@ WriteLiteral(" id=\"Job_Show_Device_Actions_DeviceReturned_Button\""); WriteLiteral(" type=\"submit\""); -WriteAttribute("class", Tuple.Create(" class=\"", 60168), Tuple.Create("\"", 60244) -, Tuple.Create(Tuple.Create("", 60176), Tuple.Create("button", 60176), true) -, Tuple.Create(Tuple.Create(" ", 60182), Tuple.Create("small", 60183), true) +WriteAttribute("class", Tuple.Create(" class=\"", 60270), Tuple.Create("\"", 60346) +, Tuple.Create(Tuple.Create("", 60278), Tuple.Create("button", 60278), true) +, Tuple.Create(Tuple.Create(" ", 60284), Tuple.Create("small", 60285), true) - #line 969 "..\..\Views\Job\JobParts\_Subject.cshtml" - , Tuple.Create(Tuple.Create(" ", 60188), Tuple.Create(Model.Job.CanDeviceReadyForReturn() ? null : "alert" + #line 971 "..\..\Views\Job\JobParts\_Subject.cshtml" + , Tuple.Create(Tuple.Create(" ", 60290), Tuple.Create(Model.Job.CanDeviceReadyForReturn() ? null : "alert" #line default #line hidden -, 60189), false) +, 60291), false) ); WriteLiteral(">Device Returned\r\n"); - #line 970 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 972 "..\..\Views\Job\JobParts\_Subject.cshtml" } } @@ -3553,7 +3565,7 @@ WriteLiteral(">Device Returned\r\n"); WriteLiteral(" \r\n"); - #line 973 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 975 "..\..\Views\Job\JobParts\_Subject.cshtml" } @@ -3562,7 +3574,7 @@ WriteLiteral(" \r\n"); WriteLiteral(" "); - #line 974 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 976 "..\..\Views\Job\JobParts\_Subject.cshtml" if (Model.Job.User != null) { @@ -3576,13 +3588,13 @@ WriteLiteral(" id=\"Job_Show_User_Actions\""); WriteLiteral(">\r\n\r\n\r\n"); - #line 979 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 981 "..\..\Views\Job\JobParts\_Subject.cshtml" #line default #line hidden - #line 979 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 981 "..\..\Views\Job\JobParts\_Subject.cshtml" if (Model.Job.CanWaitingForUserAction()) { @@ -3610,13 +3622,13 @@ WriteLiteral(" title=\"Waiting for User Action\""); WriteLiteral(">\r\n"); - #line 983 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 985 "..\..\Views\Job\JobParts\_Subject.cshtml" #line default #line hidden - #line 983 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 985 "..\..\Views\Job\JobParts\_Subject.cshtml" using (Html.BeginForm(MVC.API.Job.WaitingForUserAction(Model.Job.Id, null, true))) { @@ -3624,14 +3636,14 @@ WriteLiteral(">\r\n"); #line default #line hidden - #line 985 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 987 "..\..\Views\Job\JobParts\_Subject.cshtml" Write(Html.AntiForgeryToken()); #line default #line hidden - #line 985 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 987 "..\..\Views\Job\JobParts\_Subject.cshtml" @@ -3648,7 +3660,7 @@ WriteLiteral(" class=\"block\""); WriteLiteral(">\r\n

    \r\n"); - #line 990 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 992 "..\..\Views\Job\JobParts\_Subject.cshtml" } @@ -3683,7 +3695,7 @@ WriteLiteral(">\r\n $(function () {\r\n " });\r\n \r\n"); - #line 1023 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 1025 "..\..\Views\Job\JobParts\_Subject.cshtml" } @@ -3692,7 +3704,7 @@ WriteLiteral(">\r\n $(function () {\r\n WriteLiteral(" "); - #line 1024 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 1026 "..\..\Views\Job\JobParts\_Subject.cshtml" if (Model.Job.CanNotWaitingForUserAction()) { @@ -3720,13 +3732,13 @@ WriteLiteral(" title=\"Not Waiting for User Action\""); WriteLiteral(">\r\n"); - #line 1028 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 1030 "..\..\Views\Job\JobParts\_Subject.cshtml" #line default #line hidden - #line 1028 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 1030 "..\..\Views\Job\JobParts\_Subject.cshtml" using (Html.BeginForm(MVC.API.Job.NotWaitingForUserAction(Model.Job.Id, null, true))) { @@ -3734,14 +3746,14 @@ WriteLiteral(">\r\n"); #line default #line hidden - #line 1030 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 1032 "..\..\Views\Job\JobParts\_Subject.cshtml" Write(Html.AntiForgeryToken()); #line default #line hidden - #line 1030 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 1032 "..\..\Views\Job\JobParts\_Subject.cshtml" @@ -3758,7 +3770,7 @@ WriteLiteral(" class=\"block\""); WriteLiteral(">\r\n

    \r\n"); - #line 1035 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 1037 "..\..\Views\Job\JobParts\_Subject.cshtml" } @@ -3794,7 +3806,7 @@ WriteLiteral(">\r\n $(function () {\r\n " });\r\n \r\n"); - #line 1069 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 1071 "..\..\Views\Job\JobParts\_Subject.cshtml" } @@ -3803,7 +3815,7 @@ WriteLiteral(">\r\n $(function () {\r\n WriteLiteral("\r\n \r\n"); - #line 1072 "..\..\Views\Job\JobParts\_Subject.cshtml" + #line 1074 "..\..\Views\Job\JobParts\_Subject.cshtml" } diff --git a/Disco.Web/Views/User/Show.cshtml b/Disco.Web/Views/User/Show.cshtml index f1b7136a..2ac28fb0 100644 --- a/Disco.Web/Views/User/Show.cshtml +++ b/Disco.Web/Views/User/Show.cshtml @@ -22,8 +22,9 @@ { - @flag.Item2.flag.Name@if (flag.Item1.Comments != null) - {@flag.Item1.Comments.ToHtmlComment()}@CommonHelpers.FriendlyDateAndUser(flag.Item1.AddedDate, flag.Item1.AddedUser) + @flag.Item2.flag.Name + @if (flag.Item1.Comments != null) {@flag.Item1.Comments.ToHtmlComment()} + @CommonHelpers.FriendlyDateAndUser(flag.Item1.AddedDate, flag.Item1.AddedUser) } diff --git a/Disco.Web/Views/User/Show.generated.cs b/Disco.Web/Views/User/Show.generated.cs index 48c3dd8a..f356074e 100644 --- a/Disco.Web/Views/User/Show.generated.cs +++ b/Disco.Web/Views/User/Show.generated.cs @@ -161,12 +161,17 @@ WriteLiteral(">"); #line default #line hidden -WriteLiteral(""); +WriteLiteral("\r\n"); - #line 25 "..\..\Views\User\Show.cshtml" - if (flag.Item1.Comments != null) - { + #line 26 "..\..\Views\User\Show.cshtml" + + + #line default + #line hidden + + #line 26 "..\..\Views\User\Show.cshtml" + if (flag.Item1.Comments != null) { #line default #line hidden @@ -178,7 +183,7 @@ WriteLiteral(">"); #line 26 "..\..\Views\User\Show.cshtml" - Write(flag.Item1.Comments.ToHtmlComment()); + Write(flag.Item1.Comments.ToHtmlComment()); #line default @@ -187,19 +192,20 @@ WriteLiteral(""); #line 26 "..\..\Views\User\Show.cshtml" - } + } + #line default #line hidden -WriteLiteral(""); - #line 26 "..\..\Views\User\Show.cshtml" - Write(CommonHelpers.FriendlyDateAndUser(flag.Item1.AddedDate, flag.Item1.AddedUser)); + #line 27 "..\..\Views\User\Show.cshtml" + Write(CommonHelpers.FriendlyDateAndUser(flag.Item1.AddedDate, flag.Item1.AddedUser)); #line default @@ -207,7 +213,7 @@ WriteLiteral(">"); WriteLiteral("\r\n \r\n \r\n"); - #line 29 "..\..\Views\User\Show.cshtml" + #line 30 "..\..\Views\User\Show.cshtml" } } @@ -254,7 +260,7 @@ WriteLiteral(@"> "); - #line 63 "..\..\Views\User\Show.cshtml" + #line 64 "..\..\Views\User\Show.cshtml" } @@ -263,7 +269,7 @@ WriteLiteral(@"> WriteLiteral(" "); - #line 64 "..\..\Views\User\Show.cshtml" + #line 65 "..\..\Views\User\Show.cshtml" Write(Html.Partial(MVC.User.Views.UserParts._Subject, Model)); @@ -303,13 +309,13 @@ WriteLiteral(" id=\"UserDetailTabItems\""); WriteLiteral(">\r\n"); - #line 100 "..\..\Views\User\Show.cshtml" + #line 101 "..\..\Views\User\Show.cshtml" #line default #line hidden - #line 100 "..\..\Views\User\Show.cshtml" + #line 101 "..\..\Views\User\Show.cshtml" if (Authorization.HasAny(Claims.User.ShowComments, Claims.User.ShowJobs)) { @@ -317,14 +323,14 @@ WriteLiteral(">\r\n"); #line default #line hidden - #line 102 "..\..\Views\User\Show.cshtml" + #line 103 "..\..\Views\User\Show.cshtml" Write(Html.Partial(MVC.User.Views.UserParts._CommentsAndJobs, Model)); #line default #line hidden - #line 102 "..\..\Views\User\Show.cshtml" + #line 103 "..\..\Views\User\Show.cshtml" } @@ -334,7 +340,7 @@ WriteLiteral(">\r\n"); WriteLiteral(" "); - #line 104 "..\..\Views\User\Show.cshtml" + #line 105 "..\..\Views\User\Show.cshtml" if (Authorization.Has(Claims.User.ShowAssignmentHistory)) { @@ -342,14 +348,14 @@ WriteLiteral(" "); #line default #line hidden - #line 106 "..\..\Views\User\Show.cshtml" + #line 107 "..\..\Views\User\Show.cshtml" Write(Html.Partial(MVC.User.Views.UserParts._AssignmentHistory, Model)); #line default #line hidden - #line 106 "..\..\Views\User\Show.cshtml" + #line 107 "..\..\Views\User\Show.cshtml" } @@ -359,7 +365,7 @@ WriteLiteral(" "); WriteLiteral(" "); - #line 108 "..\..\Views\User\Show.cshtml" + #line 109 "..\..\Views\User\Show.cshtml" if (Authorization.Has(Claims.User.ShowAttachments)) { @@ -367,14 +373,14 @@ WriteLiteral(" "); #line default #line hidden - #line 110 "..\..\Views\User\Show.cshtml" + #line 111 "..\..\Views\User\Show.cshtml" Write(Html.Partial(MVC.User.Views.UserParts._Resources, Model)); #line default #line hidden - #line 110 "..\..\Views\User\Show.cshtml" + #line 111 "..\..\Views\User\Show.cshtml" } @@ -384,7 +390,7 @@ WriteLiteral(" "); WriteLiteral(" "); - #line 112 "..\..\Views\User\Show.cshtml" + #line 113 "..\..\Views\User\Show.cshtml" if (Authorization.Has(Claims.User.ShowFlagAssignments) || Model.User.UserFlagAssignments.CanShowAny()) { @@ -392,14 +398,14 @@ WriteLiteral(" "); #line default #line hidden - #line 114 "..\..\Views\User\Show.cshtml" + #line 115 "..\..\Views\User\Show.cshtml" Write(Html.Partial(MVC.User.Views.UserParts._Flags, Model)); #line default #line hidden - #line 114 "..\..\Views\User\Show.cshtml" + #line 115 "..\..\Views\User\Show.cshtml" } @@ -409,7 +415,7 @@ WriteLiteral(" "); WriteLiteral(" "); - #line 116 "..\..\Views\User\Show.cshtml" + #line 117 "..\..\Views\User\Show.cshtml" if (Authorization.Has(Claims.User.ShowAuthorization)) { @@ -417,14 +423,14 @@ WriteLiteral(" "); #line default #line hidden - #line 118 "..\..\Views\User\Show.cshtml" + #line 119 "..\..\Views\User\Show.cshtml" Write(Html.Partial(MVC.User.Views.UserParts._Authorization, Model)); #line default #line hidden - #line 118 "..\..\Views\User\Show.cshtml" + #line 119 "..\..\Views\User\Show.cshtml" } @@ -434,13 +440,13 @@ WriteLiteral(" "); WriteLiteral(" \r\n"); - #line 121 "..\..\Views\User\Show.cshtml" + #line 122 "..\..\Views\User\Show.cshtml" #line default #line hidden - #line 121 "..\..\Views\User\Show.cshtml" + #line 122 "..\..\Views\User\Show.cshtml" if (requiresLive) { @@ -478,7 +484,7 @@ WriteLiteral(" \r\n"); - #line 168 "..\..\Views\User\Show.cshtml" + #line 169 "..\..\Views\User\Show.cshtml" } diff --git a/Disco.Web/Views/User/UserParts/_Subject.cshtml b/Disco.Web/Views/User/UserParts/_Subject.cshtml index 9fa59f7b..25f9c05b 100644 --- a/Disco.Web/Views/User/UserParts/_Subject.cshtml +++ b/Disco.Web/Views/User/UserParts/_Subject.cshtml @@ -481,8 +481,9 @@ { - @flag.Item2.flag.Name@if (flag.Item1.Comments != null) - {@flag.Item1.Comments.ToHtmlComment()}@CommonHelpers.FriendlyDateAndUser(flag.Item1.AddedDate, flag.Item1.AddedUserId) + @flag.Item2.flag.Name + @if (flag.Item1.Comments != null) {@flag.Item1.Comments.ToHtmlComment()} + @CommonHelpers.FriendlyDateAndUser(flag.Item1.AddedDate, flag.Item1.AddedUserId) } diff --git a/Disco.Web/Views/User/UserParts/_Subject.generated.cs b/Disco.Web/Views/User/UserParts/_Subject.generated.cs index 7d4792b4..22a958ea 100644 --- a/Disco.Web/Views/User/UserParts/_Subject.generated.cs +++ b/Disco.Web/Views/User/UserParts/_Subject.generated.cs @@ -1738,12 +1738,17 @@ WriteLiteral(">"); #line default #line hidden -WriteLiteral(""); +WriteLiteral("\r\n"); - #line 484 "..\..\Views\User\UserParts\_Subject.cshtml" - if (flag.Item1.Comments != null) - { + #line 485 "..\..\Views\User\UserParts\_Subject.cshtml" + + + #line default + #line hidden + + #line 485 "..\..\Views\User\UserParts\_Subject.cshtml" + if (flag.Item1.Comments != null) { #line default #line hidden @@ -1755,7 +1760,7 @@ WriteLiteral(">"); #line 485 "..\..\Views\User\UserParts\_Subject.cshtml" - Write(flag.Item1.Comments.ToHtmlComment()); + Write(flag.Item1.Comments.ToHtmlComment()); #line default @@ -1764,19 +1769,21 @@ WriteLiteral(""); #line 485 "..\..\Views\User\UserParts\_Subject.cshtml" - } + } + #line default #line hidden -WriteLiteral(""); - #line 485 "..\..\Views\User\UserParts\_Subject.cshtml" - Write(CommonHelpers.FriendlyDateAndUser(flag.Item1.AddedDate, flag.Item1.AddedUserId)); + #line 486 "..\..\Views\User\UserParts\_Subject.cshtml" + Write(CommonHelpers.FriendlyDateAndUser(flag.Item1.AddedDate, flag.Item1.AddedUserId)); #line default @@ -1786,7 +1793,7 @@ WriteLiteral("\r\n " \r\n"); - #line 488 "..\..\Views\User\UserParts\_Subject.cshtml" + #line 489 "..\..\Views\User\UserParts\_Subject.cshtml" } } @@ -1840,7 +1847,7 @@ WriteLiteral(">\r\n " \r\n"); - #line 523 "..\..\Views\User\UserParts\_Subject.cshtml" + #line 524 "..\..\Views\User\UserParts\_Subject.cshtml" } @@ -1851,7 +1858,7 @@ WriteLiteral(" \r\n " \r\n"); - #line 528 "..\..\Views\User\UserParts\_Subject.cshtml" + #line 529 "..\..\Views\User\UserParts\_Subject.cshtml" } } else @@ -1867,7 +1874,7 @@ WriteLiteral(" class=\"smallMessage\""); WriteLiteral(">No Current Device Assignments\r\n"); - #line 533 "..\..\Views\User\UserParts\_Subject.cshtml" + #line 534 "..\..\Views\User\UserParts\_Subject.cshtml" } @@ -1877,7 +1884,7 @@ WriteLiteral(" \r\n \r\n "\r\n"); - #line 537 "..\..\Views\User\UserParts\_Subject.cshtml" + #line 538 "..\..\Views\User\UserParts\_Subject.cshtml" } diff --git a/Disco.Web/Views/User/_UserTable.cshtml b/Disco.Web/Views/User/_UserTable.cshtml index b59925b7..6191048f 100644 --- a/Disco.Web/Views/User/_UserTable.cshtml +++ b/Disco.Web/Views/User/_UserTable.cshtml @@ -51,8 +51,9 @@ { - @flag.Item2.flag.Name@if (flag.Item1.Comments != null) - {@flag.Item1.Comments.ToHtmlComment()}@CommonHelpers.FriendlyDateAndUser(flag.Item1.AddedDate, flag.Item1.AddedUserId) + @flag.Item2.flag.Name + @if (flag.Item1.Comments != null) {@flag.Item1.Comments.ToHtmlComment()} + @CommonHelpers.FriendlyDateAndUser(flag.Item1.AddedDate, flag.Item1.AddedUserId) } diff --git a/Disco.Web/Views/User/_UserTable.generated.cs b/Disco.Web/Views/User/_UserTable.generated.cs index 6c07dcb4..7cd036b8 100644 --- a/Disco.Web/Views/User/_UserTable.generated.cs +++ b/Disco.Web/Views/User/_UserTable.generated.cs @@ -242,12 +242,17 @@ WriteLiteral(">"); #line default #line hidden -WriteLiteral(""); +WriteLiteral("\r\n"); - #line 54 "..\..\Views\User\_UserTable.cshtml" - if (flag.Item1.Comments != null) - { + #line 55 "..\..\Views\User\_UserTable.cshtml" + + + #line default + #line hidden + + #line 55 "..\..\Views\User\_UserTable.cshtml" + if (flag.Item1.Comments != null) { #line default #line hidden @@ -259,7 +264,7 @@ WriteLiteral(">"); #line 55 "..\..\Views\User\_UserTable.cshtml" - Write(flag.Item1.Comments.ToHtmlComment()); + Write(flag.Item1.Comments.ToHtmlComment()); #line default @@ -268,19 +273,20 @@ WriteLiteral(""); #line 55 "..\..\Views\User\_UserTable.cshtml" - } + } + #line default #line hidden -WriteLiteral(""); - #line 55 "..\..\Views\User\_UserTable.cshtml" - Write(CommonHelpers.FriendlyDateAndUser(flag.Item1.AddedDate, flag.Item1.AddedUserId)); + #line 56 "..\..\Views\User\_UserTable.cshtml" + Write(CommonHelpers.FriendlyDateAndUser(flag.Item1.AddedDate, flag.Item1.AddedUserId)); #line default @@ -289,7 +295,7 @@ WriteLiteral("\r\n " \r\n"); - #line 58 "..\..\Views\User\_UserTable.cshtml" + #line 59 "..\..\Views\User\_UserTable.cshtml" } } @@ -299,7 +305,7 @@ WriteLiteral("\r\n WriteLiteral(" \r\n"); - #line 61 "..\..\Views\User\_UserTable.cshtml" + #line 62 "..\..\Views\User\_UserTable.cshtml" } @@ -310,7 +316,7 @@ WriteLiteral(" \r\n \r\n" WriteLiteral(" "); - #line 64 "..\..\Views\User\_UserTable.cshtml" + #line 65 "..\..\Views\User\_UserTable.cshtml" Write(item.Surname); @@ -321,7 +327,7 @@ WriteLiteral("\r\n \r\n \ WriteLiteral(" "); - #line 67 "..\..\Views\User\_UserTable.cshtml" + #line 68 "..\..\Views\User\_UserTable.cshtml" Write(item.GivenName); @@ -332,7 +338,7 @@ WriteLiteral("\r\n \r\n \ WriteLiteral(" "); - #line 70 "..\..\Views\User\_UserTable.cshtml" + #line 71 "..\..\Views\User\_UserTable.cshtml" Write(item.DisplayName); @@ -343,7 +349,7 @@ WriteLiteral("\r\n \r\n \ WriteLiteral(" "); - #line 73 "..\..\Views\User\_UserTable.cshtml" + #line 74 "..\..\Views\User\_UserTable.cshtml" Write(item.AssignedDevicesCount); @@ -354,7 +360,7 @@ WriteLiteral("\r\n \r\n \ WriteLiteral(" "); - #line 76 "..\..\Views\User\_UserTable.cshtml" + #line 77 "..\..\Views\User\_UserTable.cshtml" Write(item.JobCountOpen); @@ -363,7 +369,7 @@ WriteLiteral(" "); WriteLiteral(" "); - #line 76 "..\..\Views\User\_UserTable.cshtml" + #line 77 "..\..\Views\User\_UserTable.cshtml" if (item.JobCount > item.JobCountOpen) { @@ -377,7 +383,7 @@ WriteLiteral(" class=\"smallMessage\""); WriteLiteral(">("); - #line 78 "..\..\Views\User\_UserTable.cshtml" + #line 79 "..\..\Views\User\_UserTable.cshtml" Write(item.JobCount - item.JobCountOpen); @@ -386,7 +392,7 @@ WriteLiteral(">("); WriteLiteral(" Closed)\r\n"); - #line 79 "..\..\Views\User\_UserTable.cshtml" + #line 80 "..\..\Views\User\_UserTable.cshtml" } @@ -395,7 +401,7 @@ WriteLiteral(" Closed)\r\n"); WriteLiteral(" \r\n \r\n"); - #line 82 "..\..\Views\User\_UserTable.cshtml" + #line 83 "..\..\Views\User\_UserTable.cshtml" } @@ -430,7 +436,7 @@ WriteLiteral(">\r\n $(function () {\r\n var userTable "\n \r\n"); - #line 124 "..\..\Views\User\_UserTable.cshtml" + #line 125 "..\..\Views\User\_UserTable.cshtml" } else { @@ -445,7 +451,7 @@ WriteLiteral(" class=\"smallMessage\""); WriteLiteral(">No Users Found\r\n"); - #line 128 "..\..\Views\User\_UserTable.cshtml" + #line 129 "..\..\Views\User\_UserTable.cshtml" }