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-02-01 18:40:11 +00:00
parent 205ac4d54d
commit fa40aef432
2 changed files with 15 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -228,7 +228,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.GenerateReturnListColumns(dataListTableProcessingOptions.Columns); ColumnsJSON = DataList.GenerateReturnListColumns(dataListTableProcessingOptions.Columns);
return new DataListReturnData(rows, totalRecordCount, ColumnsJSON); return new DataListReturnData(rows, totalRecordCount, ColumnsJSON, dataListTableProcessingOptions.SortBy, dataListTableProcessingOptions.Filter);
} }

8
server/AyaNova/DataList/DataListReturnData.cs
View File

@@ -1,3 +1,5 @@
using System.Collections.Generic;
using AyaNova.Models;
namespace AyaNova.DataList namespace AyaNova.DataList
{ {
@@ -7,12 +9,16 @@ namespace AyaNova.DataList
public object Data { get; } public object Data { get; }
public long TotalRecordCount { get; } public long TotalRecordCount { get; }
public object Columns { get; } public object Columns { get; }
public Dictionary<string, string> SortBy { get; set; }
public List<DataListFilterOption> Filter { get; set; }
public DataListReturnData(object returnItems, long totalRecordCount, Newtonsoft.Json.Linq.JArray columns) public DataListReturnData(object returnItems, long totalRecordCount, Newtonsoft.Json.Linq.JArray columns, Dictionary<string, string> sortBy, List<DataListFilterOption> filter)
{ {
Data = returnItems; Data = returnItems;
TotalRecordCount = totalRecordCount; TotalRecordCount = totalRecordCount;
Columns = columns; Columns = columns;
SortBy = sortBy;
Filter = filter;
} }
}//eoc }//eoc