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-22 00:47:17 +00:00
parent bee5fe85f9
commit b83cbed31a
12 changed files with 57 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -57,12 +57,12 @@ namespace AyaNova.DataList
var qFrom = DataList.SQLFrom;
//FILTERED?
DataFilter TheFilter = null;
DataListFilter TheFilter = null;
var qWhere = string.Empty;
var qOrderBy = string.Empty;
if (listOptions.DataFilterId > 0)
{
TheFilter = await ct.DataFilter.FirstOrDefaultAsync(x => x.Id == listOptions.DataFilterId);
TheFilter = await ct.DataListFilter.FirstOrDefaultAsync(x => x.Id == listOptions.DataFilterId);
//WHERE CLAUSE - FILTER
qWhere = DataListSqlFilterCriteriaBuilder.DataFilterToSQLCriteria(TheFilter, DataList.FieldDefinitions, UserId);
//ORDER BY CLAUSE - SORT

2
server/AyaNova/DataList/DataListSqlFilterCriteriaBuilder.cs
View File

@@ -11,7 +11,7 @@ namespace AyaNova.DataList
{
public static class DataListSqlFilterCriteriaBuilder
{
public static string DataFilterToSQLCriteria(AyaNova.Models.DataFilter dataFilter, List<AyaDataListFieldDefinition> objectFields, long userId)
public static string DataFilterToSQLCriteria(AyaNova.Models.DataListFilter dataFilter, List<AyaDataListFieldDefinition> objectFields, long userId)
{
if (string.IsNullOrWhiteSpace(dataFilter.Filter))

2
server/AyaNova/DataList/DataListSqlFilterOrderByBuilder.cs
View File

@@ -10,7 +10,7 @@ namespace AyaNova.DataList
// public static string DefaultPickListOrderBy => "ORDER BY NAME ASC";
public static string DataFilterToSQLOrderBy(AyaNova.Models.DataFilter dataFilter)
public static string DataFilterToSQLOrderBy(AyaNova.Models.DataListFilter dataFilter)
{
if (string.IsNullOrWhiteSpace(dataFilter.Sort))