diff --git a/server/AyaNova/DataList/DataListFetcher.cs b/server/AyaNova/DataList/DataListFetcher.cs index 569db35d..a0631332 100644 --- a/server/AyaNova/DataList/DataListFetcher.cs +++ b/server/AyaNova/DataList/DataListFetcher.cs @@ -12,11 +12,11 @@ namespace AyaNova.DataList { internal static class DataListFetcher { - internal static async Task GetResponse( - string DataListKey, AyContext ct, IUrlHelper Url, - string routeName, ListOptions listOptions, string JSONDataListTemplate, long UserId) - { - //TODO: Get template (MOCKED FOR NOW UNTIL PROOF OF CONCEPT) + internal static async Task GetResponse( + string DataListKey, AyContext ct, IUrlHelper Url, + string routeName, ListOptions listOptions, string JSONDataListTemplate, long UserId) + { + //TODO: Get template (MOCKED FOR NOW UNTIL PROOF OF CONCEPT) // var MOCK_WIDGET_USER_EMAIL_DISPLAY_TEMPLATE_JSON = @" // { // ""full"":[""widgetname"",""username"",""emailaddress"",""widgetactive""], @@ -24,8 +24,8 @@ namespace AyaNova.DataList // } // "; - // var AyaObjectFields = AyaObjectFieldDefinitions.AyaObjectFields(AyaObjectFieldDefinitions.TEST_WIDGET_USER_EMAIL_ADDRESS_LIST_KEY); - var DataList=DataListFactory.GetAyaDataList(nameof(TestWidgetUserEmailDataList)); + // var AyaObjectFields = AyaObjectFieldDefinitions.AyaObjectFields(AyaObjectFieldDefinitions.TEST_WIDGET_USER_EMAIL_ADDRESS_LIST_KEY); + var DataList = DataListFactory.GetAyaDataList(DataListKey); //TODO: PUt this in the template biz class ultimately and modify sqlselectbuilder to use it @@ -55,7 +55,7 @@ namespace AyaNova.DataList //this is where the full SQL statement needs to be made with JOINS etc //TODO: Can this be moved away into the objectfields or new object //var qFrom = "from awidget left outer join auser on (awidget.userid=auser.id) left outer join auseroptions on (auser.id=auseroptions.userid)"; - var qFrom=DataList.SQLFrom; + var qFrom = DataList.SQLFrom; //FILTERED? DataFilter TheFilter = null; @@ -166,7 +166,7 @@ namespace AyaNova.DataList ApiPagedResponse pr = new ApiPagedResponse(rows, pageLinks, ColumnsJSON); return pr; - } + } }//eoc