From f9bf0053e8b16dca907cf0ce841d8e199ca2b854 Mon Sep 17 00:00:00 2001 From: John Cardinal Date: Tue, 4 May 2021 18:02:04 +0000 Subject: [PATCH] --- .vscode/launch.json | 2 +- .../DataList/WorkOrderItemPriorityDataList.cs | 8 +- .../DataList/WorkOrderItemStatusDataList.cs | 10 +- server/AyaNova/biz/FormFieldReference.cs | 10 +- server/AyaNova/resource/de.json | 5 +- server/AyaNova/resource/en.json | 5 +- server/AyaNova/resource/es.json | 5 +- server/AyaNova/resource/fr.json | 5 +- server/AyaNova/util/Seeder.cs | 185 ++++++++++++++++++ 9 files changed, 217 insertions(+), 18 deletions(-) diff --git a/.vscode/launch.json b/.vscode/launch.json index 0e2049e9..8fd97968 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": "false", + "AYANOVA_SERVER_TEST_MODE": "true", "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/WorkOrderItemPriorityDataList.cs b/server/AyaNova/DataList/WorkOrderItemPriorityDataList.cs index e8a32e85..4f185a1f 100644 --- a/server/AyaNova/DataList/WorkOrderItemPriorityDataList.cs +++ b/server/AyaNova/DataList/WorkOrderItemPriorityDataList.cs @@ -20,9 +20,9 @@ namespace AyaNova.DataList FieldKey = "WorkOrderItemPriorityName", AType = (int)AyaType.WorkOrderItemPriority, UiFieldDataType = (int)UiFieldDataType.Text, - SqlIdColumnName = "aworkorderstatus.id", - SqlValueColumnName = "aworkorderstatus.name", - SqlColorColumnName = "aworkorderstatus.color", + SqlIdColumnName = "aworkorderitempriority.id", + SqlValueColumnName = "aworkorderitempriority.name", + SqlColorColumnName = "aworkorderitempriority.color", IsRowId = true }); @@ -32,7 +32,7 @@ namespace AyaNova.DataList TKey = "Active", FieldKey = "Active", UiFieldDataType = (int)UiFieldDataType.Bool, - SqlValueColumnName = "aworkorderstatus.active" + SqlValueColumnName = "aworkorderitempriority.active" }); diff --git a/server/AyaNova/DataList/WorkOrderItemStatusDataList.cs b/server/AyaNova/DataList/WorkOrderItemStatusDataList.cs index 8eb77a18..69d94680 100644 --- a/server/AyaNova/DataList/WorkOrderItemStatusDataList.cs +++ b/server/AyaNova/DataList/WorkOrderItemStatusDataList.cs @@ -20,9 +20,9 @@ namespace AyaNova.DataList FieldKey = "WorkOrderItemStatusName", AType = (int)AyaType.WorkOrderItemStatus, UiFieldDataType = (int)UiFieldDataType.Text, - SqlIdColumnName = "aworkorderstatus.id", - SqlValueColumnName = "aworkorderstatus.name", - SqlColorColumnName = "aworkorderstatus.color", + SqlIdColumnName = "aworkorderitemstatus.id", + SqlValueColumnName = "aworkorderitemstatus.name", + SqlColorColumnName = "aworkorderitemstatus.color", IsRowId = true }); @@ -31,7 +31,7 @@ namespace AyaNova.DataList TKey = "WorkOrderItemStatusNotes", FieldKey = "WorkOrderItemStatusNotes", UiFieldDataType = (int)UiFieldDataType.Text, - SqlValueColumnName = "aworkorderstatus.notes" + SqlValueColumnName = "aworkorderitemstatus.notes" }); FieldDefinitions.Add(new DataListFieldDefinition @@ -39,7 +39,7 @@ namespace AyaNova.DataList TKey = "Active", FieldKey = "Active", UiFieldDataType = (int)UiFieldDataType.Bool, - SqlValueColumnName = "aworkorderstatus.active" + SqlValueColumnName = "aworkorderitemstatus.active" }); diff --git a/server/AyaNova/biz/FormFieldReference.cs b/server/AyaNova/biz/FormFieldReference.cs index c1b811eb..4e0ca515 100644 --- a/server/AyaNova/biz/FormFieldReference.cs +++ b/server/AyaNova/biz/FormFieldReference.cs @@ -36,6 +36,8 @@ namespace AyaNova.Biz _formFieldKeys.Add("Contact"); _formFieldKeys.Add(AyaType.ServiceBank.ToString()); _formFieldKeys.Add(AyaType.WorkOrderStatus.ToString()); + _formFieldKeys.Add(AyaType.WorkOrderItemStatus.ToString()); + _formFieldKeys.Add(AyaType.WorkOrderItemPriority.ToString()); } return _formFieldKeys; } @@ -875,7 +877,7 @@ namespace AyaNova.Biz l.Add(new FormField { TKey = "Wiki", FieldKey = "WorkOrderItemWiki", TKeySection = "WorkOrderItem" }); l.Add(new FormField { TKey = "Attachments", FieldKey = "WorkOrderItemAttachments", TKeySection = "WorkOrderItem" }); - + l.Add(new FormField { TKey = "WorkOrderItemWorkOrderStatusID", FieldKey = "WorkOrderItemWorkOrderStatusID", TKeySection = "WorkOrderItem" }); l.Add(new FormField { TKey = "WorkOrderItemPriorityID", FieldKey = "WorkOrderItemPriorityID", TKeySection = "WorkOrderItem" }); l.Add(new FormField { TKey = "WorkOrderItemRequestDate", FieldKey = "WorkOrderItemRequestDate", TKeySection = "WorkOrderItem" }); @@ -947,7 +949,7 @@ namespace AyaNova.Biz } #endregion - #region WorkOrderItemStatus + #region WorkOrderItemStatus { List l = new List(); l.Add(new FormField { TKey = "WorkOrderItemStatusNotes", FieldKey = "WorkOrderItemStatusNotes" }); @@ -955,9 +957,9 @@ namespace AyaNova.Biz } #endregion - #region WorkOrderItemPriority + #region WorkOrderItemPriority { - List l = new List(); + List l = new List(); _formFields.Add(AyaType.WorkOrderItemPriority.ToString(), l); } #endregion diff --git a/server/AyaNova/resource/de.json b/server/AyaNova/resource/de.json index bc30185a..eb1d3706 100644 --- a/server/AyaNova/resource/de.json +++ b/server/AyaNova/resource/de.json @@ -2213,5 +2213,8 @@ "WorkOrderItemStatusList": "Artikelstatusliste", "WorkOrderItemStatusName": "Name", "WorkOrderItemStatusNotes": "Anmerkungen", - "WorkOrderItemStatusColor": "Farbe" + "WorkOrderItemStatusColor": "Farbe", + "WorkOrderItemPriorityList": "Prioritätsliste für Arbeitsauftragspositionen", + "WorkOrderItemPriorityName": "Name", + "WorkOrderItemPriorityColor": "Farbe" } \ No newline at end of file diff --git a/server/AyaNova/resource/en.json b/server/AyaNova/resource/en.json index 51739eb0..e5d11610 100644 --- a/server/AyaNova/resource/en.json +++ b/server/AyaNova/resource/en.json @@ -2213,6 +2213,9 @@ "WorkOrderItemStatusList": "Work order item status list", "WorkOrderItemStatusName": "Name", "WorkOrderItemStatusNotes": "Notes", - "WorkOrderItemStatusColor": "Color" + "WorkOrderItemStatusColor": "Color", + "WorkOrderItemPriorityList": "Work order item priority list", + "WorkOrderItemPriorityName": "Name", + "WorkOrderItemPriorityColor": "Color" } \ No newline at end of file diff --git a/server/AyaNova/resource/es.json b/server/AyaNova/resource/es.json index 4392cb9b..9ccbc2d9 100644 --- a/server/AyaNova/resource/es.json +++ b/server/AyaNova/resource/es.json @@ -2213,5 +2213,8 @@ "WorkOrderItemStatusList": "Lista de estado del artículo", "WorkOrderItemStatusName": "Nombre", "WorkOrderItemStatusNotes": "Notas", - "WorkOrderItemStatusColor": "Color" + "WorkOrderItemStatusColor": "Color", + "WorkOrderItemPriorityList": "Lista de prioridad de elementos de la orden de trabajo", + "WorkOrderItemPriorityName": "Nombre", + "WorkOrderItemPriorityColor": "Color" } \ No newline at end of file diff --git a/server/AyaNova/resource/fr.json b/server/AyaNova/resource/fr.json index d4fd4865..d77e61b0 100644 --- a/server/AyaNova/resource/fr.json +++ b/server/AyaNova/resource/fr.json @@ -2213,5 +2213,8 @@ "WorkOrderItemStatusList": "Liste des statuts des articles", "WorkOrderItemStatusName": "Nom", "WorkOrderItemStatusNotes": "Remarques", - "WorkOrderItemStatusColor": "Couleur" + "WorkOrderItemStatusColor": "Couleur", + "WorkOrderItemPriorityList": "Liste de priorité des éléments de l'ordre de travail", + "WorkOrderItemPriorityName": "Nom", + "WorkOrderItemPriorityColor": "Couleur" } \ No newline at end of file diff --git a/server/AyaNova/util/Seeder.cs b/server/AyaNova/util/Seeder.cs index 464170e9..58a8055a 100644 --- a/server/AyaNova/util/Seeder.cs +++ b/server/AyaNova/util/Seeder.cs @@ -1072,6 +1072,191 @@ namespace AyaNova.Util } } + + + ///////////////////////////////////////////////////// + //WorkorderItemStatus + { + + { + WorkOrderItemStatus stat = new WorkOrderItemStatus(); + stat.Name = "Item is completed"; + stat.Active = true; + stat.Color = "#c00000"; + + stat.Notes = "Indicates this item has been completed"; + using (AyContext ct = ServiceProviderProvider.DBContext) + { + WorkOrderItemStatusBiz biz = WorkOrderItemStatusBiz.GetBiz(ct); + var NewObject = await biz.CreateAsync(stat); + + if (NewObject == null) + { + var err = $"Seeder::SeedKnownObjects error creating workorder item status\r\n{biz.GetErrorsAsString()}"; + log.LogError(err); + throw new System.Exception(err); + } + } + } + + { + WorkOrderItemStatus stat = new WorkOrderItemStatus(); + stat.Name = "Item scheduled"; + stat.Active = true; + stat.Color = "#00ff00"; + + stat.Notes = "Indicates this item has been scheduled"; + using (AyContext ct = ServiceProviderProvider.DBContext) + { + WorkOrderItemStatusBiz biz = WorkOrderItemStatusBiz.GetBiz(ct); + var NewObject = await biz.CreateAsync(stat); + + if (NewObject == null) + { + var err = $"Seeder::SeedKnownObjects error creating workorder item status\r\n{biz.GetErrorsAsString()}"; + log.LogError(err); + throw new System.Exception(err); + } + } + } + + { + WorkOrderItemStatus stat = new WorkOrderItemStatus(); + stat.Name = "Item on hold"; + stat.Active = true; + stat.Color = "#0000ff"; + + stat.Notes = "Indicates this item is on hold"; + using (AyContext ct = ServiceProviderProvider.DBContext) + { + WorkOrderItemStatusBiz biz = WorkOrderItemStatusBiz.GetBiz(ct); + var NewObject = await biz.CreateAsync(stat); + + if (NewObject == null) + { + var err = $"Seeder::SeedKnownObjects error creating workorder item status\r\n{biz.GetErrorsAsString()}"; + log.LogError(err); + throw new System.Exception(err); + } + } + } + } + + + +///////////////////////////////////////////////////// + //WorkOrderItemPriority + { + + { + WorkOrderItemPriority stat = new WorkOrderItemPriority(); + stat.Name = "Immediately"; + stat.Active = true; + stat.Color = "#c00000"; + + + using (AyContext ct = ServiceProviderProvider.DBContext) + { + WorkOrderItemPriorityBiz biz = WorkOrderItemPriorityBiz.GetBiz(ct); + var NewObject = await biz.CreateAsync(stat); + + if (NewObject == null) + { + var err = $"Seeder::SeedKnownObjects error creating workorder item status\r\n{biz.GetErrorsAsString()}"; + log.LogError(err); + throw new System.Exception(err); + } + } + } + + { + WorkOrderItemPriority stat = new WorkOrderItemPriority(); + stat.Name = "24 hours"; + stat.Active = true; + stat.Color = "#ff9900"; + + + using (AyContext ct = ServiceProviderProvider.DBContext) + { + WorkOrderItemPriorityBiz biz = WorkOrderItemPriorityBiz.GetBiz(ct); + var NewObject = await biz.CreateAsync(stat); + + if (NewObject == null) + { + var err = $"Seeder::SeedKnownObjects error creating workorder item status\r\n{biz.GetErrorsAsString()}"; + log.LogError(err); + throw new System.Exception(err); + } + } + } + + { + WorkOrderItemPriority stat = new WorkOrderItemPriority(); + stat.Name = "6 hours"; + stat.Active = true; + stat.Color = "#ffff00"; + + + using (AyContext ct = ServiceProviderProvider.DBContext) + { + WorkOrderItemPriorityBiz biz = WorkOrderItemPriorityBiz.GetBiz(ct); + var NewObject = await biz.CreateAsync(stat); + + if (NewObject == null) + { + var err = $"Seeder::SeedKnownObjects error creating workorder item status\r\n{biz.GetErrorsAsString()}"; + log.LogError(err); + throw new System.Exception(err); + } + } + } + + { + WorkOrderItemPriority stat = new WorkOrderItemPriority(); + stat.Name = "One week"; + stat.Active = true; + stat.Color = "#00ccff"; + + + using (AyContext ct = ServiceProviderProvider.DBContext) + { + WorkOrderItemPriorityBiz biz = WorkOrderItemPriorityBiz.GetBiz(ct); + var NewObject = await biz.CreateAsync(stat); + + if (NewObject == null) + { + var err = $"Seeder::SeedKnownObjects error creating workorder item status\r\n{biz.GetErrorsAsString()}"; + log.LogError(err); + throw new System.Exception(err); + } + } + } + + { + WorkOrderItemPriority stat = new WorkOrderItemPriority(); + stat.Name = "30 days"; + stat.Active = true; + stat.Color = "#00ff00"; + + + using (AyContext ct = ServiceProviderProvider.DBContext) + { + WorkOrderItemPriorityBiz biz = WorkOrderItemPriorityBiz.GetBiz(ct); + var NewObject = await biz.CreateAsync(stat); + + if (NewObject == null) + { + var err = $"Seeder::SeedKnownObjects error creating workorder item status\r\n{biz.GetErrorsAsString()}"; + log.LogError(err); + throw new System.Exception(err); + } + } + } + + + } + + //========================= }