diff --git a/server/AyaNova/Controllers/DataListController.cs b/server/AyaNova/Controllers/DataListController.cs
index c24b72b4..bbb4a8c7 100644
--- a/server/AyaNova/Controllers/DataListController.cs
+++ b/server/AyaNova/Controllers/DataListController.cs
@@ -51,14 +51,14 @@ namespace AyaNova.Api.Controllers
/// Collection with paging data
// [HttpPost("List", Name = nameof(List))]
[HttpPost]
- public async Task List([FromBody] ListOptions listOptions)
+ public async Task List([FromBody] DataListOptions listOptions)
{
if (!serverState.IsOpen)
return StatusCode(503, new ApiErrorResponse(serverState.ApiErrorCode, null, serverState.Reason));
if (listOptions.Limit == null || listOptions.Limit < 1)
{
- listOptions.Limit = ListOptions.DefaultLimit;
+ listOptions.Limit = DataListOptions.DefaultLimit;
}
if (listOptions.Offset == null)
{
diff --git a/server/AyaNova/Controllers/PickListController.cs b/server/AyaNova/Controllers/PickListController.cs
index c53bc1b3..a6d4dca9 100644
--- a/server/AyaNova/Controllers/PickListController.cs
+++ b/server/AyaNova/Controllers/PickListController.cs
@@ -53,7 +53,7 @@ namespace AyaNova.Api.Controllers
/// Parameters for pick list see api docs for details
/// Filtered list
[HttpPost("list")]
- public async Task PostList([FromBody] PickListParams pickListParams)
+ public async Task PostList([FromBody] PickListOptions pickListParams)
{
if (serverState.IsClosed)
return StatusCode(503, new ApiErrorResponse(serverState.ApiErrorCode, null, serverState.Reason));
diff --git a/server/AyaNova/DataList/DataListFetcher.cs b/server/AyaNova/DataList/DataListFetcher.cs
index 2a42ec5a..40452a99 100644
--- a/server/AyaNova/DataList/DataListFetcher.cs
+++ b/server/AyaNova/DataList/DataListFetcher.cs
@@ -18,7 +18,7 @@ namespace AyaNova.DataList
// Get the data list data requested
//
//
- internal static async Task GetResponseAsync(string DataListKey, AyContext ct, ListOptions listOptions, AuthorizationRoles UserRoles, ILogger log, long userId)
+ internal static async Task GetResponseAsync(string DataListKey, AyContext ct, DataListOptions listOptions, AuthorizationRoles UserRoles, ILogger log, long userId)
{
var DataList = DataListFactory.GetAyaDataList(DataListKey);
@@ -84,8 +84,8 @@ namespace AyaNova.DataList
qOrderBy = DataListSqlFilterOrderByBuilder.DataFilterToSQLOrderBy(DataList.FieldDefinitions, InternalListViewArray);
//LIMIT AND OFFSET CLAUSE - PAGING
- listOptions.Offset = listOptions.Offset ?? ListOptions.DefaultOffset;
- listOptions.Limit = listOptions.Limit ?? ListOptions.DefaultLimit;
+ listOptions.Offset = listOptions.Offset ?? DataListOptions.DefaultOffset;
+ listOptions.Limit = listOptions.Limit ?? DataListOptions.DefaultLimit;
var qLimitOffset = $"LIMIT {listOptions.Limit} OFFSET {listOptions.Offset}";
//PUT IT ALL TOGETHER
diff --git a/server/AyaNova/DataList/ListOptions.cs b/server/AyaNova/DataList/ListOptions.cs
index 57413899..861f8f1d 100644
--- a/server/AyaNova/DataList/ListOptions.cs
+++ b/server/AyaNova/DataList/ListOptions.cs
@@ -4,7 +4,7 @@ using Microsoft.AspNetCore.Mvc;
namespace AyaNova.DataList
{
- public sealed class ListOptions
+ public sealed class DataListOptions
{
public const int MaxPageSize = 1000;
public const int DefaultOffset = 0;
@@ -19,6 +19,13 @@ namespace AyaNova.DataList
[FromBody, Required]
public string DataListKey { get; set; }
+/*
+columns:["PartInventoryTransactionEntryDate","PartPartNumber","PartWarehouseName","PartInventoryTransactionQuantity","PartInventoryTransactionDescription","PartInventoryTransactionSource","PartInventoryBalance"]
+sortBy:["PartInventoryTransactionEntryDate"],//same as grid natively does all columns here
+sortDesc:[true],//same as grid natively does, all columns here true or false each
+filter:[{column:"PartPartNumber",items:[{op: "=",value: "400735"}]}],
+variant:"string"
+*/
[FromBody]
public string ListView { get; set; }//optional, if null or empty will use default list view built into DataList
diff --git a/server/AyaNova/PickList/PickListParams.cs b/server/AyaNova/PickList/PickListParams.cs
index 66a84dd6..424d69da 100644
--- a/server/AyaNova/PickList/PickListParams.cs
+++ b/server/AyaNova/PickList/PickListParams.cs
@@ -14,7 +14,7 @@ namespace AyaNova.PickList
/// Return only specific items (for pre-selected items on forms)
/// Some lists optionally take a variant string, e.g. User type "inside","outside" etc
*/
- public sealed class PickListParams
+ public sealed class PickListOptions
{
[FromBody]
@@ -32,7 +32,7 @@ namespace AyaNova.PickList
[FromBody]
public string ListVariant { get; set; }
- public PickListParams()
+ public PickListOptions()
{
AyaType = AyaType.NoType;
Query = string.Empty;