diff --git a/server/AyaNova/DataList/AyaDataList.cs b/server/AyaNova/DataList/AyaDataList.cs index 338070c5..d82b59f6 100644 --- a/server/AyaNova/DataList/AyaDataList.cs +++ b/server/AyaNova/DataList/AyaDataList.cs @@ -57,10 +57,10 @@ namespace AyaNova.DataList - public Newtonsoft.Json.Linq.JArray GenerateListColumnsJSONFromListView(JArray listViewArray) + public Newtonsoft.Json.Linq.JArray GenerateReturnListColumns(List columns) { - var ListViewFieldKeys = GetFieldListFromListView(listViewArray); + // var ListViewFieldKeys = GetFieldListFromListView(listViewArray); var CustomFieldDefinitions = GetCustomFieldDefinitionsForList(); //Generate JSON fragment to return with column definitions @@ -70,7 +70,7 @@ namespace AyaNova.DataList bool FirstColumnAdded = false; - foreach (string s in ListViewFieldKeys) + foreach (string s in columns) { AyaDataListFieldDefinition o = FieldDefinitions.FirstOrDefault(z => z.FieldKey == s); #if (DEBUG) diff --git a/server/AyaNova/DataList/DataListFetcher.cs b/server/AyaNova/DataList/DataListFetcher.cs index 5111877b..538c1861 100644 --- a/server/AyaNova/DataList/DataListFetcher.cs +++ b/server/AyaNova/DataList/DataListFetcher.cs @@ -41,12 +41,12 @@ namespace AyaNova.DataList StaticServerFilterOptions = ((IAyaDataListServerCriteria)DataList).DataListServerCriteria(userId, userRoles, listOptions); - //Get the public field key names in a list from the listview - List PublicListViewFieldList = listOptions.Columns; + // //Get the public field key names in a list from the listview + // List PublicListViewFieldList = listOptions.Columns; //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 - 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 //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(" ", " "); //RETURN OBJECTS - int returnRowColumnCount = PublicListViewFieldList.Count(); + int returnRowColumnCount = listOptions.Columns.Count(); List> rows = new List>(); long totalRecordCount = 0; @@ -105,7 +105,7 @@ namespace AyaNova.DataList //INSERT REMAINING FIELDS FROM TEMPLATE INTO THE RETURN ROWS LIST - foreach (string TemplateField in PublicListViewFieldList) + foreach (string TemplateField in listOptions.Columns) { //get the AyaObjectFieldDefinition @@ -230,7 +230,7 @@ namespace AyaNova.DataList //BUILD THE COLUMNS RETURN PROPERTY JSON FRAGMENT 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); diff --git a/server/AyaNova/DataList/IAyaDataList.cs b/server/AyaNova/DataList/IAyaDataList.cs index e8ea210c..bd333650 100644 --- a/server/AyaNova/DataList/IAyaDataList.cs +++ b/server/AyaNova/DataList/IAyaDataList.cs @@ -24,7 +24,7 @@ namespace AyaNova.DataList void SetListOptionDefaultsIfNecessary(DataListOptions listOptions); - Newtonsoft.Json.Linq.JArray GenerateListColumnsJSONFromListView(JArray listViewArray); + Newtonsoft.Json.Linq.JArray GenerateReturnListColumns(List columns); // List GetFieldListFromListView(JArray listViewArray);