diff --git a/devdocs/todo.txt b/devdocs/todo.txt index d83e14b5..0b0e084b 100644 --- a/devdocs/todo.txt +++ b/devdocs/todo.txt @@ -22,7 +22,13 @@ REALLY MAKING MORE PROGRESS WHEN CLIENT DEV DRIVES BACKEND DEV, STICK TO THAT!! TODO: return the list as objects as specified TODO: Make a joined table list for development - - User list with their email address, just name and address and user ID is enough to develop the backend code + - Widget->User->emailaddress + - Modify Widget, add UserId to it (maybe prepared by like a quote) + - Modify all the widget related code to work with this and also populate it + - Going to need to modify a lot of shit for this at the client too but it's necessary to be on the right path now + + + - Widget list with User and their email CLIENT CUSTOM FIELDS CHANGE - Must use numeric instead of text values now diff --git a/server/AyaNova/biz/AyDataType.cs b/server/AyaNova/biz/AyDataType.cs index beda0269..b332b43c 100644 --- a/server/AyaNova/biz/AyDataType.cs +++ b/server/AyaNova/biz/AyDataType.cs @@ -30,7 +30,8 @@ namespace AyaNova.Biz Decimal = 7, Currency = 8, Tags = 9, - Enum = 10 + Enum = 10, + EmailAddress = 11 } } diff --git a/server/AyaNova/biz/ObjectFields.cs b/server/AyaNova/biz/ObjectFields.cs index fdd5978b..cfb23fa4 100644 --- a/server/AyaNova/biz/ObjectFields.cs +++ b/server/AyaNova/biz/ObjectFields.cs @@ -23,6 +23,7 @@ namespace AyaNova.Biz //For objects that are compound list objects or reporting objects it's whatever uniquely but clearly identifies that and ends in _LIST public const string WIDGET_KEY = "widget"; public const string USER_KEY = "user"; + public const string USER_EMAIL_ADDRESS_LIST_KEY = "UserEmailAddress";//for development testing, not a real thing going forward public static List AvailableObjectKeys @@ -214,6 +215,12 @@ namespace AyaNova.Biz l.Add(new ObjectField { Key = "UserCustom15", PropertyName = "UserCustom15", Custom = true }); l.Add(new ObjectField { Key = "UserCustom16", PropertyName = "UserCustom16", Custom = true }); break; + case USER_EMAIL_ADDRESS_LIST_KEY: + #region USER_EMAIL_ADDRESS_LIST_KEY + l.Add(new ObjectField { Key = "df", AyObjectType = (int)AyaType.User }); + l.Add(new ObjectField { Key = "Name", PropertyName = "Name", SharedLTKey = true, DataType = (int)AyaDataType.Text, Hideable = false }); + l.Add(new ObjectField { Key = "UserEmailAddress", PropertyName = "Emailaddress", DataType = (int)AyaDataType.EmailAddress, SqlColumn="emailaddress" }); + break; #endregion @@ -349,7 +356,7 @@ namespace AyaNova.Biz } } - + }