jessikitty/Disco
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

qol: simplify and Tuple.Create()

Browse Source
This commit is contained in:
Gary Sharp
2025-07-20 15:58:42 +10:00
parent 4c27b0ff3c
commit fd43d85778
17 changed files with 138 additions and 138 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Disco.ClientBootstrapper/FormStatus.cs
+3 -3
View File
@@ -6,7 +6,7 @@ namespace Disco.ClientBootstrapper
public partial class FormStatus : Form, IStatus
{
private delegate void dUpdateStatus(string Heading, string SubHeading, string Message, Nullable<bool> ShowProgress, Nullable<int> Progress);
private delegate void dUpdateStatus(string Heading, string SubHeading, string Message, bool? ShowProgress, int? Progress);
private dUpdateStatus mUpdateStatus;
public FormStatus()
@@ -28,7 +28,7 @@ namespace Disco.ClientBootstrapper
Program.ExitApplication();
}
public void UpdateStatus(string Heading, string SubHeading, string Message, Nullable<bool> ShowProgress = null, Nullable<int> Progress = null)
public void UpdateStatus(string Heading, string SubHeading, string Message, bool? ShowProgress = null, int? Progress = null)
{
try
{
@@ -36,7 +36,7 @@ namespace Disco.ClientBootstrapper
}
catch (Exception) { }
}
private void UpdateStatusDo(string Heading, string SubHeading, string Message, Nullable<bool> ShowProgress, Nullable<int> Progress)
private void UpdateStatusDo(string Heading, string SubHeading, string Message, bool? ShowProgress, int? Progress)
{
if (Heading != null)
if (this.labelHeading.Text != Heading)
Disco.ClientBootstrapper/Interop/WIMInterop.cs
+22 -22
View File
@@ -139,7 +139,7 @@ namespace Disco.ClientBootstrapper.Interop.WIMInterop
CreateFileAccessPrivate fileAccess = GetMappedFileAccess(access);
if (fileAccess == CreateFileAccessPrivate.Read && (!File.Exists(imageFilePath) || (CreateFileMode.OpenExisting != mode)))
{
throw new System.UnauthorizedAccessException("Read access can be specified only with OpenExisting mode or OpenAlways mode when the .wim file does not exist.");
throw new UnauthorizedAccessException("Read access can be specified only with OpenExisting mode or OpenAlways mode when the .wim file does not exist.");
}
//
@@ -150,9 +150,9 @@ namespace Disco.ClientBootstrapper.Interop.WIMInterop
m_ImageContainerHandle = NativeMethods.CreateFile(imageFilePath, (uint)fileAccess, (uint)mode);
m_WindowsImageFilePath = imageFilePath;
}
catch (System.DllNotFoundException ex)
catch (DllNotFoundException ex)
{
throw new System.DllNotFoundException(string.Format(
throw new DllNotFoundException(string.Format(
"Unable to load WIM libraries. Make sure the correct DLLs are present (Wimgapi.dll and Xmlrw.dll)."), ex.InnerException);
}
@@ -171,7 +171,7 @@ namespace Disco.ClientBootstrapper.Interop.WIMInterop
//
//Throw an exception
//
throw new System.InvalidOperationException($"Unable to open the .wim file {imageFilePath}.");
throw new InvalidOperationException($"Unable to open the .wim file {imageFilePath}.");
}
//
@@ -684,7 +684,7 @@ namespace Disco.ClientBootstrapper.Interop.WIMInterop
//
//Everything failed; throw an exception
//
throw new System.InvalidOperationException($"Unable to open/create .wim file {imageFile}. Error = {rc}");
throw new InvalidOperationException($"Unable to open/create .wim file {imageFile}. Error = {rc}");
}
return windowsImageHandle;
@@ -719,7 +719,7 @@ namespace Disco.ClientBootstrapper.Interop.WIMInterop
//
//Throw an exception
//
throw new System.InvalidOperationException($"Unable to close image handle. Error = {rc}");
throw new InvalidOperationException($"Unable to close image handle. Error = {rc}");
}
}
@@ -754,7 +754,7 @@ namespace Disco.ClientBootstrapper.Interop.WIMInterop
//
//Throw an exception
//
throw new System.InvalidOperationException($"Unable to set temporary path. Error = {rc}");
throw new InvalidOperationException($"Unable to set temporary path. Error = {rc}");
}
}
@@ -791,7 +791,7 @@ namespace Disco.ClientBootstrapper.Interop.WIMInterop
//
//Throw an exception
//
throw new System.InvalidOperationException($"Unable to load image. Error = {rc}");
throw new InvalidOperationException($"Unable to load image. Error = {rc}");
}
return hWim;
@@ -829,7 +829,7 @@ namespace Disco.ClientBootstrapper.Interop.WIMInterop
//
//Throw an exception
//
throw new System.InvalidOperationException($"Failed to capture image from {path}. Error = {rc}");
throw new InvalidOperationException($"Failed to capture image from {path}. Error = {rc}");
}
return hImage;
}
@@ -869,7 +869,7 @@ namespace Disco.ClientBootstrapper.Interop.WIMInterop
//
//Throw an exception
//
throw new System.InvalidOperationException($"Unable to get image count. Error = {rc}");
throw new InvalidOperationException($"Unable to get image count. Error = {rc}");
}
return count;
@@ -966,19 +966,19 @@ namespace Disco.ClientBootstrapper.Interop.WIMInterop
temporaryPath);
rc = Marshal.GetLastWin32Error();
}
catch (System.StackOverflowException)
catch (StackOverflowException)
{
//
//Throw an exception
//
throw new System.InvalidOperationException($"Unable to mount image {windowsImageFileName} to {mountPath}.");
throw new InvalidOperationException($"Unable to mount image {windowsImageFileName} to {mountPath}.");
}
if (status == false)
{
//
//Throw an exception
//
throw new System.InvalidOperationException($"Unable to mount image {windowsImageFileName} to {mountPath}. Error = {rc}");
throw new InvalidOperationException($"Unable to mount image {windowsImageFileName} to {mountPath}. Error = {rc}");
}
}
@@ -1015,7 +1015,7 @@ namespace Disco.ClientBootstrapper.Interop.WIMInterop
//
//Throw an exception
//
throw new System.InvalidOperationException($"Unable to apply image to {applicationPath}. Error = {rc}");
throw new InvalidOperationException($"Unable to apply image to {applicationPath}. Error = {rc}");
}
}
@@ -1055,7 +1055,7 @@ namespace Disco.ClientBootstrapper.Interop.WIMInterop
//
//Throw an exception
//
throw new System.InvalidOperationException($"Unable to get image information. Error = {rc}");
throw new InvalidOperationException($"Unable to get image information. Error = {rc}");
}
string s = Marshal.PtrToStringUni(info);
@@ -1103,7 +1103,7 @@ namespace Disco.ClientBootstrapper.Interop.WIMInterop
//
//Throw an exception
//
throw new System.InvalidOperationException($"Unable to set image information. Error = {rc}");
throw new InvalidOperationException($"Unable to set image information. Error = {rc}");
}
}
@@ -1139,12 +1139,12 @@ namespace Disco.ClientBootstrapper.Interop.WIMInterop
status = WimUnmountImage(mountPath, wimdowsImageFileName, (uint)imageIndex, commitChanges);
rc = Marshal.GetLastWin32Error();
}
catch (System.StackOverflowException ex)
catch (StackOverflowException ex)
{
//
//Throw an exception
//
throw new System.StackOverflowException($"Unable to unmount image {wimdowsImageFileName} from {mountPath}.",
throw new StackOverflowException($"Unable to unmount image {wimdowsImageFileName} from {mountPath}.",
ex.InnerException);
}
if (status == false)
@@ -1152,7 +1152,7 @@ namespace Disco.ClientBootstrapper.Interop.WIMInterop
//
//Throw an exception
//
throw new System.InvalidOperationException($"Unable to unmount image {wimdowsImageFileName} from {mountPath}. Error = {rc}");
throw new InvalidOperationException($"Unable to unmount image {wimdowsImageFileName} from {mountPath}. Error = {rc}");
}
}
@@ -1208,7 +1208,7 @@ namespace Disco.ClientBootstrapper.Interop.WIMInterop
//
//Throw an exception
//
throw new System.InvalidOperationException("Unable to register message callback.");
throw new InvalidOperationException("Unable to register message callback.");
}
}
@@ -1240,7 +1240,7 @@ namespace Disco.ClientBootstrapper.Interop.WIMInterop
//
// Throw an exception
//
throw new System.InvalidOperationException("Unable to unregister message callback.");
throw new InvalidOperationException("Unable to unregister message callback.");
}
}
@@ -1344,7 +1344,7 @@ namespace Disco.ClientBootstrapper.Interop.WIMInterop
}
//[CLSCompliant(false)]
[FlagsAttribute]
[Flags]
private
enum
CreateFileAccessPrivate : uint
Disco.Services/Devices/DeviceModelExtensions.cs
+2 -2
View File
@@ -112,7 +112,7 @@ namespace Disco.Services
// Obtain the Device Model with the in-scope DataContext
// - Overhead acknowledged, but reasonable given the infrequency of occurrence
deviceModel = DeviceModelsSet.FirstOrDefault(dm => dm.Manufacturer == Manufacturer && dm.Model == Model);
return new Tuple<DeviceModel, bool>(deviceModel, true);
return Tuple.Create(deviceModel, true);
}
}
}
@@ -122,7 +122,7 @@ namespace Disco.Services
deviceModel.ModelType = ModelType;
}
return new Tuple<DeviceModel, bool>(deviceModel, false);
return Tuple.Create(deviceModel, false);
}
}
Disco.Services/Devices/Enrolment/LogMacAddressImportingTask.cs
+1 -1
View File
@@ -86,7 +86,7 @@ namespace Disco.Services.Devices.Enrolment
Dictionary<string, Tuple<string, string>> addresses = new Dictionary<string, Tuple<string, string>>();
foreach (var result in results.OrderBy(r => r.Timestamp))
addresses[((string)result.Arguments[1]).ToLower()] = new Tuple<string, string>((string)result.Arguments[4], (string)result.Arguments[5]);
addresses[((string)result.Arguments[1]).ToLower()] = Tuple.Create((string)result.Arguments[4], (string)result.Arguments[5]);
Status.UpdateStatus(75, $"Importing {addresses.Count} details");
Disco.Services/Documents/QRCodeBinaryEncoder.cs
+1 -1
View File
@@ -145,7 +145,7 @@ namespace Disco.Services.Documents
byte[] dataBytes = new byte[numDataBytesInBlock];
bits.toBytes(8 * dataBytesOffset, dataBytes, 0, numDataBytesInBlock);
byte[] ecBytes = generateECBytes(dataBytes, numEcBytesInBlock);
blocks.Add(new Tuple<byte[], byte[]>(dataBytes, ecBytes));
blocks.Add(Tuple.Create(dataBytes, ecBytes));
maxNumDataBytes = Math.Max(maxNumDataBytes, numDataBytesInBlock);
maxNumEcBytes = Math.Max(maxNumEcBytes, ecBytes.Length);
Disco.Services/Expressions/Expression.cs
+3 -3
View File
@@ -75,14 +75,14 @@ namespace Disco.Services.Expressions
public Tuple<string, bool, object> Evaluate(object ExpressionContext, IDictionary Variables)
{
if (Count == 0)
return new Tuple<string, bool, object>(string.Empty, false, null);
return Tuple.Create(string.Empty, false, (object)null);
if (!IsDynamic)
{
if (Count != 1)
throw new InvalidOperationException("Non-dynamic expressions should only have one part");
if (this[0] is TextExpressionPart textPart)
return new Tuple<string, bool, object>(textPart.RawSource, false, null);
return Tuple.Create(textPart.RawSource, false, (object)null);
else
throw new InvalidOperationException("Non-dynamic expressions should have a single TextExpressionPart component");
}
@@ -115,7 +115,7 @@ namespace Disco.Services.Expressions
}
}
}
return new Tuple<string, bool, object>(resultValue.ToString(), resultError, resultObject);
return Tuple.Create(resultValue.ToString(), resultError, resultObject);
}
public static Expression TokenizeSingleDynamic(string Name, string ExpressionSource, int Ordinal)
{
Disco.Services/Expressions/Extensions/ImageResultImplementations/FileMontageImageExpressionResult.cs
+1 -1
View File
@@ -208,7 +208,7 @@ namespace Disco.Services.Expressions.Extensions.ImageResultImplementations
}
}
return new Tuple<int, int, double>(bestColumnCount, bestRowCount, bestItemRatio);
return Tuple.Create(bestColumnCount, bestRowCount, bestItemRatio);
}
Disco.Services/Jobs/JobExtensions.cs
+1 -1
View File
@@ -204,7 +204,7 @@ namespace Disco.Services
public static Tuple<string, string> Status(this Job j)
{
var statusId = j.CalculateStatusId();
return new Tuple<string, string>(statusId, JobStatusDescription(statusId, j));
return Tuple.Create(statusId, JobStatusDescription(statusId, j));
}
public static List<DocumentTemplate> AvailableDocumentTemplates(this Job j, DiscoDataContext Database, User User, DateTime TimeStamp)
Disco.Services/Logging/ReadLogContext.cs
+4 -4
View File
@@ -74,7 +74,7 @@ namespace Disco.Services.Logging
private List<Tuple<string, DateTime>> RelevantLogFiles(DiscoDataContext Database)
{
List<Tuple<string, DateTime>> relevantFiles = new List<Tuple<string, DateTime>>();
var relevantFiles = new List<Tuple<string, DateTime>>();
var logDirectoryBase = LogContext.LogFileBasePath(Database);
var logDirectoryBaseInfo = new DirectoryInfo(logDirectoryBase);
var endDate = End.HasValue ? End.Value : DateTime.Now;
@@ -92,7 +92,7 @@ namespace Disco.Services.Logging
{
var fileName = LogContext.LogFilePath(Database, queryDate, false);
if (File.Exists(fileName))
relevantFiles.Add(new Tuple<string, DateTime>(fileName, LogFileDate(fileName).Value));
relevantFiles.Add(Tuple.Create(fileName, LogFileDate(fileName).Value));
queryDate = queryDate.AddDays(1);
}
@@ -118,7 +118,7 @@ namespace Disco.Services.Logging
{
foreach (var logFile in logFiles)
{
relevantFiles.Add(new Tuple<string, DateTime>(logFile, LogFileDate(logFile).Value));
relevantFiles.Add(Tuple.Create(logFile, LogFileDate(logFile).Value));
}
}
else
@@ -130,7 +130,7 @@ namespace Disco.Services.Logging
{
if (fileNameDate.Value < endDate)
{
relevantFiles.Add(new Tuple<string, DateTime>(logFile, fileNameDate.Value));
relevantFiles.Add(Tuple.Create(logFile, fileNameDate.Value));
}
else
{
Disco.Services/Plugins/PluginManifest.cs
+3 -3
View File
@@ -519,7 +519,7 @@ namespace Disco.Services.Plugins
var fileDateCheck = File.GetLastWriteTime(resourcePath);
if (fileDateCheck == resourceHash.Item2)
#endif
return new Tuple<string, string>(resourcePath, resourceHash.Item1);
return Tuple.Create(resourcePath, resourceHash.Item1);
}
if (!File.Exists(resourcePath))
@@ -532,12 +532,12 @@ namespace Disco.Services.Plugins
using (SHA256 sha = SHA256.Create())
{
byte[] hash = sha.ComputeHash(fileBytes);
resourceHash = new Tuple<string, DateTime>(HttpServerUtility.UrlTokenEncode(hash), fileDate);
resourceHash = Tuple.Create(HttpServerUtility.UrlTokenEncode(hash), fileDate);
}
}
WebResourceHashes[resourceKey] = resourceHash;
return new Tuple<string, string>(resourcePath, resourceHash.Item1);
return Tuple.Create(resourcePath, resourceHash.Item1);
}
public string WebResourceUrl(string Resource)
{
Disco.Services/Users/Cache.cs
+1 -1
View File
@@ -157,7 +157,7 @@ namespace Disco.Services.Users
{
var cache = _Cache;
var record = new Tuple<User, AuthorizationToken, DateTime>(Record.Item1, Record.Item2, DateTime.Now.AddTicks(CacheTimeoutTicks));
var record = Tuple.Create(Record.Item1, Record.Item2, DateTime.Now.AddTicks(CacheTimeoutTicks));
if (cache.ContainsKey(UserId))
{
if (cache.TryGetValue(UserId, out var oldRecord))
Disco.Web/Extensions/HtmlExtensions.cs
+5 -5
View File
@@ -81,23 +81,23 @@ namespace Disco.Web
var breadCrumbs = new List<Tuple<string, ActionResult>>();
if (title1 != null)
{
breadCrumbs.Add(new Tuple<string, ActionResult>(title1, link1));
breadCrumbs.Add(Tuple.Create(title1, link1));
}
if (title2 != null)
{
breadCrumbs.Add(new Tuple<string, ActionResult>(title2, link2));
breadCrumbs.Add(Tuple.Create(title2, link2));
}
if (title3 != null)
{
breadCrumbs.Add(new Tuple<string, ActionResult>(title3, link3));
breadCrumbs.Add(Tuple.Create(title3, link3));
}
if (title4 != null)
{
breadCrumbs.Add(new Tuple<string, ActionResult>(title4, link4));
breadCrumbs.Add(Tuple.Create(title4, link4));
}
if (title5 != null)
{
breadCrumbs.Add(new Tuple<string, ActionResult>(title5, link5));
breadCrumbs.Add(Tuple.Create(title5, link5));
}
return breadCrumbs;
Disco.Web/Models/InitialConfig/CompleteModel.cs
+2 -2
View File
@@ -24,11 +24,11 @@ namespace Disco.Web.Models.InitialConfig
try
{
// Try and Resolve 'disco'
DiscoDnsTestResult = new Tuple<IPHostEntry, Exception>(Dns.GetHostEntry("disco"), null);
DiscoDnsTestResult = Tuple.Create(Dns.GetHostEntry("disco"), (Exception)null);
}
catch (Exception ex)
{
DiscoDnsTestResult = new Tuple<IPHostEntry, Exception>(null, ex);
DiscoDnsTestResult = Tuple.Create((IPHostEntry)null, ex);
}
#endregion
Disco.Web/Views/Job/JobParts/Queues.cshtml
+1 -1
View File
@@ -11,7 +11,7 @@
var hasJobQueueShow = Authorization.Has(Claims.Config.JobQueue.Show);
var queues = JobQueueService.GetQueues();
var queueHistory = Model.Job.JobQueues.Select(jq => new Tuple<JobQueueJob, JobQueueToken>(jq, queues.First(q => q.JobQueue.Id == jq.JobQueueId))).ToList();
var queueHistory = Model.Job.JobQueues.Select(jq => Tuple.Create(jq, queues.First(q => q.JobQueue.Id == jq.JobQueueId))).ToList();
}
@if (queueHistory.Count > 0)
{
Disco.Web/Views/Job/JobParts/Queues.generated.cs
+55 -55
View File
@@ -62,7 +62,7 @@ namespace Disco.Web.Views.Job.JobParts
var hasJobQueueShow = Authorization.Has(Claims.Config.JobQueue.Show);
var queues = JobQueueService.GetQueues();
var queueHistory = Model.Job.JobQueues.Select(jq => new Tuple<JobQueueJob, JobQueueToken>(jq, queues.First(q => q.JobQueue.Id == jq.JobQueueId))).ToList();
var queueHistory = Model.Job.JobQueues.Select(jq => Tuple.Create(jq, queues.First(q => q.JobQueue.Id == jq.JobQueueId))).ToList();
#line default
@@ -138,14 +138,14 @@ WriteLiteral(" data-jobqueuejobaddeddate=\"");
#line hidden
WriteLiteral("\"");
WriteAttribute("class", Tuple.Create(" class=\"", 1371), Tuple.Create("\"", 1434)
WriteAttribute("class", Tuple.Create(" class=\"", 1346), Tuple.Create("\"", 1409)
#line 28 "..\..\Views\Job\JobParts\Queues.cshtml"
, Tuple.Create(Tuple.Create("", 1379), Tuple.Create<System.Object, System.Int32>(!jq.Item1.RemovedDate.HasValue ? "added" : "removed"
, Tuple.Create(Tuple.Create("", 1354), Tuple.Create<System.Object, System.Int32>(!jq.Item1.RemovedDate.HasValue ? "added" : "removed"
#line default
#line hidden
, 1379), false)
, 1354), false)
);
WriteLiteral(">\r\n <td");
@@ -154,26 +154,26 @@ WriteLiteral(" class=\"name\"");
WriteLiteral(">\r\n <i");
WriteAttribute("class", Tuple.Create(" class=\"", 1495), Tuple.Create("\"", 1580)
, Tuple.Create(Tuple.Create("", 1503), Tuple.Create("fa", 1503), true)
, Tuple.Create(Tuple.Create(" ", 1505), Tuple.Create("fa-", 1506), true)
WriteAttribute("class", Tuple.Create(" class=\"", 1470), Tuple.Create("\"", 1555)
, Tuple.Create(Tuple.Create("", 1478), Tuple.Create("fa", 1478), true)
, Tuple.Create(Tuple.Create(" ", 1480), Tuple.Create("fa-", 1481), true)
#line 30 "..\..\Views\Job\JobParts\Queues.cshtml"
, Tuple.Create(Tuple.Create("", 1509), Tuple.Create<System.Object, System.Int32>(jq.Item2.JobQueue.Icon
, Tuple.Create(Tuple.Create("", 1484), Tuple.Create<System.Object, System.Int32>(jq.Item2.JobQueue.Icon
#line default
#line hidden
, 1509), false)
, Tuple.Create(Tuple.Create(" ", 1534), Tuple.Create("fa-fw", 1535), true)
, Tuple.Create(Tuple.Create(" ", 1540), Tuple.Create("fa-lg", 1541), true)
, Tuple.Create(Tuple.Create(" ", 1546), Tuple.Create("d-", 1547), true)
, 1484), false)
, Tuple.Create(Tuple.Create(" ", 1509), Tuple.Create("fa-fw", 1510), true)
, Tuple.Create(Tuple.Create(" ", 1515), Tuple.Create("fa-lg", 1516), true)
, Tuple.Create(Tuple.Create(" ", 1521), Tuple.Create("d-", 1522), true)
#line 30 "..\..\Views\Job\JobParts\Queues.cshtml"
, Tuple.Create(Tuple.Create("", 1549), Tuple.Create<System.Object, System.Int32>(jq.Item2.JobQueue.IconColour
, Tuple.Create(Tuple.Create("", 1524), Tuple.Create<System.Object, System.Int32>(jq.Item2.JobQueue.IconColour
#line default
#line hidden
, 1549), false)
, 1524), false)
);
WriteLiteral("></i>\r\n");
@@ -236,28 +236,28 @@ WriteLiteral(" ");
#line hidden
WriteLiteral(" <i");
WriteAttribute("class", Tuple.Create(" class=\"", 2043), Tuple.Create("\"", 2115)
, Tuple.Create(Tuple.Create("", 2051), Tuple.Create("fa", 2051), true)
, Tuple.Create(Tuple.Create(" ", 2053), Tuple.Create("d-priority-", 2054), true)
WriteAttribute("class", Tuple.Create(" class=\"", 2018), Tuple.Create("\"", 2090)
, Tuple.Create(Tuple.Create("", 2026), Tuple.Create("fa", 2026), true)
, Tuple.Create(Tuple.Create(" ", 2028), Tuple.Create("d-priority-", 2029), true)
#line 41 "..\..\Views\Job\JobParts\Queues.cshtml"
, Tuple.Create(Tuple.Create("", 2065), Tuple.Create<System.Object, System.Int32>(jq.Item2.JobQueue.Priority.ToString().ToLower()
, Tuple.Create(Tuple.Create("", 2040), Tuple.Create<System.Object, System.Int32>(jq.Item2.JobQueue.Priority.ToString().ToLower()
#line default
#line hidden
, 2065), false)
, 2040), false)
);
WriteAttribute("title", Tuple.Create(" title=\"", 2116), Tuple.Create("\"", 2179)
WriteAttribute("title", Tuple.Create(" title=\"", 2091), Tuple.Create("\"", 2154)
#line 41 "..\..\Views\Job\JobParts\Queues.cshtml"
, Tuple.Create(Tuple.Create("", 2124), Tuple.Create<System.Object, System.Int32>(jq.Item2.JobQueue.Priority.ToString()
, Tuple.Create(Tuple.Create("", 2099), Tuple.Create<System.Object, System.Int32>(jq.Item2.JobQueue.Priority.ToString()
#line default
#line hidden
, 2124), false)
, Tuple.Create(Tuple.Create(" ", 2164), Tuple.Create("Queue", 2165), true)
, Tuple.Create(Tuple.Create(" ", 2170), Tuple.Create("Priority", 2171), true)
, 2099), false)
, Tuple.Create(Tuple.Create(" ", 2139), Tuple.Create("Queue", 2140), true)
, Tuple.Create(Tuple.Create(" ", 2145), Tuple.Create("Priority", 2146), true)
);
WriteLiteral("></i>\r\n");
@@ -381,15 +381,15 @@ WriteLiteral(">");
#line hidden
WriteLiteral("</div>\r\n </td>\r\n <td");
WriteAttribute("class", Tuple.Create(" class=\"", 3039), Tuple.Create("\"", 3102)
, Tuple.Create(Tuple.Create("", 3047), Tuple.Create("removed", 3047), true)
WriteAttribute("class", Tuple.Create(" class=\"", 3014), Tuple.Create("\"", 3077)
, Tuple.Create(Tuple.Create("", 3022), Tuple.Create("removed", 3022), true)
#line 60 "..\..\Views\Job\JobParts\Queues.cshtml"
, Tuple.Create(Tuple.Create("", 3054), Tuple.Create<System.Object, System.Int32>(!jq.Item1.RemovedDate.HasValue ? " na" : null
, Tuple.Create(Tuple.Create("", 3029), Tuple.Create<System.Object, System.Int32>(!jq.Item1.RemovedDate.HasValue ? " na" : null
#line default
#line hidden
, 3054), false)
, 3029), false)
);
WriteLiteral(">\r\n");
@@ -507,17 +507,17 @@ WriteLiteral(" <a");
WriteLiteral(" href=\"#\"");
WriteAttribute("class", Tuple.Create(" class=\"", 4103), Tuple.Create("\"", 4204)
, Tuple.Create(Tuple.Create("", 4111), Tuple.Create("button", 4111), true)
, Tuple.Create(Tuple.Create(" ", 4117), Tuple.Create("small", 4118), true)
, Tuple.Create(Tuple.Create(" ", 4123), Tuple.Create("remove", 4124), true)
WriteAttribute("class", Tuple.Create(" class=\"", 4078), Tuple.Create("\"", 4179)
, Tuple.Create(Tuple.Create("", 4086), Tuple.Create("button", 4086), true)
, Tuple.Create(Tuple.Create(" ", 4092), Tuple.Create("small", 4093), true)
, Tuple.Create(Tuple.Create(" ", 4098), Tuple.Create("remove", 4099), true)
#line 80 "..\..\Views\Job\JobParts\Queues.cshtml"
, Tuple.Create(Tuple.Create(" ", 4130), Tuple.Create<System.Object, System.Int32>(jq.Item1.CanCloseJobNormallyAfterRemoved() ? "canCloseNormally" : null
, Tuple.Create(Tuple.Create(" ", 4105), Tuple.Create<System.Object, System.Int32>(jq.Item1.CanCloseJobNormallyAfterRemoved() ? "canCloseNormally" : null
#line default
#line hidden
, 4131), false)
, 4106), false)
);
WriteLiteral(">Remove</a>\r\n");
@@ -546,29 +546,29 @@ WriteLiteral(">In Progress</span>\r\n");
#line hidden
WriteLiteral(" </td>\r\n <td");
WriteAttribute("class", Tuple.Create(" class=\"", 4426), Tuple.Create("\"", 4571)
, Tuple.Create(Tuple.Create("", 4434), Tuple.Create("sla", 4434), true)
WriteAttribute("class", Tuple.Create(" class=\"", 4401), Tuple.Create("\"", 4546)
, Tuple.Create(Tuple.Create("", 4409), Tuple.Create("sla", 4409), true)
#line 87 "..\..\Views\Job\JobParts\Queues.cshtml"
, Tuple.Create(Tuple.Create(" ", 4437), Tuple.Create<System.Object, System.Int32>(overdue ? "overdue" : null
, Tuple.Create(Tuple.Create(" ", 4412), Tuple.Create<System.Object, System.Int32>(overdue ? "overdue" : null
#line default
#line hidden
, 4438), false)
, 4413), false)
#line 87 "..\..\Views\Job\JobParts\Queues.cshtml"
, Tuple.Create(Tuple.Create(" ", 4467), Tuple.Create<System.Object, System.Int32>(jq.Item1.CanEditSla() ? "canEditSLA" : null
, Tuple.Create(Tuple.Create(" ", 4442), Tuple.Create<System.Object, System.Int32>(jq.Item1.CanEditSla() ? "canEditSLA" : null
#line default
#line hidden
, 4468), false)
, 4443), false)
#line 87 "..\..\Views\Job\JobParts\Queues.cshtml"
, Tuple.Create(Tuple.Create(" ", 4514), Tuple.Create<System.Object, System.Int32>(jq.Item1.CanEditPriority() ? "canEditPriority" : null
, Tuple.Create(Tuple.Create(" ", 4489), Tuple.Create<System.Object, System.Int32>(jq.Item1.CanEditPriority() ? "canEditPriority" : null
#line default
#line hidden
, 4515), false)
, 4490), false)
);
WriteLiteral(" data-priority=\"");
@@ -626,28 +626,28 @@ WriteLiteral("></i>\r\n");
#line hidden
WriteLiteral(" <i");
WriteAttribute("class", Tuple.Create(" class=\"", 4945), Tuple.Create("\"", 5008)
, Tuple.Create(Tuple.Create("", 4953), Tuple.Create("fa", 4953), true)
, Tuple.Create(Tuple.Create(" ", 4955), Tuple.Create("d-priority-", 4956), true)
WriteAttribute("class", Tuple.Create(" class=\"", 4920), Tuple.Create("\"", 4983)
, Tuple.Create(Tuple.Create("", 4928), Tuple.Create("fa", 4928), true)
, Tuple.Create(Tuple.Create(" ", 4930), Tuple.Create("d-priority-", 4931), true)
#line 92 "..\..\Views\Job\JobParts\Queues.cshtml"
, Tuple.Create(Tuple.Create("", 4967), Tuple.Create<System.Object, System.Int32>(jq.Item1.Priority.ToString().ToLower()
, Tuple.Create(Tuple.Create("", 4942), Tuple.Create<System.Object, System.Int32>(jq.Item1.Priority.ToString().ToLower()
#line default
#line hidden
, 4967), false)
, 4942), false)
);
WriteAttribute("title", Tuple.Create(" title=\"", 5009), Tuple.Create("\"", 5061)
WriteAttribute("title", Tuple.Create(" title=\"", 4984), Tuple.Create("\"", 5036)
#line 92 "..\..\Views\Job\JobParts\Queues.cshtml"
, Tuple.Create(Tuple.Create("", 5017), Tuple.Create<System.Object, System.Int32>(jq.Item1.Priority.ToString()
, Tuple.Create(Tuple.Create("", 4992), Tuple.Create<System.Object, System.Int32>(jq.Item1.Priority.ToString()
#line default
#line hidden
, 5017), false)
, Tuple.Create(Tuple.Create(" ", 5048), Tuple.Create("Job", 5049), true)
, Tuple.Create(Tuple.Create(" ", 5052), Tuple.Create("Priority", 5053), true)
, 4992), false)
, Tuple.Create(Tuple.Create(" ", 5023), Tuple.Create("Job", 5024), true)
, Tuple.Create(Tuple.Create(" ", 5027), Tuple.Create("Priority", 5028), true)
);
WriteLiteral("></i>\r\n");
@@ -1038,14 +1038,14 @@ WriteLiteral(">\r\n");
#line hidden
WriteLiteral(" <option");
WriteAttribute("value", Tuple.Create(" value=\"", 8844), Tuple.Create("\"", 8867)
WriteAttribute("value", Tuple.Create(" value=\"", 8819), Tuple.Create("\"", 8842)
#line 167 "..\..\Views\Job\JobParts\Queues.cshtml"
, Tuple.Create(Tuple.Create("", 8852), Tuple.Create<System.Object, System.Int32>(priorityItem
, Tuple.Create(Tuple.Create("", 8827), Tuple.Create<System.Object, System.Int32>(priorityItem
#line default
#line hidden
, 8852), false)
, 8827), false)
);
WriteLiteral(">");
Disco.Web/Views/Shared/_JobTableRender.cshtml
+1 -1
View File
@@ -71,7 +71,7 @@
<td class="status">
@if (statusItem.ActiveJobQueues != null)
{<div class="queues">
@foreach (var jqToken in ((JobTableStatusItemModel)item).ActiveJobQueues.Select(jqj => new Tuple<JobTableStatusQueueItemModel, Disco.Services.Jobs.JobQueues.JobQueueToken>(jqj, Disco.Services.Jobs.JobQueues.JobQueueService.GetQueue(jqj.QueueId))))
@foreach (var jqToken in ((JobTableStatusItemModel)item).ActiveJobQueues.Select(jqj => Tuple.Create(jqj, Disco.Services.Jobs.JobQueues.JobQueueService.GetQueue(jqj.QueueId))))
{
<i class="fa fa-@(jqToken.Item2.JobQueue.Icon) fa-fw d-@(jqToken.Item2.JobQueue.IconColour)" title="@(jqToken.Item2.JobQueue.Name) [@(jqToken.Item1.Priority)]"></i>
}
Disco.Web/Views/Shared/_JobTableRender.generated.cs
+32 -32
View File
@@ -497,7 +497,7 @@ WriteLiteral(">\r\n");
#line hidden
#line 74 "..\..\Views\Shared\_JobTableRender.cshtml"
foreach (var jqToken in ((JobTableStatusItemModel)item).ActiveJobQueues.Select(jqj => new Tuple<JobTableStatusQueueItemModel, Disco.Services.Jobs.JobQueues.JobQueueToken>(jqj, Disco.Services.Jobs.JobQueues.JobQueueService.GetQueue(jqj.QueueId))))
foreach (var jqToken in ((JobTableStatusItemModel)item).ActiveJobQueues.Select(jqj => Tuple.Create(jqj, Disco.Services.Jobs.JobQueues.JobQueueService.GetQueue(jqj.QueueId))))
{
@@ -505,44 +505,44 @@ WriteLiteral(">\r\n");
#line hidden
WriteLiteral(" <i");
WriteAttribute("class", Tuple.Create(" class=\"", 3875), Tuple.Create("\"", 3964)
, Tuple.Create(Tuple.Create("", 3883), Tuple.Create("fa", 3883), true)
, Tuple.Create(Tuple.Create(" ", 3885), Tuple.Create("fa-", 3886), true)
WriteAttribute("class", Tuple.Create(" class=\"", 3803), Tuple.Create("\"", 3892)
, Tuple.Create(Tuple.Create("", 3811), Tuple.Create("fa", 3811), true)
, Tuple.Create(Tuple.Create(" ", 3813), Tuple.Create("fa-", 3814), true)
#line 76 "..\..\Views\Shared\_JobTableRender.cshtml"
, Tuple.Create(Tuple.Create("", 3889), Tuple.Create<System.Object, System.Int32>(jqToken.Item2.JobQueue.Icon
, Tuple.Create(Tuple.Create("", 3817), Tuple.Create<System.Object, System.Int32>(jqToken.Item2.JobQueue.Icon
#line default
#line hidden
, 3889), false)
, Tuple.Create(Tuple.Create(" ", 3919), Tuple.Create("fa-fw", 3920), true)
, Tuple.Create(Tuple.Create(" ", 3925), Tuple.Create("d-", 3926), true)
, 3817), false)
, Tuple.Create(Tuple.Create(" ", 3847), Tuple.Create("fa-fw", 3848), true)
, Tuple.Create(Tuple.Create(" ", 3853), Tuple.Create("d-", 3854), true)
#line 76 "..\..\Views\Shared\_JobTableRender.cshtml"
, Tuple.Create(Tuple.Create("", 3928), Tuple.Create<System.Object, System.Int32>(jqToken.Item2.JobQueue.IconColour
, Tuple.Create(Tuple.Create("", 3856), Tuple.Create<System.Object, System.Int32>(jqToken.Item2.JobQueue.IconColour
#line default
#line hidden
, 3928), false)
, 3856), false)
);
WriteAttribute("title", Tuple.Create(" title=\"", 3965), Tuple.Create("\"", 4031)
WriteAttribute("title", Tuple.Create(" title=\"", 3893), Tuple.Create("\"", 3959)
#line 76 "..\..\Views\Shared\_JobTableRender.cshtml"
, Tuple.Create(Tuple.Create("", 3973), Tuple.Create<System.Object, System.Int32>(jqToken.Item2.JobQueue.Name
, Tuple.Create(Tuple.Create("", 3901), Tuple.Create<System.Object, System.Int32>(jqToken.Item2.JobQueue.Name
#line default
#line hidden
, 3973), false)
, Tuple.Create(Tuple.Create(" ", 4003), Tuple.Create("[", 4004), true)
, 3901), false)
, Tuple.Create(Tuple.Create(" ", 3931), Tuple.Create("[", 3932), true)
#line 76 "..\..\Views\Shared\_JobTableRender.cshtml"
, Tuple.Create(Tuple.Create("", 4005), Tuple.Create<System.Object, System.Int32>(jqToken.Item1.Priority
, Tuple.Create(Tuple.Create("", 3933), Tuple.Create<System.Object, System.Int32>(jqToken.Item1.Priority
#line default
#line hidden
, 4005), false)
, Tuple.Create(Tuple.Create("", 4030), Tuple.Create("]", 4030), true)
, 3933), false)
, Tuple.Create(Tuple.Create("", 3958), Tuple.Create("]", 3958), true)
);
WriteLiteral("></i>\r\n");
@@ -565,17 +565,17 @@ WriteLiteral(" </div>");
#line hidden
WriteLiteral(" <i");
WriteAttribute("class", Tuple.Create(" class=\"", 4153), Tuple.Create("\"", 4200)
, Tuple.Create(Tuple.Create("", 4161), Tuple.Create("fa", 4161), true)
, Tuple.Create(Tuple.Create(" ", 4163), Tuple.Create("fa-square", 4164), true)
, Tuple.Create(Tuple.Create(" ", 4173), Tuple.Create("jobStatus", 4174), true)
WriteAttribute("class", Tuple.Create(" class=\"", 4081), Tuple.Create("\"", 4128)
, Tuple.Create(Tuple.Create("", 4089), Tuple.Create("fa", 4089), true)
, Tuple.Create(Tuple.Create(" ", 4091), Tuple.Create("fa-square", 4092), true)
, Tuple.Create(Tuple.Create(" ", 4101), Tuple.Create("jobStatus", 4102), true)
#line 79 "..\..\Views\Shared\_JobTableRender.cshtml"
, Tuple.Create(Tuple.Create(" ", 4183), Tuple.Create<System.Object, System.Int32>(item.StatusId
, Tuple.Create(Tuple.Create(" ", 4111), Tuple.Create<System.Object, System.Int32>(item.StatusId
#line default
#line hidden
, 4184), false)
, 4112), false)
);
WriteLiteral("></i>&nbsp;");
@@ -701,14 +701,14 @@ WriteLiteral(" class=\"type\"");
WriteLiteral("><span");
WriteAttribute("title", Tuple.Create(" title=\"", 4895), Tuple.Create("\"", 4927)
WriteAttribute("title", Tuple.Create(" title=\"", 4823), Tuple.Create("\"", 4855)
#line 89 "..\..\Views\Shared\_JobTableRender.cshtml"
, Tuple.Create(Tuple.Create("", 4903), Tuple.Create<System.Object, System.Int32>(item.JobTypeDescription
, Tuple.Create(Tuple.Create("", 4831), Tuple.Create<System.Object, System.Int32>(item.JobTypeDescription
#line default
#line hidden
, 4903), false)
, 4831), false)
);
WriteLiteral(">");
@@ -776,14 +776,14 @@ WriteLiteral(">\r\n");
#line hidden
WriteLiteral("<span");
WriteAttribute("title", Tuple.Create(" title=\"", 5467), Tuple.Create("\"", 5503)
WriteAttribute("title", Tuple.Create(" title=\"", 5395), Tuple.Create("\"", 5431)
#line 97 "..\..\Views\Shared\_JobTableRender.cshtml"
, Tuple.Create(Tuple.Create("", 5475), Tuple.Create<System.Object, System.Int32>(item.DeviceModelDescription
, Tuple.Create(Tuple.Create("", 5403), Tuple.Create<System.Object, System.Int32>(item.DeviceModelDescription
#line default
#line hidden
, 5475), false)
, 5403), false)
);
WriteLiteral(">");
@@ -924,14 +924,14 @@ WriteLiteral(" class=\"technician\"");
WriteLiteral("><span");
WriteAttribute("title", Tuple.Create(" title=\"", 6471), Tuple.Create("\"", 6510)
WriteAttribute("title", Tuple.Create(" title=\"", 6399), Tuple.Create("\"", 6438)
#line 113 "..\..\Views\Shared\_JobTableRender.cshtml"
, Tuple.Create(Tuple.Create("", 6479), Tuple.Create<System.Object, System.Int32>(item.OpenedTechUserDisplayName
, Tuple.Create(Tuple.Create("", 6407), Tuple.Create<System.Object, System.Int32>(item.OpenedTechUserDisplayName
#line default
#line hidden
, 6479), false)
, 6407), false)
);
WriteLiteral(">");