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

Feature: Job Queues

Browse Source 
Also UI style, theme and element changes
This commit is contained in:
Gary Sharp
2014-02-03 14:50:08 +11:00
parent bdb3e1e6b4
commit 3f63281dc4
212 changed files with 17334 additions and 5441 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Disco.Web/Models/Device/ShowModel.cs
+2 -1
View File
@@ -8,6 +8,7 @@ using Disco.BI.Extensions;
using Disco.Models.UI.Device;
using Disco.Web.Extensions;
using Disco.Services.Plugins;
using Disco.Models.Services.Jobs.JobLists;
namespace Disco.Web.Models.Device
{
@@ -20,7 +21,7 @@ namespace Disco.Web.Models.Device
public PluginFeatureManifest DeviceProfileCertificateProvider { get; set; }
public List<Disco.Models.Repository.DeviceBatch> DeviceBatches { get; set; }
public Disco.Models.BI.Job.JobTableModel Jobs { get; set; }
public JobTableModel Jobs { get; set; }
public List<Disco.Models.Repository.DeviceCertificate> Certificates { get; set; }
public string OrganisationUnit { get; set; }
Disco.Web/Models/Job/CreateModel.cs
+3 -7
View File
@@ -37,13 +37,11 @@ namespace Disco.Web.Models.Job
public Disco.Models.Repository.Device Device { get; set; }
public Disco.Models.Repository.User User { get; set; }
public List<Disco.Models.Repository.JobType> JobTypes { get; set; }
public List<Disco.Models.Repository.JobSubType> JobSubTypes { get; set; }
public void UpdateModel(DiscoDataContext Database)
{
if (this.JobTypes == null)
JobTypes = Database.JobTypes.ToList();
if (this.JobSubTypes == null)
JobSubTypes = Database.JobSubTypes.ToList();
JobTypes = Database.JobTypes.Include("JobSubTypes.JobQueues").ToList();
if (!string.IsNullOrEmpty(DeviceSerialNumber))
{
@@ -68,7 +66,6 @@ namespace Disco.Web.Models.Job
{
case Disco.Models.Repository.JobType.JobTypeIds.UMgmt:
JobTypes.Remove(jobType);
JobSubTypes.RemoveAll(jst => jst.JobType == jobType);
break;
default:
break;
@@ -88,7 +85,6 @@ namespace Disco.Web.Models.Job
case Disco.Models.Repository.JobType.JobTypeIds.HWar:
case Disco.Models.Repository.JobType.JobTypeIds.SImg:
JobTypes.Remove(jobType);
JobSubTypes.RemoveAll(jst => jst.JobType == jobType);
break;
default:
break;
@@ -134,7 +130,7 @@ namespace Disco.Web.Models.Job
if (SubTypes != null)
{
var subTypes = this.SubTypes;
return this.JobSubTypes.Where(m => subTypes.Contains(String.Format("{0}_{1}", m.JobTypeId, m.Id))).ToList();
return this.JobTypes.SelectMany(jt => jt.JobSubTypes).Where(m => subTypes.Contains(String.Format("{0}_{1}", m.JobTypeId, m.Id))).ToList();
}
return null;
}
Disco.Web/Models/Job/IndexModel.cs
+3 -2
View File
@@ -3,13 +3,14 @@ using System.Collections.Generic;
using System.Linq;
using System.Web;
using Disco.Models.UI.Job;
using Disco.Models.Services.Jobs.JobLists;
namespace Disco.Web.Models.Job
{
public class IndexModel : JobIndexModel
{
public Disco.Models.BI.Job.JobTableModel OpenJobs { get; set; }
public Disco.Models.BI.Job.JobTableModel LongRunningJobs { get; set; }
public JobTableModel MyJobs { get; set; }
public JobTableModel LongRunningJobs { get; set; }
public List<Disco.Models.BI.Job.Statistics.DailyOpenedClosedItem> DailyOpenedClosedStatistics { get; set; }
}
Disco.Web/Models/Job/ListModel.cs
+4 -6
View File
@@ -1,21 +1,19 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Web;
using Disco.Models.Services.Jobs.JobLists;
using Disco.Models.UI.Job;
using System.Linq;
namespace Disco.Web.Models.Job
{
public class ListModel : JobListModel
{
public string Title { get; set; }
public Disco.Models.BI.Job.JobTableModel JobTable { get; set; }
public JobTableModel JobTable { get; set; }
public string PageTitle
{
get
{
return string.Format("{0} ({1})", Title, JobTable.Items.Count);
return string.Format("{0} ({1})", Title, JobTable.Items.Count());
}
}
}
Disco.Web/Models/Job/ShowModel.cs
+1
View File
@@ -17,6 +17,7 @@ namespace Disco.Web.Models.Job
public List<Disco.Models.Repository.DocumentTemplate> AvailableDocumentTemplates { get; set; }
public List<Disco.Models.Repository.JobSubType> UpdatableJobSubTypes { get; set; }
public List<Disco.Models.Repository.JobQueue> AvailableQueues { get; set; }
public List<SelectListItem> DocumentTemplatesSelectListItems
{
Disco.Web/Models/Search/QueryModel.cs
+6 -7
View File
@@ -1,8 +1,7 @@
using Disco.Models.UI.Search;
using System;
using Disco.Models.BI.Search;
using Disco.Models.Services.Jobs.JobLists;
using Disco.Models.UI.Search;
using System.Collections.Generic;
using System.Linq;
using System.Web;
namespace Disco.Web.Models.Search
{
@@ -12,8 +11,8 @@ namespace Disco.Web.Models.Search
public string Term { get; set; }
public bool Success { get; set; }
public string ErrorMessage { get; set; }
public List<Disco.Models.BI.Search.DeviceSearchResultItem> Devices { get; set; }
public Disco.Models.BI.Job.JobTableModel Jobs { get; set; }
public List<Disco.Models.BI.Search.UserSearchResultItem> Users { get; set; }
public List<DeviceSearchResultItem> Devices { get; set; }
public JobTableModel Jobs { get; set; }
public List<UserSearchResultItem> Users { get; set; }
}
}
Disco.Web/Models/Shared/FancyTreeNode.cs
+1 -1
View File
@@ -1,4 +1,4 @@
using Disco.Models.Authorization;
using Disco.Models.Services.Authorization;
using System;
using System.Collections.Generic;
using System.Linq;
Disco.Web/Models/User/ShowModel.cs
+6 -10
View File
@@ -1,22 +1,18 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Web;
using System.Web.Mvc;
using Disco.BI;
using Disco.BI.Extensions;
using Disco.Models.Interop.ActiveDirectory;
using Disco.Models.Services.Authorization;
using Disco.Models.Services.Jobs.JobLists;
using Disco.Models.UI.User;
using Disco.Web.Extensions;
using Disco.Models.Authorization;
using Disco.Web.Models.Shared;
using System.Collections.Generic;
using System.Linq;
using System.Web.Mvc;
namespace Disco.Web.Models.User
{
public class ShowModel : UserShowModel
{
public Disco.Models.Repository.User User { get; set; }
public Disco.Models.BI.Job.JobTableModel Jobs { get; set; }
public JobTableModel Jobs { get; set; }
public List<Disco.Models.Repository.DocumentTemplate> DocumentTemplates { get; set; }
public IAuthorizationToken AuthorizationToken { get; set; }
public IClaimNavigatorItem ClaimNavigator { get; set; }