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

Update: SignalR 2.0.3 Migration; Noticeboards

Browse Source 
Migrate all SignalR 1.x Persistent Connections to SignalR 2.x Hubs.
Abstracts ScheduledTaskStatus with core interface and adds a Mock for
optional status reporting. Noticeboards rewritten (with new theme) to be
more resilient and accurate.
This commit is contained in:
Gary Sharp
2014-06-01 23:27:07 +10:00
parent f6fae26bc7
commit 4cd57f4a90
116 changed files with 9874 additions and 6462 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Disco.Web/Areas/Public/Controllers/HeldDevicesController.cs
+19 -67
View File
@@ -1,6 +1,5 @@
using Disco.Models.Repository;
using Disco.Services.Jobs.Noticeboards;
using Disco.Services.Web;
using System.Collections.Generic;
using System.Linq;
using System.Web.Mvc;
@@ -8,81 +7,32 @@ namespace Disco.Web.Areas.Public.Controllers
{
public partial class HeldDevicesController : DatabaseController
{
#region Helpers
private List<Models.HeldDevices.HeldDeviceModel> GetHeldDevices(IQueryable<Job> query)
{
var jobs = query.Where(j =>
!j.ClosedDate.HasValue &&
j.DeviceSerialNumber != null &&
((j.DeviceHeld.HasValue && !j.DeviceReturnedDate.HasValue) || j.WaitingForUserAction.HasValue)
).Select(j => new Models.HeldDevices.HeldDeviceQueryModel
{
JobId = j.Id,
DeviceSerialNumber = j.DeviceSerialNumber,
DeviceComputerName = j.Device.DeviceDomainId,
DeviceLocation = j.Device.Location,
DeviceProfileId = j.Device.DeviceProfileId,
DeviceAddressId = j.Device.DeviceProfile.DefaultOrganisationAddress,
UserId = j.Device.AssignedUserId,
UserDisplayName = j.Device.AssignedUser.DisplayName,
WaitingForUserAction = j.WaitingForUserAction.HasValue || ((j.JobMetaNonWarranty.AccountingChargeRequiredDate.HasValue || j.JobMetaNonWarranty.AccountingChargeAddedDate.HasValue) && !j.JobMetaNonWarranty.AccountingChargePaidDate.HasValue),
WaitingForUserActionSince = j.WaitingForUserAction.HasValue ? j.WaitingForUserAction : (j.JobMetaNonWarranty.AccountingChargeRequiredDate.HasValue ? j.JobMetaNonWarranty.AccountingChargeRequiredDate : j.JobMetaNonWarranty.AccountingChargeAddedDate),
ReadyForReturn = j.DeviceReadyForReturn.HasValue,
EstimatedReturnTime = j.ExpectedClosedDate,
ReadyForReturnSince = j.DeviceReadyForReturn
}).GroupBy(j => j.DeviceSerialNumber);
var thd = new List<Models.HeldDevices.HeldDeviceModel>();
foreach (var job in jobs)
{
if (job.Any(j => j.WaitingForUserAction))
{
thd.Add(job.Where(j => j.WaitingForUserAction).OrderBy(j => j.WaitingForUserActionSince).FirstOrDefault().ToUserHeldDeviceModel(Database));
}
else
{
if (job.All(j => j.ReadyForReturn))
{
thd.Add(job.FirstOrDefault().ToUserHeldDeviceModel(Database));
}
else
{
thd.Add(job.Where(j => !j.ReadyForReturn).OrderByDescending(j => j.EstimatedReturnTime).FirstOrDefault().ToUserHeldDeviceModel(Database));
}
}
}
return thd;
}
private List<Models.HeldDevices.HeldDeviceModel> GetHeldDevices()
{
return GetHeldDevices(Database.Jobs);
}
private Models.HeldDevices.HeldDeviceModel GetHeldDevice(string DeviceSerialNumber)
{
return GetHeldDevices(Database.Jobs.Where(j => j.DeviceSerialNumber == DeviceSerialNumber)).FirstOrDefault();
}
#endregion
public virtual ActionResult Index()
{
return View(GetHeldDevices());
var m = Disco.Services.Jobs.Noticeboards.HeldDevices.GetHeldDevices(Database);
return View(m);
}
public virtual ActionResult ReadyForReturnXml()
{
var readyForReturn = GetHeldDevices().Where(j => j.ReadyForReturn && !j.WaitingForUserAction).ToArray();
var readyForReturn = Disco.Services.Jobs.Noticeboards.HeldDevices.GetHeldDevices(Database)
.Where(j => j.ReadyForReturn && !j.WaitingForUserAction).Cast<HeldDeviceItem>().ToArray();
return new Extensions.XmlResult(readyForReturn);
}
public virtual ActionResult WaitingForUserActionXml()
{
var waitingForUserAction = GetHeldDevices().Where(j => j.WaitingForUserAction).ToArray();
var waitingForUserAction = Disco.Services.Jobs.Noticeboards.HeldDevices.GetHeldDevices(Database)
.Where(j => j.WaitingForUserAction).Cast<HeldDeviceItem>().ToArray();
return new Extensions.XmlResult(waitingForUserAction);
}
public virtual ActionResult HeldDevicesXml()
{
var heldDevices = GetHeldDevices().Where(j => !j.ReadyForReturn && !j.WaitingForUserAction).ToArray();
var heldDevices = Disco.Services.Jobs.Noticeboards.HeldDevices.GetHeldDevices(Database)
.Where(j => !j.ReadyForReturn && !j.WaitingForUserAction).Cast<HeldDeviceItem>().ToArray();
return new Extensions.XmlResult(heldDevices);
}
@@ -93,13 +43,15 @@ namespace Disco.Web.Areas.Public.Controllers
public virtual ActionResult HeldDevice(string id)
{
var uhd = GetHeldDevice(id);
return Json(uhd, JsonRequestBehavior.AllowGet);
var m = Disco.Services.Jobs.Noticeboards.HeldDevices.GetHeldDevice(Database, id);
return Json(m, JsonRequestBehavior.AllowGet);
}
public virtual ActionResult HeldDevices()
{
var uhd = GetHeldDevices();
return Json(uhd, JsonRequestBehavior.AllowGet);
var m = Disco.Services.Jobs.Noticeboards.HeldDevices.GetHeldDevices(Database);
return Json(m, JsonRequestBehavior.AllowGet);
}
}
}
Disco.Web/Areas/Public/Controllers/UserHeldDevicesController.cs
+19 -66
View File
@@ -1,6 +1,5 @@
using Disco.Models.Repository;
using Disco.Services.Jobs.Noticeboards;
using Disco.Services.Web;
using System.Collections.Generic;
using System.Linq;
using System.Web.Mvc;
@@ -8,79 +7,32 @@ namespace Disco.Web.Areas.Public.Controllers
{
public partial class UserHeldDevicesController : DatabaseController
{
#region Helpers
private List<Models.UserHeldDevices.UserHeldDeviceModel> GetUserHeldDevices(IQueryable<Job> query)
{
var jobs = query.Where(j =>
!j.ClosedDate.HasValue && j.Device.AssignedUserId != null &&
j.DeviceSerialNumber != null &&
((j.DeviceHeld.HasValue && !j.DeviceReturnedDate.HasValue) || j.WaitingForUserAction.HasValue)
).Select(j => new Models.UserHeldDevices.HeldJobDeviceModel
{
JobId = j.Id,
WaitingForUserAction = j.WaitingForUserAction.HasValue || ((j.JobMetaNonWarranty.AccountingChargeRequiredDate.HasValue || j.JobMetaNonWarranty.AccountingChargeAddedDate.HasValue) && !j.JobMetaNonWarranty.AccountingChargePaidDate.HasValue),
WaitingForUserActionSince = j.WaitingForUserAction.HasValue ? j.WaitingForUserAction : (j.JobMetaNonWarranty.AccountingChargeRequiredDate.HasValue ? j.JobMetaNonWarranty.AccountingChargeRequiredDate : j.JobMetaNonWarranty.AccountingChargeAddedDate),
ReadyForReturn = j.DeviceReadyForReturn.HasValue,
EstimatedReturnTime = j.ExpectedClosedDate,
ReadyForReturnSince = j.DeviceReadyForReturn,
UserId = j.Device.AssignedUserId,
UserDisplayName = j.Device.AssignedUser.DisplayName,
DeviceProfileId = j.Device.DeviceProfileId,
DeviceAddressId = j.Device.DeviceProfile.DefaultOrganisationAddress
}).GroupBy(j => j.UserId);
var thd = new List<Models.UserHeldDevices.UserHeldDeviceModel>();
foreach (var job in jobs)
{
if (job.Any(j => j.WaitingForUserAction))
{
thd.Add(job.Where(j => j.WaitingForUserAction).OrderBy(j => j.WaitingForUserActionSince).FirstOrDefault().ToUserHeldDeviceModel(Database));
}
else
{
if (job.All(j => j.ReadyForReturn))
{
thd.Add(job.FirstOrDefault().ToUserHeldDeviceModel(Database));
}
else
{
thd.Add(job.Where(j => !j.ReadyForReturn).OrderByDescending(j => j.EstimatedReturnTime).FirstOrDefault().ToUserHeldDeviceModel(Database));
}
}
}
return thd;
}
#endregion
private List<Models.UserHeldDevices.UserHeldDeviceModel> GetUserHeldDevices()
{
return GetUserHeldDevices(Database.Jobs);
}
private Models.UserHeldDevices.UserHeldDeviceModel GetUserHeldDevice(string UserId)
{
return GetUserHeldDevices(Database.Jobs.Where(j => j.Device.AssignedUserId == UserId)).FirstOrDefault();
}
public virtual ActionResult Index()
{
return View(GetUserHeldDevices());
var m = Disco.Services.Jobs.Noticeboards.HeldDevicesForUsers.GetHeldDevicesForUsers(Database);
return View(m);
}
public virtual ActionResult ReadyForReturnXml()
{
var readyForReturn = GetUserHeldDevices().Where(j => j.ReadyForReturn && !j.WaitingForUserAction).ToArray();
var readyForReturn = Disco.Services.Jobs.Noticeboards.HeldDevicesForUsers.GetHeldDevicesForUsers(Database)
.Where(j => j.ReadyForReturn && !j.WaitingForUserAction).Cast<HeldDeviceItem>().ToArray();
return new Extensions.XmlResult(readyForReturn);
}
public virtual ActionResult WaitingForUserActionXml()
{
var userHeldDevices = GetUserHeldDevices().Where(j => j.WaitingForUserAction).ToArray();
var userHeldDevices = Disco.Services.Jobs.Noticeboards.HeldDevicesForUsers.GetHeldDevicesForUsers(Database)
.Where(j => j.WaitingForUserAction).Cast<HeldDeviceItem>().ToArray();
return new Extensions.XmlResult(userHeldDevices);
}
public virtual ActionResult UserHeldDevicesXml()
{
var userHeldDevices = GetUserHeldDevices().Where(j => !j.ReadyForReturn && !j.WaitingForUserAction).ToArray();
var userHeldDevices = Disco.Services.Jobs.Noticeboards.HeldDevicesForUsers.GetHeldDevicesForUsers(Database)
.Where(j => !j.ReadyForReturn && !j.WaitingForUserAction).Cast<HeldDeviceItem>().ToArray();
return new Extensions.XmlResult(userHeldDevices);
}
@@ -91,14 +43,15 @@ namespace Disco.Web.Areas.Public.Controllers
public virtual ActionResult UserHeldDevice(string id)
{
var uhd = GetUserHeldDevice(id);
return Json(uhd, JsonRequestBehavior.AllowGet);
var m = Disco.Services.Jobs.Noticeboards.HeldDevicesForUsers.GetHeldDeviceForUsers(Database, id);
return Json(m, JsonRequestBehavior.AllowGet);
}
public virtual ActionResult UserHeldDevices()
{
var uhd = GetUserHeldDevices();
return Json(uhd, JsonRequestBehavior.AllowGet);
}
var m = Disco.Services.Jobs.Noticeboards.HeldDevicesForUsers.GetHeldDevicesForUsers(Database);
return Json(m, JsonRequestBehavior.AllowGet);
}
}
}