From fb0f64ef1ec7b413ea28c9e42843601d82c6206c Mon Sep 17 00:00:00 2001 From: John Cardinal Date: Fri, 17 Jan 2020 21:47:01 +0000 Subject: [PATCH] --- server/AyaNova/biz/WidgetBiz.cs | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/server/AyaNova/biz/WidgetBiz.cs b/server/AyaNova/biz/WidgetBiz.cs index 963d51fc..3a48cfcf 100644 --- a/server/AyaNova/biz/WidgetBiz.cs +++ b/server/AyaNova/biz/WidgetBiz.cs @@ -411,8 +411,7 @@ namespace AyaNova.Biz ""mini"":[""widgetname"",""username"",""emailaddress""] } "; - - var Object + var AyaObjectFieldsKey=AyaObjectFields.TEST_WIDGET_USER_EMAIL_ADDRESS_LIST_KEY; //BUILD THE QUERY /* @@ -424,7 +423,7 @@ namespace AyaNova.Biz */ //SELECT FRAGMENT COLUMNS FROM TEMPLATE //"select clm,clm,clm" - var qSelectColumns = SqlSelectBuilder.Build(AyaObjectFields.TEST_WIDGET_USER_EMAIL_ADDRESS_LIST_KEY, MOCK_WIDGET_USER_EMAIL_DISPLAY_TEMPLATE_JSON, listOptions.Mini); + var qSelectColumns = SqlSelectBuilder.Build(AyaObjectFieldsKey, 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 @@ -439,7 +438,7 @@ namespace AyaNova.Biz { TheFilter = await ct.DataFilter.FirstOrDefaultAsync(x => x.Id == listOptions.DataFilterId); //WHERE CLAUSE - FILTER - qWhere = SqlFilterCriteriaBuilder.DataFilterToSQLCriteria(TheFilter, AyaObjectFields.ObjectFieldsList(AyaObjectFields.TEST_WIDGET_USER_EMAIL_ADDRESS_LIST_KEY), UserId); + qWhere = SqlFilterCriteriaBuilder.DataFilterToSQLCriteria(TheFilter, AyaObjectFields.ObjectFieldsList(AyaObjectFieldsKey), UserId); //ORDER BY CLAUSE - SORT //BUILD ORDER BY AND APPEND IT qOrderBy = SqlFilterOrderByBuilder.DataFilterToSQLOrderBy(TheFilter); @@ -518,7 +517,7 @@ namespace AyaNova.Biz } else { - ColumnsJSON = AyaObjectFields.GenerateListColumnsJSONFromTemplate(AyaType.Widget, AyaObjectFields.TEST_WIDGET_USER_EMAIL_ADDRESS_LIST_KEY, MOCK_WIDGET_USER_EMAIL_DISPLAY_TEMPLATE_JSON); + ColumnsJSON = AyaObjectFields.GenerateListColumnsJSONFromTemplate(AyaType.Widget, AyaObjectFieldsKey, MOCK_WIDGET_USER_EMAIL_DISPLAY_TEMPLATE_JSON); }