diff --git a/server/AyaNova/DataList/AyaDataList.cs b/server/AyaNova/DataList/AyaDataList.cs index d5ebbdc5..658529a9 100644 --- a/server/AyaNova/DataList/AyaDataList.cs +++ b/server/AyaNova/DataList/AyaDataList.cs @@ -74,19 +74,19 @@ namespace AyaNova.DataList sb.Append("{"); //Build required part of column definition if (!o.IsCustomField) - sb.Append($"\"cm\":\"{o.LtKey}\",\"dt\":{(int)o.UiFieldDataType}"); + sb.Append($"\"cm\":\"{o.TKey}\",\"dt\":{(int)o.UiFieldDataType}"); else { //insert specific type for this custom field - if (CustomFieldDefinitions.ContainsKey(o.LtKey)) + if (CustomFieldDefinitions.ContainsKey(o.TKey)) { - var customFieldType = CustomFieldDefinitions[o.LtKey]; - sb.Append($"\"cm\":\"{o.LtKey}\",\"dt\":{customFieldType}"); + var customFieldType = CustomFieldDefinitions[o.TKey]; + sb.Append($"\"cm\":\"{o.TKey}\",\"dt\":{customFieldType}"); } else { //this is normal as there may not be a definition for a Custom field but it's been requested so just treat it like text - sb.Append($"\"cm\":\"{o.LtKey}\",\"dt\":{(int)UiFieldDataType.Text}"); + sb.Append($"\"cm\":\"{o.TKey}\",\"dt\":{(int)UiFieldDataType.Text}"); } } @@ -131,7 +131,7 @@ namespace AyaNova.DataList { //this relies on the convention I'm using of AyaType name as the first part of all custom fields lT keys, e.g. //WidgetCustom1 -> Widget - var ayatypename = d.LtKey.Split("Custom")[0]; + var ayatypename = d.TKey.Split("Custom")[0]; if (!typesProcessed.Contains(ayatypename)) { //make sure we do each type only once diff --git a/server/AyaNova/DataList/AyaDataListFieldDefinition.cs b/server/AyaNova/DataList/AyaDataListFieldDefinition.cs index 1277250e..42c7407b 100644 --- a/server/AyaNova/DataList/AyaDataListFieldDefinition.cs +++ b/server/AyaNova/DataList/AyaDataListFieldDefinition.cs @@ -13,7 +13,7 @@ namespace AyaNova.DataList public string FieldKey { get; set; } //CLIENT Use only for display - public string LtKey { get; set; } + public string TKey { get; set; } //CLIENT / SERVER - client display server validation purposes public bool IsCustomField { get; set; } diff --git a/server/AyaNova/DataList/TestUserDataList.cs b/server/AyaNova/DataList/TestUserDataList.cs index 5bd87ee1..c94b6745 100644 --- a/server/AyaNova/DataList/TestUserDataList.cs +++ b/server/AyaNova/DataList/TestUserDataList.cs @@ -45,7 +45,7 @@ namespace AyaNova.DataList //DPRECATED FieldDefinitions.Add(new AyaDataListFieldDefinition { FieldKey = "df", AyaObjectType = (int)AyaType.User, SqlIdColumnName = "auser.id" }); FieldDefinitions.Add(new AyaDataListFieldDefinition { - LtKey = "User", + TKey = "User", FieldKey = "username", AyaObjectType = (int)AyaType.User, UiFieldDataType = (int)UiFieldDataType.Text, @@ -56,7 +56,7 @@ namespace AyaNova.DataList FieldDefinitions.Add(new AyaDataListFieldDefinition { - LtKey = "Active", + TKey = "Active", FieldKey = "useractive", UiFieldDataType = (int)UiFieldDataType.Bool, SqlValueColumnName = "auser.active" @@ -64,7 +64,7 @@ namespace AyaNova.DataList FieldDefinitions.Add(new AyaDataListFieldDefinition { - LtKey = "AuthorizationRoles", + TKey = "AuthorizationRoles", FieldKey = "userroles", UiFieldDataType = (int)UiFieldDataType.Enum, EnumType = AyaNova.Util.StringUtil.TrimTypeName(typeof(AuthorizationRoles).ToString()), @@ -73,7 +73,7 @@ namespace AyaNova.DataList FieldDefinitions.Add(new AyaDataListFieldDefinition { - LtKey = "UserType", + TKey = "UserType", FieldKey = "usertype", UiFieldDataType = (int)UiFieldDataType.Enum, EnumType = AyaNova.Util.StringUtil.TrimTypeName(typeof(UserType).ToString()), @@ -82,7 +82,7 @@ namespace AyaNova.DataList FieldDefinitions.Add(new AyaDataListFieldDefinition { - LtKey = "UserEmployeeNumber", + TKey = "UserEmployeeNumber", FieldKey = "useremployeenumber", UiFieldDataType = (int)UiFieldDataType.Text, SqlValueColumnName = "auser.employeenumber" @@ -90,7 +90,7 @@ namespace AyaNova.DataList FieldDefinitions.Add(new AyaDataListFieldDefinition { - LtKey = "UserNotes", + TKey = "UserNotes", FieldKey = "usernotes", UiFieldDataType = (int)UiFieldDataType.Text, SqlValueColumnName = "auser.notes" @@ -102,22 +102,22 @@ namespace AyaNova.DataList //NEED TO COME BACK TO THIS ONCE CLIENT IS CONSUMING THESE LISTS //WIDGETLIST has custom fields so good test before doing here - // FieldDefinitions.Add(new AyaDataListFieldDefinition { LtKey = "WidgetCustom1", FieldKey = "widgetcustom1", IsCustomField = true }); - // FieldDefinitions.Add(new AyaDataListFieldDefinition { LtKey = "WidgetCustom2", FieldKey = "widgetcustom2", IsCustomField = true }); - // FieldDefinitions.Add(new AyaDataListFieldDefinition { LtKey = "WidgetCustom3", FieldKey = "widgetcustom3", IsCustomField = true }); - // FieldDefinitions.Add(new AyaDataListFieldDefinition { LtKey = "WidgetCustom4", FieldKey = "widgetcustom4", IsCustomField = true }); - // FieldDefinitions.Add(new AyaDataListFieldDefinition { LtKey = "WidgetCustom5", FieldKey = "widgetcustom5", IsCustomField = true }); - // FieldDefinitions.Add(new AyaDataListFieldDefinition { LtKey = "WidgetCustom6", FieldKey = "widgetcustom6", IsCustomField = true }); - // FieldDefinitions.Add(new AyaDataListFieldDefinition { LtKey = "WidgetCustom7", FieldKey = "widgetcustom7", IsCustomField = true }); - // FieldDefinitions.Add(new AyaDataListFieldDefinition { LtKey = "WidgetCustom8", FieldKey = "widgetcustom8", IsCustomField = true }); - // FieldDefinitions.Add(new AyaDataListFieldDefinition { LtKey = "WidgetCustom9", FieldKey = "widgetcustom9", IsCustomField = true }); - // FieldDefinitions.Add(new AyaDataListFieldDefinition { LtKey = "WidgetCustom10", FieldKey = "widgetcustom10", IsCustomField = true }); - // FieldDefinitions.Add(new AyaDataListFieldDefinition { LtKey = "WidgetCustom11", FieldKey = "widgetcustom11", IsCustomField = true }); - // FieldDefinitions.Add(new AyaDataListFieldDefinition { LtKey = "WidgetCustom12", FieldKey = "widgetcustom12", IsCustomField = true }); - // FieldDefinitions.Add(new AyaDataListFieldDefinition { LtKey = "WidgetCustom13", FieldKey = "widgetcustom13", IsCustomField = true }); - // FieldDefinitions.Add(new AyaDataListFieldDefinition { LtKey = "WidgetCustom14", FieldKey = "widgetcustom14", IsCustomField = true }); - // FieldDefinitions.Add(new AyaDataListFieldDefinition { LtKey = "WidgetCustom15", FieldKey = "widgetcustom15", IsCustomField = true }); - // FieldDefinitions.Add(new AyaDataListFieldDefinition { LtKey = "WidgetCustom16", FieldKey = "widgetcustom16", IsCustomField = true }); + // FieldDefinitions.Add(new AyaDataListFieldDefinition { TKey = "WidgetCustom1", FieldKey = "widgetcustom1", IsCustomField = true }); + // FieldDefinitions.Add(new AyaDataListFieldDefinition { TKey = "WidgetCustom2", FieldKey = "widgetcustom2", IsCustomField = true }); + // FieldDefinitions.Add(new AyaDataListFieldDefinition { TKey = "WidgetCustom3", FieldKey = "widgetcustom3", IsCustomField = true }); + // FieldDefinitions.Add(new AyaDataListFieldDefinition { TKey = "WidgetCustom4", FieldKey = "widgetcustom4", IsCustomField = true }); + // FieldDefinitions.Add(new AyaDataListFieldDefinition { TKey = "WidgetCustom5", FieldKey = "widgetcustom5", IsCustomField = true }); + // FieldDefinitions.Add(new AyaDataListFieldDefinition { TKey = "WidgetCustom6", FieldKey = "widgetcustom6", IsCustomField = true }); + // FieldDefinitions.Add(new AyaDataListFieldDefinition { TKey = "WidgetCustom7", FieldKey = "widgetcustom7", IsCustomField = true }); + // FieldDefinitions.Add(new AyaDataListFieldDefinition { TKey = "WidgetCustom8", FieldKey = "widgetcustom8", IsCustomField = true }); + // FieldDefinitions.Add(new AyaDataListFieldDefinition { TKey = "WidgetCustom9", FieldKey = "widgetcustom9", IsCustomField = true }); + // FieldDefinitions.Add(new AyaDataListFieldDefinition { TKey = "WidgetCustom10", FieldKey = "widgetcustom10", IsCustomField = true }); + // FieldDefinitions.Add(new AyaDataListFieldDefinition { TKey = "WidgetCustom11", FieldKey = "widgetcustom11", IsCustomField = true }); + // FieldDefinitions.Add(new AyaDataListFieldDefinition { TKey = "WidgetCustom12", FieldKey = "widgetcustom12", IsCustomField = true }); + // FieldDefinitions.Add(new AyaDataListFieldDefinition { TKey = "WidgetCustom13", FieldKey = "widgetcustom13", IsCustomField = true }); + // FieldDefinitions.Add(new AyaDataListFieldDefinition { TKey = "WidgetCustom14", FieldKey = "widgetcustom14", IsCustomField = true }); + // FieldDefinitions.Add(new AyaDataListFieldDefinition { TKey = "WidgetCustom15", FieldKey = "widgetcustom15", IsCustomField = true }); + // FieldDefinitions.Add(new AyaDataListFieldDefinition { TKey = "WidgetCustom16", FieldKey = "widgetcustom16", IsCustomField = true }); } }//eoc }//eons \ No newline at end of file diff --git a/server/AyaNova/DataList/TestWidgetDataList.cs b/server/AyaNova/DataList/TestWidgetDataList.cs index c2c12969..029f6c87 100644 --- a/server/AyaNova/DataList/TestWidgetDataList.cs +++ b/server/AyaNova/DataList/TestWidgetDataList.cs @@ -62,7 +62,7 @@ namespace AyaNova.DataList FieldDefinitions.Add(new AyaDataListFieldDefinition { - LtKey = "WidgetName", + TKey = "WidgetName", FieldKey = "widgetname", AyaObjectType = (int)AyaType.Widget, UiFieldDataType = (int)UiFieldDataType.Text, @@ -72,28 +72,28 @@ namespace AyaNova.DataList }); FieldDefinitions.Add(new AyaDataListFieldDefinition { - LtKey = "WidgetSerial", + TKey = "WidgetSerial", FieldKey = "widgetserial", UiFieldDataType = (int)UiFieldDataType.Integer, SqlValueColumnName = "awidget.serial" }); FieldDefinitions.Add(new AyaDataListFieldDefinition { - LtKey = "WidgetDollarAmount", + TKey = "WidgetDollarAmount", FieldKey = "widgetdollaramount", UiFieldDataType = (int)UiFieldDataType.Currency, SqlValueColumnName = "awidget.dollaramount" }); FieldDefinitions.Add(new AyaDataListFieldDefinition { - LtKey = "WidgetCount", + TKey = "WidgetCount", FieldKey = "widgetcount", UiFieldDataType = (int)UiFieldDataType.Integer, SqlValueColumnName = "awidget.count" }); FieldDefinitions.Add(new AyaDataListFieldDefinition { - LtKey = "WidgetUserType", + TKey = "WidgetUserType", FieldKey = "widgetusertype", UiFieldDataType = (int)UiFieldDataType.Enum, EnumType = AyaNova.Util.StringUtil.TrimTypeName(typeof(UserType).ToString()), @@ -101,31 +101,31 @@ namespace AyaNova.DataList }); FieldDefinitions.Add(new AyaDataListFieldDefinition { - LtKey = "WidgetStartDate", + TKey = "WidgetStartDate", FieldKey = "widgetstartdate", UiFieldDataType = (int)UiFieldDataType.DateTime, SqlValueColumnName = "awidget.startdate" }); FieldDefinitions.Add(new AyaDataListFieldDefinition { - LtKey = "WidgetEndDate", + TKey = "WidgetEndDate", FieldKey = "widgetenddate", UiFieldDataType = (int)UiFieldDataType.DateTime, SqlValueColumnName = "awidget.enddate" }); FieldDefinitions.Add(new AyaDataListFieldDefinition { - LtKey = "WidgetNotes", + TKey = "WidgetNotes", FieldKey = "widgetnotes", UiFieldDataType = (int)UiFieldDataType.Text, SqlValueColumnName = "awidget.notes" }); - //FieldDefinitions.Add(new AyaDataListFieldDefinition { LtKey = "User", FieldKey = "userid", UiFieldDataType = (int)AyaUiFieldDataType.Text, AyaObjectType = (int)AyaType.User }); + //FieldDefinitions.Add(new AyaDataListFieldDefinition { TKey = "User", FieldKey = "userid", UiFieldDataType = (int)AyaUiFieldDataType.Text, AyaObjectType = (int)AyaType.User }); FieldDefinitions.Add(new AyaDataListFieldDefinition { FieldKey = "username", - LtKey = "User", + TKey = "User", UiFieldDataType = (int)UiFieldDataType.Text, AyaObjectType = (int)AyaType.User, SqlIdColumnName = "auser.id", @@ -133,35 +133,35 @@ namespace AyaNova.DataList }); FieldDefinitions.Add(new AyaDataListFieldDefinition { - LtKey = "Active", + TKey = "Active", FieldKey = "widgetactive", UiFieldDataType = (int)UiFieldDataType.Bool, SqlValueColumnName = "awidget.active" }); FieldDefinitions.Add(new AyaDataListFieldDefinition { - LtKey = "Tags", + TKey = "Tags", FieldKey = "widgettags", UiFieldDataType = (int)UiFieldDataType.Tags, SqlValueColumnName = "awidget.tags" }); - FieldDefinitions.Add(new AyaDataListFieldDefinition { LtKey = "WidgetCustom1", FieldKey = "widgetcustom1", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "awidget.customfields" }); - FieldDefinitions.Add(new AyaDataListFieldDefinition { LtKey = "WidgetCustom2", FieldKey = "widgetcustom2", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "awidget.customfields" }); - FieldDefinitions.Add(new AyaDataListFieldDefinition { LtKey = "WidgetCustom3", FieldKey = "widgetcustom3", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "awidget.customfields" }); - FieldDefinitions.Add(new AyaDataListFieldDefinition { LtKey = "WidgetCustom4", FieldKey = "widgetcustom4", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "awidget.customfields" }); - FieldDefinitions.Add(new AyaDataListFieldDefinition { LtKey = "WidgetCustom5", FieldKey = "widgetcustom5", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "awidget.customfields" }); - FieldDefinitions.Add(new AyaDataListFieldDefinition { LtKey = "WidgetCustom6", FieldKey = "widgetcustom6", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "awidget.customfields" }); - FieldDefinitions.Add(new AyaDataListFieldDefinition { LtKey = "WidgetCustom7", FieldKey = "widgetcustom7", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "awidget.customfields" }); - FieldDefinitions.Add(new AyaDataListFieldDefinition { LtKey = "WidgetCustom8", FieldKey = "widgetcustom8", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "awidget.customfields" }); - FieldDefinitions.Add(new AyaDataListFieldDefinition { LtKey = "WidgetCustom9", FieldKey = "widgetcustom9", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "awidget.customfields" }); - FieldDefinitions.Add(new AyaDataListFieldDefinition { LtKey = "WidgetCustom10", FieldKey = "widgetcustom10", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "awidget.customfields" }); - FieldDefinitions.Add(new AyaDataListFieldDefinition { LtKey = "WidgetCustom11", FieldKey = "widgetcustom11", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "awidget.customfields" }); - FieldDefinitions.Add(new AyaDataListFieldDefinition { LtKey = "WidgetCustom12", FieldKey = "widgetcustom12", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "awidget.customfields" }); - FieldDefinitions.Add(new AyaDataListFieldDefinition { LtKey = "WidgetCustom13", FieldKey = "widgetcustom13", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "awidget.customfields" }); - FieldDefinitions.Add(new AyaDataListFieldDefinition { LtKey = "WidgetCustom14", FieldKey = "widgetcustom14", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "awidget.customfields" }); - FieldDefinitions.Add(new AyaDataListFieldDefinition { LtKey = "WidgetCustom15", FieldKey = "widgetcustom15", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "awidget.customfields" }); - FieldDefinitions.Add(new AyaDataListFieldDefinition { LtKey = "WidgetCustom16", FieldKey = "widgetcustom16", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "awidget.customfields" }); + FieldDefinitions.Add(new AyaDataListFieldDefinition { TKey = "WidgetCustom1", FieldKey = "widgetcustom1", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "awidget.customfields" }); + FieldDefinitions.Add(new AyaDataListFieldDefinition { TKey = "WidgetCustom2", FieldKey = "widgetcustom2", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "awidget.customfields" }); + FieldDefinitions.Add(new AyaDataListFieldDefinition { TKey = "WidgetCustom3", FieldKey = "widgetcustom3", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "awidget.customfields" }); + FieldDefinitions.Add(new AyaDataListFieldDefinition { TKey = "WidgetCustom4", FieldKey = "widgetcustom4", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "awidget.customfields" }); + FieldDefinitions.Add(new AyaDataListFieldDefinition { TKey = "WidgetCustom5", FieldKey = "widgetcustom5", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "awidget.customfields" }); + FieldDefinitions.Add(new AyaDataListFieldDefinition { TKey = "WidgetCustom6", FieldKey = "widgetcustom6", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "awidget.customfields" }); + FieldDefinitions.Add(new AyaDataListFieldDefinition { TKey = "WidgetCustom7", FieldKey = "widgetcustom7", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "awidget.customfields" }); + FieldDefinitions.Add(new AyaDataListFieldDefinition { TKey = "WidgetCustom8", FieldKey = "widgetcustom8", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "awidget.customfields" }); + FieldDefinitions.Add(new AyaDataListFieldDefinition { TKey = "WidgetCustom9", FieldKey = "widgetcustom9", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "awidget.customfields" }); + FieldDefinitions.Add(new AyaDataListFieldDefinition { TKey = "WidgetCustom10", FieldKey = "widgetcustom10", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "awidget.customfields" }); + FieldDefinitions.Add(new AyaDataListFieldDefinition { TKey = "WidgetCustom11", FieldKey = "widgetcustom11", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "awidget.customfields" }); + FieldDefinitions.Add(new AyaDataListFieldDefinition { TKey = "WidgetCustom12", FieldKey = "widgetcustom12", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "awidget.customfields" }); + FieldDefinitions.Add(new AyaDataListFieldDefinition { TKey = "WidgetCustom13", FieldKey = "widgetcustom13", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "awidget.customfields" }); + FieldDefinitions.Add(new AyaDataListFieldDefinition { TKey = "WidgetCustom14", FieldKey = "widgetcustom14", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "awidget.customfields" }); + FieldDefinitions.Add(new AyaDataListFieldDefinition { TKey = "WidgetCustom15", FieldKey = "widgetcustom15", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "awidget.customfields" }); + FieldDefinitions.Add(new AyaDataListFieldDefinition { TKey = "WidgetCustom16", FieldKey = "widgetcustom16", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "awidget.customfields" }); } }//eoc }//eons \ No newline at end of file diff --git a/server/AyaNova/DataList/TestWidgetUserEmailDataList.cs b/server/AyaNova/DataList/TestWidgetUserEmailDataList.cs index 3de3c1f0..b492bc3d 100644 --- a/server/AyaNova/DataList/TestWidgetUserEmailDataList.cs +++ b/server/AyaNova/DataList/TestWidgetUserEmailDataList.cs @@ -48,7 +48,7 @@ namespace AyaNova.DataList FieldDefinitions.Add(new AyaDataListFieldDefinition { FieldKey = "widgetname", - LtKey = "WidgetName", + TKey = "WidgetName", UiFieldDataType = (int)UiFieldDataType.Text, AyaObjectType = (int)AyaType.Widget, SqlIdColumnName = "awidget.id", @@ -58,7 +58,7 @@ namespace AyaNova.DataList FieldDefinitions.Add(new AyaDataListFieldDefinition { FieldKey = "username", - LtKey = "User", + TKey = "User", UiFieldDataType = (int)UiFieldDataType.Text, AyaObjectType = (int)AyaType.User, SqlIdColumnName = "auser.id", @@ -66,14 +66,14 @@ namespace AyaNova.DataList }); FieldDefinitions.Add(new AyaDataListFieldDefinition { - LtKey = "UserEmailAddress", + TKey = "UserEmailAddress", FieldKey = "emailaddress", SqlValueColumnName = "auseroptions.emailaddress", UiFieldDataType = (int)UiFieldDataType.EmailAddress }); FieldDefinitions.Add(new AyaDataListFieldDefinition { - LtKey = "Active", + TKey = "Active", FieldKey = "widgetactive", SqlValueColumnName = "awidget.active", UiFieldDataType = (int)UiFieldDataType.Bool diff --git a/server/AyaNova/PickList/AyaPickListFieldDefinition.cs b/server/AyaNova/PickList/AyaPickListFieldDefinition.cs index b4213875..f5e025ab 100644 --- a/server/AyaNova/PickList/AyaPickListFieldDefinition.cs +++ b/server/AyaNova/PickList/AyaPickListFieldDefinition.cs @@ -9,12 +9,11 @@ namespace AyaNova.PickList //also the sql displaycolumnname if identical public string FieldKey { get; set; } //CLIENT Use only for display - public string LtKey { get; set; } + public string TKey { get; set; } // Used for casting query public UiFieldDataType ColumnDataType { get; set; } public bool IsRowId { get; set; }//both indicates is row ID but also that it's required as the only required field. Not technically necessary maybe but to prevent foot shooting. - public bool IsActiveColumn { get; set; } - public AyaType AyaObjectType { get; set; } + public bool IsActiveColumn { get; set; } [JsonIgnore] public string SqlIdColumnName { get; set; } [JsonIgnore] diff --git a/server/AyaNova/PickList/UserPickList.cs b/server/AyaNova/PickList/UserPickList.cs index 7682b172..d3db37b7 100644 --- a/server/AyaNova/PickList/UserPickList.cs +++ b/server/AyaNova/PickList/UserPickList.cs @@ -31,7 +31,7 @@ namespace AyaNova.PickList ColumnDefinitions = new List(); ColumnDefinitions.Add(new AyaPickListFieldDefinition { - LtKey = "Active", + TKey = "Active", FieldKey = "useractive", ColumnDataType = UiFieldDataType.Bool, SqlValueColumnName = "auser.active", @@ -39,7 +39,7 @@ namespace AyaNova.PickList }); ColumnDefinitions.Add(new AyaPickListFieldDefinition { - LtKey = "UserName", + TKey = "UserName", FieldKey = "username", ColumnDataType = UiFieldDataType.Text, SqlIdColumnName = "auser.id", @@ -48,7 +48,7 @@ namespace AyaNova.PickList }); ColumnDefinitions.Add(new AyaPickListFieldDefinition { - LtKey = "UserEmployeeNumber", + TKey = "UserEmployeeNumber", FieldKey = "useremployeenumber", ColumnDataType = UiFieldDataType.Text, SqlValueColumnName = "auser.employeenumber" @@ -56,7 +56,7 @@ namespace AyaNova.PickList ColumnDefinitions.Add(new AyaPickListFieldDefinition { - LtKey = "Tags", + TKey = "Tags", FieldKey = "usertags", ColumnDataType = UiFieldDataType.Tags, SqlValueColumnName = "auser.tags" diff --git a/server/AyaNova/PickList/WidgetPickList.cs b/server/AyaNova/PickList/WidgetPickList.cs index e655ad17..2fe3fe04 100644 --- a/server/AyaNova/PickList/WidgetPickList.cs +++ b/server/AyaNova/PickList/WidgetPickList.cs @@ -37,7 +37,7 @@ namespace AyaNova.PickList ColumnDefinitions = new List(); ColumnDefinitions.Add(new AyaPickListFieldDefinition { - LtKey = "Active", + TKey = "Active", FieldKey = "widgetactive", ColumnDataType = UiFieldDataType.Bool, SqlValueColumnName = "awidget.active", @@ -46,7 +46,7 @@ namespace AyaNova.PickList ColumnDefinitions.Add(new AyaPickListFieldDefinition { - LtKey = "WidgetName", + TKey = "WidgetName", FieldKey = "widgetname", //AyaObjectType = AyaType.Widget, ColumnDataType = UiFieldDataType.Text, @@ -57,7 +57,7 @@ namespace AyaNova.PickList ColumnDefinitions.Add(new AyaPickListFieldDefinition { - LtKey = "WidgetSerial", + TKey = "WidgetSerial", FieldKey = "widgetserial", ColumnDataType = UiFieldDataType.Integer, SqlValueColumnName = "awidget.serial" @@ -66,7 +66,7 @@ namespace AyaNova.PickList ColumnDefinitions.Add(new AyaPickListFieldDefinition { FieldKey = "username", - LtKey = "User", + TKey = "User", ColumnDataType = UiFieldDataType.Text, SqlIdColumnName = "auser.id", SqlValueColumnName = "auser.name" @@ -74,7 +74,7 @@ namespace AyaNova.PickList ColumnDefinitions.Add(new AyaPickListFieldDefinition { - LtKey = "Tags", + TKey = "Tags", FieldKey = "widgettags", ColumnDataType = UiFieldDataType.Tags, SqlValueColumnName = "awidget.tags" diff --git a/server/AyaNova/biz/AyaFormFieldDefinitions.cs b/server/AyaNova/biz/AyaFormFieldDefinitions.cs index d0509f7f..31ca69e7 100644 --- a/server/AyaNova/biz/AyaFormFieldDefinitions.cs +++ b/server/AyaNova/biz/AyaFormFieldDefinitions.cs @@ -48,36 +48,36 @@ namespace AyaNova.Biz #region WIDGET_KEY - l.Add(new AyaFormFieldDefinition { LtKey = "WidgetName", FieldKey = "Name", Hideable = false }); - l.Add(new AyaFormFieldDefinition { LtKey = "WidgetSerial", FieldKey = "Serial" }); - l.Add(new AyaFormFieldDefinition { LtKey = "WidgetDollarAmount", FieldKey = "DollarAmount" }); - l.Add(new AyaFormFieldDefinition { LtKey = "WidgetCount", FieldKey = "Count" }); - l.Add(new AyaFormFieldDefinition { LtKey = "WidgetUserType", FieldKey = "UserType" }); - l.Add(new AyaFormFieldDefinition { LtKey = "WidgetStartDate", FieldKey = "StartDate" }); - l.Add(new AyaFormFieldDefinition { LtKey = "WidgetEndDate", FieldKey = "EndDate" }); - l.Add(new AyaFormFieldDefinition { LtKey = "WidgetNotes", FieldKey = "Notes" }); + l.Add(new AyaFormFieldDefinition { TKey = "WidgetName", FieldKey = "Name", Hideable = false }); + l.Add(new AyaFormFieldDefinition { TKey = "WidgetSerial", FieldKey = "Serial" }); + l.Add(new AyaFormFieldDefinition { TKey = "WidgetDollarAmount", FieldKey = "DollarAmount" }); + l.Add(new AyaFormFieldDefinition { TKey = "WidgetCount", FieldKey = "Count" }); + l.Add(new AyaFormFieldDefinition { TKey = "WidgetUserType", FieldKey = "UserType" }); + l.Add(new AyaFormFieldDefinition { TKey = "WidgetStartDate", FieldKey = "StartDate" }); + l.Add(new AyaFormFieldDefinition { TKey = "WidgetEndDate", FieldKey = "EndDate" }); + l.Add(new AyaFormFieldDefinition { TKey = "WidgetNotes", FieldKey = "Notes" }); //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 AyaFormFieldDefinition { LtKey = "User", FieldKey = "UserId" }); - l.Add(new AyaFormFieldDefinition { LtKey = "Active", FieldKey = "Active", Hideable = false }); - l.Add(new AyaFormFieldDefinition { LtKey = "Tags", FieldKey = "Tags" }); + l.Add(new AyaFormFieldDefinition { TKey = "User", FieldKey = "UserId" }); + l.Add(new AyaFormFieldDefinition { TKey = "Active", FieldKey = "Active", Hideable = false }); + l.Add(new AyaFormFieldDefinition { TKey = "Tags", FieldKey = "Tags" }); - l.Add(new AyaFormFieldDefinition { LtKey = "WidgetCustom1", FieldKey = "WidgetCustom1", IsCustomField = true }); - l.Add(new AyaFormFieldDefinition { LtKey = "WidgetCustom2", FieldKey = "WidgetCustom2", IsCustomField = true }); - l.Add(new AyaFormFieldDefinition { LtKey = "WidgetCustom3", FieldKey = "WidgetCustom3", IsCustomField = true }); - l.Add(new AyaFormFieldDefinition { LtKey = "WidgetCustom4", FieldKey = "WidgetCustom4", IsCustomField = true }); - l.Add(new AyaFormFieldDefinition { LtKey = "WidgetCustom5", FieldKey = "WidgetCustom5", IsCustomField = true }); - l.Add(new AyaFormFieldDefinition { LtKey = "WidgetCustom6", FieldKey = "WidgetCustom6", IsCustomField = true }); - l.Add(new AyaFormFieldDefinition { LtKey = "WidgetCustom7", FieldKey = "WidgetCustom7", IsCustomField = true }); - l.Add(new AyaFormFieldDefinition { LtKey = "WidgetCustom8", FieldKey = "WidgetCustom8", IsCustomField = true }); - l.Add(new AyaFormFieldDefinition { LtKey = "WidgetCustom9", FieldKey = "WidgetCustom9", IsCustomField = true }); - l.Add(new AyaFormFieldDefinition { LtKey = "WidgetCustom10", FieldKey = "WidgetCustom10", IsCustomField = true }); - l.Add(new AyaFormFieldDefinition { LtKey = "WidgetCustom11", FieldKey = "WidgetCustom11", IsCustomField = true }); - l.Add(new AyaFormFieldDefinition { LtKey = "WidgetCustom12", FieldKey = "WidgetCustom12", IsCustomField = true }); - l.Add(new AyaFormFieldDefinition { LtKey = "WidgetCustom13", FieldKey = "WidgetCustom13", IsCustomField = true }); - 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 }); + l.Add(new AyaFormFieldDefinition { TKey = "WidgetCustom1", FieldKey = "WidgetCustom1", IsCustomField = true }); + l.Add(new AyaFormFieldDefinition { TKey = "WidgetCustom2", FieldKey = "WidgetCustom2", IsCustomField = true }); + l.Add(new AyaFormFieldDefinition { TKey = "WidgetCustom3", FieldKey = "WidgetCustom3", IsCustomField = true }); + l.Add(new AyaFormFieldDefinition { TKey = "WidgetCustom4", FieldKey = "WidgetCustom4", IsCustomField = true }); + l.Add(new AyaFormFieldDefinition { TKey = "WidgetCustom5", FieldKey = "WidgetCustom5", IsCustomField = true }); + l.Add(new AyaFormFieldDefinition { TKey = "WidgetCustom6", FieldKey = "WidgetCustom6", IsCustomField = true }); + l.Add(new AyaFormFieldDefinition { TKey = "WidgetCustom7", FieldKey = "WidgetCustom7", IsCustomField = true }); + l.Add(new AyaFormFieldDefinition { TKey = "WidgetCustom8", FieldKey = "WidgetCustom8", IsCustomField = true }); + l.Add(new AyaFormFieldDefinition { TKey = "WidgetCustom9", FieldKey = "WidgetCustom9", IsCustomField = true }); + l.Add(new AyaFormFieldDefinition { TKey = "WidgetCustom10", FieldKey = "WidgetCustom10", IsCustomField = true }); + l.Add(new AyaFormFieldDefinition { TKey = "WidgetCustom11", FieldKey = "WidgetCustom11", IsCustomField = true }); + l.Add(new AyaFormFieldDefinition { TKey = "WidgetCustom12", FieldKey = "WidgetCustom12", IsCustomField = true }); + l.Add(new AyaFormFieldDefinition { TKey = "WidgetCustom13", FieldKey = "WidgetCustom13", IsCustomField = true }); + l.Add(new AyaFormFieldDefinition { TKey = "WidgetCustom14", FieldKey = "WidgetCustom14", IsCustomField = true }); + l.Add(new AyaFormFieldDefinition { TKey = "WidgetCustom15", FieldKey = "WidgetCustom15", IsCustomField = true }); + l.Add(new AyaFormFieldDefinition { TKey = "WidgetCustom16", FieldKey = "WidgetCustom16", IsCustomField = true }); return l; #endregion } @@ -85,30 +85,30 @@ namespace AyaNova.Biz 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" }); - l.Add(new AyaFormFieldDefinition { LtKey = "AuthorizationRoles", FieldKey = "Roles", Hideable = false }); - l.Add(new AyaFormFieldDefinition { LtKey = "UserNotes", FieldKey = "Notes" }); - l.Add(new AyaFormFieldDefinition { LtKey = "UserType", FieldKey = "UserType", Hideable = false }); - l.Add(new AyaFormFieldDefinition { LtKey = "Active", FieldKey = "Active", Hideable = false }); - l.Add(new AyaFormFieldDefinition { LtKey = "Tags", FieldKey = "Tags" }); + l.Add(new AyaFormFieldDefinition { TKey = "Name", FieldKey = "Name", Hideable = false }); + l.Add(new AyaFormFieldDefinition { TKey = "UserEmployeeNumber", FieldKey = "EmployeeNumber" }); + l.Add(new AyaFormFieldDefinition { TKey = "AuthorizationRoles", FieldKey = "Roles", Hideable = false }); + l.Add(new AyaFormFieldDefinition { TKey = "UserNotes", FieldKey = "Notes" }); + l.Add(new AyaFormFieldDefinition { TKey = "UserType", FieldKey = "UserType", Hideable = false }); + l.Add(new AyaFormFieldDefinition { TKey = "Active", FieldKey = "Active", Hideable = false }); + l.Add(new AyaFormFieldDefinition { TKey = "Tags", FieldKey = "Tags" }); - l.Add(new AyaFormFieldDefinition { LtKey = "UserCustom1", FieldKey = "UserCustom1", IsCustomField = true }); - l.Add(new AyaFormFieldDefinition { LtKey = "UserCustom2", FieldKey = "UserCustom2", IsCustomField = true }); - l.Add(new AyaFormFieldDefinition { LtKey = "UserCustom3", FieldKey = "UserCustom3", IsCustomField = true }); - l.Add(new AyaFormFieldDefinition { LtKey = "UserCustom4", FieldKey = "UserCustom4", IsCustomField = true }); - l.Add(new AyaFormFieldDefinition { LtKey = "UserCustom5", FieldKey = "UserCustom5", IsCustomField = true }); - l.Add(new AyaFormFieldDefinition { LtKey = "UserCustom6", FieldKey = "UserCustom6", IsCustomField = true }); - l.Add(new AyaFormFieldDefinition { LtKey = "UserCustom7", FieldKey = "UserCustom7", IsCustomField = true }); - l.Add(new AyaFormFieldDefinition { LtKey = "UserCustom8", FieldKey = "UserCustom8", IsCustomField = true }); - l.Add(new AyaFormFieldDefinition { LtKey = "UserCustom9", FieldKey = "UserCustom9", IsCustomField = true }); - l.Add(new AyaFormFieldDefinition { LtKey = "UserCustom10", FieldKey = "UserCustom10", IsCustomField = true }); - l.Add(new AyaFormFieldDefinition { LtKey = "UserCustom11", FieldKey = "UserCustom11", IsCustomField = true }); - l.Add(new AyaFormFieldDefinition { LtKey = "UserCustom12", FieldKey = "UserCustom12", IsCustomField = true }); - l.Add(new AyaFormFieldDefinition { LtKey = "UserCustom13", FieldKey = "UserCustom13", IsCustomField = true }); - 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 }); + l.Add(new AyaFormFieldDefinition { TKey = "UserCustom1", FieldKey = "UserCustom1", IsCustomField = true }); + l.Add(new AyaFormFieldDefinition { TKey = "UserCustom2", FieldKey = "UserCustom2", IsCustomField = true }); + l.Add(new AyaFormFieldDefinition { TKey = "UserCustom3", FieldKey = "UserCustom3", IsCustomField = true }); + l.Add(new AyaFormFieldDefinition { TKey = "UserCustom4", FieldKey = "UserCustom4", IsCustomField = true }); + l.Add(new AyaFormFieldDefinition { TKey = "UserCustom5", FieldKey = "UserCustom5", IsCustomField = true }); + l.Add(new AyaFormFieldDefinition { TKey = "UserCustom6", FieldKey = "UserCustom6", IsCustomField = true }); + l.Add(new AyaFormFieldDefinition { TKey = "UserCustom7", FieldKey = "UserCustom7", IsCustomField = true }); + l.Add(new AyaFormFieldDefinition { TKey = "UserCustom8", FieldKey = "UserCustom8", IsCustomField = true }); + l.Add(new AyaFormFieldDefinition { TKey = "UserCustom9", FieldKey = "UserCustom9", IsCustomField = true }); + l.Add(new AyaFormFieldDefinition { TKey = "UserCustom10", FieldKey = "UserCustom10", IsCustomField = true }); + l.Add(new AyaFormFieldDefinition { TKey = "UserCustom11", FieldKey = "UserCustom11", IsCustomField = true }); + l.Add(new AyaFormFieldDefinition { TKey = "UserCustom12", FieldKey = "UserCustom12", IsCustomField = true }); + l.Add(new AyaFormFieldDefinition { TKey = "UserCustom13", FieldKey = "UserCustom13", IsCustomField = true }); + l.Add(new AyaFormFieldDefinition { TKey = "UserCustom14", FieldKey = "UserCustom14", IsCustomField = true }); + l.Add(new AyaFormFieldDefinition { TKey = "UserCustom15", FieldKey = "UserCustom15", IsCustomField = true }); + l.Add(new AyaFormFieldDefinition { TKey = "UserCustom16", FieldKey = "UserCustom16", IsCustomField = true }); return l; #endregion } @@ -137,7 +137,7 @@ namespace AyaNova.Biz public string FieldKey { get; set; } //CLIENT Use only for display - public string LtKey { get; set; } + public string TKey { get; set; } //CLIENT form customization public bool Hideable { get; set; } diff --git a/server/AyaNova/biz/CustomFieldsValidator.cs b/server/AyaNova/biz/CustomFieldsValidator.cs index 9de430d5..723eb060 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 = AyaFormFieldDefinitions.AyaFormFields(formCustom.FormKey).Where(x => x.IsCustomField == true).Select(x => x.LtKey).ToList(); + var ThisFormCustomFieldsList = AyaFormFieldDefinitions.AyaFormFields(formCustom.FormKey).Where(x => x.IsCustomField == true).Select(x => x.TKey).ToList(); //If the customFields string is empty then only validation is if any of the fields are required to be filled in if (!hasCustomData)