From 8489a129c32b3430cf1e7a6e954f3e955ec17e46 Mon Sep 17 00:00:00 2001 From: John Cardinal Date: Mon, 3 May 2021 17:11:31 +0000 Subject: [PATCH] --- .vscode/launch.json | 2 +- server/AyaNova/biz/FormFieldReference.cs | 60 ++++++++++++++++++++---- server/AyaNova/resource/de.json | 2 +- server/AyaNova/resource/en.json | 2 +- server/AyaNova/resource/es.json | 2 +- server/AyaNova/resource/fr.json | 2 +- 6 files changed, 55 insertions(+), 15 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/biz/FormFieldReference.cs b/server/AyaNova/biz/FormFieldReference.cs index ae204cc3..4db4feec 100644 --- a/server/AyaNova/biz/FormFieldReference.cs +++ b/server/AyaNova/biz/FormFieldReference.cs @@ -827,10 +827,13 @@ namespace AyaNova.Biz #region WorkOrder { + //WORKORDER List l = new List(); - //l.Add(new FormField { TKey = "WorkOrderSerial", FieldKey = "Serial", Hideable = false }); - l.Add(new FormField { TKey = "WorkOrderNotes", FieldKey = "Notes" }); - //l.Add(new FormField { TKey = "Active", FieldKey = "Active", Hideable = false }); + + l.Add(new FormField { TKey = "WorkOrderSummary", FieldKey = "WorkOrderSummary" }); + l.Add(new FormField { TKey = "WorkOrderStatus", FieldKey = "WorkOrderStatus" }); + l.Add(new FormField { TKey = "Address", FieldKey = "Address" }); + l.Add(new FormField { TKey = "Tags", FieldKey = "Tags" }); l.Add(new FormField { TKey = "Wiki", FieldKey = "Wiki" }); l.Add(new FormField { TKey = "Attachments", FieldKey = "Attachments" }); @@ -851,6 +854,39 @@ namespace AyaNova.Biz l.Add(new FormField { TKey = "WorkOrderCustom14", FieldKey = "WorkOrderCustom14", IsCustomField = true }); l.Add(new FormField { TKey = "WorkOrderCustom15", FieldKey = "WorkOrderCustom15", IsCustomField = true }); l.Add(new FormField { TKey = "WorkOrderCustom16", FieldKey = "WorkOrderCustom16", IsCustomField = true }); + + + + //WORKORDER ITEM + l.Add(new FormField { TKey = "WorkOrderItemSummary", FieldKey = "WorkOrderItemSummary", TKeySection="WorkOrderItem" }); + l.Add(new FormField { TKey = "WorkOrderItemSequence", FieldKey = "WorkOrderItemSequence", TKeySection="WorkOrderItem" }); + l.Add(new FormField { TKey = "WorkOrderItemTechNotes", FieldKey = "WorkOrderItemTechNotes", TKeySection="WorkOrderItem" }); + l.Add(new FormField { TKey = "WorkOrderItemScheduledUserList", FieldKey = "WorkOrderItemScheduledUserList", TKeySection="WorkOrderItem" }); + l.Add(new FormField { TKey = "Tags", FieldKey = "WorkOrderItemTags", TKeySection="WorkOrderItem" }); + 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 = "WorkOrderItemCustom1", FieldKey = "WorkOrderItemCustom1", IsCustomField = true }); + l.Add(new FormField { TKey = "WorkOrderItemCustom2", FieldKey = "WorkOrderItemCustom2", IsCustomField = true }); + l.Add(new FormField { TKey = "WorkOrderItemCustom3", FieldKey = "WorkOrderItemCustom3", IsCustomField = true }); + l.Add(new FormField { TKey = "WorkOrderItemCustom4", FieldKey = "WorkOrderItemCustom4", IsCustomField = true }); + l.Add(new FormField { TKey = "WorkOrderItemCustom5", FieldKey = "WorkOrderItemCustom5", IsCustomField = true }); + l.Add(new FormField { TKey = "WorkOrderItemCustom6", FieldKey = "WorkOrderItemCustom6", IsCustomField = true }); + l.Add(new FormField { TKey = "WorkOrderItemCustom7", FieldKey = "WorkOrderItemCustom7", IsCustomField = true }); + l.Add(new FormField { TKey = "WorkOrderItemCustom8", FieldKey = "WorkOrderItemCustom8", IsCustomField = true }); + l.Add(new FormField { TKey = "WorkOrderItemCustom9", FieldKey = "WorkOrderItemCustom9", IsCustomField = true }); + l.Add(new FormField { TKey = "WorkOrderItemCustom10", FieldKey = "WorkOrderItemCustom10", IsCustomField = true }); + l.Add(new FormField { TKey = "WorkOrderItemCustom11", FieldKey = "WorkOrderItemCustom11", IsCustomField = true }); + l.Add(new FormField { TKey = "WorkOrderItemCustom12", FieldKey = "WorkOrderItemCustom12", IsCustomField = true }); + l.Add(new FormField { TKey = "WorkOrderItemCustom13", FieldKey = "WorkOrderItemCustom13", IsCustomField = true }); + l.Add(new FormField { TKey = "WorkOrderItemCustom14", FieldKey = "WorkOrderItemCustom14", IsCustomField = true }); + l.Add(new FormField { TKey = "WorkOrderItemCustom15", FieldKey = "WorkOrderItemCustom15", IsCustomField = true }); + l.Add(new FormField { TKey = "WorkOrderItemCustom16", FieldKey = "WorkOrderItemCustom16", IsCustomField = true }); + + + + + _formFields.Add(AyaType.WorkOrder.ToString(), l); } @@ -886,13 +922,13 @@ namespace AyaNova.Biz } #endregion - #region WorkOrderStatus - { - List l = new List(); - l.Add(new FormField { TKey = "WorkOrderStatusNotes", FieldKey = "WorkOrderStatusNotes" }); - _formFields.Add(AyaType.WorkOrderStatus.ToString(), l); - } - #endregion + // #region WorkOrderStatus + // { + // List l = new List(); + // l.Add(new FormField { TKey = "WorkOrderStatusNotes", FieldKey = "WorkOrderStatusNotes" }); + // _formFields.Add(AyaType.WorkOrderStatus.ToString(), l); + // } + // #endregion #region CustomerServiceRequest { @@ -959,6 +995,10 @@ namespace AyaNova.Biz //CLIENT Use only for display in customization form public string TKey { get; set; } + //CLIENT Use only for display in customization form to disambiguate things like + //Tags in main workorder and Tags in Workorder Item and Tags in Unit (all on same form) + public string TKeySection {get;set;} + //CLIENT form customization // public bool Hideable { get; set; } diff --git a/server/AyaNova/resource/de.json b/server/AyaNova/resource/de.json index 9285e654..397f70df 100644 --- a/server/AyaNova/resource/de.json +++ b/server/AyaNova/resource/de.json @@ -2188,7 +2188,7 @@ "NextPMNumber": "Nächste vorbeugende Wartung", "WorkOrderErrorLocked": "Der Arbeitsauftrag ist derzeit gesperrt und kann nicht geändert werden", "WorkOrderSerialNumber": "Nummer", - "Sequence": "Reihenfolge", + "WorkOrderItemSequence": "Reihenfolge", "SoftDelete": "Zum Löschen markieren", "Undelete": "Wiederherstellen", "NewStatus": "Neuer Status", diff --git a/server/AyaNova/resource/en.json b/server/AyaNova/resource/en.json index 2538c204..a96757aa 100644 --- a/server/AyaNova/resource/en.json +++ b/server/AyaNova/resource/en.json @@ -2188,7 +2188,7 @@ "NextPMNumber": "Next preventive maintenance", "WorkOrderErrorLocked": "Work order is set to a locked status and can't be changed", "WorkOrderSerialNumber": "Number", - "Sequence": "Sequence", + "WorkOrderItemSequence": "Sequence", "SoftDelete": "Mark for deletion", "Undelete": "Undelete", "NewStatus": "New status", diff --git a/server/AyaNova/resource/es.json b/server/AyaNova/resource/es.json index 820d3835..2830fa30 100644 --- a/server/AyaNova/resource/es.json +++ b/server/AyaNova/resource/es.json @@ -2188,7 +2188,7 @@ "NextPMNumber": "Siguiente mantenimiento preventivo", "WorkOrderErrorLocked": "La orden de trabajo está actualmente configurada en un estado bloqueado y no se puede cambiar", "WorkOrderSerialNumber": "Número", - "Sequence": "Secuencia", + "WorkOrderItemSequence": "Secuencia", "SoftDelete": "Marcar para borrar", "Undelete": "Recuperar", "NewStatus": "Nuevo estado", diff --git a/server/AyaNova/resource/fr.json b/server/AyaNova/resource/fr.json index d40a01d7..d84e14cf 100644 --- a/server/AyaNova/resource/fr.json +++ b/server/AyaNova/resource/fr.json @@ -2188,7 +2188,7 @@ "NextPMNumber": "Prochaine maintenance préventive", "WorkOrderErrorLocked": "Le bon de travail est actuellement défini sur un statut verrouillé et ne peut pas être modifié", "WorkOrderSerialNumber": "Numéro", - "Sequence": "Séquence", + "WorkOrderItemSequence": "Séquence", "SoftDelete": "Marquer pour suppression", "Undelete": "Annuler la suppression", "NewStatus": "Nouveau statut",