From 96202bd812ef45e71195d594cefede3465dd0c86 Mon Sep 17 00:00:00 2001 From: John Cardinal Date: Thu, 17 Feb 2022 20:51:27 +0000 Subject: [PATCH] --- .vscode/launch.json | 2 +- .../generator/CoreJobMetricsSnapshot.cs | 14 +++++++++++--- server/AyaNova/resource/de.json | 18 ++++++++++++++---- server/AyaNova/resource/en.json | 14 ++++++++++++-- server/AyaNova/resource/es.json | 14 ++++++++++++-- server/AyaNova/resource/fr.json | 12 +++++++++++- 6 files changed, 61 insertions(+), 13 deletions(-) diff --git a/.vscode/launch.json b/.vscode/launch.json index 29bca52e..55a33e65 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -48,7 +48,7 @@ "AYANOVA_DATA_PATH": "c:\\temp\\ravendata", "AYANOVA_USE_URLS": "http://*:7575;", //"AYANOVA_PERMANENTLY_ERASE_DATABASE":"true", - "AYANOVA_SERVER_TEST_MODE": "false", + "AYANOVA_SERVER_TEST_MODE": "true", "AYANOVA_REPORT_RENDERING_TIMEOUT":"1", "AYANOVA_SERVER_TEST_MODE_SEEDLEVEL": "small", "AYANOVA_BACKUP_PG_DUMP_PATH": "C:\\data\\code\\postgres_14\\bin" diff --git a/server/AyaNova/generator/CoreJobMetricsSnapshot.cs b/server/AyaNova/generator/CoreJobMetricsSnapshot.cs index 3385efd4..43214aa5 100644 --- a/server/AyaNova/generator/CoreJobMetricsSnapshot.cs +++ b/server/AyaNova/generator/CoreJobMetricsSnapshot.cs @@ -20,8 +20,8 @@ namespace AyaNova.Biz private static Process _process = Process.GetCurrentProcess(); private static TimeSpan _oldCPUTime = TimeSpan.Zero; - private static DateTime _lastMMSnapshot = DateTime.UtcNow; - private static DateTime _lastDDSnapshot = DateTime.UtcNow; + private static DateTime _lastMMSnapshot = DateTime.UtcNow.Subtract(new TimeSpan(1, 1, 1, 1, 1));//ensure it captures on a fresh boot; + private static DateTime _lastDDSnapshot = DateTime.UtcNow.Subtract(new TimeSpan(1, 1, 1, 1, 1));//ensure it captures on a fresh boot private static double _cpu = 0; @@ -29,7 +29,7 @@ namespace AyaNova.Biz private static TimeSpan tsOneMinute = new TimeSpan(0, 1, 0); private static TimeSpan ts24Hours = new TimeSpan(24, 0, 0); #else - private static TimeSpan tsOneMinute = new TimeSpan(0, 1, 0); + private static TimeSpan tsOneMinute = new TimeSpan(24, 0, 0); private static TimeSpan ts24Hours = new TimeSpan(24, 0, 0); #endif //////////////////////////////////////////////////////////////////////////////////////////////// @@ -88,6 +88,9 @@ namespace AyaNova.Biz //System.Diagnostics.Debug.WriteLine("MM SAVED"); } _lastMMSnapshot = now; +#if(DEBUG) + // log.LogInformation($"DEBUG DD ISSUE: during MM metrics snapshot, _lastDDSnapshot was {_lastDDSnapshot.ToString()}, IsAfterduration return value is {DateUtil.IsAfterDuration(_lastDDSnapshot, ts24Hours)} "); +#endif } @@ -97,7 +100,12 @@ namespace AyaNova.Biz // if (DateUtil.IsAfterDuration(_lastDDSnapshot, ts24Hours)) { +#if (DEBUG) + log.LogInformation("DEBUG DD metrics snapshot"); +#else log.LogDebug("DD metrics snapshot"); +#endif + var now = DateTime.UtcNow; //FILES ON DISK var UtilFilesInfo = FileUtil.GetBackupFolderSizeInfo(); diff --git a/server/AyaNova/resource/de.json b/server/AyaNova/resource/de.json index b1b9a48d..7b8352e7 100644 --- a/server/AyaNova/resource/de.json +++ b/server/AyaNova/resource/de.json @@ -291,6 +291,7 @@ "DuplicateToPM": "Duplikat zur vorbeugenden Wartung", "DuplicateToQuote": "Zum Angebot duplizieren", "DuplicateToWorkOrder": "Zum Arbeitsauftrag duplizieren", + "Duration": "Dauer", "EraseMultipleObjectsWarning": "Warnung: Sie sind dabei, mehrere Objekte dauerhaft zu löschen.\nBist du sicher?", "ErrorAPI2000": "Server ist geschlossen", "ErrorAPI2001": "Server ist wegen Wartungsarbeiten geschlossen", @@ -453,6 +454,7 @@ "InsertImage": "Bild einfügen", "InsertLink": "Link einfügen", "Inventory": "Bestand", + "InventoryPurchaseOrders": "Einkaufsaufträge", "InventoryRoleRequired": "Der Benutzer muss für diesen Vorgang eine Inventarrolle haben", "JobCompleted": "Arbeit erledigt", "JobCreated": "Serverjob erstellt", @@ -739,14 +741,22 @@ "PasswordResetMessageTitle": "Ihr Online-Konto ist fertig", "PickListTemplate": "Auswahllistenvorlage", "PickListTemplates": "Wählen Sie Listenvorlagen aus", - "PM": "Wartung/Inspektion", - "PMItem": "PMItem", - "PMList": "Wartung/Inspektion", + "PM": "Vorbeugende Wartung", + "PMItem": "Element für vorbeugende Wartung", + "PMItemExpense": "Vorbeugende Wartung - Aufwendungen", + "PMItemLabor": "Vorbeugende Wartung - Arbeit", + "PMItemLoan": "Vorbeugende Wartung - Ausleihe", + "PMItemOutsideService":"Vorbeugende Wartung - Fremdleistung", + "PMItemPart":"Vorbeugende Wartung - Teile", + "PMItemScheduledUser":"Vorbeugende Wartung - Geplante Benutzer", + "PMItemTravel":"Vorbeugende Wartung - Reisen", + "PMItemTask":"Vorbeugende Wartung - Aufgaben", + "PMItemUnit":"Vorbeugende Wartung - Einheiten", + "PMList": "Liste der vorbeugenden Wartung", "PMNextServiceDate": "Nächster Service am", "PMNextWoGenerateDate": "Nächstes Generierungsdatum", "PMSerialNumber": "Nummer", "PMStopGeneratingDate": "Erstellung beenden am", - "PMTemplate": "Wartung/Inspektion vorlage", "Price": "Preis", "PriceOverride": "Preisüberschreibung", "Print": "Drucken", diff --git a/server/AyaNova/resource/en.json b/server/AyaNova/resource/en.json index 278c60f4..aa11550b 100644 --- a/server/AyaNova/resource/en.json +++ b/server/AyaNova/resource/en.json @@ -291,6 +291,7 @@ "DuplicateToPM": "Duplicate to Preventive Maintenance", "DuplicateToQuote": "Duplicate to Quote", "DuplicateToWorkOrder": "Duplicate to Work order", + "Duration": "Duration", "EraseMultipleObjectsWarning": "Warning: you are about to permanently erase multiple objects.\r\nAre you sure?", "ErrorAPI2000": "The server is closed", "ErrorAPI2001": "The server is closed for maintenance", @@ -453,6 +454,7 @@ "InsertImage": "Insert image", "InsertLink": "Insert link", "Inventory": "Inventory", + "InventoryPurchaseOrders": "Purchase Orders", "InventoryRoleRequired": "User must have Inventory Role for this operation", "JobCompleted": "Job completed", "JobCreated": "Server job created", @@ -740,13 +742,21 @@ "PickListTemplate": "Autocomplete list template", "PickListTemplates": "Autocomplete list templates", "PM": "Preventive maintenance", - "PMItem": "PMItem", + "PMItem": "P.M. item", + "PMItemExpense": "P.M. item - expense", + "PMItemLabor": "P.M. item - labor", + "PMItemLoan": "P.M. item - loan unit", + "PMItemOutsideService":"P.M. item - outside service", + "PMItemPart":"P.M. item - part", + "PMItemScheduledUser":"P.M. item - scheduled user", + "PMItemTravel":"P.M. item - travel", + "PMItemTask":"P.M. item - task", + "PMItemUnit":"P.M. item - unit", "PMList": "Preventive maintenance", "PMNextServiceDate": "Next service date", "PMNextWoGenerateDate": "Next generate event", "PMSerialNumber": "Number", "PMStopGeneratingDate": "Stop generating date", - "PMTemplate": "Preventive maintenance template", "Price": "Price", "PriceOverride": "Price override", "Print": "Print", diff --git a/server/AyaNova/resource/es.json b/server/AyaNova/resource/es.json index 93d2e7b2..96de1981 100644 --- a/server/AyaNova/resource/es.json +++ b/server/AyaNova/resource/es.json @@ -291,6 +291,7 @@ "DuplicateToPM": "Duplicado de mantenimiento preventivo", "DuplicateToQuote": "Duplicar para cotizar", "DuplicateToWorkOrder": "Duplicar a la orden de trabajo", + "Duration": "Duración", "EraseMultipleObjectsWarning": "Advertencia: está a punto de borrar de forma permanente varios objetos.\n¿Estás seguro?", "ErrorAPI2000": "El servidor esta cerrado", "ErrorAPI2001": "El servidor está cerrado por mantenimiento", @@ -453,6 +454,7 @@ "InsertImage": "Insertar imagen", "InsertLink": "Insertar vínculo", "Inventory": "Inventario", + "InventoryPurchaseOrders": "Órdenes de compra", "InventoryRoleRequired": "El usuario debe tener un rol de inventario para esta operación", "JobCompleted": "Trabajo completo", "JobCreated": "Trabajo de servidor creado", @@ -740,13 +742,21 @@ "PickListTemplate": "Plantilla de lista de selección", "PickListTemplates": "Seleccionar plantillas de lista", "PM": "Mantenimiento preventivo", - "PMItem": "PMItem", + "PMItem": "Elemento de mantenimiento preventivo", + "PMItemExpense": "Mantenimiento preventivo - gasto", + "PMItemLabor": "Mantenimiento preventivo - labor", + "PMItemLoan": "Mantenimiento preventivo - préstamo", + "PMItemOutsideService":"Mantenimiento preventivo - servicio externo", + "PMItemPart":"Mantenimiento preventivo - pieza", + "PMItemScheduledUser":"Mantenimiento preventivo - usuario programado", + "PMItemTravel":"Mantenimiento preventivo - viajes", + "PMItemTask":"Mantenimiento preventivo - tareas", + "PMItemUnit":"Mantenimiento preventivo - unidades", "PMList": "Mantenimiento preventivo", "PMNextServiceDate": "Fecha del próximo servicio", "PMNextWoGenerateDate": "Siguiente evento de generación", "PMSerialNumber": "Número", "PMStopGeneratingDate": "Fecha fin de generación", - "PMTemplate": "Plantilla mantenimiento preventivo", "Price": "Precio", "PriceOverride": "Anulación de precio", "Print": "Imprimir", diff --git a/server/AyaNova/resource/fr.json b/server/AyaNova/resource/fr.json index d5b49b4d..1036e29f 100644 --- a/server/AyaNova/resource/fr.json +++ b/server/AyaNova/resource/fr.json @@ -291,6 +291,7 @@ "DuplicateToPM": "Dupliquer à la maintenance préventive", "DuplicateToQuote": "Dupliquer pour devis", "DuplicateToWorkOrder": "Dupliquer à l'ordre de travail", + "Duration": "Durée", "EraseMultipleObjectsWarning": "Attention: vous êtes sur le point d'effacer définitivement plusieurs objets.\nÊtes-vous sûr?", "ErrorAPI2000": "Le serveur est fermé", "ErrorAPI2001": "Le serveur est fermé pour maintenance", @@ -453,6 +454,7 @@ "InsertImage": "Insérer une image", "InsertLink": "Insérer un lien", "Inventory": "Stock", + "InventoryPurchaseOrders": "Bons de commande", "InventoryRoleRequired": "L'utilisateur doit avoir un rôle d'inventaire pour cette opération", "JobCompleted": "Travail terminé", "JobCreated": "Travail serveur créé", @@ -741,12 +743,20 @@ "PickListTemplates": "Sélectionner des modèles de liste", "PM": "Entretien préventif", "PMItem": "PMItem", + "PMItemExpense": "Vorbeugende Wartung - Aufwendungen", + "PMItemLabor": "PMItem labor", + "PMItemLoan": "PMItem Loan", + "PMItemOutsideService":"PMItemOutsideService", + "PMItemPart":"PMItemPart", + "PMItemScheduledUser":"PMItemschedUser", + "PMItemTravel":"PMItemtravel", + "PMItemTask":"PMItemTask", + "PMItemUnit":"PMItemUnit", "PMList": "Entretien préventif", "PMNextServiceDate": "Date de service suivant", "PMNextWoGenerateDate": "Prochain événement de génération", "PMSerialNumber": "Numéro", "PMStopGeneratingDate": "Arrêter de générer des dates", - "PMTemplate": "Modèle d'entretien préventif", "Price": "Prix", "PriceOverride": "Remplacement de prix", "Print": "Imprimer",