From 9e34aa576abd232fbf9fe34176beaa853307f40d Mon Sep 17 00:00:00 2001 From: John Cardinal Date: Fri, 13 Nov 2020 23:52:31 +0000 Subject: [PATCH] --- server/AyaNova/PickList/PickListFactory.cs | 2 ++ .../PickList/WorkOrderTemplatePickList.cs | 36 +++++-------------- 2 files changed, 10 insertions(+), 28 deletions(-) diff --git a/server/AyaNova/PickList/PickListFactory.cs b/server/AyaNova/PickList/PickListFactory.cs index a4003834..97938c25 100644 --- a/server/AyaNova/PickList/PickListFactory.cs +++ b/server/AyaNova/PickList/PickListFactory.cs @@ -18,6 +18,8 @@ namespace AyaNova.PickList return new WidgetPickList() as IAyaPickList; case AyaType.User: return new UserPickList() as IAyaPickList; + case AyaType.WorkOrderTemplate: + return new WorkOrderTemplatePickList() as IAyaPickList; default: throw new System.NotImplementedException("PICKLIST NOT IMPLEMENTED"); diff --git a/server/AyaNova/PickList/WorkOrderTemplatePickList.cs b/server/AyaNova/PickList/WorkOrderTemplatePickList.cs index 9a27cedf..c970ed8d 100644 --- a/server/AyaNova/PickList/WorkOrderTemplatePickList.cs +++ b/server/AyaNova/PickList/WorkOrderTemplatePickList.cs @@ -14,16 +14,10 @@ namespace AyaNova.PickList dynamic dTemplate = new JArray(); dynamic cm = new JObject(); - cm.fld = "username"; + cm.fld = "name"; dTemplate.Add(cm); - cm = new JObject(); - cm.fld = "useremployeenumber"; - dTemplate.Add(cm); - - cm = new JObject(); - cm.fld = "usertags"; - dTemplate.Add(cm); + base.DefaultTemplate = dTemplate.ToString(Newtonsoft.Json.Formatting.None); @@ -32,35 +26,21 @@ namespace AyaNova.PickList ColumnDefinitions.Add(new AyaPickListFieldDefinition { TKey = "Active", - FieldKey = "useractive", + FieldKey = "active", ColumnDataType = UiFieldDataType.Bool, - SqlValueColumnName = "auser.active", + SqlValueColumnName = "aworkordertemplate.active", IsActiveColumn = true }); ColumnDefinitions.Add(new AyaPickListFieldDefinition { TKey = "Name", - FieldKey = "username", + FieldKey = "name", ColumnDataType = UiFieldDataType.Text, - SqlIdColumnName = "auser.id", - SqlValueColumnName = "auser.name", + SqlIdColumnName = "aworkordertemplate.id", + SqlValueColumnName = "aworkordertemplate.name", IsRowId = true }); - ColumnDefinitions.Add(new AyaPickListFieldDefinition - { - TKey = "WorkOrderTemplateEmployeeNumber", - FieldKey = "useremployeenumber", - ColumnDataType = UiFieldDataType.Text, - SqlValueColumnName = "auser.employeenumber" - }); - - ColumnDefinitions.Add(new AyaPickListFieldDefinition - { - TKey = "Tags", - FieldKey = "usertags", - ColumnDataType = UiFieldDataType.Tags, - SqlValueColumnName = "auser.tags" - }); + } }//eoc }//eons \ No newline at end of file