server/AyaNova/DataList/AyaDataList.cs

@@ -3,6 +3,7 @@ using System.Linq;
 using System.Text;
 using AyaNova.Biz;
 using Newtonsoft.Json.Linq;
+using Microsoft.EntityFrameworkCore;
 
 namespace AyaNova.DataList
 {
@@ -44,6 +45,10 @@ namespace AyaNova.DataList
         public Newtonsoft.Json.Linq.JArray GenerateListColumnsJSONFromListView(JArray listViewArray)
         {
 
+            //custom fields handling
+            var ct = AyaNova.Util.ServiceProviderProvider.DBContext;
+            var FormCustomization = ct.FormCustom.AsNoTracking().SingleOrDefault(x => x.FormKey == AyaType.Widget.ToString());
+
             var ListViewFieldKeys = GetFieldListFromListView(listViewArray);
 
             //Generate JSON fragment to return with column definitions
@@ -71,7 +76,12 @@ namespace AyaNova.DataList
                         sb.Append(",");
                     sb.Append("{");
                     //Build required part of column definition
+                    if (!o.IsCustomField)
                         sb.Append($"\"cm\":\"{o.LtKey}\",\"dt\":{(int)o.UiFieldDataType}");
+                    else
+                    {
+                        //insert specific type for this custom field
+                    }
 
                     //Has a AyObjectType? (linkable / openable)
                     if (o.AyaObjectType != 0)

server/AyaNova/biz/AyaFormFieldDefinitions.cs

@@ -1,7 +1,4 @@
-using System.Linq;
 using System.Collections.Generic;
-using Newtonsoft.Json.Linq;
-using System.Text;
 
 namespace AyaNova.Biz
 {
@@ -15,8 +12,8 @@ namespace AyaNova.Biz
 
         //DEFINE VALID KEYS HERE
 
-        public const string WIDGET_KEY = "widget";
-        public const string USER_KEY = "user";
+        // public const string WIDGET_KEY = "widget";
+        // public const string USER_KEY = "user";
 
 
         public static List<string> AyaFormFieldDefinitionKeys
@@ -24,12 +21,13 @@ namespace AyaNova.Biz
             get
             {
                 List<string> l = new List<string>{
-                    WIDGET_KEY, USER_KEY
+                    AyaType.Widget.ToString(),AyaType.User.ToString()
                 };
                 return l;
             }
         }
 
+
         public static bool IsValidFormFieldDefinitionKey(string key)
         {
             return AyaFormFieldDefinitionKeys.Contains(key);
@@ -42,9 +40,11 @@ namespace AyaNova.Biz
             *****************************  Otherwise the hidden field can't be set and the object can't be saved EVER        
             */
             List<AyaFormFieldDefinition> l = new List<AyaFormFieldDefinition>();
-            switch (key)
+
+            if (key == AyaType.Widget.ToString())
             {
-                case WIDGET_KEY:
+
+
                 #region WIDGET_KEY
 
                 l.Add(new AyaFormFieldDefinition { LtKey = "WidgetName", FieldKey = "Name", Hideable = false });
@@ -77,9 +77,12 @@ namespace AyaNova.Biz
                 l.Add(new AyaFormFieldDefinition { LtKey = "WidgetCustom14", FieldKey = "WidgetCustom14", IsCustomField = true });
                 l.Add(new AyaFormFieldDefinition { LtKey = "WidgetCustom15", FieldKey = "WidgetCustom15", IsCustomField = true });
                 l.Add(new AyaFormFieldDefinition { LtKey = "WidgetCustom16", FieldKey = "WidgetCustom16", IsCustomField = true });
-                    break;
+                return l;
                 #endregion
-                case USER_KEY:
+            }
+
+            if (key == AyaType.User.ToString())
+            {
                 #region USER_KEY
                 l.Add(new AyaFormFieldDefinition { LtKey = "Name", FieldKey = "Name", Hideable = false });
                 l.Add(new AyaFormFieldDefinition { LtKey = "UserEmployeeNumber", FieldKey = "EmployeeNumber" });
@@ -105,15 +108,12 @@ namespace AyaNova.Biz
                 l.Add(new AyaFormFieldDefinition { LtKey = "UserCustom14", FieldKey = "UserCustom14", IsCustomField = true });
                 l.Add(new AyaFormFieldDefinition { LtKey = "UserCustom15", FieldKey = "UserCustom15", IsCustomField = true });
                 l.Add(new AyaFormFieldDefinition { LtKey = "UserCustom16", FieldKey = "UserCustom16", IsCustomField = true });
-                    break;
-                #endregion
-
-
-
-                default:
-                    throw new System.ArgumentOutOfRangeException($"AyaFormFieldDefinitions: {key} is not valid");
-            }
                 return l;
+                #endregion
+            }
+
+            throw new System.ArgumentOutOfRangeException($"AyaFormFieldDefinitions: {key} is not valid");
+
         }
 
         public static string TranslateLTCustomFieldToInternalCustomFieldName(string lTCustomFieldName)

server/AyaNova/biz/UserBiz.cs

@@ -381,7 +381,7 @@ namespace AyaNova.Biz
                 AddError(ApiErrorCode.VALIDATION_LENGTH_EXCEEDED, "EmployeeNumber", "255 max");
 
             //Any form customizations to validate?
-            var FormCustomization = await ct.FormCustom.SingleOrDefaultAsync(x => x.FormKey == AyaFormFieldDefinitions.USER_KEY);
+            var FormCustomization = await ct.FormCustom.SingleOrDefaultAsync(x => x.FormKey == AyaType.User.ToString());
             if (FormCustomization != null)
             {
                 //Yeppers, do the validation, there are two, the custom fields and the regular fields that might be set to required

server/AyaNova/biz/WidgetBiz.cs

@@ -285,7 +285,7 @@ namespace AyaNova.Biz
             }
 
             //Any form customizations to validate?
-            var FormCustomization = await ct.FormCustom.AsNoTracking().SingleOrDefaultAsync(x => x.FormKey == AyaFormFieldDefinitions.WIDGET_KEY);
+            var FormCustomization = await ct.FormCustom.AsNoTracking().SingleOrDefaultAsync(x => x.FormKey == AyaType.Widget.ToString());
             if (FormCustomization != null)
             {
                 //Yeppers, do the validation, there are two, the custom fields and the regular fields that might be set to required

server/AyaNova/util/Seeder.cs

@@ -85,7 +85,7 @@ namespace AyaNova.Util
 
                     var fc = new FormCustom()
                     {
-                        FormKey = AyaFormFieldDefinitions.WIDGET_KEY,
+                        FormKey = AyaType.Widget.ToString(),
                         Template = @"[
                                             {
                                             ""fld"": ""Notes"",