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
2021-01-28 19:18:36 +00:00
parent 32b3e89b91
commit 9001f565a7
2 changed files with 60 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
server/AyaNova/DataList/DataListFetcher.cs
View File

@@ -55,7 +55,7 @@ namespace AyaNova.DataList
//BUILD THE QUERY
//SELECT CLAUSE
var qSelect = DataListSqlSelectBuilder.Build(DataList.FieldDefinitions, AllUniqueFieldKeysRequiredForQuery);
var qSelect = DataListSqlSelectBuilder.BuildForDataTableListResponse(DataList.FieldDefinitions, AllUniqueFieldKeysRequiredForQuery);
//FROM CLAUSE
var qFrom = DataList.SQLFrom;
@@ -277,6 +277,10 @@ namespace AyaNova.DataList
if (DataList is IDataListInternalCriteria)
StaticServerFilterOptions = ((IDataListInternalCriteria)DataList).DataListInternalCriteria(userId, userRoles, dataListSelectionOptions);
//Add the internal filters into the listoptions existing filters
//NOTE: There is currently no overlap between internal filtered columns and filters coming from the client
foreach (DataListFilterOption dfo in StaticServerFilterOptions)
dataListSelectionOptions.Filter.Add(dfo);
// //Hard coded extra criteria from Client end
// //parse and combine any additional listview hard coded from Client UI
@@ -289,7 +293,7 @@ namespace AyaNova.DataList
//BUILD THE QUERY
//SELECT FRAGMENT COLUMNS FROM TEMPLATE
var SelectBuild = DataListSqlSelectBuilder.BuildForReportIdListOnly(DataList.FieldDefinitions);
var qSelect = DataListSqlSelectBuilder.BuildForIdListResponse(DataList.FieldDefinitions, dataListSelectionOptions);
//FROM CLAUSE
var qFrom = DataList.SQLFrom;
@@ -306,7 +310,7 @@ namespace AyaNova.DataList
//PUT IT ALL TOGETHER
string qDataQuery = string.Empty;
qDataQuery = $"{SelectBuild.Select} {qFrom} {qWhere} {qOrderBy} ".Replace(" ", " ");
qDataQuery = $"{qSelect} {qFrom} {qWhere} {qOrderBy} ".Replace(" ", " ");
//RETURN OBJECTS
var retList = new List<long>();