diff --git a/.vscode/launch.json b/.vscode/launch.json index 9efe9077..40c502d0 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -16,13 +16,13 @@ "cwd": "${workspaceFolder}/server/AyaNova", "stopAtEntry": false, "internalConsoleOptions": "openOnSessionStart", - // Enable launching a web browser when ASP.NET Core starts. For more information: https://aka.ms/VSCode-CS-LaunchJson-WebBrowser - //this needs to be tweaked probably - //https://github.com/OmniSharp/omnisharp-vscode/blob/master/debugger-launchjson.md#starting-a-web-browser - "serverReadyAction": { + // Enable launching a web browser when ASP.NET Core starts. For more information: https://aka.ms/VSCode-CS-LaunchJson-WebBrowser + //this needs to be tweaked probably + //https://github.com/OmniSharp/omnisharp-vscode/blob/master/debugger-launchjson.md#starting-a-web-browser + "serverReadyAction": { "action": "openExternally", - "pattern": "^\\s*Now listening on:\\s+(https?://\\S+)" - }, + "pattern": "^\\s*Now listening on:\\s+(https?://\\S+)" + }, // "launchBrowser": { // "enabled": true, // "args": "${auto-detect-url}/api/v8/", @@ -42,20 +42,19 @@ "AYANOVA_JWT_SECRET": "UNLICENSED5G*QQJ8#bQ7$Xr_@sXfHq4", //"AYANOVA_SET_SUPERUSER_PW": "l3tm3in", "AYANOVA_LOG_LEVEL": "Info", - // "AYANOVA_LOG_LEVEL": "Debug", - // "AYANOVA_LOG_LEVEL": "Trace", + // "AYANOVA_LOG_LEVEL": "Debug", + // "AYANOVA_LOG_LEVEL": "Trace", "AYANOVA_DEFAULT_TRANSLATION": "en", //TRANSLATION MUST BE en for Integration TESTING //"AYANOVA_PERMANENTLY_ERASE_DATABASE": "true", "AYANOVA_DB_CONNECTION": "Server=localhost;Username=postgres;Password=raven;Database=AyaNova;", "AYANOVA_USE_URLS": "http://*:7575;", "AYANOVA_FOLDER_USER_FILES": "c:\\temp\\RavenTestData\\userfiles", - "AYANOVA_FOLDER_BACKUP_FILES": "c:\\temp\\RavenTestData\\backupfiles", - "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\\PostgreSQLPortable_12.0\\App\\PgSQL\\bin\\" - + "AYANOVA_FOLDER_BACKUP_FILES": "c:\\temp\\RavenTestData\\backupfiles", + "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\\PostgreSQLPortable_12.0\\App\\PgSQL\\bin\\" }, "sourceFileMap": { "/Views": "${workspaceFolder}/Views" diff --git a/server/AyaNova/Controllers/ServerStateController.cs b/server/AyaNova/Controllers/ServerStateController.cs index 63c062fc..fe9deae1 100644 --- a/server/AyaNova/Controllers/ServerStateController.cs +++ b/server/AyaNova/Controllers/ServerStateController.cs @@ -129,7 +129,7 @@ namespace AyaNova.Api.Controllers if (!Authorized.HasModifyRole(HttpContext.Items, AyaType.ServerState)) return StatusCode(403, new ApiNotAuthorizedResponse()); - log.LogInformation($"Server shut down requested by user {UserNameFromContext.Name(HttpContext.Items)}, server shutting down now..."); + log.LogInformation($"### Server shut down requested by user {UserNameFromContext.Name(HttpContext.Items)}, triggering shut down event now..."); _appLifetime.StopApplication(); return Accepted(); diff --git a/server/AyaNova/resource/de.json b/server/AyaNova/resource/de.json index 5395de67..79db9d48 100644 --- a/server/AyaNova/resource/de.json +++ b/server/AyaNova/resource/de.json @@ -953,9 +953,9 @@ "DateRangeOctober": "Oktober", "DateRangeNovember": "November", "DateRangeDecember": "Dezember", - "DateRangePreviousYearThisMonth":"Vorjahr - diesen Monat", - "DateRangePreviousYearLastMonth":"Vorjahr - letzter Monat", - "DateRangePreviousYearNextMonth":"Vorjahr - nächster Monat", + "DateRangePreviousYearThisMonth": "Vorjahr - diesen Monat", + "DateRangePreviousYearLastMonth": "Vorjahr - letzter Monat", + "DateRangePreviousYearNextMonth": "Vorjahr - nächster Monat", "DayAny": "Beliebiger Wochentag", "DayFriday": "Freitag", "DayMonday": "Montag", @@ -1574,7 +1574,7 @@ "AuthorizationRoleSalesFull": "Verkaufsabteilung - unbeschränkt", "AuthorizationRoleAll": "Alle rollen", "Welcome": "Willkommen in AyaNova", - "ThankYouForEvaluating":"Vielen Dank, dass Sie AyaNova ausprobiert haben. Verwenden Sie die folgenden Links, um AyaNova zu erkunden und festzustellen, ob es zu Ihrer Organisation passt.", + "ThankYouForEvaluating": "Vielen Dank, dass Sie AyaNova ausprobiert haben. Verwenden Sie die folgenden Links, um AyaNova zu erkunden und festzustellen, ob es zu Ihrer Organisation passt.", "ErrorFieldValueNotInteger": "Der Wert muss eine ganze Zahl sein", "ErrorFieldValueNotDecimal": "Wert muss eine Zahl sein", "ErrorAPI2000": "Server ist geschlossen", @@ -1875,8 +1875,8 @@ "NotifyEventReminderImminent": "Erinnerung unmittelbar bevorsteht", "NotifyEventScheduledOnWorkorder": "Geplant auf Arbeitsauftrag", "NotifyEventScheduledOnWorkorderImminent": "Arbeitsauftragsplan steht kurz bevor", - "NotifyEventWorkorderFinishStatusOverdue": "Arbeitsauftrag nicht rechtzeitig erledigt", - "NotifyEventWorkorderFinished":"Arbeitsauftrag beendet", + "NotifyEventWorkorderFinishStatusOverdue": "Arbeitsauftrag nicht rechtzeitig erledigt", + "NotifyEventWorkorderFinished": "Arbeitsauftrag beendet", "NotifyEventOutsideServiceOverdue": "Drittanbieter-Service überfällig", "NotifyEventOutsideServiceReceived": "Service von Drittanbietern abgeschlossen, Gerät erhalten", "NotifyEventPartRequestReceived": "Angeforderter Teil erhalten", @@ -1911,8 +1911,10 @@ "DeliverAfter": "Liefern nach", "NotifyQueue": "Warteschlange für Benachrichtigungszustellung", "DirectNotification": "Direkte Benachrichtigung", - "GlobalLogo":"Geschäftslogos", - "SmallLogo":"Kleines Logo", - "MediumLogo":"Mittelgroßes Logo", - "LargeLogo":"Großes Logo" + "GlobalLogo": "Geschäftslogos", + "SmallLogo": "Kleines Logo", + "MediumLogo": "Mittelgroßes Logo", + "LargeLogo": "Großes Logo", + "ShutDownServer": "Server herunterfahren", + "AreYouSureShutDown": "Sind Sie sicher, dass Sie den Server herunterfahren möchten?" } \ No newline at end of file diff --git a/server/AyaNova/resource/en.json b/server/AyaNova/resource/en.json index 2a89a255..5d46507f 100644 --- a/server/AyaNova/resource/en.json +++ b/server/AyaNova/resource/en.json @@ -953,9 +953,9 @@ "DateRangeOctober": "October", "DateRangeNovember": "November", "DateRangeDecember": "December", - "DateRangePreviousYearThisMonth":"Previous year - this month", - "DateRangePreviousYearLastMonth":"Previous year - last month", - "DateRangePreviousYearNextMonth":"Previous year - next month", + "DateRangePreviousYearThisMonth": "Previous year - this month", + "DateRangePreviousYearLastMonth": "Previous year - last month", + "DateRangePreviousYearNextMonth": "Previous year - next month", "DayAny": "Any day of the week", "DayFriday": "Friday", "DayMonday": "Monday", @@ -1574,7 +1574,7 @@ "AuthorizationRoleSalesFull": "Sales - full", "AuthorizationRoleAll": "All roles", "Welcome": "Welcome to AyaNova", - "ThankYouForEvaluating":"Thank you for trying AyaNova. Please use the following links to help explore AyaNova and see if it is a good match for your organization.", + "ThankYouForEvaluating": "Thank you for trying AyaNova. Please use the following links to help explore AyaNova and see if it is a good match for your organization.", "ErrorFieldValueNotInteger": "Value must be an integer", "ErrorFieldValueNotDecimal": "Value must be a number", "ErrorAPI2000": "The server is closed", @@ -1876,7 +1876,7 @@ "NotifyEventScheduledOnWorkorder": "Scheduled on work order", "NotifyEventScheduledOnWorkorderImminent": "Work order scheduled service imminent", "NotifyEventWorkorderFinishStatusOverdue": "Work order not finished in time", - "NotifyEventWorkorderFinished":"Work order finished", + "NotifyEventWorkorderFinished": "Work order finished", "NotifyEventOutsideServiceOverdue": "Outside service overdue", "NotifyEventOutsideServiceReceived": "Outside service unit received back", "NotifyEventPartRequestReceived": "Requested part received", @@ -1908,11 +1908,13 @@ "SmtpServerPort": "SMTP server port", "NotifyFromAddress": "SMTP notify from address", "AyaNovaServerURL": "AyaNova server URL", - "DeliverAfter":"Deliver after", - "NotifyQueue":"Notify event delivery queue", - "DirectNotification":"Direct notification", - "GlobalLogo":"Business logos", - "SmallLogo":"Small sized logo", - "MediumLogo":"Medium sized logo", - "LargeLogo":"Large sized logo" + "DeliverAfter": "Deliver after", + "NotifyQueue": "Notify event delivery queue", + "DirectNotification": "Direct notification", + "GlobalLogo": "Business logos", + "SmallLogo": "Small sized logo", + "MediumLogo": "Medium sized logo", + "LargeLogo": "Large sized logo", + "ShutDownServer": "Shut down server", + "AreYouSureShutDown": "Are you certain you want to shut down the server?" } \ No newline at end of file diff --git a/server/AyaNova/resource/es.json b/server/AyaNova/resource/es.json index 81a9c74e..9ff32cf6 100644 --- a/server/AyaNova/resource/es.json +++ b/server/AyaNova/resource/es.json @@ -953,9 +953,9 @@ "DateRangeOctober": "Octubre", "DateRangeNovember": "Noviembre", "DateRangeDecember": "Diciembre", - "DateRangePreviousYearThisMonth":"Año anterior - este mes", - "DateRangePreviousYearLastMonth":"Año anterior - mes pasado", - "DateRangePreviousYearNextMonth":"Año anterior - mes siguiente", + "DateRangePreviousYearThisMonth": "Año anterior - este mes", + "DateRangePreviousYearLastMonth": "Año anterior - mes pasado", + "DateRangePreviousYearNextMonth": "Año anterior - mes siguiente", "DayAny": "Cualquier día de la semana", "DayFriday": "Viernes", "DayMonday": "Lunes", @@ -1574,7 +1574,7 @@ "AuthorizationRoleSalesFull": "Ventas - completo", "AuthorizationRoleAll": "Todos los roles", "Welcome": "Bienvenido a AyaNova", - "ThankYouForEvaluating":"Gracias por probar AyaNova. Utilice los siguientes enlaces para ayudar a explorar AyaNova y ver si es una buena opción para su organización.", + "ThankYouForEvaluating": "Gracias por probar AyaNova. Utilice los siguientes enlaces para ayudar a explorar AyaNova y ver si es una buena opción para su organización.", "ErrorFieldValueNotInteger": "El valor debe ser un entero", "ErrorFieldValueNotDecimal": "El valor debe ser un número", "ErrorAPI2000": "El servidor esta cerrado", @@ -1876,7 +1876,7 @@ "NotifyEventScheduledOnWorkorder": "Programado en orden de trabajo", "NotifyEventScheduledOnWorkorderImminent": "Servicio de orden de trabajo programado inminente", "NotifyEventWorkorderFinishStatusOverdue": "Orden de trabajo no terminada a tiempo", - "NotifyEventWorkorderFinished":"Orden de trabajo terminada", + "NotifyEventWorkorderFinished": "Orden de trabajo terminada", "NotifyEventOutsideServiceOverdue": "El servicio de terceros está atrasado", "NotifyEventOutsideServiceReceived": "Servicio de terceros completado, unidad recibida de vuelta", "NotifyEventPartRequestReceived": "Parte solicitada recibida", @@ -1910,9 +1910,11 @@ "AyaNovaServerURL": "URL del servidor AyaNova", "DeliverAfter": "Entregar después", "NotifyQueue": "Notificar cola de entrega de eventos", - "DirectNotification": "Notificación directa", - "GlobalLogo":"Logotipos comerciales", - "SmallLogo":"Logotipo de tamaño pequeño", - "MediumLogo":"Logotipo de tamaño mediano", - "LargeLogo":"Logotipo de gran tamaño" + "DirectNotification": "Notificación directa", + "GlobalLogo": "Logotipos comerciales", + "SmallLogo": "Logotipo de tamaño pequeño", + "MediumLogo": "Logotipo de tamaño mediano", + "LargeLogo": "Logotipo de gran tamaño", + "ShutDownServer": "Apagar el servidor", + "AreYouSureShutDown": "¿Estás segura de que quieres cerrar el servidor?" } \ No newline at end of file diff --git a/server/AyaNova/resource/fr.json b/server/AyaNova/resource/fr.json index e0274ec7..b66284c9 100644 --- a/server/AyaNova/resource/fr.json +++ b/server/AyaNova/resource/fr.json @@ -953,9 +953,9 @@ "DateRangeOctober": "Octobre", "DateRangeNovember": "Novembre", "DateRangeDecember": "Décembre", - "DateRangePreviousYearThisMonth":"Année précédente - ce mois-ci", - "DateRangePreviousYearLastMonth":"Année précédente - le mois dernier", - "DateRangePreviousYearNextMonth":"Année précédente - mois prochain", + "DateRangePreviousYearThisMonth": "Année précédente - ce mois-ci", + "DateRangePreviousYearLastMonth": "Année précédente - le mois dernier", + "DateRangePreviousYearNextMonth": "Année précédente - mois prochain", "DayAny": "N'importe quel jour de la semaine", "DayFriday": "Vendredi", "DayMonday": "Lundi", @@ -1574,7 +1574,7 @@ "AuthorizationRoleSalesFull": "Ventes - complète", "AuthorizationRoleAll": "Tous les rôles", "Welcome": "Bienvenue chez AyaNova", - "ThankYouForEvaluating":"Merci d'essayer AyaNova. Veuillez utiliser les liens suivants pour vous aider à explorer AyaNova et voir s'il correspond bien à votre organisation.", + "ThankYouForEvaluating": "Merci d'essayer AyaNova. Veuillez utiliser les liens suivants pour vous aider à explorer AyaNova et voir s'il correspond bien à votre organisation.", "ErrorFieldValueNotInteger": "La valeur doit être un entier", "ErrorFieldValueNotDecimal": "La valeur doit être un nombre", "ErrorAPI2000": "Le serveur est fermé", @@ -1876,7 +1876,7 @@ "NotifyEventScheduledOnWorkorder": "Planifié sur ordre de travail", "NotifyEventScheduledOnWorkorderImminent": "Service planifié d'un ordre de travail imminent", "NotifyEventWorkorderFinishStatusOverdue": "Bon de travail non terminé à temps", - "NotifyEventWorkorderFinished":"Bon de travail terminé", + "NotifyEventWorkorderFinished": "Bon de travail terminé", "NotifyEventOutsideServiceOverdue": "Le service tiers est en retard", "NotifyEventOutsideServiceReceived": "Service tiers terminé, unité reçue", "NotifyEventPartRequestReceived": "Pièce demandée reçue", @@ -1910,9 +1910,11 @@ "AyaNovaServerURL": "URL du serveur AyaNova", "DeliverAfter": "Livrer après", "NotifyQueue": "Notifier file d'attente de remise des événements", - "DirectNotification": "Notification directe", - "GlobalLogo":"Logos d'entreprise", - "SmallLogo":"Logo de petite taille", - "MediumLogo":"Logo de taille moyenne", - "LargeLogo":"Logo de grande taille" + "DirectNotification": "Notification directe", + "GlobalLogo": "Logos d'entreprise", + "SmallLogo": "Logo de petite taille", + "MediumLogo": "Logo de taille moyenne", + "LargeLogo": "Logo de grande taille", + "ShutDownServer": "Arrêter le serveur", + "AreYouSureShutDown": "Êtes-vous certain de vouloir arrêter le serveur?" } \ No newline at end of file