admin/raven
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Browse Source
This commit is contained in:
John Cardinal
2020-01-17 21:35:25 +00:00
parent b4853777ea
commit a14ac69bd0
7 changed files with 31 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
server/AyaNova/Controllers/WidgetController.cs
View File

@@ -130,7 +130,7 @@ namespace AyaNova.Api.Controllers
//Instantiate the business object handler //Instantiate the business object handler
WidgetBiz biz = WidgetBiz.GetBiz(ct, HttpContext); 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)); return Ok(new ApiOkWithPagingResponse(pr));
// string ret= biz.GetList(Url, nameof(List), pagingOptions).Result; // string ret= biz.GetList(Url, nameof(List), pagingOptions).Result;
// return Ok(ret); // return Ok(ret);

4
server/AyaNova/biz/ObjectFields.cs
View File

@@ -220,9 +220,9 @@ namespace AyaNova.Biz
break; break;
#endregion #endregion
case TEST_WIDGET_USER_EMAIL_ADDRESS_LIST_KEY: 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 l.Add(new AyaField
{ {
FieldKey = "widgetname", FieldKey = "widgetname",

10
server/AyaNova/biz/PickListFetcher.cs
View File

@@ -45,11 +45,11 @@ namespace AyaNova.Biz
//BUILD ORDER BY AND APPEND IT //BUILD ORDER BY AND APPEND IT
qSort = SqlFilterOrderByBuilder.DataFilterToSQLOrderBy(TheFilter); qSort = SqlFilterOrderByBuilder.DataFilterToSQLOrderBy(TheFilter);
} }
else // else
{ // {
//GET DEFAULT ORDER BY // //GET DEFAULT ORDER BY
qSort = SqlFilterOrderByBuilder.DefaultPickListOrderBy(); // qSort = SqlFilterOrderByBuilder.DefaultPickListOrderBy;
} // }
//ITEMS //ITEMS
//add the limit and offset values: //add the limit and offset values:

12
server/AyaNova/biz/SqlFilterOrderByBuilder.cs
View File

@@ -12,22 +12,16 @@ namespace AyaNova.Biz
public static class SqlFilterOrderByBuilder public static class SqlFilterOrderByBuilder
{ {
public static string DefaultGetManyOrderBy() // public static string DefaultGetManyOrderBy => "ORDER BY ID DESC";
{
return "ORDER BY ID DESC";
}
public static string DefaultPickListOrderBy() // public static string DefaultPickListOrderBy => "ORDER BY NAME ASC";
{
return "ORDER BY NAME ASC";
}
public static string DataFilterToSQLOrderBy(AyaNova.Models.DataFilter dataFilter) public static string DataFilterToSQLOrderBy(AyaNova.Models.DataFilter dataFilter)
{ {
if (string.IsNullOrWhiteSpace(dataFilter.Sort)) if (string.IsNullOrWhiteSpace(dataFilter.Sort))
{ {
return DefaultGetManyOrderBy(); return string.Empty;//used to be default order by
} }
StringBuilder sb = new StringBuilder(); StringBuilder sb = new StringBuilder();

4
server/AyaNova/biz/SqlSelectBuilder.cs
View File

@@ -37,7 +37,7 @@ namespace AyaNova.Biz
sb.Append("SELECT "); sb.Append("SELECT ");
//Default ID column for each row (always is aliased as df) //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) if (def == null)
{ {
throw new System.ArgumentNullException($"SqlSelectBuilder: objectFieldList for key \"{objectKey}\" is missing the df default field"); 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) foreach (string ColumnName in templateFieldList)
{ {
AyaField o = objectFieldsList.FirstOrDefault(x => x.LtKey == ColumnName); AyaField o = objectFieldsList.FirstOrDefault(x => x.FieldKey == ColumnName);
#if (DEBUG) #if (DEBUG)
//Developers little helper //Developers little helper
if (o == null) if (o == null)

10
server/AyaNova/biz/UserBiz.cs
View File

@@ -196,11 +196,11 @@ namespace AyaNova.Biz
//BUILD ORDER BY AND APPEND IT //BUILD ORDER BY AND APPEND IT
q = q + SqlFilterOrderByBuilder.DataFilterToSQLOrderBy(TheFilter); q = q + SqlFilterOrderByBuilder.DataFilterToSQLOrderBy(TheFilter);
} }
else // else
{ // {
//GET DEFAULT ORDER BY // //GET DEFAULT ORDER BY
q = q + SqlFilterOrderByBuilder.DefaultGetManyOrderBy(); // q = q + SqlFilterOrderByBuilder.DefaultGetManyOrderBy;
} // }
#pragma warning disable EF1000 #pragma warning disable EF1000

26
server/AyaNova/biz/WidgetBiz.cs
View File

@@ -314,11 +314,11 @@ namespace AyaNova.Biz
//BUILD ORDER BY AND APPEND IT //BUILD ORDER BY AND APPEND IT
qOrderBy = SqlFilterOrderByBuilder.DataFilterToSQLOrderBy(TheFilter); qOrderBy = SqlFilterOrderByBuilder.DataFilterToSQLOrderBy(TheFilter);
} }
else // else
{ // {
//GET DEFAULT ORDER BY // //GET DEFAULT ORDER BY
qOrderBy = SqlFilterOrderByBuilder.DefaultGetManyOrderBy(); // qOrderBy = SqlFilterOrderByBuilder.DefaultGetManyOrderBy;
} // }
//LIMIT AND OFFSET CLAUSE - PAGING //LIMIT AND OFFSET CLAUSE - PAGING
listOptions.Offset = listOptions.Offset ?? ListOptions.DefaultOffset; listOptions.Offset = listOptions.Offset ?? ListOptions.DefaultOffset;
@@ -426,7 +426,7 @@ order by auseroptions.emailaddress desc
*/ */
//SELECT FRAGMENT COLUMNS FROM TEMPLATE //SELECT FRAGMENT COLUMNS FROM TEMPLATE
//"select clm,clm,clm" //"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 //FROM CLAUSE
//this is where the full SQL statement needs to be made with JOINS etc //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; var qWhere = string.Empty;
if (listOptions.DataFilterId > 0) 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 //ORDER BY CLAUSE - SORT
@@ -454,11 +454,11 @@ order by auseroptions.emailaddress desc
//BUILD ORDER BY AND APPEND IT //BUILD ORDER BY AND APPEND IT
qOrderBy = SqlFilterOrderByBuilder.DataFilterToSQLOrderBy(TheFilter); qOrderBy = SqlFilterOrderByBuilder.DataFilterToSQLOrderBy(TheFilter);
} }
else // else
{ // {
//GET DEFAULT ORDER BY // //GET DEFAULT ORDER BY
qOrderBy = SqlFilterOrderByBuilder.DefaultGetManyOrderBy(); // qOrderBy = SqlFilterOrderByBuilder.DefaultGetManyOrderBy;
} // }
//LIMIT AND OFFSET CLAUSE - PAGING //LIMIT AND OFFSET CLAUSE - PAGING
listOptions.Offset = listOptions.Offset ?? ListOptions.DefaultOffset; listOptions.Offset = listOptions.Offset ?? ListOptions.DefaultOffset;
@@ -527,7 +527,7 @@ order by auseroptions.emailaddress desc
} }
else 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 //TODO: BUILD THE RETURN LIST OF DATA ITEMS