From d914a3506808892ed56745eebd32bd113b60e608 Mon Sep 17 00:00:00 2001 From: John Cardinal Date: Thu, 22 Jul 2021 23:51:01 +0000 Subject: [PATCH] --- .vscode/launch.json | 4 +- server/AyaNova/PickList/PickListFactory.cs | 44 +++++++++++++++++----- 2 files changed, 37 insertions(+), 11 deletions(-) diff --git a/.vscode/launch.json b/.vscode/launch.json index 9b7fcdd3..b77f3b95 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -47,13 +47,13 @@ // "AYANOVA_LOG_LEVEL": "Trace", "AYANOVA_DEFAULT_TRANSLATION": "en", //TRANSLATION MUST BE en for Integration TESTING - "AYANOVA_PERMANENTLY_ERASE_DATABASE": "true", + //"AYANOVA_PERMANENTLY_ERASE_DATABASE": "true", "AYANOVA_DB_CONNECTION": "Server=localhost;Username=postgres;Password=raven;Database=AyaNova;CommandTimeout=120;", "AYANOVA_USE_URLS": "http://*:7575;", "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": "false", + "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/PickList/PickListFactory.cs b/server/AyaNova/PickList/PickListFactory.cs index bd9db925..f0e56144 100644 --- a/server/AyaNova/PickList/PickListFactory.cs +++ b/server/AyaNova/PickList/PickListFactory.cs @@ -20,8 +20,8 @@ namespace AyaNova.PickList return new CustomerPickList() as IAyaPickList; case AyaType.HeadOffice: return new HeadOfficePickList() as IAyaPickList; - case AyaType.Widget: - return new WidgetPickList() as IAyaPickList; + // case AyaType.Widget: + // return new WidgetPickList() as IAyaPickList; case AyaType.User: return new UserPickList() as IAyaPickList; case AyaType.Vendor: @@ -53,6 +53,8 @@ namespace AyaNova.PickList case AyaType.Report: return new ReportPickList() as IAyaPickList; + //@##### WARNING: BE SURE TO ADD NEW TYPES BELOW OR USERS WON"T BE ABLE TO EDIT THE TEMPLATE FOR THEM + default: throw new System.NotImplementedException($"PICKLIST {ayaType} NOT IMPLEMENTED"); @@ -65,15 +67,39 @@ namespace AyaNova.PickList { List TranslationKeysToFetch = new List(); List ret = new List(); - var values = System.Enum.GetValues(typeof(AyaType)); + + List values = new List(); + values.Add(AyaType.Contract); + values.Add(AyaType.Customer); + values.Add(AyaType.HeadOffice); + values.Add(AyaType.LoanUnit); + values.Add(AyaType.Part); + values.Add(AyaType.PartWarehouse); + values.Add(AyaType.PartAssembly); + values.Add(AyaType.Project); + values.Add(AyaType.Report); + values.Add(AyaType.ServiceRate); + values.Add(AyaType.TaskGroup); + values.Add(AyaType.TaxCode); + values.Add(AyaType.TravelRate); + values.Add(AyaType.Unit); + values.Add(AyaType.UnitModel); + values.Add(AyaType.User); + values.Add(AyaType.Vendor); + values.Add(AyaType.WorkOrderTemplate); + + //### NEW ONES HERE + + + foreach (AyaType t in values) { - if (t.HasAttribute(typeof(CoreBizObjectAttribute))) - { - var name = t.ToString(); - TranslationKeysToFetch.Add(name); - ret.Add(new NameIdItem() { Name = name, Id = (long)t }); - } + // if (t.HasAttribute(typeof(CoreBizObjectAttribute))) + // { + var name = t.ToString(); + TranslationKeysToFetch.Add(name); + ret.Add(new NameIdItem() { Name = name, Id = (long)t }); + // } } var LT = TranslationBiz.GetSubsetStaticAsync(TranslationKeysToFetch, TranslationId).Result; foreach (NameIdItem i in ret)