server/AyaNova/Controllers/FormCustomController.cs

@@ -145,7 +145,7 @@ namespace AyaNova.Api.Controllers
 
             if (!ModelState.IsValid)
                 return BadRequest(new ApiErrorResponse(ModelState));
-            return Ok(ApiOkResponse.Response(AyaObjectFields.AvailableObjectKeys, true));
+            return Ok(ApiOkResponse.Response(AyaObjectFieldDefinitions.AvailableObjectKeys, true));
         }
 
 

server/AyaNova/Controllers/ObjectFieldsController.cs

@@ -59,9 +59,9 @@ namespace AyaNova.Api.Controllers
             if (!ModelState.IsValid)
                 return BadRequest(new ApiErrorResponse(ModelState));
 
-            if (AyaObjectFields.IsValidObjectKey(objectKey))
+            if (AyaObjectFieldDefinitions.IsValidObjectKey(objectKey))
             {
-                return Ok(ApiOkResponse.Response(AyaObjectFields.ObjectFieldsList(objectKey), true));
+                return Ok(ApiOkResponse.Response(AyaObjectFieldDefinitions.ObjectFieldsList(objectKey), true));
             }
             else
             {

server/AyaNova/biz/AyaObjectFieldDefinitions.cs

@@ -15,7 +15,7 @@ namespace AyaNova.Biz
     //  - Essentially this replaces all the attribute decoration in v7 and the individual classes with objects
 
 
-    public static class AyaObjectFields
+    public static class AyaObjectFieldDefinitions
     {
 
         //DEFINE VALID KEYS HERE

server/AyaNova/biz/CustomFieldsValidator.cs

@@ -16,7 +16,7 @@ namespace AyaNova.Biz
                 return;
           
             var FormTemplate = JArray.Parse(formCustom.Template);          
-            var ThisFormCustomFieldsList = AyaObjectFields.ObjectFieldsList(formCustom.FormKey).Where(x => x.IsCustomField == true).Select(x => x.LtKey).ToList();
+            var ThisFormCustomFieldsList = AyaObjectFieldDefinitions.ObjectFieldsList(formCustom.FormKey).Where(x => x.IsCustomField == true).Select(x => x.LtKey).ToList();
 
             //If the customFields string is empty then only validation is if any of the fields are required to be filled in
             if (!hasCustomData)
@@ -52,7 +52,7 @@ namespace AyaNova.Biz
             {
 
                 //Translate the LT field key to the actual customFieldData field key
-                var InternalCustomFieldName = AyaObjectFields.TranslateLTCustomFieldToInternalCustomFieldName(iFldKey);
+                var InternalCustomFieldName = AyaObjectFieldDefinitions.TranslateLTCustomFieldToInternalCustomFieldName(iFldKey);
                 //Check if it's set to required
                 var isRequired = CustomFieldIsSetToRequired(FormTemplate, iFldKey);
 

server/AyaNova/biz/DataFilterBiz.cs

@@ -248,13 +248,13 @@ namespace AyaNova.Biz
 
 
             List<AyaFieldDefinition> FieldList = null;
-            if (!AyaObjectFields.IsValidObjectKey(inObj.ListKey))
+            if (!AyaObjectFieldDefinitions.IsValidObjectKey(inObj.ListKey))
             {
                 AddError(ApiErrorCode.VALIDATION_INVALID_VALUE, "ListKey", $"ListKey \"{inObj.ListKey}\" is empty or in-valid");
             }
             else
             {
-                FieldList = AyaObjectFields.ObjectFieldsList(inObj.ListKey);
+                FieldList = AyaObjectFieldDefinitions.ObjectFieldsList(inObj.ListKey);
             }
 
 

server/AyaNova/biz/FormCustomBiz.cs

@@ -96,7 +96,7 @@ namespace AyaNova.Biz
             }
 
             //If it doesn't exist, vet the form key name is ok by checking with this list            
-            if (!AyaObjectFields.AvailableObjectKeys.Contains(formKey))
+            if (!AyaObjectFieldDefinitions.AvailableObjectKeys.Contains(formKey))
             {
                 //Nope, whatever it is, it's not valid
                 return null;
@@ -165,7 +165,7 @@ namespace AyaNova.Biz
                 AddError(ApiErrorCode.VALIDATION_REQUIRED, "FormKey");
             else
             {
-                if (!AyaObjectFields.IsValidObjectKey(inObj.FormKey))
+                if (!AyaObjectFieldDefinitions.IsValidObjectKey(inObj.FormKey))
                 {
                     AddError(ApiErrorCode.VALIDATION_INVALID_VALUE, "FormKey");
                 }
@@ -192,7 +192,7 @@ namespace AyaNova.Biz
             if ((!PropertyHasErrors("FormKey") && !string.IsNullOrWhiteSpace(inObj.Template)))
             {
                 var ValidCustomFieldTypes = CustomFieldType.ValidCustomFieldTypes;
-                var ValidFormFields = AyaObjectFields.ObjectFieldsList(inObj.FormKey);
+                var ValidFormFields = AyaObjectFieldDefinitions.ObjectFieldsList(inObj.FormKey);
                 try
                 {
                     //Parse the json, expecting something like this:

server/AyaNova/biz/RequiredFieldsValidator.cs

@@ -18,7 +18,7 @@ namespace AyaNova.Biz
             //var OuterJson=JObject.Parse(formCustom.Template);
             var FormTemplate = JArray.Parse(formCustom.Template);
            // var FormTemplate=(JArray)OuterJson["template"];
-            var FormFields = AyaObjectFields.ObjectFieldsList(formCustom.FormKey);
+            var FormFields = AyaObjectFieldDefinitions.ObjectFieldsList(formCustom.FormKey);
             // var ThisFormNormalFieldsList = FormFields.Where(x => x.Custom == false).Select(x => x.Key).ToList();
 
             foreach (JObject jo in FormTemplate)

server/AyaNova/biz/SqlSelectBuilder.cs

@@ -20,7 +20,7 @@ namespace AyaNova.Biz
             var jtemplate = JObject.Parse(template);
 
             //get the fields list
-            var objectFieldsList = AyaObjectFields.ObjectFieldsList(objectKey);
+            var objectFieldsList = AyaObjectFieldDefinitions.ObjectFieldsList(objectKey);
 
             //convert to strings array (https://stackoverflow.com/a/33836599/8939)
             string[] templateFieldList;

server/AyaNova/biz/UserBiz.cs

@@ -191,7 +191,7 @@ namespace AyaNova.Biz
                 var TheFilter = await ct.DataFilter.FirstOrDefaultAsync(x => x.Id == pagingOptions.DataFilterId);
 
                 //BUILD WHERE AND APPEND IT
-                q = q + SqlFilterCriteriaBuilder.DataFilterToSQLCriteria(TheFilter, AyaObjectFields.ObjectFieldsList(AyaObjectFields.USER_KEY), UserId);
+                q = q + SqlFilterCriteriaBuilder.DataFilterToSQLCriteria(TheFilter, AyaObjectFieldDefinitions.ObjectFieldsList(AyaObjectFieldDefinitions.USER_KEY), UserId);
 
                 //BUILD ORDER BY AND APPEND IT
                 q = q + SqlFilterOrderByBuilder.DataFilterToSQLOrderBy(TheFilter);
@@ -252,7 +252,7 @@ namespace AyaNova.Biz
             pagingOptions.Limit = pagingOptions.Limit ?? ListOptions.DefaultLimit;
 
 
-            var ret = PickListFetcher.GetPickList(ct, UserId, pagingOptions, AyaObjectFields.ObjectFieldsList(AyaObjectFields.USER_KEY), "auser");
+            var ret = PickListFetcher.GetPickList(ct, UserId, pagingOptions, AyaObjectFieldDefinitions.ObjectFieldsList(AyaObjectFieldDefinitions.USER_KEY), "auser");
 
             var pageLinks = new PaginationLinkBuilder(Url, routeName, null, pagingOptions, ret.TotalRecordCount).PagingLinksObject();
 
@@ -531,7 +531,7 @@ namespace AyaNova.Biz
                 AddError(ApiErrorCode.VALIDATION_LENGTH_EXCEEDED, "EmployeeNumber", "255 max");
 
             //Any form customizations to validate?
-            var FormCustomization = ct.FormCustom.SingleOrDefault(x => x.FormKey == AyaObjectFields.USER_KEY);
+            var FormCustomization = ct.FormCustom.SingleOrDefault(x => x.FormKey == AyaObjectFieldDefinitions.USER_KEY);
             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

@@ -413,7 +413,7 @@ namespace AyaNova.Biz
                 ""mini"":[""widgetname"",""username"",""emailaddress""]
             }
             ";
-            var AyaObjectFieldsKey = AyaObjectFields.TEST_WIDGET_USER_EMAIL_ADDRESS_LIST_KEY;
+            var AyaObjectFieldsKey = AyaObjectFieldDefinitions.TEST_WIDGET_USER_EMAIL_ADDRESS_LIST_KEY;
 
             //BUILD THE QUERY           
             /*
@@ -440,7 +440,7 @@ namespace AyaNova.Biz
             {
                 TheFilter = await ct.DataFilter.FirstOrDefaultAsync(x => x.Id == listOptions.DataFilterId);
                 //WHERE CLAUSE - FILTER            
-                qWhere = SqlFilterCriteriaBuilder.DataFilterToSQLCriteria(TheFilter, AyaObjectFields.ObjectFieldsList(AyaObjectFieldsKey), UserId);
+                qWhere = SqlFilterCriteriaBuilder.DataFilterToSQLCriteria(TheFilter, AyaObjectFieldDefinitions.ObjectFieldsList(AyaObjectFieldsKey), UserId);
                 //ORDER BY CLAUSE - SORT 
                 //BUILD ORDER BY AND APPEND IT
                 qOrderBy = SqlFilterOrderByBuilder.DataFilterToSQLOrderBy(TheFilter);
@@ -469,7 +469,7 @@ namespace AyaNova.Biz
             //RETURN OBJECTS       
             //todo: need exact rowcount so can set up array on each row
             //need to know which index of each row is going to need the id of the next row
-                 
+
             List<List<AyaFieldData>> rows= new List<List<AyaFieldData>>();
             long totalRecordCount = 0;
 
@@ -525,11 +525,11 @@ namespace AyaNova.Biz
             string ColumnsJSON = string.Empty;
             if (listOptions.Mini)
             {
-                ColumnsJSON = AyaObjectFields.GenerateMINIListColumnsJSON(AyaType.Widget);
+                ColumnsJSON = AyaObjectFieldDefinitions.GenerateMINIListColumnsJSON(AyaType.Widget);
             }
             else
             {
-                ColumnsJSON = AyaObjectFields.GenerateListColumnsJSONFromTemplate(AyaType.Widget, AyaObjectFieldsKey, MOCK_WIDGET_USER_EMAIL_DISPLAY_TEMPLATE_JSON);
+                ColumnsJSON = AyaObjectFieldDefinitions.GenerateListColumnsJSONFromTemplate(AyaType.Widget, AyaObjectFieldsKey, MOCK_WIDGET_USER_EMAIL_DISPLAY_TEMPLATE_JSON);
             }
 
 
@@ -602,7 +602,7 @@ namespace AyaNova.Biz
             }
 
             //Any form customizations to validate?
-            var FormCustomization = ct.FormCustom.SingleOrDefault(x => x.FormKey == AyaObjectFields.WIDGET_KEY);
+            var FormCustomization = ct.FormCustom.SingleOrDefault(x => x.FormKey == AyaObjectFieldDefinitions.WIDGET_KEY);
             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

@@ -82,7 +82,7 @@ namespace AyaNova.Util
 
                     var fc = new FormCustom()
                     {
-                        FormKey = AyaObjectFields.WIDGET_KEY,
+                        FormKey = AyaObjectFieldDefinitions.WIDGET_KEY,
                         Template = @"[
                                             {
                                             ""fld"": ""WidgetNotes"",