Feature #26: User Flags

Flags can be associated with Users. Includes minor updates to Job Queues and improved visibility of user information.
2014-06-10 17:16:24 +10:00
parent b64ac3b16f
commit 4c3a68da30
104 changed files with 8112 additions and 1623 deletions
@@ -203,7 +203,7 @@ namespace Disco.Web.Controllers

            m.Device = Database.Devices
                .Include("DeviceModel").Include("DeviceProfile").Include("DeviceBatch").Include("DeviceDetails")
-                .Include("DeviceUserAssignments.AssignedUser").Include("AssignedUser").Include("DeviceCertificates")
+                .Include("DeviceUserAssignments.AssignedUser.UserFlagAssignments").Include("AssignedUser.UserFlagAssignments").Include("DeviceCertificates")
                .Include("DeviceAttachments.TechUser").Include("DeviceAttachments.DocumentTemplate")
                .FirstOrDefault(d => d.SerialNumber == id);

@@ -296,7 +296,7 @@ namespace Disco.Web.Controllers

            m.Job = Database.Jobs
                .Include("Device.DeviceModel").Include("Device.DeviceBatch").Include("DeviceHeldTechUser").Include("DeviceReadyForReturnTechUser").Include("DeviceReturnedTechUser")
-                .Include("OpenedTechUser").Include("ClosedTechUser").Include("JobType").Include("JobSubTypes").Include("User").Include("JobLogs.TechUser")
+                .Include("OpenedTechUser").Include("ClosedTechUser").Include("JobType").Include("JobSubTypes").Include("User.UserFlagAssignments").Include("JobLogs.TechUser")
                .Include("JobAttachments.TechUser").Include("JobAttachments.DocumentTemplate")
                .FirstOrDefault(j => j.Id == id.Value);

@@ -84,7 +84,7 @@ namespace Disco.Web.Controllers
                            if (vm != null)
                            {
                                m.FriendlyTerm = string.Format("Device Model: {0}", vm.ToString());
-                                m.Devices = Services.Searching.Search.SearchDeviceModel(Database, vm.Id, LimitCount: null);
+                                m.Devices = Services.Searching.Search.SearchDeviceModel(Database, vm.Id);
                                break;
                            }
                        }
@@ -101,7 +101,7 @@ namespace Disco.Web.Controllers
                            if (dp != null)
                            {
                                m.FriendlyTerm = string.Format("Device Profile: {0}", dp.ToString());
-                                m.Devices = Services.Searching.Search.SearchDeviceProfile(Database, dp.Id, LimitCount: null);
+                                m.Devices = Services.Searching.Search.SearchDeviceProfile(Database, dp.Id);
                                break;
                            }
                        }
@@ -118,7 +118,7 @@ namespace Disco.Web.Controllers
                            if (db != null)
                            {
                                m.FriendlyTerm = string.Format("Device Batch: {0}", db.ToString());
-                                m.Devices = Services.Searching.Search.SearchDeviceBatch(Database, db.Id, LimitCount: null);
+                                m.Devices = Services.Searching.Search.SearchDeviceBatch(Database, db.Id);
                                break;
                            }
                        }
@@ -232,6 +232,23 @@ namespace Disco.Web.Controllers
                                return View(m);
                            }
                        }
+                    case "userflag":
+                        Authorization.RequireAll(Claims.User.Search, Claims.User.ShowFlagAssignments);
+                        int flagId;
+                        if (int.TryParse(term, out flagId))
+                        {
+                            var flag = Database.UserFlags.Find(flagId);
+                            if (flag != null)
+                            {
+                                m.FriendlyTerm = string.Format("User Flag: {0}", flag.ToString());
+                                m.Users = Services.Searching.Search.SearchUserFlag(Database, flag.Id);
+                                break;
+                            }
+                        }
+                        m.FriendlyTerm = string.Format("User Flag: {0}", term);
+                        m.Success = false;
+                        m.ErrorMessage = "Invalid User Flag Id";
+                        break;
                }
            }

@@ -7,6 +7,7 @@ using Disco.Services.Authorization.Roles;
 using Disco.Services.Interop.ActiveDirectory;
 using Disco.Services.Plugins.Features.UIExtension;
 using Disco.Services.Users;
+using Disco.Services.Users.UserFlags;
 using Disco.Services.Web;
 using System;
 using System.Linq;
@@ -61,6 +62,8 @@ namespace Disco.Web.Controllers
                .Include("DeviceUserAssignments.Device.DeviceBatch")
                .Include("UserAttachments.TechUser")
                .Include("UserAttachments.DocumentTemplate")
+                .Include("UserFlagAssignments.AddedUser")
+                .Include("UserFlagAssignments.RemovedUser")
                .FirstOrDefault(um => um.UserId == id);

            if (m.User == null)
@@ -80,6 +83,16 @@ namespace Disco.Web.Controllers
                m.Jobs.Fill(Database, Disco.Services.Searching.Search.BuildJobTableModel(Database).Where(j => j.UserId == id).OrderByDescending(j => j.Id), true);
            }

+            if (Authorization.Has(Claims.User.ShowFlagAssignments))
+            {
+                var usedFlags = m.User.UserFlagAssignments
+                    .Where(a => !a.RemovedDate.HasValue)
+                    .Select(a => a.UserFlagId)
+                    .Distinct().ToList();
+
+                m.AvailableUserFlags = UserFlagService.GetUserFlags().Where(f => !usedFlags.Contains(f.Id)).ToList();
+            }
+
            try
            {
                if (Authorization.Has(Claims.User.ShowAuthorization))