diff --git a/server/AyaNova/Controllers/WidgetController.cs b/server/AyaNova/Controllers/WidgetController.cs index 126574b8..8e2ab4e7 100644 --- a/server/AyaNova/Controllers/WidgetController.cs +++ b/server/AyaNova/Controllers/WidgetController.cs @@ -130,7 +130,7 @@ namespace AyaNova.Api.Controllers //Instantiate the business object handler WidgetBiz biz = WidgetBiz.GetBiz(ct, HttpContext); - ApiPagedResponse pr = biz.TestGetWidgetUserEmailList(Url, nameof(List), pagingOptions).Result; + ApiPagedResponse pr = biz.TestGetWidgetUserEmailList(Url, nameof(TestGetWidgetUserEmailList), pagingOptions).Result; return Ok(new ApiOkWithPagingResponse(pr)); // string ret= biz.GetList(Url, nameof(List), pagingOptions).Result; // return Ok(ret); diff --git a/server/AyaNova/biz/ObjectFields.cs b/server/AyaNova/biz/ObjectFields.cs index 51f04f03..f035cc0b 100644 --- a/server/AyaNova/biz/ObjectFields.cs +++ b/server/AyaNova/biz/ObjectFields.cs @@ -220,9 +220,9 @@ namespace AyaNova.Biz break; #endregion case TEST_WIDGET_USER_EMAIL_ADDRESS_LIST_KEY: - #region WIDGET_USER_EMAIL_ADDRESS_LIST_KEY + #region TEST_WIDGET_USER_EMAIL_ADDRESS_LIST_KEY - l.Add(new AyaField { LtKey = "df", AyaObjectType = (int)AyaType.Widget, SqlIdColumnName = "awidget.id" }); + l.Add(new AyaField { FieldKey = "df", AyaObjectType = (int)AyaType.Widget, SqlIdColumnName = "awidget.id" }); l.Add(new AyaField { FieldKey = "widgetname", diff --git a/server/AyaNova/biz/PickListFetcher.cs b/server/AyaNova/biz/PickListFetcher.cs index 00baeaa6..92b63712 100644 --- a/server/AyaNova/biz/PickListFetcher.cs +++ b/server/AyaNova/biz/PickListFetcher.cs @@ -45,11 +45,11 @@ namespace AyaNova.Biz //BUILD ORDER BY AND APPEND IT qSort = SqlFilterOrderByBuilder.DataFilterToSQLOrderBy(TheFilter); } - else - { - //GET DEFAULT ORDER BY - qSort = SqlFilterOrderByBuilder.DefaultPickListOrderBy(); - } + // else + // { + // //GET DEFAULT ORDER BY + // qSort = SqlFilterOrderByBuilder.DefaultPickListOrderBy; + // } //ITEMS //add the limit and offset values: diff --git a/server/AyaNova/biz/SqlFilterOrderByBuilder.cs b/server/AyaNova/biz/SqlFilterOrderByBuilder.cs index 768e76e9..2593a447 100644 --- a/server/AyaNova/biz/SqlFilterOrderByBuilder.cs +++ b/server/AyaNova/biz/SqlFilterOrderByBuilder.cs @@ -12,22 +12,16 @@ namespace AyaNova.Biz public static class SqlFilterOrderByBuilder { - public static string DefaultGetManyOrderBy() - { - return "ORDER BY ID DESC"; - } + // public static string DefaultGetManyOrderBy => "ORDER BY ID DESC"; - public static string DefaultPickListOrderBy() - { - return "ORDER BY NAME ASC"; - } + // public static string DefaultPickListOrderBy => "ORDER BY NAME ASC"; public static string DataFilterToSQLOrderBy(AyaNova.Models.DataFilter dataFilter) { if (string.IsNullOrWhiteSpace(dataFilter.Sort)) { - return DefaultGetManyOrderBy(); + return string.Empty;//used to be default order by } StringBuilder sb = new StringBuilder(); diff --git a/server/AyaNova/biz/SqlSelectBuilder.cs b/server/AyaNova/biz/SqlSelectBuilder.cs index 0f46228a..35842d2a 100644 --- a/server/AyaNova/biz/SqlSelectBuilder.cs +++ b/server/AyaNova/biz/SqlSelectBuilder.cs @@ -37,7 +37,7 @@ namespace AyaNova.Biz sb.Append("SELECT "); //Default ID column for each row (always is aliased as df) - AyaField def = objectFieldsList.FirstOrDefault(x => x.LtKey == "df"); + AyaField def = objectFieldsList.FirstOrDefault(x => x.FieldKey == "df"); if (def == null) { throw new System.ArgumentNullException($"SqlSelectBuilder: objectFieldList for key \"{objectKey}\" is missing the df default field"); @@ -55,7 +55,7 @@ namespace AyaNova.Biz foreach (string ColumnName in templateFieldList) { - AyaField o = objectFieldsList.FirstOrDefault(x => x.LtKey == ColumnName); + AyaField o = objectFieldsList.FirstOrDefault(x => x.FieldKey == ColumnName); #if (DEBUG) //Developers little helper if (o == null) diff --git a/server/AyaNova/biz/UserBiz.cs b/server/AyaNova/biz/UserBiz.cs index 4aea45ed..4fcaf496 100644 --- a/server/AyaNova/biz/UserBiz.cs +++ b/server/AyaNova/biz/UserBiz.cs @@ -196,11 +196,11 @@ namespace AyaNova.Biz //BUILD ORDER BY AND APPEND IT q = q + SqlFilterOrderByBuilder.DataFilterToSQLOrderBy(TheFilter); } - else - { - //GET DEFAULT ORDER BY - q = q + SqlFilterOrderByBuilder.DefaultGetManyOrderBy(); - } + // else + // { + // //GET DEFAULT ORDER BY + // q = q + SqlFilterOrderByBuilder.DefaultGetManyOrderBy; + // } #pragma warning disable EF1000 diff --git a/server/AyaNova/biz/WidgetBiz.cs b/server/AyaNova/biz/WidgetBiz.cs index 440c76da..cd412017 100644 --- a/server/AyaNova/biz/WidgetBiz.cs +++ b/server/AyaNova/biz/WidgetBiz.cs @@ -314,11 +314,11 @@ namespace AyaNova.Biz //BUILD ORDER BY AND APPEND IT qOrderBy = SqlFilterOrderByBuilder.DataFilterToSQLOrderBy(TheFilter); } - else - { - //GET DEFAULT ORDER BY - qOrderBy = SqlFilterOrderByBuilder.DefaultGetManyOrderBy(); - } + // else + // { + // //GET DEFAULT ORDER BY + // qOrderBy = SqlFilterOrderByBuilder.DefaultGetManyOrderBy; + // } //LIMIT AND OFFSET CLAUSE - PAGING listOptions.Offset = listOptions.Offset ?? ListOptions.DefaultOffset; @@ -426,7 +426,7 @@ order by auseroptions.emailaddress desc */ //SELECT FRAGMENT COLUMNS FROM TEMPLATE //"select clm,clm,clm" - var qSelectColumns = SqlSelectBuilder.Build(AyaObjectFields.WIDGET_KEY, MOCK_WIDGET_USER_EMAIL_DISPLAY_TEMPLATE_JSON, listOptions.Mini); + var qSelectColumns = SqlSelectBuilder.Build(AyaObjectFields.TEST_WIDGET_USER_EMAIL_ADDRESS_LIST_KEY, 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 @@ -444,7 +444,7 @@ order by auseroptions.emailaddress desc var qWhere = string.Empty; if (listOptions.DataFilterId > 0) { - qWhere = SqlFilterCriteriaBuilder.DataFilterToSQLCriteria(TheFilter, AyaObjectFields.ObjectFieldsList(AyaObjectFields.WIDGET_KEY), UserId); + qWhere = SqlFilterCriteriaBuilder.DataFilterToSQLCriteria(TheFilter, AyaObjectFields.ObjectFieldsList(AyaObjectFields.TEST_WIDGET_USER_EMAIL_ADDRESS_LIST_KEY), UserId); } //ORDER BY CLAUSE - SORT @@ -454,11 +454,11 @@ order by auseroptions.emailaddress desc //BUILD ORDER BY AND APPEND IT qOrderBy = SqlFilterOrderByBuilder.DataFilterToSQLOrderBy(TheFilter); } - else - { - //GET DEFAULT ORDER BY - qOrderBy = SqlFilterOrderByBuilder.DefaultGetManyOrderBy(); - } + // else + // { + // //GET DEFAULT ORDER BY + // qOrderBy = SqlFilterOrderByBuilder.DefaultGetManyOrderBy; + // } //LIMIT AND OFFSET CLAUSE - PAGING listOptions.Offset = listOptions.Offset ?? ListOptions.DefaultOffset; @@ -527,7 +527,7 @@ order by auseroptions.emailaddress desc } else { - ColumnsJSON = AyaObjectFields.GenerateListColumnsJSONFromTemplate(AyaType.Widget, AyaObjectFields.WIDGET_KEY, MOCK_WIDGET_USER_EMAIL_DISPLAY_TEMPLATE_JSON); + ColumnsJSON = AyaObjectFields.GenerateListColumnsJSONFromTemplate(AyaType.Widget, AyaObjectFields.TEST_WIDGET_USER_EMAIL_ADDRESS_LIST_KEY, MOCK_WIDGET_USER_EMAIL_DISPLAY_TEMPLATE_JSON); } //TODO: BUILD THE RETURN LIST OF DATA ITEMS