From 40cb386c6eac947731d5661f00e3834383ee4fad Mon Sep 17 00:00:00 2001 From: John Cardinal Date: Wed, 24 Nov 2021 20:22:32 +0000 Subject: [PATCH] --- server/AyaNova/DataList/DataListFieldDefinition.cs | 2 +- server/AyaNova/DataList/DataListReturnData.cs | 2 ++ server/AyaNova/DataList/PartInventoryDataList.cs | 11 +++++------ .../AyaNova/models/DataListTableProcessingOptions.cs | 2 ++ server/AyaNova/resource/de.json | 1 + server/AyaNova/resource/en.json | 1 + server/AyaNova/resource/es.json | 1 + server/AyaNova/resource/fr.json | 1 + 8 files changed, 14 insertions(+), 7 deletions(-) diff --git a/server/AyaNova/DataList/DataListFieldDefinition.cs b/server/AyaNova/DataList/DataListFieldDefinition.cs index 7872514a..74e20ce4 100644 --- a/server/AyaNova/DataList/DataListFieldDefinition.cs +++ b/server/AyaNova/DataList/DataListFieldDefinition.cs @@ -26,7 +26,7 @@ namespace AyaNova.DataList //CLIENT / SERVER - client display server validation purposes public bool IsSortable { get; set; } - //CLIENT / SERVER - indicates internal only meta column, don't show to user for filter settings etc + //SERVER - indicates internal only meta column, not a client thing public bool IsMeta { get; set; } //CLIENT Use only for display diff --git a/server/AyaNova/DataList/DataListReturnData.cs b/server/AyaNova/DataList/DataListReturnData.cs index b58aab33..94c37d06 100644 --- a/server/AyaNova/DataList/DataListReturnData.cs +++ b/server/AyaNova/DataList/DataListReturnData.cs @@ -9,6 +9,8 @@ namespace AyaNova.DataList public object Columns { get; } public Dictionary SortBy { get; set; } public List Filter { get; set; } + //All columns that are hidden but are affecting the query (sorting, filtering) + //so in UI can show that there are hidden columns affecting the result set public List HiddenAffectiveColumns {get;set;} public DataListReturnData(object returnItems, long totalRecordCount, Newtonsoft.Json.Linq.JArray columns, Dictionary sortBy, List filter, List hiddenAffectiveColumns) diff --git a/server/AyaNova/DataList/PartInventoryDataList.cs b/server/AyaNova/DataList/PartInventoryDataList.cs index f3f40c40..56ed9b1d 100644 --- a/server/AyaNova/DataList/PartInventoryDataList.cs +++ b/server/AyaNova/DataList/PartInventoryDataList.cs @@ -16,7 +16,7 @@ namespace AyaNova.DataList var RoleSet = BizRoles.GetRoleSet(DefaultListAType); AllowedRoles = RoleSet.ReadFullRecord | RoleSet.Change; - DefaultColumns = new List() { "PartName", "PartWarehouseName", "PartInventoryBalance", "PartByWarehouseInventoryMinStockLevel", "PartByWarehouseInventoryReorderQuantity", "PartByWarehouseInventoryQuantityOnOrder", "PartByWarehouseInventoryQtyOnOrderCommitted", "Active" }; + DefaultColumns = new List() { "PartName", "PartWarehouseName", "PartInventoryBalance", "PartByWarehouseInventoryMinStockLevel", "PartByWarehouseInventoryReorderQuantity", "PartByWarehouseInventoryQuantityOnOrder", "PartByWarehouseInventoryQtyOnOrderCommitted", "Active","PartInventoryId" }; DefaultSortBy = new Dictionary() { { "PartName", "+" }, { "PartWarehouseName", "+" } }; FieldDefinitions = new List(); @@ -96,14 +96,13 @@ namespace AyaNova.DataList FieldDefinitions.Add(new DataListFieldDefinition { - TKey = "PartInventoryTransactionDescription", - FieldKey = "PartInventoryTransactionDescription", + TKey = "PartInventoryId", + FieldKey = "PartInventoryId", AType = (int)AyaType.PartInventory, UiFieldDataType = (int)UiFieldDataType.Text, SqlIdColumnName = "partinventoryid", - SqlValueColumnName = "partinventorydescription", - IsMeta = true,//only so it doesn't show in the UI but is required for report - IsRowId = true + SqlValueColumnName = "partinventoryid", + IsRowId = true//useless but necessary to show for row selection and reporting purposes }); FieldDefinitions.Add(new DataListFieldDefinition diff --git a/server/AyaNova/models/DataListTableProcessingOptions.cs b/server/AyaNova/models/DataListTableProcessingOptions.cs index f357652e..5066414c 100644 --- a/server/AyaNova/models/DataListTableProcessingOptions.cs +++ b/server/AyaNova/models/DataListTableProcessingOptions.cs @@ -15,6 +15,8 @@ namespace AyaNova.Models internal const int DefaultLimit = 25; internal int? Offset { get; set; } internal int? Limit { get; set; } + //All columns that are hidden but are affecting the query (sorting, filtering) + //so in UI can show that there are hidden columns affecting the result set internal List HiddenAffectiveColumns { get; set; } internal DataListTableProcessingOptions( diff --git a/server/AyaNova/resource/de.json b/server/AyaNova/resource/de.json index 0652d819..01f0c962 100644 --- a/server/AyaNova/resource/de.json +++ b/server/AyaNova/resource/de.json @@ -2170,6 +2170,7 @@ "PartInventoryTransactionSource": "Transaktionsquelle", "PartInventoryTransactionQuantity": "Menge", "PartInventoryBalance": "Menge zur Hand", + "PartInventoryId": "Inventar-ID", "PartStockingLevels": "Mindestbestand an Teilen", "Columns": "Spalten", "SaveACopy": "Kopie speichern", diff --git a/server/AyaNova/resource/en.json b/server/AyaNova/resource/en.json index 026de456..342a0b9b 100644 --- a/server/AyaNova/resource/en.json +++ b/server/AyaNova/resource/en.json @@ -2170,6 +2170,7 @@ "PartInventoryTransactionSource": "Transaction source", "PartInventoryTransactionQuantity": "Quantity", "PartInventoryBalance": "On hand quantity", + "PartInventoryId": "Inventory Id", "PartStockingLevels": "Part stocking levels", "Columns": "Columns", "SaveACopy": "Save a copy", diff --git a/server/AyaNova/resource/es.json b/server/AyaNova/resource/es.json index c59f5096..7662b154 100644 --- a/server/AyaNova/resource/es.json +++ b/server/AyaNova/resource/es.json @@ -2170,6 +2170,7 @@ "PartInventoryTransactionSource": "Origen de la transacción", "PartInventoryTransactionQuantity": "Cantidad", "PartInventoryBalance": "Cantidad en mano", + "PartInventoryId": "ID de inventario", "PartStockingLevels": "Niveles de existencias de piezas", "Columns": "Columnas", "SaveACopy": "Guardar una copia", diff --git a/server/AyaNova/resource/fr.json b/server/AyaNova/resource/fr.json index 3fe43a13..3676f261 100644 --- a/server/AyaNova/resource/fr.json +++ b/server/AyaNova/resource/fr.json @@ -2170,6 +2170,7 @@ "PartInventoryTransactionSource": "Source de transaction", "PartInventoryTransactionQuantity": "Quantité", "PartInventoryBalance": "Quantité disponible", + "PartInventoryId": "ID d'inventaire", "PartStockingLevels": "Niveaux de stockage des pièces", "Columns": "Colonnes", "SaveACopy": "Enregistrer une copie",