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

Bug Fix #4: Only reference jobs where device held

Browse Source
This commit is contained in:
Gary Sharp
2014-02-18 17:00:14 +11:00
parent bfa3bf1e94
commit a82e039140
4 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Disco.Models/Services/Jobs/JobLists/JobLocationReference.cs
+1 -1
View File
@@ -9,6 +9,6 @@ namespace Disco.Models.Services.Jobs.JobLists
public class JobLocationReference
{
public string Location { get; set; }
public List<JobTableItemModel> References { get; set; }
public List<JobTableStatusItemModel> References { get; set; }
}
}
Disco.Services/Jobs/JobLists/JobTableExtensions.cs
+4 -4
View File
@@ -259,9 +259,9 @@ namespace Disco.Services
return queueItems.Where(qi => usersQueues.ContainsKey(qi.QueueId));
}
public static IEnumerable<JobLocationReference> JobLocationReferences(this IEnumerable<JobTableItemModel> Items, IEnumerable<string> IncludeLocations)
public static IEnumerable<JobLocationReference> JobLocationReferences(this IEnumerable<JobTableStatusItemModel> Items, IEnumerable<string> IncludeLocations)
{
var innerItems = Items.Where(i => !string.IsNullOrWhiteSpace(i.DeviceHeldLocation));
var innerItems = Items.Where(i => !string.IsNullOrWhiteSpace(i.DeviceHeldLocation) && i.DeviceHeld.HasValue && !i.DeviceReturnedDate.HasValue);
return IncludeLocations.GroupJoin(innerItems, o => o, i => i.DeviceHeldLocation,
(i, o) => new JobLocationReference
@@ -271,9 +271,9 @@ namespace Disco.Services
},
StringComparer.InvariantCultureIgnoreCase);
}
public static IEnumerable<JobLocationReference> JobLocationReferences(this IEnumerable<JobTableItemModel> Items)
public static IEnumerable<JobLocationReference> JobLocationReferences(this IEnumerable<JobTableStatusItemModel> Items)
{
return Items.Where(i => !string.IsNullOrWhiteSpace(i.DeviceHeldLocation))
return Items.Where(i => !string.IsNullOrWhiteSpace(i.DeviceHeldLocation) && i.DeviceHeld.HasValue && !i.DeviceReturnedDate.HasValue)
.GroupBy(i => i.DeviceHeldLocation, StringComparer.InvariantCultureIgnoreCase)
.Select(i => new JobLocationReference()
{
Disco.Web/Areas/API/Controllers/JobController.cs
+2 -2
View File
@@ -2158,13 +2158,13 @@ namespace Disco.Web.Areas.API.Controllers
throw new InvalidOperationException("Unknown Location Mode Configured");
}
var locationReferences = ManagedJobList.OpenJobsTable(j => j).Items.JobLocationReferences(locations);
var locationReferences = ManagedJobList.OpenJobsTable(j => j).Items.Cast<JobTableStatusItemModel>().JobLocationReferences(locations);
var results = locationReferences.Select(locRef =>
{
string reference = null;
if (locRef.References == null && locRef.References.Count > 0)
if (locRef.References != null && locRef.References.Count > 0)
{
if (locRef.References.Count == 1)
reference = string.Format("Job {0}", locRef.References[0].JobId);
Disco.Web/Controllers/JobController.cs
+1 -1
View File
@@ -354,7 +354,7 @@ namespace Disco.Web.Controllers
{
m.LocationMode = Database.DiscoConfiguration.JobPreferences.LocationMode;
if (m.LocationMode == LocationModes.RestrictedList)
m.LocationOptions = ManagedJobList.OpenJobsTable(j => j).Items.JobLocationReferences(Database.DiscoConfiguration.JobPreferences.LocationList).ToList();
m.LocationOptions = ManagedJobList.OpenJobsTable(j => j).Items.Cast<JobTableStatusItemModel>().JobLocationReferences(Database.DiscoConfiguration.JobPreferences.LocationList).ToList();
}
// UI Extensions