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/QuoteStatusDataList.cs b/server/AyaNova/DataList/QuoteStatusDataList.cs index 5c5b833e..ac742d0a 100644 --- a/server/AyaNova/DataList/QuoteStatusDataList.cs +++ b/server/AyaNova/DataList/QuoteStatusDataList.cs @@ -10,14 +10,14 @@ namespace AyaNova.DataList SQLFrom = "from aquotestatus"; var RoleSet = BizRoles.GetRoleSet(DefaultListAType); AllowedRoles = RoleSet.ReadFullRecord | RoleSet.Change; - DefaultColumns = new List() { "QuoteStatusName", "SelectRoles", "RemoveRoles", "Active" }; - DefaultSortBy = new Dictionary() { { "QuoteStatusName", "+" } }; + DefaultColumns = new List() { "StatusName", "SelectRoles", "RemoveRoles", "Active" }; + DefaultSortBy = new Dictionary() { { "StatusName", "+" } }; FieldDefinitions = new List(); FieldDefinitions.Add(new DataListFieldDefinition { - TKey = "QuoteStatusName", - FieldKey = "QuoteStatusName", + TKey = "StatusName", + FieldKey = "StatusName", AType = (int)AyaType.QuoteStatus, UiFieldDataType = (int)UiFieldDataType.Text, SqlIdColumnName = "aquotestatus.id", @@ -28,8 +28,8 @@ namespace AyaNova.DataList FieldDefinitions.Add(new DataListFieldDefinition { - TKey = "QuoteStatusNotes", - FieldKey = "QuoteStatusNotes", + TKey = "StatusNotes", + FieldKey = "StatusNotes", UiFieldDataType = (int)UiFieldDataType.Text, SqlValueColumnName = "aquotestatus.notes" }); @@ -44,16 +44,16 @@ namespace AyaNova.DataList FieldDefinitions.Add(new DataListFieldDefinition { - TKey = "QuoteStatusCompleted", - FieldKey = "QuoteStatusCompleted", + TKey = "StatusCompleted", + FieldKey = "StatusCompleted", UiFieldDataType = (int)UiFieldDataType.Bool, SqlValueColumnName = "aquotestatus.completed" }); FieldDefinitions.Add(new DataListFieldDefinition { - TKey = "QuoteStatusLocked", - FieldKey = "QuoteStatusLocked", + TKey = "StatusLocked", + FieldKey = "StatusLocked", UiFieldDataType = (int)UiFieldDataType.Bool, SqlValueColumnName = "aquotestatus.locked" }); diff --git a/server/AyaNova/DataList/WorkOrderStatusDataList.cs b/server/AyaNova/DataList/WorkOrderStatusDataList.cs index 294a0e67..ed490302 100644 --- a/server/AyaNova/DataList/WorkOrderStatusDataList.cs +++ b/server/AyaNova/DataList/WorkOrderStatusDataList.cs @@ -10,14 +10,14 @@ namespace AyaNova.DataList SQLFrom = "from aworkorderstatus"; var RoleSet = BizRoles.GetRoleSet(DefaultListAType); AllowedRoles = RoleSet.ReadFullRecord | RoleSet.Change; - DefaultColumns = new List() { "WorkOrderStatusName", "SelectRoles", "RemoveRoles", "Active" }; - DefaultSortBy = new Dictionary() { { "WorkOrderStatusName", "+" } }; + DefaultColumns = new List() { "StatusName", "SelectRoles", "RemoveRoles", "Active" }; + DefaultSortBy = new Dictionary() { { "StatusName", "+" } }; FieldDefinitions = new List(); FieldDefinitions.Add(new DataListFieldDefinition { - TKey = "WorkOrderStatusName", - FieldKey = "WorkOrderStatusName", + TKey = "StatusName", + FieldKey = "StatusName", AType = (int)AyaType.WorkOrderStatus, UiFieldDataType = (int)UiFieldDataType.Text, SqlIdColumnName = "aworkorderstatus.id", @@ -28,8 +28,8 @@ namespace AyaNova.DataList FieldDefinitions.Add(new DataListFieldDefinition { - TKey = "WorkOrderStatusNotes", - FieldKey = "WorkOrderStatusNotes", + TKey = "StatusNotes", + FieldKey = "StatusNotes", UiFieldDataType = (int)UiFieldDataType.Text, SqlValueColumnName = "aworkorderstatus.notes" }); @@ -44,16 +44,16 @@ namespace AyaNova.DataList FieldDefinitions.Add(new DataListFieldDefinition { - TKey = "WorkOrderStatusCompleted", - FieldKey = "WorkOrderStatusCompleted", + TKey = "StatusCompleted", + FieldKey = "StatusCompleted", UiFieldDataType = (int)UiFieldDataType.Bool, SqlValueColumnName = "aworkorderstatus.completed" }); FieldDefinitions.Add(new DataListFieldDefinition { - TKey = "WorkOrderStatusLocked", - FieldKey = "WorkOrderStatusLocked", + TKey = "StatusLocked", + FieldKey = "StatusLocked", UiFieldDataType = (int)UiFieldDataType.Bool, SqlValueColumnName = "aworkorderstatus.locked" }); diff --git a/server/AyaNova/biz/BizRoles.cs b/server/AyaNova/biz/BizRoles.cs index ad5f2085..6e5f7d56 100644 --- a/server/AyaNova/biz/BizRoles.cs +++ b/server/AyaNova/biz/BizRoles.cs @@ -872,7 +872,7 @@ namespace AyaNova.Biz //ONGOING VALIDATION TO CATCH MISMATCH WHEN NEW ROLES ADDED (wont' catch changes to existing unfortunately) - var lastRoles = "{\"Customer\":{\"Change\":33098,\"ReadFullRecord\":65669,\"Select\":131071},\"CustomerNote\":{\"Change\":33098,\"ReadFullRecord\":65669,\"Select\":131071},\"Contract\":{\"Change\":33098,\"ReadFullRecord\":65669,\"Select\":131071},\"HeadOffice\":{\"Change\":33098,\"ReadFullRecord\":65669,\"Select\":131071},\"LoanUnit\":{\"Change\":33098,\"ReadFullRecord\":65669,\"Select\":131071},\"Part\":{\"Change\":98,\"ReadFullRecord\":29,\"Select\":131071},\"PartInventory\":{\"Change\":98,\"ReadFullRecord\":29,\"Select\":131071},\"PartWarehouse\":{\"Change\":98,\"ReadFullRecord\":29,\"Select\":131071},\"PartAssembly\":{\"Change\":98,\"ReadFullRecord\":29,\"Select\":131071},\"PurchaseOrder\":{\"Change\":98,\"ReadFullRecord\":29,\"Select\":131071},\"PartInventoryRequest\":{\"Change\":98,\"ReadFullRecord\":29,\"Select\":131071},\"PartInventoryRestock\":{\"Change\":98,\"ReadFullRecord\":29,\"Select\":131071},\"PM\":{\"Change\":33098,\"ReadFullRecord\":65669,\"Select\":131071},\"PMItem\":{\"Change\":33098,\"ReadFullRecord\":65669,\"Select\":131071},\"Project\":{\"Change\":33098,\"ReadFullRecord\":65669,\"Select\":131071},\"ServiceRate\":{\"Change\":74,\"ReadFullRecord\":33037,\"Select\":131071},\"TravelRate\":{\"Change\":74,\"ReadFullRecord\":33037,\"Select\":131071},\"TaxCode\":{\"Change\":66,\"ReadFullRecord\":98701,\"Select\":131071},\"Unit\":{\"Change\":33098,\"ReadFullRecord\":65669,\"Select\":131071},\"UnitModel\":{\"Change\":33098,\"ReadFullRecord\":65669,\"Select\":131071},\"Vendor\":{\"Change\":33130,\"ReadFullRecord\":65669,\"Select\":131071},\"TaskGroup\":{\"Change\":10,\"ReadFullRecord\":131071,\"Select\":131071},\"WorkOrderStatus\":{\"Change\":10,\"ReadFullRecord\":131071,\"Select\":131071},\"WorkOrderItemStatus\":{\"Change\":1354,\"ReadFullRecord\":105093,\"Select\":131071},\"WorkOrderItemPriority\":{\"Change\":1354,\"ReadFullRecord\":105093,\"Select\":131071},\"WorkOrder\":{\"Change\":1994,\"ReadFullRecord\":105093,\"Select\":131071},\"WorkOrderItem\":{\"Change\":330,\"ReadFullRecord\":105093,\"Select\":131071},\"WorkOrderItemExpense\":{\"Change\":458,\"ReadFullRecord\":98949,\"Select\":131071},\"WorkOrderItemLabor\":{\"Change\":1994,\"ReadFullRecord\":98949,\"Select\":131071},\"WorkOrderItemLoan\":{\"Change\":330,\"ReadFullRecord\":99461,\"Select\":131071},\"WorkOrderItemPart\":{\"Change\":330,\"ReadFullRecord\":99461,\"Select\":131071},\"WorkOrderItemPartRequest\":{\"Change\":330,\"ReadFullRecord\":99461,\"Select\":131071},\"WorkOrderItemScheduledUser\":{\"Change\":330,\"ReadFullRecord\":99973,\"Select\":131071},\"WorkOrderItemTask\":{\"Change\":1994,\"ReadFullRecord\":98949,\"Select\":131071},\"WorkOrderItemTravel\":{\"Change\":1994,\"ReadFullRecord\":98949,\"Select\":131071},\"WorkOrderItemUnit\":{\"Change\":330,\"ReadFullRecord\":99461,\"Select\":131071},\"WorkOrderItemOutsideService\":{\"Change\":330,\"ReadFullRecord\":98437,\"Select\":131071},\"Quote\":{\"Change\":32842,\"ReadFullRecord\":65541,\"Select\":131071},\"QuoteItem\":{\"Change\":32842,\"ReadFullRecord\":65541,\"Select\":131071},\"QuoteItemExpense\":{\"Change\":32842,\"ReadFullRecord\":65541,\"Select\":131071},\"QuoteItemLabor\":{\"Change\":32842,\"ReadFullRecord\":65541,\"Select\":131071},\"QuoteItemLoan\":{\"Change\":32842,\"ReadFullRecord\":65541,\"Select\":131071},\"QuoteItemPart\":{\"Change\":32842,\"ReadFullRecord\":65541,\"Select\":131071},\"QuoteItemScheduledUser\":{\"Change\":32842,\"ReadFullRecord\":65541,\"Select\":131071},\"QuoteItemTask\":{\"Change\":32842,\"ReadFullRecord\":65541,\"Select\":131071},\"QuoteItemTravel\":{\"Change\":32842,\"ReadFullRecord\":65541,\"Select\":131071},\"QuoteItemUnit\":{\"Change\":32842,\"ReadFullRecord\":65541,\"Select\":131071},\"QuoteItemOutsideService\":{\"Change\":32842,\"ReadFullRecord\":65541,\"Select\":131071},\"Global\":{\"Change\":2,\"ReadFullRecord\":1,\"Select\":0},\"GlobalOps\":{\"Change\":16384,\"ReadFullRecord\":8192,\"Select\":0},\"User\":{\"Change\":2,\"ReadFullRecord\":1,\"Select\":131071},\"UserOptions\":{\"Change\":2,\"ReadFullRecord\":1,\"Select\":0},\"Widget\":{\"Change\":34,\"ReadFullRecord\":17,\"Select\":131071},\"ServerState\":{\"Change\":16384,\"ReadFullRecord\":131071,\"Select\":0},\"License\":{\"Change\":2,\"ReadFullRecord\":1,\"Select\":0},\"TrialSeeder\":{\"Change\":16386,\"ReadFullRecord\":8193,\"Select\":0},\"LogFile\":{\"Change\":0,\"ReadFullRecord\":24576,\"Select\":0},\"Backup\":{\"Change\":16384,\"ReadFullRecord\":8195,\"Select\":0},\"FileAttachment\":{\"Change\":2,\"ReadFullRecord\":3,\"Select\":0},\"ServerJob\":{\"Change\":16384,\"ReadFullRecord\":8195,\"Select\":0},\"OpsNotificationSettings\":{\"Change\":16384,\"ReadFullRecord\":8195,\"Select\":0},\"ServerMetrics\":{\"Change\":16384,\"ReadFullRecord\":24576,\"Select\":0},\"Translation\":{\"Change\":2,\"ReadFullRecord\":1,\"Select\":131071},\"DataListSavedFilter\":{\"Change\":2,\"ReadFullRecord\":131071,\"Select\":0},\"FormCustom\":{\"Change\":2,\"ReadFullRecord\":131071,\"Select\":0},\"PickListTemplate\":{\"Change\":2,\"ReadFullRecord\":131071,\"Select\":0},\"BizMetrics\":{\"Change\":2,\"ReadFullRecord\":98369,\"Select\":0},\"Notification\":{\"Change\":131071,\"ReadFullRecord\":131071,\"Select\":0},\"NotifySubscription\":{\"Change\":131071,\"ReadFullRecord\":131071,\"Select\":0},\"Report\":{\"Change\":3,\"ReadFullRecord\":131071,\"Select\":131071},\"CustomerServiceRequest\":{\"Change\":4106,\"ReadFullRecord\":2437,\"Select\":131071},\"Memo\":{\"Change\":124927,\"ReadFullRecord\":124927,\"Select\":124927},\"Reminder\":{\"Change\":124927,\"ReadFullRecord\":124927,\"Select\":124927},\"Review\":{\"Change\":124927,\"ReadFullRecord\":124927,\"Select\":124927}}"; + var lastRoles = "{\"Customer\":{\"Change\":33098,\"ReadFullRecord\":65669,\"Select\":131071},\"CustomerNote\":{\"Change\":33098,\"ReadFullRecord\":65669,\"Select\":131071},\"Contract\":{\"Change\":33098,\"ReadFullRecord\":65669,\"Select\":131071},\"HeadOffice\":{\"Change\":33098,\"ReadFullRecord\":65669,\"Select\":131071},\"LoanUnit\":{\"Change\":33098,\"ReadFullRecord\":65669,\"Select\":131071},\"Part\":{\"Change\":98,\"ReadFullRecord\":29,\"Select\":131071},\"PartInventory\":{\"Change\":98,\"ReadFullRecord\":29,\"Select\":131071},\"PartWarehouse\":{\"Change\":98,\"ReadFullRecord\":29,\"Select\":131071},\"PartAssembly\":{\"Change\":98,\"ReadFullRecord\":29,\"Select\":131071},\"PurchaseOrder\":{\"Change\":98,\"ReadFullRecord\":29,\"Select\":131071},\"PartInventoryRequest\":{\"Change\":98,\"ReadFullRecord\":29,\"Select\":131071},\"PartInventoryRestock\":{\"Change\":98,\"ReadFullRecord\":29,\"Select\":131071},\"PM\":{\"Change\":33098,\"ReadFullRecord\":65669,\"Select\":131071},\"PMItem\":{\"Change\":33098,\"ReadFullRecord\":65669,\"Select\":131071},\"Project\":{\"Change\":33098,\"ReadFullRecord\":65669,\"Select\":131071},\"ServiceRate\":{\"Change\":74,\"ReadFullRecord\":33037,\"Select\":131071},\"TravelRate\":{\"Change\":74,\"ReadFullRecord\":33037,\"Select\":131071},\"TaxCode\":{\"Change\":66,\"ReadFullRecord\":98701,\"Select\":131071},\"Unit\":{\"Change\":33098,\"ReadFullRecord\":65669,\"Select\":131071},\"UnitModel\":{\"Change\":33098,\"ReadFullRecord\":65669,\"Select\":131071},\"Vendor\":{\"Change\":33130,\"ReadFullRecord\":65669,\"Select\":131071},\"TaskGroup\":{\"Change\":10,\"ReadFullRecord\":131071,\"Select\":131071},\"WorkOrderStatus\":{\"Change\":10,\"ReadFullRecord\":131071,\"Select\":131071},\"WorkOrderItemStatus\":{\"Change\":1354,\"ReadFullRecord\":105093,\"Select\":131071},\"WorkOrderItemPriority\":{\"Change\":1354,\"ReadFullRecord\":105093,\"Select\":131071},\"WorkOrder\":{\"Change\":1994,\"ReadFullRecord\":105093,\"Select\":131071},\"WorkOrderItem\":{\"Change\":330,\"ReadFullRecord\":105093,\"Select\":131071},\"WorkOrderItemExpense\":{\"Change\":458,\"ReadFullRecord\":98949,\"Select\":131071},\"WorkOrderItemLabor\":{\"Change\":1994,\"ReadFullRecord\":98949,\"Select\":131071},\"WorkOrderItemLoan\":{\"Change\":330,\"ReadFullRecord\":99461,\"Select\":131071},\"WorkOrderItemPart\":{\"Change\":330,\"ReadFullRecord\":99461,\"Select\":131071},\"WorkOrderItemPartRequest\":{\"Change\":330,\"ReadFullRecord\":99461,\"Select\":131071},\"WorkOrderItemScheduledUser\":{\"Change\":330,\"ReadFullRecord\":99973,\"Select\":131071},\"WorkOrderItemTask\":{\"Change\":1994,\"ReadFullRecord\":98949,\"Select\":131071},\"WorkOrderItemTravel\":{\"Change\":1994,\"ReadFullRecord\":98949,\"Select\":131071},\"WorkOrderItemUnit\":{\"Change\":330,\"ReadFullRecord\":99461,\"Select\":131071},\"WorkOrderItemOutsideService\":{\"Change\":330,\"ReadFullRecord\":98437,\"Select\":131071},\"Quote\":{\"Change\":32842,\"ReadFullRecord\":65541,\"Select\":131071},\"QuoteItem\":{\"Change\":32842,\"ReadFullRecord\":65541,\"Select\":131071},\"QuoteItemExpense\":{\"Change\":32842,\"ReadFullRecord\":65541,\"Select\":131071},\"QuoteItemLabor\":{\"Change\":32842,\"ReadFullRecord\":65541,\"Select\":131071},\"QuoteItemLoan\":{\"Change\":32842,\"ReadFullRecord\":65541,\"Select\":131071},\"QuoteItemPart\":{\"Change\":32842,\"ReadFullRecord\":65541,\"Select\":131071},\"QuoteItemScheduledUser\":{\"Change\":32842,\"ReadFullRecord\":65541,\"Select\":131071},\"QuoteItemTask\":{\"Change\":32842,\"ReadFullRecord\":65541,\"Select\":131071},\"QuoteItemTravel\":{\"Change\":32842,\"ReadFullRecord\":65541,\"Select\":131071},\"QuoteItemUnit\":{\"Change\":32842,\"ReadFullRecord\":65541,\"Select\":131071},\"QuoteItemOutsideService\":{\"Change\":32842,\"ReadFullRecord\":65541,\"Select\":131071},\"QuoteStatus\":{\"Change\":32778,\"ReadFullRecord\":131071,\"Select\":131071},\"Global\":{\"Change\":2,\"ReadFullRecord\":1,\"Select\":0},\"GlobalOps\":{\"Change\":16384,\"ReadFullRecord\":8192,\"Select\":0},\"User\":{\"Change\":2,\"ReadFullRecord\":1,\"Select\":131071},\"UserOptions\":{\"Change\":2,\"ReadFullRecord\":1,\"Select\":0},\"Widget\":{\"Change\":34,\"ReadFullRecord\":17,\"Select\":131071},\"ServerState\":{\"Change\":16384,\"ReadFullRecord\":131071,\"Select\":0},\"License\":{\"Change\":2,\"ReadFullRecord\":1,\"Select\":0},\"TrialSeeder\":{\"Change\":16386,\"ReadFullRecord\":8193,\"Select\":0},\"LogFile\":{\"Change\":0,\"ReadFullRecord\":24576,\"Select\":0},\"Backup\":{\"Change\":16384,\"ReadFullRecord\":8195,\"Select\":0},\"FileAttachment\":{\"Change\":2,\"ReadFullRecord\":3,\"Select\":0},\"ServerJob\":{\"Change\":16384,\"ReadFullRecord\":8195,\"Select\":0},\"OpsNotificationSettings\":{\"Change\":16384,\"ReadFullRecord\":8195,\"Select\":0},\"ServerMetrics\":{\"Change\":16384,\"ReadFullRecord\":24576,\"Select\":0},\"Translation\":{\"Change\":2,\"ReadFullRecord\":1,\"Select\":131071},\"DataListSavedFilter\":{\"Change\":2,\"ReadFullRecord\":131071,\"Select\":0},\"FormCustom\":{\"Change\":2,\"ReadFullRecord\":131071,\"Select\":0},\"PickListTemplate\":{\"Change\":2,\"ReadFullRecord\":131071,\"Select\":0},\"BizMetrics\":{\"Change\":2,\"ReadFullRecord\":98369,\"Select\":0},\"Notification\":{\"Change\":131071,\"ReadFullRecord\":131071,\"Select\":0},\"NotifySubscription\":{\"Change\":131071,\"ReadFullRecord\":131071,\"Select\":0},\"Report\":{\"Change\":3,\"ReadFullRecord\":131071,\"Select\":131071},\"CustomerServiceRequest\":{\"Change\":4106,\"ReadFullRecord\":2437,\"Select\":131071},\"Memo\":{\"Change\":124927,\"ReadFullRecord\":124927,\"Select\":124927},\"Reminder\":{\"Change\":124927,\"ReadFullRecord\":124927,\"Select\":124927},\"Review\":{\"Change\":124927,\"ReadFullRecord\":124927,\"Select\":124927}}"; Dictionary lastRolesDeserialized = Newtonsoft.Json.JsonConvert.DeserializeObject>(lastRoles); if (lastRolesDeserialized.Count != roles.Count) { diff --git a/server/AyaNova/biz/FormFieldReference.cs b/server/AyaNova/biz/FormFieldReference.cs index 26cfde1c..79d14dda 100644 --- a/server/AyaNova/biz/FormFieldReference.cs +++ b/server/AyaNova/biz/FormFieldReference.cs @@ -1364,7 +1364,7 @@ namespace AyaNova.Biz #region WorkOrderStatus { List l = new List(); - l.Add(new FormField { TKey = "WorkOrderStatusNotes", FieldKey = "WorkOrderStatusNotes" }); + l.Add(new FormField { TKey = "StatusNotes", FieldKey = "StatusNotes" }); _formFields.Add(AyaType.WorkOrderStatus.ToString(), l); } #endregion diff --git a/server/AyaNova/resource/de.json b/server/AyaNova/resource/de.json index 038b7b94..9ab8ff00 100644 --- a/server/AyaNova/resource/de.json +++ b/server/AyaNova/resource/de.json @@ -1635,15 +1635,15 @@ "WorkOrderPMWorkOrderID": "Wartung/Inspektion", "WorkOrderStatusARGB": "ARGB-Farbe", "WorkOrderStatusBold": "Fett", - "WorkOrderStatusCompletedStatus": "Dieser Status ist \"Abgeschlossen\"", + "CompletedStatus": "Dieser Status ist \"Abgeschlossen\"", "WorkOrderStatusList": "Arbeitsauftragsstatusangaben", - "WorkOrderStatusName": "Name", - "WorkOrderStatusNotes": "Anmerkungen", - "WorkOrderStatusColor": "Farbe", + "StatusName": "Name", + "StatusNotes": "Anmerkungen", + "StatusColor": "Farbe", "SelectRoles": "Wer kann auswählen", "RemoveRoles": "Wer kann entfernen", - "WorkOrderStatusCompleted": "Ist ein abgeschlossener Status", - "WorkOrderStatusLocked": "Ist ein Sperrstatus", + "StatusCompleted": "Ist ein abgeschlossener Status", + "StatusLocked": "Ist ein Sperrstatus", "WorkOrderStatusUnderlined": "Unterstrichen", "WorkOrderSummaryTemplate": "Arbeitsauftragspostenzusammenfassung - Vorlage", "WorkOrderSummaryWorkOrderItem": "Anzuzeigende Informationen über Arbeitsauftragsposten", diff --git a/server/AyaNova/resource/en.json b/server/AyaNova/resource/en.json index d3cf27e5..c5819fd6 100644 --- a/server/AyaNova/resource/en.json +++ b/server/AyaNova/resource/en.json @@ -1635,15 +1635,15 @@ "WorkOrderPMWorkOrderID": "Preventive Maintenance", "WorkOrderStatusARGB": "Color", "WorkOrderStatusBold": "Bold", - "WorkOrderStatusCompletedStatus": "This status is \"Completed\"", + "CompletedStatus": "This status is \"Completed\"", "WorkOrderStatusList": "Work order status list", - "WorkOrderStatusName": "Name", - "WorkOrderStatusNotes": "Notes", - "WorkOrderStatusColor": "Color", + "StatusName": "Name", + "StatusNotes": "Notes", + "StatusColor": "Color", "SelectRoles": "Who can select", "RemoveRoles": "Who can remove", - "WorkOrderStatusCompleted": "Is a completed status", - "WorkOrderStatusLocked": "Is a locking status", + "StatusCompleted": "Is a completed status", + "StatusLocked": "Is a locking status", "WorkOrderStatusUnderlined": "Underlined", "WorkOrderSummaryTemplate": "Work order Item Summary Template", "WorkOrderSummaryWorkOrderItem": "Work order Item Info To Display", diff --git a/server/AyaNova/resource/es.json b/server/AyaNova/resource/es.json index d1383763..d5924f03 100644 --- a/server/AyaNova/resource/es.json +++ b/server/AyaNova/resource/es.json @@ -1635,15 +1635,15 @@ "WorkOrderPMWorkOrderID": "Mantenimiento preventivo", "WorkOrderStatusARGB": "Color ARGB", "WorkOrderStatusBold": "Negrita", - "WorkOrderStatusCompletedStatus": "El estado es \"Completado\"", + "CompletedStatus": "El estado es \"Completado\"", "WorkOrderStatusList": "Estados del pedido", - "WorkOrderStatusName": "Nombre", - "WorkOrderStatusNotes": "Notas", - "WorkOrderStatusColor": "Color", + "StatusName": "Nombre", + "StatusNotes": "Notas", + "StatusColor": "Color", "SelectRoles": "Quien puede seleccionar", "RemoveRoles": "Quien puede remover", - "WorkOrderStatusCompleted": "Es un estado completo", - "WorkOrderStatusLocked": "Es un estado de bloqueo", + "StatusCompleted": "Es un estado completo", + "StatusLocked": "Es un estado de bloqueo", "WorkOrderStatusUnderlined": "Subrayado", "WorkOrderSummaryTemplate": "Plantilla resumen elemento pedido", "WorkOrderSummaryWorkOrderItem": "Información mostrada elemento de pedido", diff --git a/server/AyaNova/resource/fr.json b/server/AyaNova/resource/fr.json index 22f473d3..a820f819 100644 --- a/server/AyaNova/resource/fr.json +++ b/server/AyaNova/resource/fr.json @@ -1635,15 +1635,15 @@ "WorkOrderPMWorkOrderID": "Entretien préventif", "WorkOrderStatusARGB": "Couleur ARVB", "WorkOrderStatusBold": "Gras", - "WorkOrderStatusCompletedStatus": "Cet état est “Terminé”", + "CompletedStatus": "Cet état est “Terminé”", "WorkOrderStatusList": "États de bon de travail", - "WorkOrderStatusName": "Nom", - "WorkOrderStatusNotes": "Remarques", - "WorkOrderStatusColor": "Couleur", + "StatusName": "Nom", + "StatusNotes": "Remarques", + "StatusColor": "Couleur", "SelectRoles": "Qui peut sélectionner", "RemoveRoles": "Qui peut supprimer", - "WorkOrderStatusCompleted": "Est un statut terminé", - "WorkOrderStatusLocked": "Est un statut de verrouillage", + "StatusCompleted": "Est un statut terminé", + "StatusLocked": "Est un statut de verrouillage", "WorkOrderStatusUnderlined": "Souligné", "WorkOrderSummaryTemplate": "Modèle de résumé d'élément de bon de travail", "WorkOrderSummaryWorkOrderItem": "Infos de bon de travail à afficher",