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-27 15:20:48 +00:00
parent 89bd335de1
commit 7d1bb41246
3 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
server/AyaNova/DataList/AyaDataList.cs
View File

@@ -57,10 +57,10 @@ namespace AyaNova.DataList
public Newtonsoft.Json.Linq.JArray GenerateListColumnsJSONFromListView(JArray listViewArray) public Newtonsoft.Json.Linq.JArray GenerateReturnListColumns(List<string> columns)
{ {
var ListViewFieldKeys = GetFieldListFromListView(listViewArray); // var ListViewFieldKeys = GetFieldListFromListView(listViewArray);
var CustomFieldDefinitions = GetCustomFieldDefinitionsForList(); var CustomFieldDefinitions = GetCustomFieldDefinitionsForList();
//Generate JSON fragment to return with column definitions //Generate JSON fragment to return with column definitions
@@ -70,7 +70,7 @@ namespace AyaNova.DataList
bool FirstColumnAdded = false; bool FirstColumnAdded = false;
foreach (string s in ListViewFieldKeys) foreach (string s in columns)
{ {
AyaDataListFieldDefinition o = FieldDefinitions.FirstOrDefault(z => z.FieldKey == s); AyaDataListFieldDefinition o = FieldDefinitions.FirstOrDefault(z => z.FieldKey == s);
#if (DEBUG) #if (DEBUG)

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

@@ -41,12 +41,12 @@ namespace AyaNova.DataList
StaticServerFilterOptions = ((IAyaDataListServerCriteria)DataList).DataListServerCriteria(userId, userRoles, listOptions); StaticServerFilterOptions = ((IAyaDataListServerCriteria)DataList).DataListServerCriteria(userId, userRoles, listOptions);
//Get the public field key names in a list from the listview // //Get the public field key names in a list from the listview
List<string> PublicListViewFieldList = listOptions.Columns; // List<string> PublicListViewFieldList = listOptions.Columns;
//Get the combination of all unique fields from both StaticServerFilterOptions and listOptions //Get the combination of all unique fields from both StaticServerFilterOptions and listOptions
//NOTE: this assumes no list options filter colums that don't exist in listoptions.columns //NOTE: this assumes no list options filter colums that don't exist in listoptions.columns
var AllUniqueFieldKeysRequiredForQuery = PublicListViewFieldList.Union(StaticServerFilterOptions.Select(z => z.Column).ToList()).ToList(); var AllUniqueFieldKeysRequiredForQuery = listOptions.Columns.Union(StaticServerFilterOptions.Select(z => z.Column).ToList()).ToList();
//Add the internal filters into the listoptions existing filters //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 //NOTE: There is currently no overlap between internal filtered columns and filters coming from the client
@@ -84,7 +84,7 @@ namespace AyaNova.DataList
qTotalRecordsQuery = $"SELECT COUNT(*) {qFrom} {qWhere}".Replace(" ", " "); qTotalRecordsQuery = $"SELECT COUNT(*) {qFrom} {qWhere}".Replace(" ", " ");
//RETURN OBJECTS //RETURN OBJECTS
int returnRowColumnCount = PublicListViewFieldList.Count(); int returnRowColumnCount = listOptions.Columns.Count();
List<List<AyaFieldData>> rows = new List<List<AyaFieldData>>(); List<List<AyaFieldData>> rows = new List<List<AyaFieldData>>();
long totalRecordCount = 0; long totalRecordCount = 0;
@@ -105,7 +105,7 @@ namespace AyaNova.DataList
//INSERT REMAINING FIELDS FROM TEMPLATE INTO THE RETURN ROWS LIST //INSERT REMAINING FIELDS FROM TEMPLATE INTO THE RETURN ROWS LIST
foreach (string TemplateField in PublicListViewFieldList) foreach (string TemplateField in listOptions.Columns)
{ {
//get the AyaObjectFieldDefinition //get the AyaObjectFieldDefinition
@@ -230,7 +230,7 @@ namespace AyaNova.DataList
//BUILD THE COLUMNS RETURN PROPERTY JSON FRAGMENT //BUILD THE COLUMNS RETURN PROPERTY JSON FRAGMENT
Newtonsoft.Json.Linq.JArray ColumnsJSON = null; Newtonsoft.Json.Linq.JArray ColumnsJSON = null;
ColumnsJSON = DataList.GenerateListColumnsJSONFromListView(listOptions.Columns);//<<<-----this next ColumnsJSON = DataList.GenerateReturnListColumns(listOptions.Columns);//<<<-----this next
return new ApiDataListResponse(rows, totalRecordCount, ColumnsJSON); return new ApiDataListResponse(rows, totalRecordCount, ColumnsJSON);

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

@@ -24,7 +24,7 @@ namespace AyaNova.DataList
void SetListOptionDefaultsIfNecessary(DataListOptions listOptions); void SetListOptionDefaultsIfNecessary(DataListOptions listOptions);
Newtonsoft.Json.Linq.JArray GenerateListColumnsJSONFromListView(JArray listViewArray); Newtonsoft.Json.Linq.JArray GenerateReturnListColumns(List<string> columns);
// List<string> GetFieldListFromListView(JArray listViewArray); // List<string> GetFieldListFromListView(JArray listViewArray);