diff --git a/server/AyaNova/ControllerHelpers/Authorized.cs b/server/AyaNova/ControllerHelpers/Authorized.cs
index 73224a59..a0b7a801 100644
--- a/server/AyaNova/ControllerHelpers/Authorized.cs
+++ b/server/AyaNova/ControllerHelpers/Authorized.cs
@@ -39,6 +39,40 @@ namespace AyaNova.Api.ControllerHelpers
+ ///
+ /// READ FULL RECORD (not just name and id)
+ ///
+ ///
+ ///
+ ///
+ internal static bool HasSelectRole(IDictionary HttpContextItems, AyaType objectType)
+ {
+ AuthorizationRoles currentUserRoles = UserRolesFromContext.Roles(HttpContextItems);
+ return HasSelectRole(currentUserRoles, objectType);
+ }
+
+ ///
+ /// SELECT BY NAME
+ ///
+ ///
+ ///
+ ///
+ internal static bool HasSelectRole(AuthorizationRoles currentUserRoles, AyaType objectType)
+ {
+ //NOTE: this assumes that if you can change you can read
+ if (currentUserRoles.HasAnyFlags(BizRoles.GetRoleSet(objectType).Change))
+ return true;
+
+ if (currentUserRoles.HasAnyFlags(BizRoles.GetRoleSet(objectType).ReadFullRecord))
+ return true;
+
+ if (currentUserRoles.HasAnyFlags(BizRoles.GetRoleSet(objectType).Select))
+ return true;
+
+ return false;
+ }
+
+
///
/// READ FULL RECORD (not just name and id)
///
diff --git a/server/AyaNova/PickList/AyaPickList.cs b/server/AyaNova/PickList/AyaPickList.cs
new file mode 100644
index 00000000..ca2cabc1
--- /dev/null
+++ b/server/AyaNova/PickList/AyaPickList.cs
@@ -0,0 +1,218 @@
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using AyaNova.Biz;
+using Newtonsoft.Json.Linq;
+using Microsoft.EntityFrameworkCore;
+
+namespace AyaNova.PickList
+{
+
+ ///
+ /// PickList object base class
+ ///
+ internal abstract class AyaPickList : IAyaPickList
+ {
+
+ public AyaPickList()
+ {
+
+ }
+
+ public string SQLFrom { get; set; }
+ public List FieldDefinitions { get; set; }
+ public AuthorizationRoles AllowedRoles { get; set; }
+ public AyaType DefaultListObjectType { get; set; }
+
+ public string DefaultListView { get; set; }
+
+
+ //return array of field keys in list view
+ public List GetFieldListFromListView(JArray listViewArray)
+ {
+ // [{key:"COLUMN UNIQUE KEY ID",sort:"-" or "+",filter:{any:true/false,items:[{FILTER OBJECT SEE BELOW}]} }, {key:"second column unique key"},{...etc...}]
+ List ret = new List();
+ for (int i = 0; i < listViewArray.Count; i++)
+ {
+ var cm = listViewArray[i];
+ ret.Add(cm["fld"].Value());
+ }
+ return ret;
+ }
+
+
+
+ public Newtonsoft.Json.Linq.JArray GenerateListColumnsJSONFromListView(JArray listViewArray)
+ {
+
+ var ListViewFieldKeys = GetFieldListFromListView(listViewArray);
+ var CustomFieldDefinitions = GetCustomFieldDefinitionsForList();
+
+ //Generate JSON fragment to return with column definitions
+ StringBuilder sb = new StringBuilder();
+
+ sb.Append("[");
+
+ bool FirstColumnAdded = false;
+
+ foreach (string s in ListViewFieldKeys)
+ {
+ AyaPickListFieldDefinition o = FieldDefinitions.FirstOrDefault(x => x.FieldKey == s);
+#if (DEBUG)
+ //Developers little helper
+ if (o == null)
+ {
+ throw new System.ArgumentNullException($"DEV ERROR in AyaPickList::GenerateListColumnsJSONFromListView - field {s} specified in ListView was NOT found in ObjectFields list");
+ }
+#endif
+
+ if (o != null)
+ {//Here is where we can vet the field name, if it doesn't exist. For production we'll just ignore those ones
+
+ if (FirstColumnAdded)
+ 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
+ if (CustomFieldDefinitions.ContainsKey(o.LtKey))
+ {
+ var customFieldType = CustomFieldDefinitions[o.LtKey];
+ sb.Append($"\"cm\":\"{o.LtKey}\",\"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}");
+ }
+ }
+
+ //Has a AyObjectType? (linkable / openable)
+ if (o.AyaObjectType != 0)
+ sb.Append($",\"ay\":{(int)o.AyaObjectType}");
+
+ //Row ID column?
+ if (o.IsRowId)
+ {
+ sb.Append($",\"rid\":1");
+ }
+
+ //Has a Enumtype?
+ if (!string.IsNullOrEmpty(o.EnumType))
+ sb.Append($",\"et\":\"{AyaNova.Util.StringUtil.TrimTypeName(o.EnumType)}\"");
+
+ sb.Append("}");
+ FirstColumnAdded = true;
+
+ }
+ }
+ sb.Append("]");
+
+ return JArray.Parse(sb.ToString());
+ }
+
+
+ //Find and return a dictionary of all custom fields definitions for all types in list
+ //used to build the column array and define specific type defined for custom fields so client datatable
+ //knows how to format it
+ private Dictionary GetCustomFieldDefinitionsForList()
+ {
+ //all keys and types can go in the same list since they are unique to each type of list
+ //i.e. both users and widget custom fields can be in the same list
+ Dictionary ret = new Dictionary();
+ List typesProcessed = new List();
+ //custom fields handling
+ foreach (AyaPickListFieldDefinition d in this.FieldDefinitions)
+ {
+ if (d.IsCustomField)
+ {
+ //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];
+ if (!typesProcessed.Contains(ayatypename))
+ {
+ //make sure we do each type only once
+ typesProcessed.Add(ayatypename);
+ //fetch it and set it
+ using (var ct = AyaNova.Util.ServiceProviderProvider.DBContext)
+ {
+ var fc = ct.FormCustom.AsNoTracking().SingleOrDefault(x => x.FormKey == ayatypename);
+#if (DEBUG)
+ if (fc == null)
+ {
+ throw new System.ArgumentNullException($"AyaPickList:GetCustomFieldDefinitionsForList, Custom field object type {ayatypename} has no FormCustom defined");
+ }
+#endif
+ //production handling of missing formcustom
+ if (fc == null)
+ continue;
+
+ //iterate the fields and add each custom one with a type to the return dictionary
+ var flds = JArray.Parse(fc.Template);
+ foreach (JToken t in flds)
+ {
+ if (t["type"] != null)
+ {
+ ret.Add(t["fld"].Value(), t["type"].Value());
+ }
+ }
+
+
+ }
+
+ }
+ }
+ }
+ /*{[
+ {
+ "fld": "Notes",
+ "required": true
+ },
+ {
+ "fld": "WidgetCustom1",
+ "required": false,
+ "type": 1
+ },
+ {
+ "fld": "WidgetCustom2",
+ "required": true,
+ "type": 4
+ },
+ {
+ "fld": "WidgetCustom3",
+ "required": false,
+ "type": 5
+ },
+ {
+ "fld": "WidgetCustom4",
+ "required": false,
+ "type": 6
+ },
+ {
+ "fld": "WidgetCustom5",
+ "required": false,
+ "type": 8
+ },
+ {
+ "fld": "WidgetCustom6",
+ "required": false,
+ "type": 2
+ },
+ {
+ "fld": "WidgetCustom7",
+ "required": false,
+ "type": 3
+ }
+ ]}*/
+ return ret;
+
+ }
+
+
+
+ }//eoc
+
+}//eons
\ No newline at end of file
diff --git a/server/AyaNova/PickList/AyaPickListFieldDefinition.cs b/server/AyaNova/PickList/AyaPickListFieldDefinition.cs
new file mode 100644
index 00000000..7e5093c4
--- /dev/null
+++ b/server/AyaNova/PickList/AyaPickListFieldDefinition.cs
@@ -0,0 +1,83 @@
+using AyaNova.Biz;
+using System.ComponentModel.DataAnnotations;
+using Newtonsoft.Json;
+
+namespace AyaNova.PickList
+{
+
+ //This class defines a field used for returning data in list format for UI pick lists
+ public class AyaPickListFieldDefinition
+ {
+ //CLIENT / SERVER Unique identifier used at BOTH client and server
+ //also the sql displaycolumnname if identical
+ public string FieldKey { get; set; }
+
+ //CLIENT Use only for display
+ public string LtKey { get; set; }
+
+ //CLIENT / SERVER - client display server validation purposes
+ public bool IsCustomField { get; set; }
+
+ //CLIENT / SERVER - client display server validation purposes
+ public bool IsFilterable { get; set; }
+
+ //CLIENT / SERVER - client display server validation purposes
+ public bool IsSortable { get; set; }
+
+ //CLIENT Use only for display
+ public int UiFieldDataType { get; set; }
+
+ //CLIENT Use only for display
+ public string EnumType { get; set; }
+
+ //SERVER / CLIENT - used to identify the column that represents the entire row ID and object
+ //MUST be present in all datalists and displayed at the client
+ public bool IsRowId { get; set; }
+
+ //CLIENT / SERVER - client display and to indicate what object to open , Server for formatting return object
+ public int AyaObjectType { get; set; }
+
+ //SERVER - for building sql queries
+ //don't return these properties when api user fetches field list definitions in DataListController
+ [JsonIgnore]
+ public string SqlIdColumnName { get; set; }
+ [JsonIgnore]
+ public string SqlValueColumnName { get; set; }
+
+
+
+
+
+ public AyaPickListFieldDefinition()
+ {
+ //most common defaults
+
+ IsCustomField = false;
+ IsFilterable = true;
+ IsSortable = true;
+ IsRowId = false;
+ //Set openable object type to no type which is the default and means it's not a link to another object
+ AyaObjectType = (int)AyaType.NoType;
+
+ }
+
+ //Get column to query for display name or use FieldName if there is no difference
+ public string GetSqlValueColumnName()
+ {
+ if (string.IsNullOrEmpty(SqlValueColumnName))
+ {
+ return FieldKey.ToLowerInvariant();
+ }
+ else
+ {
+ return SqlValueColumnName;
+ }
+ }
+
+ public bool HasIdColumn()
+ {
+ return !string.IsNullOrWhiteSpace(SqlIdColumnName);
+ }
+
+ }
+}
\ No newline at end of file
diff --git a/server/AyaNova/PickList/IAyaPickList.cs b/server/AyaNova/PickList/IAyaPickList.cs
new file mode 100644
index 00000000..3e722582
--- /dev/null
+++ b/server/AyaNova/PickList/IAyaPickList.cs
@@ -0,0 +1,30 @@
+using System.Collections.Generic;
+using Newtonsoft.Json.Linq;
+using AyaNova.Biz;
+namespace AyaNova.PickList
+{
+ internal interface IAyaPickList
+ {
+
+ //sql query from fragment with table joins et
+ string SQLFrom { get; set; }
+
+ //List of fields for this object
+ List FieldDefinitions { get; set; }
+
+ //allowed roles to access this list
+ AuthorizationRoles AllowedRoles { get; set; }
+
+ //Default object type to open for rows of this list (use no object if no)
+ AyaType DefaultListObjectType { get; set; }
+
+ //Default / STOCK DataListView when none is specified
+ string DefaultListView { get; set; }
+
+ Newtonsoft.Json.Linq.JArray GenerateListColumnsJSONFromListView(JArray listViewArray);
+ List GetFieldListFromListView(JArray listViewArray);
+
+
+ }
+
+}
\ No newline at end of file
diff --git a/server/AyaNova/PickList/PickListFactory.cs b/server/AyaNova/PickList/PickListFactory.cs
new file mode 100644
index 00000000..7592bfc2
--- /dev/null
+++ b/server/AyaNova/PickList/PickListFactory.cs
@@ -0,0 +1,40 @@
+using System.Collections.Generic;
+using System.Linq;
+using AyaNova.Biz;
+
+
+namespace AyaNova.PickList
+{
+ internal static class PickListFactory
+ {
+
+ //Instantiate list object specified from type
+ internal static IAyaPickList GetAyaPickList(AyaType ayaType)
+ {
+ switch(ayaType){
+ case AyaType.Widget:
+ return new WidgetPickList() as IAyaDataList;
+ }
+ }
+
+ //List all the datalist types available
+ internal static List GetListOfAllPickListKeyNames()
+ {
+ //https://stackoverflow.com/a/42574373/8939
+
+ List ret = new List();
+ System.Reflection.Assembly ass = System.Reflection.Assembly.GetEntryAssembly();
+
+ foreach (System.Reflection.TypeInfo ti in ass.DefinedTypes)
+ {
+ if (!ti.IsAbstract && ti.ImplementedInterfaces.Contains(typeof(IAyaPickList)))
+ {
+ ret.Add(ti.Name);
+ }
+ }
+ return ret;
+ }
+
+
+ }//eoc
+}//eons
\ No newline at end of file
diff --git a/server/AyaNova/PickList/PickListFetcher.cs b/server/AyaNova/PickList/PickListFetcher.cs
new file mode 100644
index 00000000..7db1dff2
--- /dev/null
+++ b/server/AyaNova/PickList/PickListFetcher.cs
@@ -0,0 +1,183 @@
+using System.Collections.Generic;
+using System.Linq;
+using AyaNova.Biz;
+using Newtonsoft.Json.Linq;
+using AyaNova.Api.ControllerHelpers;
+using Microsoft.AspNetCore.Mvc;
+using AyaNova.Models;
+using System.Threading.Tasks;
+using Microsoft.EntityFrameworkCore;
+using EnumsNET;
+
+namespace AyaNova.PickList
+{
+ internal static class PickListFetcher
+ {
+ internal static async Task GetResponseAsync(AyaType ayaType, string query, AuthorizationRoles userRoles)
+ //string PickListKey, AyContext ct, ListOptions listOptions, long UserId, AuthorizationRoles UserRoles)
+ {
+
+ var PickList = PickListFactory.GetAyaPickList(ayaType);
+
+ //was the name not found as a list?
+ if (PickList == null)
+ {
+ throw new System.ArgumentOutOfRangeException($"PickList \"{PickListKey}\" specified does not exist");
+ }
+
+ //check rights
+
+ if (!UserRoles.HasAnyFlags(PickList.AllowedRoles))
+ throw new System.UnauthorizedAccessException("User roles insufficient for this datalist");
+
+ //do we need to default the listView?
+ if (string.IsNullOrWhiteSpace(listOptions.ListView))
+ {
+ listOptions.ListView = PickList.DefaultListView;
+ }
+
+ //parse the list view
+ var ListViewArray = JArray.Parse(listOptions.ListView);
+
+
+ //Get the field key names in a list from the listview
+ List ListViewFieldList = PickList.GetFieldListFromListView(ListViewArray);
+
+ //BUILD THE QUERY
+ //SELECT FRAGMENT COLUMNS FROM TEMPLATE
+ var SelectBuild = PickListSqlSelectBuilder.Build(PickList.FieldDefinitions, ListViewFieldList);
+
+ //FROM CLAUSE
+ var qFrom = PickList.SQLFrom;
+
+ var qWhere = string.Empty;
+ var qOrderBy = string.Empty;
+
+ //WHERE CLAUSE - FILTER
+ qWhere = PickListSqlFilterCriteriaBuilder.DataFilterToSQLCriteria(PickList.FieldDefinitions, ListViewArray, UserId);
+
+ //ORDER BY CLAUSE - SORT
+ //BUILD ORDER BY
+ qOrderBy = PickListSqlFilterOrderByBuilder.DataFilterToSQLOrderBy(PickList.FieldDefinitions, ListViewArray);
+
+ //LIMIT AND OFFSET CLAUSE - PAGING
+ listOptions.Offset = listOptions.Offset ?? ListOptions.DefaultOffset;
+ listOptions.Limit = listOptions.Limit ?? ListOptions.DefaultLimit;
+ var qLimitOffset = $"LIMIT {listOptions.Limit} OFFSET {listOptions.Offset}";
+
+ //PUT IT ALL TOGETHER
+ string qDataQuery = string.Empty;
+ string qTotalRecordsQuery = string.Empty;
+
+ qDataQuery = $"{SelectBuild.Select} {qFrom} {qWhere} {qOrderBy} {qLimitOffset}".Replace(" ", " ");
+ qTotalRecordsQuery = $"SELECT COUNT(*) {qFrom} {qWhere}".Replace(" ", " ");
+
+ //RETURN OBJECTS
+ int returnRowColumnCount = ListViewFieldList.Count();
+ List> rows = new List>();
+ long totalRecordCount = 0;
+
+ //QUERY THE DB
+ using (var command = ct.Database.GetDbConnection().CreateCommand())
+ {
+ await ct.Database.OpenConnectionAsync();
+
+ //GET DATA RETURN ROWS
+ command.CommandText = qDataQuery;
+ using (var dr = await command.ExecuteReaderAsync())
+ {
+ while (dr.Read())
+ {
+ List row = new List(returnRowColumnCount);
+
+
+ //INSERT REMAINING FIELDS FROM TEMPLATE INTO THE RETURN ROWS LIST
+ foreach (string TemplateField in ListViewFieldList)
+ {
+
+ //get the AyaObjectFieldDefinition
+ AyaPickListFieldDefinition f = PickList.FieldDefinitions.FirstOrDefault(x => x.FieldKey == TemplateField);
+ if (f.IsCustomField)
+ {
+
+ AyaFieldData AyaField = new AyaFieldData();
+ var cust = dr.GetString(SelectBuild.map[f.GetSqlValueColumnName()]);
+ if (!string.IsNullOrWhiteSpace(cust))
+ {
+ JObject j = JObject.Parse(cust);
+ //convert field name to cust name then get value
+ var InternalCustomFieldName = AyaFormFieldDefinitions.TranslateLTCustomFieldToInternalCustomFieldName(TemplateField);
+ //Sometimes a custom field is specified but doesn't exist in the collection so don't assume it's there
+ // AyaField.v = j[InternalCustomFieldName].Value