From ca3e621c363ab356f8f26040e9e25cd9af4818f9 Mon Sep 17 00:00:00 2001 From: John Cardinal Date: Thu, 15 Jul 2021 22:57:09 +0000 Subject: [PATCH] --- .../DataList/WorkOrderStatusDataList.cs | 6 ++-- server/AyaNova/util/Seeder.cs | 34 +++++++++---------- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/server/AyaNova/DataList/WorkOrderStatusDataList.cs b/server/AyaNova/DataList/WorkOrderStatusDataList.cs index 87517454..74b33112 100644 --- a/server/AyaNova/DataList/WorkOrderStatusDataList.cs +++ b/server/AyaNova/DataList/WorkOrderStatusDataList.cs @@ -10,7 +10,7 @@ namespace AyaNova.DataList SQLFrom = "from aworkorderstatus"; var RoleSet = BizRoles.GetRoleSet(DefaultListAType); AllowedRoles = RoleSet.ReadFullRecord | RoleSet.Change; - DefaultColumns = new List() { "WorkOrderStatusName", "WorkOrderStatusNotes", "Active" }; + DefaultColumns = new List() { "WorkOrderStatusName", "SelectRoles", "WorkOrderStatusRemoveRoles", "Active" }; DefaultSortBy = new Dictionary() { { "WorkOrderStatusName", "+" } }; FieldDefinitions = new List(); @@ -58,7 +58,7 @@ namespace AyaNova.DataList SqlValueColumnName = "aworkorderstatus.locked" }); - FieldDefinitions.Add(new DataListFieldDefinition + FieldDefinitions.Add(new DataListFieldDefinition { TKey = "SelectRoles", FieldKey = "SelectRoles", @@ -68,7 +68,7 @@ namespace AyaNova.DataList SqlValueColumnName = "aworkorderstatus.selectroles" }); - FieldDefinitions.Add(new DataListFieldDefinition + FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderStatusRemoveRoles", FieldKey = "WorkOrderStatusRemoveRoles", diff --git a/server/AyaNova/util/Seeder.cs b/server/AyaNova/util/Seeder.cs index 554505d4..5f3c8617 100644 --- a/server/AyaNova/util/Seeder.cs +++ b/server/AyaNova/util/Seeder.cs @@ -889,7 +889,7 @@ namespace AyaNova.Util stat.Color = "#c00000"; stat.Completed = false; stat.Locked = true; - stat.SelectRoles = AuthorizationRoles.AllInsideUserRoles; + stat.SelectRoles = AuthorizationRoles.Tech | AuthorizationRoles.TechRestricted; stat.RemoveRoles = AuthorizationRoles.Service | AuthorizationRoles.BizAdmin; stat.Notes = "Use to lock workorder and wait for approval from manager"; using (AyContext ct = ServiceProviderProvider.DBContext) @@ -913,8 +913,8 @@ namespace AyaNova.Util stat.Color = "#80ffff"; stat.Completed = false; stat.Locked = false; - stat.SelectRoles = AuthorizationRoles.AllInsideUserRoles; - stat.RemoveRoles = AuthorizationRoles.AllInsideUserRoles; + stat.SelectRoles = AuthorizationRoles.Service | AuthorizationRoles.BizAdmin | AuthorizationRoles.Tech; + stat.RemoveRoles = AuthorizationRoles.Service | AuthorizationRoles.BizAdmin | AuthorizationRoles.Tech; stat.Notes = "Waiting for technicians to be assigned to this work"; using (AyContext ct = ServiceProviderProvider.DBContext) { @@ -937,8 +937,8 @@ namespace AyaNova.Util stat.Color = "#00ff00"; stat.Completed = false; stat.Locked = false; - stat.SelectRoles = AuthorizationRoles.AllInsideUserRoles; - stat.RemoveRoles = AuthorizationRoles.AllInsideUserRoles; + stat.SelectRoles = AuthorizationRoles.Tech | AuthorizationRoles.Service | AuthorizationRoles.BizAdmin; + stat.RemoveRoles = AuthorizationRoles.Service | AuthorizationRoles.BizAdmin | AuthorizationRoles.Tech | AuthorizationRoles.TechRestricted; stat.Notes = "Scheduled / ready for service"; using (AyContext ct = ServiceProviderProvider.DBContext) { @@ -961,7 +961,7 @@ namespace AyaNova.Util stat.Color = "#ff0000"; stat.Completed = true; stat.Locked = true; - stat.SelectRoles = AuthorizationRoles.AllInsideUserRoles; + stat.SelectRoles = AuthorizationRoles.Tech | AuthorizationRoles.TechRestricted | AuthorizationRoles.Service | AuthorizationRoles.BizAdmin; stat.RemoveRoles = AuthorizationRoles.Service | AuthorizationRoles.BizAdmin; using (AyContext ct = ServiceProviderProvider.DBContext) @@ -985,8 +985,8 @@ namespace AyaNova.Util stat.Color = "#8080ff"; stat.Completed = false; stat.Locked = true; - stat.SelectRoles = AuthorizationRoles.AllInsideUserRoles; - stat.RemoveRoles = AuthorizationRoles.AllInsideUserRoles; + stat.SelectRoles = AuthorizationRoles.Tech | AuthorizationRoles.TechRestricted | AuthorizationRoles.Service | AuthorizationRoles.BizAdmin; + stat.RemoveRoles = AuthorizationRoles.Service | AuthorizationRoles.BizAdmin | AuthorizationRoles.Tech; using (AyContext ct = ServiceProviderProvider.DBContext) { WorkOrderStatusBiz biz = WorkOrderStatusBiz.GetBiz(ct); @@ -1008,8 +1008,8 @@ namespace AyaNova.Util stat.Color = "#c0c000"; stat.Completed = false; stat.Locked = false; - stat.SelectRoles = AuthorizationRoles.AllInsideUserRoles; - stat.RemoveRoles = AuthorizationRoles.AllInsideUserRoles; + stat.SelectRoles = AuthorizationRoles.Tech | AuthorizationRoles.TechRestricted | AuthorizationRoles.Service | AuthorizationRoles.BizAdmin; + stat.RemoveRoles = AuthorizationRoles.Service | AuthorizationRoles.BizAdmin | AuthorizationRoles.Tech | AuthorizationRoles.Inventory; using (AyContext ct = ServiceProviderProvider.DBContext) { WorkOrderStatusBiz biz = WorkOrderStatusBiz.GetBiz(ct); @@ -1031,8 +1031,8 @@ namespace AyaNova.Util stat.Color = "#ff00ff"; stat.Completed = false; stat.Locked = false; - stat.SelectRoles = AuthorizationRoles.AllInsideUserRoles; - stat.RemoveRoles = AuthorizationRoles.AllInsideUserRoles; + stat.SelectRoles = AuthorizationRoles.Tech | AuthorizationRoles.TechRestricted | AuthorizationRoles.Service | AuthorizationRoles.BizAdmin; + stat.RemoveRoles = AuthorizationRoles.Service | AuthorizationRoles.BizAdmin | AuthorizationRoles.Tech | AuthorizationRoles.Inventory; using (AyContext ct = ServiceProviderProvider.DBContext) { WorkOrderStatusBiz biz = WorkOrderStatusBiz.GetBiz(ct); @@ -1054,8 +1054,8 @@ namespace AyaNova.Util stat.Color = "#ffc0c0"; stat.Completed = false; stat.Locked = true; - stat.SelectRoles = AuthorizationRoles.AllInsideUserRoles; - stat.RemoveRoles = AuthorizationRoles.Sales | AuthorizationRoles.Accounting | AuthorizationRoles.Service | AuthorizationRoles.BizAdmin; + stat.SelectRoles = AuthorizationRoles.Tech | AuthorizationRoles.TechRestricted | AuthorizationRoles.Service | AuthorizationRoles.BizAdmin; + stat.RemoveRoles = AuthorizationRoles.Tech | AuthorizationRoles.Accounting | AuthorizationRoles.Service | AuthorizationRoles.BizAdmin; using (AyContext ct = ServiceProviderProvider.DBContext) { WorkOrderStatusBiz biz = WorkOrderStatusBiz.GetBiz(ct); @@ -2634,7 +2634,7 @@ namespace AyaNova.Util }; woItem.ScheduledUsers.Add(woItemScheduledUser); - woItemScheduledUser = new WorkOrderItemScheduledUser() + woItemScheduledUser = new WorkOrderItemScheduledUser() { UserId = KnownUserSubContractorId, EstimatedQuantity = 2, @@ -2644,7 +2644,7 @@ namespace AyaNova.Util woItem.ScheduledUsers.Add(woItemScheduledUser); } - if (y == 3) + if (y == 3) { //known restricted tech and subcontractor on some items woItemScheduledUser = new WorkOrderItemScheduledUser() @@ -2656,7 +2656,7 @@ namespace AyaNova.Util }; woItem.ScheduledUsers.Add(woItemScheduledUser); - woItemScheduledUser = new WorkOrderItemScheduledUser() + woItemScheduledUser = new WorkOrderItemScheduledUser() { UserId = KnownUserSubContractorRestrictedId, EstimatedQuantity = 2,