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-21 18:21:54 +00:00
parent a121d1dd65
commit 1f3b124d4e
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
server/AyaNova/biz/SqlFilterCriteriaBuilder.cs → server/AyaNova/DataList/DataListSqlFilterCriteriaBuilder.cs
View File

@@ -5,13 +5,13 @@ using System.Text;
using Newtonsoft.Json.Linq; using Newtonsoft.Json.Linq;
using System.Linq; using System.Linq;
using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore;
using Microsoft.Extensions.Logging; using AyaNova.Biz;
namespace AyaNova.Biz namespace AyaNova.DataList
{ {
public static class SqlFilterCriteriaBuilder public static class DataListSqlFilterCriteriaBuilder
{ {
public static string DataFilterToSQLCriteria(AyaNova.Models.DataFilter dataFilter, List<AyaObjectFieldDefinition> objectFields, long userId) public static string DataFilterToSQLCriteria(AyaNova.Models.DataFilter dataFilter, List<AyaDataListFieldDefinition> objectFields, long userId)
{ {
if (string.IsNullOrWhiteSpace(dataFilter.Filter)) if (string.IsNullOrWhiteSpace(dataFilter.Filter))

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

@@ -449,7 +449,7 @@ namespace AyaNova.Biz
*/ */
//SELECT FRAGMENT COLUMNS FROM TEMPLATE //SELECT FRAGMENT COLUMNS FROM TEMPLATE
//"select clm,clm,clm" //"select clm,clm,clm"
var qSelectColumns = SqlSelectBuilder.Build(AyaObjectFields, MOCK_WIDGET_USER_EMAIL_DISPLAY_TEMPLATE_JSON, listOptions.Mini); var qSelectColumns = DataListSqlSelectBuilder.Build(DataList.FieldDefinitions, 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
@@ -464,7 +464,7 @@ namespace AyaNova.Biz
{ {
TheFilter = await ct.DataFilter.FirstOrDefaultAsync(x => x.Id == listOptions.DataFilterId); TheFilter = await ct.DataFilter.FirstOrDefaultAsync(x => x.Id == listOptions.DataFilterId);
//WHERE CLAUSE - FILTER //WHERE CLAUSE - FILTER
qWhere = SqlFilterCriteriaBuilder.DataFilterToSQLCriteria(TheFilter, AyaObjectFields, UserId); qWhere = DataListSqlFilterCriteriaBuilder.DataFilterToSQLCriteria(TheFilter, DataList.FieldDefinitions, UserId);
//ORDER BY CLAUSE - SORT //ORDER BY CLAUSE - SORT
//BUILD ORDER BY AND APPEND IT //BUILD ORDER BY AND APPEND IT
qOrderBy = SqlFilterOrderByBuilder.DataFilterToSQLOrderBy(TheFilter); qOrderBy = SqlFilterOrderByBuilder.DataFilterToSQLOrderBy(TheFilter);
@@ -519,7 +519,7 @@ namespace AyaNova.Biz
foreach (string TemplateField in templateFieldList) foreach (string TemplateField in templateFieldList)
{ {
//get the AyaObjectFieldDefinition //get the AyaObjectFieldDefinition
AyaObjectFieldDefinition f = AyaObjectFields.FirstOrDefault(x => x.FieldKey == TemplateField); AyaDataListFieldDefinition f = DataList.FieldDefinitions.FirstOrDefault(x => x.FieldKey == TemplateField);
AyaFieldData AyaField = new AyaFieldData(); AyaFieldData AyaField = new AyaFieldData();
AyaField.v = dr.GetValue(nCurrentColumnPointer); AyaField.v = dr.GetValue(nCurrentColumnPointer);
@@ -558,7 +558,7 @@ namespace AyaNova.Biz
} }
else else
{ {
ColumnsJSON = AyaObjectFieldDefinitions.GenerateListColumnsJSONFromTemplate(AyaType.Widget, AyaObjectFields, MOCK_WIDGET_USER_EMAIL_DISPLAY_TEMPLATE_JSON); ColumnsJSON = AyaObjectFieldDefinitions.GenerateListColumnsJSONFromTemplate(AyaType.Widget, DataList.FieldDefinitions, MOCK_WIDGET_USER_EMAIL_DISPLAY_TEMPLATE_JSON);
} }