From 8c7d5119a8d86463c64df4c1f55b05096affb7c5 Mon Sep 17 00:00:00 2001 From: John Cardinal Date: Fri, 17 Jan 2020 19:59:27 +0000 Subject: [PATCH] --- .../Controllers/FormCustomController.cs | 2 +- .../Controllers/ObjectFieldsController.cs | 4 +- server/AyaNova/biz/CustomFieldsValidator.cs | 4 +- server/AyaNova/biz/DataFilterBiz.cs | 6 +- server/AyaNova/biz/FormCustomBiz.cs | 8 +- server/AyaNova/biz/ObjectFields.cs | 128 +++++++++--------- server/AyaNova/biz/PickListFetcher.cs | 2 +- server/AyaNova/biz/RequiredFieldsValidator.cs | 4 +- .../AyaNova/biz/SqlFilterCriteriaBuilder.cs | 2 +- server/AyaNova/biz/SqlSelectBuilder.cs | 6 +- server/AyaNova/biz/UserBiz.cs | 6 +- server/AyaNova/biz/WidgetBiz.cs | 18 +-- server/AyaNova/util/Seeder.cs | 2 +- 13 files changed, 96 insertions(+), 96 deletions(-) diff --git a/server/AyaNova/Controllers/FormCustomController.cs b/server/AyaNova/Controllers/FormCustomController.cs index 2be68e88..7284aa32 100644 --- a/server/AyaNova/Controllers/FormCustomController.cs +++ b/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(ObjectFields.AvailableObjectKeys, true)); + return Ok(ApiOkResponse.Response(AyaObjectFields.AvailableObjectKeys, true)); } diff --git a/server/AyaNova/Controllers/ObjectFieldsController.cs b/server/AyaNova/Controllers/ObjectFieldsController.cs index ef2044a2..f1fc2cc8 100644 --- a/server/AyaNova/Controllers/ObjectFieldsController.cs +++ b/server/AyaNova/Controllers/ObjectFieldsController.cs @@ -59,9 +59,9 @@ namespace AyaNova.Api.Controllers if (!ModelState.IsValid) return BadRequest(new ApiErrorResponse(ModelState)); - if (ObjectFields.IsValidObjectKey(objectKey)) + if (AyaObjectFields.IsValidObjectKey(objectKey)) { - return Ok(ApiOkResponse.Response(ObjectFields.ObjectFieldsList(objectKey), true)); + return Ok(ApiOkResponse.Response(AyaObjectFields.ObjectFieldsList(objectKey), true)); } else { diff --git a/server/AyaNova/biz/CustomFieldsValidator.cs b/server/AyaNova/biz/CustomFieldsValidator.cs index 15e1e8b4..dd3dc55f 100644 --- a/server/AyaNova/biz/CustomFieldsValidator.cs +++ b/server/AyaNova/biz/CustomFieldsValidator.cs @@ -16,7 +16,7 @@ namespace AyaNova.Biz return; var FormTemplate = JArray.Parse(formCustom.Template); - var ThisFormCustomFieldsList = ObjectFields.ObjectFieldsList(formCustom.FormKey).Where(x => x.IsCustomField == true).Select(x => x.LtKey).ToList(); + var ThisFormCustomFieldsList = AyaObjectFields.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 = ObjectFields.TranslateLTCustomFieldToInternalCustomFieldName(iFldKey); + var InternalCustomFieldName = AyaObjectFields.TranslateLTCustomFieldToInternalCustomFieldName(iFldKey); //Check if it's set to required var isRequired = CustomFieldIsSetToRequired(FormTemplate, iFldKey); diff --git a/server/AyaNova/biz/DataFilterBiz.cs b/server/AyaNova/biz/DataFilterBiz.cs index 78857f6b..1f1439d3 100644 --- a/server/AyaNova/biz/DataFilterBiz.cs +++ b/server/AyaNova/biz/DataFilterBiz.cs @@ -247,14 +247,14 @@ namespace AyaNova.Biz AddError(ApiErrorCode.VALIDATION_REQUIRED, "ListKey"); - List FieldList = null; - if (!ObjectFields.IsValidObjectKey(inObj.ListKey)) + List FieldList = null; + if (!AyaObjectFields.IsValidObjectKey(inObj.ListKey)) { AddError(ApiErrorCode.VALIDATION_INVALID_VALUE, "ListKey", $"ListKey \"{inObj.ListKey}\" is empty or in-valid"); } else { - FieldList = ObjectFields.ObjectFieldsList(inObj.ListKey); + FieldList = AyaObjectFields.ObjectFieldsList(inObj.ListKey); } diff --git a/server/AyaNova/biz/FormCustomBiz.cs b/server/AyaNova/biz/FormCustomBiz.cs index b79e9296..20f6eda4 100644 --- a/server/AyaNova/biz/FormCustomBiz.cs +++ b/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 (!ObjectFields.AvailableObjectKeys.Contains(formKey)) + if (!AyaObjectFields.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 (!ObjectFields.IsValidObjectKey(inObj.FormKey)) + if (!AyaObjectFields.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 = ObjectFields.ObjectFieldsList(inObj.FormKey); + var ValidFormFields = AyaObjectFields.ObjectFieldsList(inObj.FormKey); try { //Parse the json, expecting something like this: @@ -206,7 +206,7 @@ namespace AyaNova.Biz for (int i = 0; i < v.Count; i++) { - ObjectField MasterFormField = null; + AyaField MasterFormField = null; var formFieldItem = v[i]; if (formFieldItem["fld"] == null) diff --git a/server/AyaNova/biz/ObjectFields.cs b/server/AyaNova/biz/ObjectFields.cs index c0eddab2..35b164e6 100644 --- a/server/AyaNova/biz/ObjectFields.cs +++ b/server/AyaNova/biz/ObjectFields.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 ObjectFields + public static class AyaObjectFields { //DEFINE VALID KEYS HERE @@ -42,7 +42,7 @@ namespace AyaNova.Biz return AvailableObjectKeys.Contains(key); } - public static List ObjectFieldsList(string key) + public static List ObjectFieldsList(string key) { /* ***************************** WARNING: Be careful here, if a standard field is hideable and also it's DB SCHEMA is set to NON NULLABLE then the CLIENT end needs to set a default @@ -55,7 +55,7 @@ namespace AyaNova.Biz Sortable = true; MiniAvailable = true; */ - List l = new List(); + List l = new List(); switch (key) { /* @@ -157,66 +157,66 @@ namespace AyaNova.Biz //first column is the non visible Default Id column so that the client knows what to open when there is no field with ID selected that matches underlying record type //in this case the default of id is sufficient for this list - l.Add(new ObjectField { LtKey = "df", AyaObjectType = (int)AyaType.Widget }); - l.Add(new ObjectField { LtKey = "WidgetName", FieldName = "Name", UiFieldDataType = (int)AyaUiFieldDataType.Text, Hideable = false }); - l.Add(new ObjectField { LtKey = "WidgetSerial", FieldName = "Serial", UiFieldDataType = (int)AyaUiFieldDataType.Integer }); - l.Add(new ObjectField { LtKey = "WidgetDollarAmount", FieldName = "DollarAmount", UiFieldDataType = (int)AyaUiFieldDataType.Currency }); - l.Add(new ObjectField { LtKey = "WidgetCount", FieldName = "Count", UiFieldDataType = (int)AyaUiFieldDataType.Integer }); - l.Add(new ObjectField { LtKey = "WidgetRoles", FieldName = "Roles", UiFieldDataType = (int)AyaUiFieldDataType.Enum, EnumType = typeof(AuthorizationRoles).ToString() }); - l.Add(new ObjectField { LtKey = "WidgetStartDate", FieldName = "StartDate", UiFieldDataType = (int)AyaUiFieldDataType.DateTime }); - l.Add(new ObjectField { LtKey = "WidgetEndDate", FieldName = "EndDate", UiFieldDataType = (int)AyaUiFieldDataType.DateTime }); - l.Add(new ObjectField { LtKey = "WidgetNotes", FieldName = "Notes", UiFieldDataType = (int)AyaUiFieldDataType.Text }); + l.Add(new AyaField { LtKey = "df", AyaObjectType = (int)AyaType.Widget }); + l.Add(new AyaField { LtKey = "WidgetName", FieldName = "Name", UiFieldDataType = (int)AyaUiFieldDataType.Text, Hideable = false }); + l.Add(new AyaField { LtKey = "WidgetSerial", FieldName = "Serial", UiFieldDataType = (int)AyaUiFieldDataType.Integer }); + l.Add(new AyaField { LtKey = "WidgetDollarAmount", FieldName = "DollarAmount", UiFieldDataType = (int)AyaUiFieldDataType.Currency }); + l.Add(new AyaField { LtKey = "WidgetCount", FieldName = "Count", UiFieldDataType = (int)AyaUiFieldDataType.Integer }); + l.Add(new AyaField { LtKey = "WidgetRoles", FieldName = "Roles", UiFieldDataType = (int)AyaUiFieldDataType.Enum, EnumType = typeof(AuthorizationRoles).ToString() }); + l.Add(new AyaField { LtKey = "WidgetStartDate", FieldName = "StartDate", UiFieldDataType = (int)AyaUiFieldDataType.DateTime }); + l.Add(new AyaField { LtKey = "WidgetEndDate", FieldName = "EndDate", UiFieldDataType = (int)AyaUiFieldDataType.DateTime }); + l.Add(new AyaField { LtKey = "WidgetNotes", FieldName = "Notes", UiFieldDataType = (int)AyaUiFieldDataType.Text }); //More to do on this, maybe the datatype should be a LINK or something for UI purposes //circle back on this when there is enough infrastructure to test - l.Add(new ObjectField { LtKey = "User", FieldName = "userid", UiFieldDataType = (int)AyaUiFieldDataType.Text, AyaObjectType = (int)AyaType.User }); - l.Add(new ObjectField { LtKey = "Active", FieldName = "Active", UiFieldDataType = (int)AyaUiFieldDataType.Bool, Hideable = false }); - l.Add(new ObjectField { LtKey = "Tags", FieldName = "Tags", UiFieldDataType = (int)AyaUiFieldDataType.Tags }); + l.Add(new AyaField { LtKey = "User", FieldName = "userid", UiFieldDataType = (int)AyaUiFieldDataType.Text, AyaObjectType = (int)AyaType.User }); + l.Add(new AyaField { LtKey = "Active", FieldName = "Active", UiFieldDataType = (int)AyaUiFieldDataType.Bool, Hideable = false }); + l.Add(new AyaField { LtKey = "Tags", FieldName = "Tags", UiFieldDataType = (int)AyaUiFieldDataType.Tags }); - l.Add(new ObjectField { LtKey = "WidgetCustom1", FieldName = "WidgetCustom1", IsCustomField = true }); - l.Add(new ObjectField { LtKey = "WidgetCustom2", FieldName = "WidgetCustom2", IsCustomField = true }); - l.Add(new ObjectField { LtKey = "WidgetCustom3", FieldName = "WidgetCustom3", IsCustomField = true }); - l.Add(new ObjectField { LtKey = "WidgetCustom4", FieldName = "WidgetCustom4", IsCustomField = true }); - l.Add(new ObjectField { LtKey = "WidgetCustom5", FieldName = "WidgetCustom5", IsCustomField = true }); - l.Add(new ObjectField { LtKey = "WidgetCustom6", FieldName = "WidgetCustom6", IsCustomField = true }); - l.Add(new ObjectField { LtKey = "WidgetCustom7", FieldName = "WidgetCustom7", IsCustomField = true }); - l.Add(new ObjectField { LtKey = "WidgetCustom8", FieldName = "WidgetCustom8", IsCustomField = true }); - l.Add(new ObjectField { LtKey = "WidgetCustom9", FieldName = "WidgetCustom9", IsCustomField = true }); - l.Add(new ObjectField { LtKey = "WidgetCustom10", FieldName = "WidgetCustom10", IsCustomField = true }); - l.Add(new ObjectField { LtKey = "WidgetCustom11", FieldName = "WidgetCustom11", IsCustomField = true }); - l.Add(new ObjectField { LtKey = "WidgetCustom12", FieldName = "WidgetCustom12", IsCustomField = true }); - l.Add(new ObjectField { LtKey = "WidgetCustom13", FieldName = "WidgetCustom13", IsCustomField = true }); - l.Add(new ObjectField { LtKey = "WidgetCustom14", FieldName = "WidgetCustom14", IsCustomField = true }); - l.Add(new ObjectField { LtKey = "WidgetCustom15", FieldName = "WidgetCustom15", IsCustomField = true }); - l.Add(new ObjectField { LtKey = "WidgetCustom16", FieldName = "WidgetCustom16", IsCustomField = true }); + l.Add(new AyaField { LtKey = "WidgetCustom1", FieldName = "WidgetCustom1", IsCustomField = true }); + l.Add(new AyaField { LtKey = "WidgetCustom2", FieldName = "WidgetCustom2", IsCustomField = true }); + l.Add(new AyaField { LtKey = "WidgetCustom3", FieldName = "WidgetCustom3", IsCustomField = true }); + l.Add(new AyaField { LtKey = "WidgetCustom4", FieldName = "WidgetCustom4", IsCustomField = true }); + l.Add(new AyaField { LtKey = "WidgetCustom5", FieldName = "WidgetCustom5", IsCustomField = true }); + l.Add(new AyaField { LtKey = "WidgetCustom6", FieldName = "WidgetCustom6", IsCustomField = true }); + l.Add(new AyaField { LtKey = "WidgetCustom7", FieldName = "WidgetCustom7", IsCustomField = true }); + l.Add(new AyaField { LtKey = "WidgetCustom8", FieldName = "WidgetCustom8", IsCustomField = true }); + l.Add(new AyaField { LtKey = "WidgetCustom9", FieldName = "WidgetCustom9", IsCustomField = true }); + l.Add(new AyaField { LtKey = "WidgetCustom10", FieldName = "WidgetCustom10", IsCustomField = true }); + l.Add(new AyaField { LtKey = "WidgetCustom11", FieldName = "WidgetCustom11", IsCustomField = true }); + l.Add(new AyaField { LtKey = "WidgetCustom12", FieldName = "WidgetCustom12", IsCustomField = true }); + l.Add(new AyaField { LtKey = "WidgetCustom13", FieldName = "WidgetCustom13", IsCustomField = true }); + l.Add(new AyaField { LtKey = "WidgetCustom14", FieldName = "WidgetCustom14", IsCustomField = true }); + l.Add(new AyaField { LtKey = "WidgetCustom15", FieldName = "WidgetCustom15", IsCustomField = true }); + l.Add(new AyaField { LtKey = "WidgetCustom16", FieldName = "WidgetCustom16", IsCustomField = true }); break; #endregion case USER_KEY: #region USER_KEY - l.Add(new ObjectField { LtKey = "df", AyaObjectType = (int)AyaType.User }); - l.Add(new ObjectField { LtKey = "Name", FieldName = "Name", UiFieldDataType = (int)AyaUiFieldDataType.Text, Hideable = false }); - l.Add(new ObjectField { LtKey = "UserEmployeeNumber", FieldName = "EmployeeNumber", UiFieldDataType = (int)AyaUiFieldDataType.Text }); - l.Add(new ObjectField { LtKey = "AuthorizationRoles", FieldName = "Roles", Hideable = false, UiFieldDataType = (int)AyaUiFieldDataType.Enum, EnumType = typeof(AuthorizationRoles).ToString() }); - l.Add(new ObjectField { LtKey = "UserNotes", FieldName = "Notes", UiFieldDataType = (int)AyaUiFieldDataType.Text }); - l.Add(new ObjectField { LtKey = "UserUserType", FieldName = "UserType", Hideable = false, UiFieldDataType = (int)AyaUiFieldDataType.Enum, EnumType = typeof(UserType).ToString() }); - l.Add(new ObjectField { LtKey = "Active", FieldName = "Active", UiFieldDataType = (int)AyaUiFieldDataType.Bool, Hideable = false }); - l.Add(new ObjectField { LtKey = "Tags", FieldName = "Tags", UiFieldDataType = (int)AyaUiFieldDataType.Tags }); + l.Add(new AyaField { LtKey = "df", AyaObjectType = (int)AyaType.User }); + l.Add(new AyaField { LtKey = "Name", FieldName = "Name", UiFieldDataType = (int)AyaUiFieldDataType.Text, Hideable = false }); + l.Add(new AyaField { LtKey = "UserEmployeeNumber", FieldName = "EmployeeNumber", UiFieldDataType = (int)AyaUiFieldDataType.Text }); + l.Add(new AyaField { LtKey = "AuthorizationRoles", FieldName = "Roles", Hideable = false, UiFieldDataType = (int)AyaUiFieldDataType.Enum, EnumType = typeof(AuthorizationRoles).ToString() }); + l.Add(new AyaField { LtKey = "UserNotes", FieldName = "Notes", UiFieldDataType = (int)AyaUiFieldDataType.Text }); + l.Add(new AyaField { LtKey = "UserUserType", FieldName = "UserType", Hideable = false, UiFieldDataType = (int)AyaUiFieldDataType.Enum, EnumType = typeof(UserType).ToString() }); + l.Add(new AyaField { LtKey = "Active", FieldName = "Active", UiFieldDataType = (int)AyaUiFieldDataType.Bool, Hideable = false }); + l.Add(new AyaField { LtKey = "Tags", FieldName = "Tags", UiFieldDataType = (int)AyaUiFieldDataType.Tags }); - l.Add(new ObjectField { LtKey = "UserCustom1", FieldName = "UserCustom1", IsCustomField = true }); - l.Add(new ObjectField { LtKey = "UserCustom2", FieldName = "UserCustom2", IsCustomField = true }); - l.Add(new ObjectField { LtKey = "UserCustom3", FieldName = "UserCustom3", IsCustomField = true }); - l.Add(new ObjectField { LtKey = "UserCustom4", FieldName = "UserCustom4", IsCustomField = true }); - l.Add(new ObjectField { LtKey = "UserCustom5", FieldName = "UserCustom5", IsCustomField = true }); - l.Add(new ObjectField { LtKey = "UserCustom6", FieldName = "UserCustom6", IsCustomField = true }); - l.Add(new ObjectField { LtKey = "UserCustom7", FieldName = "UserCustom7", IsCustomField = true }); - l.Add(new ObjectField { LtKey = "UserCustom8", FieldName = "UserCustom8", IsCustomField = true }); - l.Add(new ObjectField { LtKey = "UserCustom9", FieldName = "UserCustom9", IsCustomField = true }); - l.Add(new ObjectField { LtKey = "UserCustom10", FieldName = "UserCustom10", IsCustomField = true }); - l.Add(new ObjectField { LtKey = "UserCustom11", FieldName = "UserCustom11", IsCustomField = true }); - l.Add(new ObjectField { LtKey = "UserCustom12", FieldName = "UserCustom12", IsCustomField = true }); - l.Add(new ObjectField { LtKey = "UserCustom13", FieldName = "UserCustom13", IsCustomField = true }); - l.Add(new ObjectField { LtKey = "UserCustom14", FieldName = "UserCustom14", IsCustomField = true }); - l.Add(new ObjectField { LtKey = "UserCustom15", FieldName = "UserCustom15", IsCustomField = true }); - l.Add(new ObjectField { LtKey = "UserCustom16", FieldName = "UserCustom16", IsCustomField = true }); + l.Add(new AyaField { LtKey = "UserCustom1", FieldName = "UserCustom1", IsCustomField = true }); + l.Add(new AyaField { LtKey = "UserCustom2", FieldName = "UserCustom2", IsCustomField = true }); + l.Add(new AyaField { LtKey = "UserCustom3", FieldName = "UserCustom3", IsCustomField = true }); + l.Add(new AyaField { LtKey = "UserCustom4", FieldName = "UserCustom4", IsCustomField = true }); + l.Add(new AyaField { LtKey = "UserCustom5", FieldName = "UserCustom5", IsCustomField = true }); + l.Add(new AyaField { LtKey = "UserCustom6", FieldName = "UserCustom6", IsCustomField = true }); + l.Add(new AyaField { LtKey = "UserCustom7", FieldName = "UserCustom7", IsCustomField = true }); + l.Add(new AyaField { LtKey = "UserCustom8", FieldName = "UserCustom8", IsCustomField = true }); + l.Add(new AyaField { LtKey = "UserCustom9", FieldName = "UserCustom9", IsCustomField = true }); + l.Add(new AyaField { LtKey = "UserCustom10", FieldName = "UserCustom10", IsCustomField = true }); + l.Add(new AyaField { LtKey = "UserCustom11", FieldName = "UserCustom11", IsCustomField = true }); + l.Add(new AyaField { LtKey = "UserCustom12", FieldName = "UserCustom12", IsCustomField = true }); + l.Add(new AyaField { LtKey = "UserCustom13", FieldName = "UserCustom13", IsCustomField = true }); + l.Add(new AyaField { LtKey = "UserCustom14", FieldName = "UserCustom14", IsCustomField = true }); + l.Add(new AyaField { LtKey = "UserCustom15", FieldName = "UserCustom15", IsCustomField = true }); + l.Add(new AyaField { LtKey = "UserCustom16", FieldName = "UserCustom16", IsCustomField = true }); break; #endregion case TEST_WIDGET_USER_EMAIL_ADDRESS_LIST_KEY: @@ -299,17 +299,17 @@ So rename things and see what breaks I guess */ - l.Add(new ObjectField { LtKey = "df", AyaObjectType = (int)AyaType.Widget, SqlIdColumnName = "awidget.id as df" }); - l.Add(new ObjectField + l.Add(new AyaField { LtKey = "df", AyaObjectType = (int)AyaType.Widget, SqlIdColumnName = "awidget.id as df" }); + l.Add(new AyaField { LtKey = "WidgetName", FieldName = "widgetname", UiFieldDataType = (int)AyaUiFieldDataType.Text, AyaObjectType = (int)AyaType.Widget, - SqlIdColumnName = "awidget.id as widgetid", - SqlDisplayColumnName = "awidget.name as widgetname" + SqlIdColumnName = "awidget.id", + SqlDisplayColumnName = "awidget.name" }); - l.Add(new ObjectField + l.Add(new AyaField { LtKey = "User", FieldName = "username", @@ -318,7 +318,7 @@ So rename things and see what breaks I guess SqlIdColumnName = "userid", SqlDisplayColumnName = "auser.name as username" }); - l.Add(new ObjectField { LtKey = "UserEmailAddress", FieldName = "emailaddress", UiFieldDataType = (int)AyaUiFieldDataType.EmailAddress }); + l.Add(new AyaField { LtKey = "UserEmailAddress", FieldName = "emailaddress", UiFieldDataType = (int)AyaUiFieldDataType.EmailAddress }); break; #endregion @@ -372,7 +372,7 @@ So rename things and see what breaks I guess foreach (string s in fullFields) { - ObjectField o = fields.FirstOrDefault(x => x.LtKey == s); + AyaField o = fields.FirstOrDefault(x => x.LtKey == s); #if (DEBUG) //Developers little helper if (o == null) @@ -406,7 +406,7 @@ So rename things and see what breaks I guess }//eoc ObjectFields - public class ObjectField + public class AyaField { public string LtKey { get; set; } public string FieldName { get; set; } @@ -431,7 +431,7 @@ So rename things and see what breaks I guess public string SqlDisplayColumnName { get; set; } - public ObjectField() + public AyaField() { //most common defaults Hideable = true; diff --git a/server/AyaNova/biz/PickListFetcher.cs b/server/AyaNova/biz/PickListFetcher.cs index 6f8c4bbe..00baeaa6 100644 --- a/server/AyaNova/biz/PickListFetcher.cs +++ b/server/AyaNova/biz/PickListFetcher.cs @@ -10,7 +10,7 @@ namespace AyaNova.Biz internal static class PickListFetcher { - internal static PickListResult GetPickList(AyContext ct, long userId, ListOptions pagingOptions, List objectFields, string tableName) + internal static PickListResult GetPickList(AyContext ct, long userId, ListOptions pagingOptions, List objectFields, string tableName) { List listItems = new List(); diff --git a/server/AyaNova/biz/RequiredFieldsValidator.cs b/server/AyaNova/biz/RequiredFieldsValidator.cs index cbc0bb1a..02375eee 100644 --- a/server/AyaNova/biz/RequiredFieldsValidator.cs +++ b/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 = ObjectFields.ObjectFieldsList(formCustom.FormKey); + var FormFields = AyaObjectFields.ObjectFieldsList(formCustom.FormKey); // var ThisFormNormalFieldsList = FormFields.Where(x => x.Custom == false).Select(x => x.Key).ToList(); foreach (JObject jo in FormTemplate) @@ -30,7 +30,7 @@ namespace AyaNova.Biz // - e.g.: {template:[{fld:"ltkeyfieldname",hide:"true/false",required:"true/false", type:"bool"},{fld:"ltkeyfieldname",hide:"true/false",required:"true/false", type:"text"]} //get the FormField object - ObjectField FF = FormFields.Where(x => x.LtKey == FldLtKey).Single(); + AyaField FF = FormFields.Where(x => x.LtKey == FldLtKey).Single(); //don't validate custom fields, just skip them // if (!string.IsNullOrWhiteSpace(FF.PropertyName))//this used to work because there would be no property name but now there is so it doesn't diff --git a/server/AyaNova/biz/SqlFilterCriteriaBuilder.cs b/server/AyaNova/biz/SqlFilterCriteriaBuilder.cs index bda57a70..b5846c0d 100644 --- a/server/AyaNova/biz/SqlFilterCriteriaBuilder.cs +++ b/server/AyaNova/biz/SqlFilterCriteriaBuilder.cs @@ -11,7 +11,7 @@ namespace AyaNova.Biz { public static class SqlFilterCriteriaBuilder { - public static string DataFilterToSQLCriteria(AyaNova.Models.DataFilter dataFilter, List objectFields, long userId) + public static string DataFilterToSQLCriteria(AyaNova.Models.DataFilter dataFilter, List objectFields, long userId) { if (string.IsNullOrWhiteSpace(dataFilter.Filter)) diff --git a/server/AyaNova/biz/SqlSelectBuilder.cs b/server/AyaNova/biz/SqlSelectBuilder.cs index 52c0d4bd..2fb7b62b 100644 --- a/server/AyaNova/biz/SqlSelectBuilder.cs +++ b/server/AyaNova/biz/SqlSelectBuilder.cs @@ -20,7 +20,7 @@ namespace AyaNova.Biz var jtemplate = JObject.Parse(template); //get the fields list - var objectFieldsList = ObjectFields.ObjectFieldsList(objectKey); + var objectFieldsList = AyaObjectFields.ObjectFieldsList(objectKey); //convert to strings array (https://stackoverflow.com/a/33836599/8939) string[] templateFieldList; @@ -37,7 +37,7 @@ namespace AyaNova.Biz sb.Append("SELECT "); //Default ID column for each row (always is aliased as df) - ObjectField def = objectFieldsList.FirstOrDefault(x => x.LtKey == "df"); + AyaField def = objectFieldsList.FirstOrDefault(x => x.LtKey == "df"); if (def == null) { throw new System.ArgumentNullException($"SqlSelectBuilder: objectFieldList for key \"{objectKey}\" is missing the df default field"); @@ -55,7 +55,7 @@ namespace AyaNova.Biz foreach (string ColumnName in templateFieldList) { - ObjectField o = objectFieldsList.FirstOrDefault(x => x.LtKey == ColumnName); + AyaField o = objectFieldsList.FirstOrDefault(x => x.LtKey == ColumnName); #if (DEBUG) //Developers little helper if (o == null) diff --git a/server/AyaNova/biz/UserBiz.cs b/server/AyaNova/biz/UserBiz.cs index 0310e673..4aea45ed 100644 --- a/server/AyaNova/biz/UserBiz.cs +++ b/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, ObjectFields.ObjectFieldsList(ObjectFields.USER_KEY), UserId); + q = q + SqlFilterCriteriaBuilder.DataFilterToSQLCriteria(TheFilter, AyaObjectFields.ObjectFieldsList(AyaObjectFields.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, ObjectFields.ObjectFieldsList(ObjectFields.USER_KEY), "auser"); + var ret = PickListFetcher.GetPickList(ct, UserId, pagingOptions, AyaObjectFields.ObjectFieldsList(AyaObjectFields.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 == ObjectFields.USER_KEY); + var FormCustomization = ct.FormCustom.SingleOrDefault(x => x.FormKey == AyaObjectFields.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 diff --git a/server/AyaNova/biz/WidgetBiz.cs b/server/AyaNova/biz/WidgetBiz.cs index ef424c1d..10ab6308 100644 --- a/server/AyaNova/biz/WidgetBiz.cs +++ b/server/AyaNova/biz/WidgetBiz.cs @@ -289,7 +289,7 @@ namespace AyaNova.Biz //SELECT FRAGMENT COLUMNS FROM TEMPLATE //"select clm,clm,clm" - var qSelectColumns = SqlSelectBuilder.Build(ObjectFields.WIDGET_KEY, MOCK_WIDGET_DISPLAY_TEMPLATE_JSON, listOptions.Mini); + var qSelectColumns = SqlSelectBuilder.Build(AyaObjectFields.WIDGET_KEY, MOCK_WIDGET_DISPLAY_TEMPLATE_JSON, listOptions.Mini); var qFrom = "FROM AWIDGET"; @@ -304,7 +304,7 @@ namespace AyaNova.Biz var qWhere = string.Empty; if (listOptions.DataFilterId > 0) { - qWhere = SqlFilterCriteriaBuilder.DataFilterToSQLCriteria(TheFilter, ObjectFields.ObjectFieldsList(ObjectFields.WIDGET_KEY), UserId); + qWhere = SqlFilterCriteriaBuilder.DataFilterToSQLCriteria(TheFilter, AyaObjectFields.ObjectFieldsList(AyaObjectFields.WIDGET_KEY), UserId); } //ORDER BY CLAUSE - SORT @@ -383,11 +383,11 @@ namespace AyaNova.Biz string ColumnsJSON = string.Empty; if (listOptions.Mini) { - ColumnsJSON = ObjectFields.GenerateMINIListColumnsJSON(AyaType.Widget); + ColumnsJSON = AyaObjectFields.GenerateMINIListColumnsJSON(AyaType.Widget); } else { - ColumnsJSON = ObjectFields.GenerateListColumnsJSONFromTemplate(AyaType.Widget, ObjectFields.WIDGET_KEY, MOCK_WIDGET_DISPLAY_TEMPLATE_JSON); + ColumnsJSON = AyaObjectFields.GenerateListColumnsJSONFromTemplate(AyaType.Widget, AyaObjectFields.WIDGET_KEY, MOCK_WIDGET_DISPLAY_TEMPLATE_JSON); } //TODO: BUILD THE RETURN LIST OF DATA ITEMS @@ -425,7 +425,7 @@ namespace AyaNova.Biz */ //SELECT FRAGMENT COLUMNS FROM TEMPLATE //"select clm,clm,clm" - var qSelectColumns = SqlSelectBuilder.Build(ObjectFields.WIDGET_KEY, MOCK_WIDGET_USER_EMAIL_DISPLAY_TEMPLATE_JSON, listOptions.Mini); + var qSelectColumns = SqlSelectBuilder.Build(AyaObjectFields.WIDGET_KEY, MOCK_WIDGET_USER_EMAIL_DISPLAY_TEMPLATE_JSON, listOptions.Mini); //FROM CLAUSE //this is where the full SQL statement needs to be made with JOINS etc @@ -443,7 +443,7 @@ namespace AyaNova.Biz var qWhere = string.Empty; if (listOptions.DataFilterId > 0) { - qWhere = SqlFilterCriteriaBuilder.DataFilterToSQLCriteria(TheFilter, ObjectFields.ObjectFieldsList(ObjectFields.WIDGET_KEY), UserId); + qWhere = SqlFilterCriteriaBuilder.DataFilterToSQLCriteria(TheFilter, AyaObjectFields.ObjectFieldsList(AyaObjectFields.WIDGET_KEY), UserId); } //ORDER BY CLAUSE - SORT @@ -522,11 +522,11 @@ namespace AyaNova.Biz string ColumnsJSON = string.Empty; if (listOptions.Mini) { - ColumnsJSON = ObjectFields.GenerateMINIListColumnsJSON(AyaType.Widget); + ColumnsJSON = AyaObjectFields.GenerateMINIListColumnsJSON(AyaType.Widget); } else { - ColumnsJSON = ObjectFields.GenerateListColumnsJSONFromTemplate(AyaType.Widget, ObjectFields.WIDGET_KEY, MOCK_WIDGET_USER_EMAIL_DISPLAY_TEMPLATE_JSON); + ColumnsJSON = AyaObjectFields.GenerateListColumnsJSONFromTemplate(AyaType.Widget, AyaObjectFields.WIDGET_KEY, MOCK_WIDGET_USER_EMAIL_DISPLAY_TEMPLATE_JSON); } //TODO: BUILD THE RETURN LIST OF DATA ITEMS @@ -606,7 +606,7 @@ namespace AyaNova.Biz } //Any form customizations to validate? - var FormCustomization = ct.FormCustom.SingleOrDefault(x => x.FormKey == ObjectFields.WIDGET_KEY); + var FormCustomization = ct.FormCustom.SingleOrDefault(x => x.FormKey == AyaObjectFields.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 diff --git a/server/AyaNova/util/Seeder.cs b/server/AyaNova/util/Seeder.cs index fa1fe8ee..72dbbdb8 100644 --- a/server/AyaNova/util/Seeder.cs +++ b/server/AyaNova/util/Seeder.cs @@ -82,7 +82,7 @@ namespace AyaNova.Util var fc = new FormCustom() { - FormKey = ObjectFields.WIDGET_KEY, + FormKey = AyaObjectFields.WIDGET_KEY, Template = @"[ { ""fld"": ""WidgetNotes"",