From 5b0708eadc1dd2e9774e55dae949e3f60cf723da Mon Sep 17 00:00:00 2001 From: John Cardinal Date: Mon, 6 Sep 2021 20:10:13 +0000 Subject: [PATCH] --- .vscode/launch.json | 2 +- server/AyaNova/DataList/DataListFieldDefinition.cs | 4 ++++ server/AyaNova/DataList/DataListProcessingBase.cs | 7 ++++++- .../AyaNova/DataList/PartInventoryTransactionsDataList.cs | 5 +++-- 4 files changed, 14 insertions(+), 4 deletions(-) diff --git a/.vscode/launch.json b/.vscode/launch.json index fcc80a75..b77f3b95 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -53,7 +53,7 @@ "AYANOVA_FOLDER_USER_FILES": "c:\\temp\\RavenTestData\\userfiles", "AYANOVA_FOLDER_BACKUP_FILES": "c:\\temp\\RavenTestData\\backupfiles", "AYANOVA_FOLDER_TEMPORARY_SERVER_FILES": "c:\\temp\\RavenTestData\\tempfiles", - "AYANOVA_SERVER_TEST_MODE": "true", + "AYANOVA_SERVER_TEST_MODE": "false", "AYANOVA_SERVER_TEST_MODE_SEEDLEVEL": "small", "AYANOVA_SERVER_TEST_MODE_TZ_OFFSET": "-7", "AYANOVA_BACKUP_PG_DUMP_PATH": "C:\\data\\code\\postgres_13\\bin\\" diff --git a/server/AyaNova/DataList/DataListFieldDefinition.cs b/server/AyaNova/DataList/DataListFieldDefinition.cs index 177a8a75..7872514a 100644 --- a/server/AyaNova/DataList/DataListFieldDefinition.cs +++ b/server/AyaNova/DataList/DataListFieldDefinition.cs @@ -42,6 +42,9 @@ namespace AyaNova.DataList //CLIENT / SERVER - client display and to indicate what object to open , Server for formatting return object public int AType { get; set; } + //CLIENT - indicates client must translate the values in this column (typically computed columns based on aygetname procedure) + public bool Translate { get; set; } + //SERVER - for building sql queries //don't return these properties when api user fetches field list definitions in DataListController [JsonIgnore] @@ -62,6 +65,7 @@ namespace AyaNova.DataList IsSortable = true; IsRowId = false; IsMeta = false; + Translate=false; //Set openable object type to no type which is the default and means it's not a link to another object AType = (int)AyaType.NoType; SqlATypeColumnName = null;//must be null as that is checked against specifically diff --git a/server/AyaNova/DataList/DataListProcessingBase.cs b/server/AyaNova/DataList/DataListProcessingBase.cs index 2dc917a3..a15cde87 100644 --- a/server/AyaNova/DataList/DataListProcessingBase.cs +++ b/server/AyaNova/DataList/DataListProcessingBase.cs @@ -67,7 +67,7 @@ namespace AyaNova.DataList } public Newtonsoft.Json.Linq.JArray GenerateReturnListColumns(List columns) - { + { var CustomFieldDefinitions = GetCustomFieldDefinitionsForList(); //Generate JSON fragment to return with column definitions @@ -133,10 +133,15 @@ namespace AyaNova.DataList //Not Sortable? if (!o.IsSortable) sb.Append($",\"ns\":1"); + //Not Filterable? if (!o.IsFilterable) sb.Append($",\"nf\":1"); + //translate required? + if (o.Translate) + sb.Append($",\"tra\":1"); + sb.Append("}"); FirstColumnAdded = true; diff --git a/server/AyaNova/DataList/PartInventoryTransactionsDataList.cs b/server/AyaNova/DataList/PartInventoryTransactionsDataList.cs index 665d850e..b1ce6131 100644 --- a/server/AyaNova/DataList/PartInventoryTransactionsDataList.cs +++ b/server/AyaNova/DataList/PartInventoryTransactionsDataList.cs @@ -27,9 +27,10 @@ namespace AyaNova.DataList TKey = "PartInventoryTransactionSource", FieldKey = "PartInventoryTransactionSource", UiFieldDataType = (int)UiFieldDataType.Text, - SqlIdColumnName = "apartinventory.sourceid", + SqlIdColumnName = "apartinventory.sourceid", SqlValueColumnName = "AYGETNAME(apartinventory.sourceid, apartinventory.sourcetype)", - SqlATypeColumnName = "apartinventory.sourcetype" + SqlATypeColumnName = "apartinventory.sourcetype", + Translate=true }); FieldDefinitions.Add(new DataListFieldDefinition