This commit is contained in:
2020-08-12 17:50:53 +00:00
parent e908868ed5
commit c065a4a3d5
6 changed files with 64 additions and 57 deletions

27
.vscode/launch.json vendored
View File

@@ -16,13 +16,13 @@
"cwd": "${workspaceFolder}/server/AyaNova", "cwd": "${workspaceFolder}/server/AyaNova",
"stopAtEntry": false, "stopAtEntry": false,
"internalConsoleOptions": "openOnSessionStart", "internalConsoleOptions": "openOnSessionStart",
// Enable launching a web browser when ASP.NET Core starts. For more information: https://aka.ms/VSCode-CS-LaunchJson-WebBrowser // 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 //this needs to be tweaked probably
//https://github.com/OmniSharp/omnisharp-vscode/blob/master/debugger-launchjson.md#starting-a-web-browser //https://github.com/OmniSharp/omnisharp-vscode/blob/master/debugger-launchjson.md#starting-a-web-browser
"serverReadyAction": { "serverReadyAction": {
"action": "openExternally", "action": "openExternally",
"pattern": "^\\s*Now listening on:\\s+(https?://\\S+)" "pattern": "^\\s*Now listening on:\\s+(https?://\\S+)"
}, },
// "launchBrowser": { // "launchBrowser": {
// "enabled": true, // "enabled": true,
// "args": "${auto-detect-url}/api/v8/", // "args": "${auto-detect-url}/api/v8/",
@@ -42,20 +42,19 @@
"AYANOVA_JWT_SECRET": "UNLICENSED5G*QQJ8#bQ7$Xr_@sXfHq4", "AYANOVA_JWT_SECRET": "UNLICENSED5G*QQJ8#bQ7$Xr_@sXfHq4",
//"AYANOVA_SET_SUPERUSER_PW": "l3tm3in", //"AYANOVA_SET_SUPERUSER_PW": "l3tm3in",
"AYANOVA_LOG_LEVEL": "Info", "AYANOVA_LOG_LEVEL": "Info",
// "AYANOVA_LOG_LEVEL": "Debug", // "AYANOVA_LOG_LEVEL": "Debug",
// "AYANOVA_LOG_LEVEL": "Trace", // "AYANOVA_LOG_LEVEL": "Trace",
"AYANOVA_DEFAULT_TRANSLATION": "en", "AYANOVA_DEFAULT_TRANSLATION": "en",
//TRANSLATION MUST BE en for Integration TESTING //TRANSLATION MUST BE en for Integration TESTING
//"AYANOVA_PERMANENTLY_ERASE_DATABASE": "true", //"AYANOVA_PERMANENTLY_ERASE_DATABASE": "true",
"AYANOVA_DB_CONNECTION": "Server=localhost;Username=postgres;Password=raven;Database=AyaNova;", "AYANOVA_DB_CONNECTION": "Server=localhost;Username=postgres;Password=raven;Database=AyaNova;",
"AYANOVA_USE_URLS": "http://*:7575;", "AYANOVA_USE_URLS": "http://*:7575;",
"AYANOVA_FOLDER_USER_FILES": "c:\\temp\\RavenTestData\\userfiles", "AYANOVA_FOLDER_USER_FILES": "c:\\temp\\RavenTestData\\userfiles",
"AYANOVA_FOLDER_BACKUP_FILES": "c:\\temp\\RavenTestData\\backupfiles", "AYANOVA_FOLDER_BACKUP_FILES": "c:\\temp\\RavenTestData\\backupfiles",
"AYANOVA_SERVER_TEST_MODE":"false", "AYANOVA_SERVER_TEST_MODE": "true",
"AYANOVA_SERVER_TEST_MODE_SEEDLEVEL":"small", "AYANOVA_SERVER_TEST_MODE_SEEDLEVEL": "small",
"AYANOVA_SERVER_TEST_MODE_TZ_OFFSET":"-7", "AYANOVA_SERVER_TEST_MODE_TZ_OFFSET": "-7",
"AYANOVA_BACKUP_PG_DUMP_PATH":"C:\\data\\code\\PostgreSQLPortable_12.0\\App\\PgSQL\\bin\\" "AYANOVA_BACKUP_PG_DUMP_PATH": "C:\\data\\code\\PostgreSQLPortable_12.0\\App\\PgSQL\\bin\\"
}, },
"sourceFileMap": { "sourceFileMap": {
"/Views": "${workspaceFolder}/Views" "/Views": "${workspaceFolder}/Views"

View File

@@ -129,7 +129,7 @@ namespace AyaNova.Api.Controllers
if (!Authorized.HasModifyRole(HttpContext.Items, AyaType.ServerState)) if (!Authorized.HasModifyRole(HttpContext.Items, AyaType.ServerState))
return StatusCode(403, new ApiNotAuthorizedResponse()); 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(); _appLifetime.StopApplication();
return Accepted(); return Accepted();

View File

@@ -953,9 +953,9 @@
"DateRangeOctober": "Oktober", "DateRangeOctober": "Oktober",
"DateRangeNovember": "November", "DateRangeNovember": "November",
"DateRangeDecember": "Dezember", "DateRangeDecember": "Dezember",
"DateRangePreviousYearThisMonth":"Vorjahr - diesen Monat", "DateRangePreviousYearThisMonth": "Vorjahr - diesen Monat",
"DateRangePreviousYearLastMonth":"Vorjahr - letzter Monat", "DateRangePreviousYearLastMonth": "Vorjahr - letzter Monat",
"DateRangePreviousYearNextMonth":"Vorjahr - nächster Monat", "DateRangePreviousYearNextMonth": "Vorjahr - nächster Monat",
"DayAny": "Beliebiger Wochentag", "DayAny": "Beliebiger Wochentag",
"DayFriday": "Freitag", "DayFriday": "Freitag",
"DayMonday": "Montag", "DayMonday": "Montag",
@@ -1574,7 +1574,7 @@
"AuthorizationRoleSalesFull": "Verkaufsabteilung - unbeschränkt", "AuthorizationRoleSalesFull": "Verkaufsabteilung - unbeschränkt",
"AuthorizationRoleAll": "Alle rollen", "AuthorizationRoleAll": "Alle rollen",
"Welcome": "Willkommen in AyaNova", "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", "ErrorFieldValueNotInteger": "Der Wert muss eine ganze Zahl sein",
"ErrorFieldValueNotDecimal": "Wert muss eine Zahl sein", "ErrorFieldValueNotDecimal": "Wert muss eine Zahl sein",
"ErrorAPI2000": "Server ist geschlossen", "ErrorAPI2000": "Server ist geschlossen",
@@ -1875,8 +1875,8 @@
"NotifyEventReminderImminent": "Erinnerung unmittelbar bevorsteht", "NotifyEventReminderImminent": "Erinnerung unmittelbar bevorsteht",
"NotifyEventScheduledOnWorkorder": "Geplant auf Arbeitsauftrag", "NotifyEventScheduledOnWorkorder": "Geplant auf Arbeitsauftrag",
"NotifyEventScheduledOnWorkorderImminent": "Arbeitsauftragsplan steht kurz bevor", "NotifyEventScheduledOnWorkorderImminent": "Arbeitsauftragsplan steht kurz bevor",
"NotifyEventWorkorderFinishStatusOverdue": "Arbeitsauftrag nicht rechtzeitig erledigt", "NotifyEventWorkorderFinishStatusOverdue": "Arbeitsauftrag nicht rechtzeitig erledigt",
"NotifyEventWorkorderFinished":"Arbeitsauftrag beendet", "NotifyEventWorkorderFinished": "Arbeitsauftrag beendet",
"NotifyEventOutsideServiceOverdue": "Drittanbieter-Service überfällig", "NotifyEventOutsideServiceOverdue": "Drittanbieter-Service überfällig",
"NotifyEventOutsideServiceReceived": "Service von Drittanbietern abgeschlossen, Gerät erhalten", "NotifyEventOutsideServiceReceived": "Service von Drittanbietern abgeschlossen, Gerät erhalten",
"NotifyEventPartRequestReceived": "Angeforderter Teil erhalten", "NotifyEventPartRequestReceived": "Angeforderter Teil erhalten",
@@ -1911,8 +1911,10 @@
"DeliverAfter": "Liefern nach", "DeliverAfter": "Liefern nach",
"NotifyQueue": "Warteschlange für Benachrichtigungszustellung", "NotifyQueue": "Warteschlange für Benachrichtigungszustellung",
"DirectNotification": "Direkte Benachrichtigung", "DirectNotification": "Direkte Benachrichtigung",
"GlobalLogo":"Geschäftslogos", "GlobalLogo": "Geschäftslogos",
"SmallLogo":"Kleines Logo", "SmallLogo": "Kleines Logo",
"MediumLogo":"Mittelgroßes Logo", "MediumLogo": "Mittelgroßes Logo",
"LargeLogo":"Großes Logo" "LargeLogo": "Großes Logo",
"ShutDownServer": "Server herunterfahren",
"AreYouSureShutDown": "Sind Sie sicher, dass Sie den Server herunterfahren möchten?"
} }

View File

@@ -953,9 +953,9 @@
"DateRangeOctober": "October", "DateRangeOctober": "October",
"DateRangeNovember": "November", "DateRangeNovember": "November",
"DateRangeDecember": "December", "DateRangeDecember": "December",
"DateRangePreviousYearThisMonth":"Previous year - this month", "DateRangePreviousYearThisMonth": "Previous year - this month",
"DateRangePreviousYearLastMonth":"Previous year - last month", "DateRangePreviousYearLastMonth": "Previous year - last month",
"DateRangePreviousYearNextMonth":"Previous year - next month", "DateRangePreviousYearNextMonth": "Previous year - next month",
"DayAny": "Any day of the week", "DayAny": "Any day of the week",
"DayFriday": "Friday", "DayFriday": "Friday",
"DayMonday": "Monday", "DayMonday": "Monday",
@@ -1574,7 +1574,7 @@
"AuthorizationRoleSalesFull": "Sales - full", "AuthorizationRoleSalesFull": "Sales - full",
"AuthorizationRoleAll": "All roles", "AuthorizationRoleAll": "All roles",
"Welcome": "Welcome to AyaNova", "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", "ErrorFieldValueNotInteger": "Value must be an integer",
"ErrorFieldValueNotDecimal": "Value must be a number", "ErrorFieldValueNotDecimal": "Value must be a number",
"ErrorAPI2000": "The server is closed", "ErrorAPI2000": "The server is closed",
@@ -1876,7 +1876,7 @@
"NotifyEventScheduledOnWorkorder": "Scheduled on work order", "NotifyEventScheduledOnWorkorder": "Scheduled on work order",
"NotifyEventScheduledOnWorkorderImminent": "Work order scheduled service imminent", "NotifyEventScheduledOnWorkorderImminent": "Work order scheduled service imminent",
"NotifyEventWorkorderFinishStatusOverdue": "Work order not finished in time", "NotifyEventWorkorderFinishStatusOverdue": "Work order not finished in time",
"NotifyEventWorkorderFinished":"Work order finished", "NotifyEventWorkorderFinished": "Work order finished",
"NotifyEventOutsideServiceOverdue": "Outside service overdue", "NotifyEventOutsideServiceOverdue": "Outside service overdue",
"NotifyEventOutsideServiceReceived": "Outside service unit received back", "NotifyEventOutsideServiceReceived": "Outside service unit received back",
"NotifyEventPartRequestReceived": "Requested part received", "NotifyEventPartRequestReceived": "Requested part received",
@@ -1908,11 +1908,13 @@
"SmtpServerPort": "SMTP server port", "SmtpServerPort": "SMTP server port",
"NotifyFromAddress": "SMTP notify from address", "NotifyFromAddress": "SMTP notify from address",
"AyaNovaServerURL": "AyaNova server URL", "AyaNovaServerURL": "AyaNova server URL",
"DeliverAfter":"Deliver after", "DeliverAfter": "Deliver after",
"NotifyQueue":"Notify event delivery queue", "NotifyQueue": "Notify event delivery queue",
"DirectNotification":"Direct notification", "DirectNotification": "Direct notification",
"GlobalLogo":"Business logos", "GlobalLogo": "Business logos",
"SmallLogo":"Small sized logo", "SmallLogo": "Small sized logo",
"MediumLogo":"Medium sized logo", "MediumLogo": "Medium sized logo",
"LargeLogo":"Large sized logo" "LargeLogo": "Large sized logo",
"ShutDownServer": "Shut down server",
"AreYouSureShutDown": "Are you certain you want to shut down the server?"
} }

View File

@@ -953,9 +953,9 @@
"DateRangeOctober": "Octubre", "DateRangeOctober": "Octubre",
"DateRangeNovember": "Noviembre", "DateRangeNovember": "Noviembre",
"DateRangeDecember": "Diciembre", "DateRangeDecember": "Diciembre",
"DateRangePreviousYearThisMonth":"Año anterior - este mes", "DateRangePreviousYearThisMonth": "Año anterior - este mes",
"DateRangePreviousYearLastMonth":"Año anterior - mes pasado", "DateRangePreviousYearLastMonth": "Año anterior - mes pasado",
"DateRangePreviousYearNextMonth":"Año anterior - mes siguiente", "DateRangePreviousYearNextMonth": "Año anterior - mes siguiente",
"DayAny": "Cualquier día de la semana", "DayAny": "Cualquier día de la semana",
"DayFriday": "Viernes", "DayFriday": "Viernes",
"DayMonday": "Lunes", "DayMonday": "Lunes",
@@ -1574,7 +1574,7 @@
"AuthorizationRoleSalesFull": "Ventas - completo", "AuthorizationRoleSalesFull": "Ventas - completo",
"AuthorizationRoleAll": "Todos los roles", "AuthorizationRoleAll": "Todos los roles",
"Welcome": "Bienvenido a AyaNova", "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", "ErrorFieldValueNotInteger": "El valor debe ser un entero",
"ErrorFieldValueNotDecimal": "El valor debe ser un número", "ErrorFieldValueNotDecimal": "El valor debe ser un número",
"ErrorAPI2000": "El servidor esta cerrado", "ErrorAPI2000": "El servidor esta cerrado",
@@ -1876,7 +1876,7 @@
"NotifyEventScheduledOnWorkorder": "Programado en orden de trabajo", "NotifyEventScheduledOnWorkorder": "Programado en orden de trabajo",
"NotifyEventScheduledOnWorkorderImminent": "Servicio de orden de trabajo programado inminente", "NotifyEventScheduledOnWorkorderImminent": "Servicio de orden de trabajo programado inminente",
"NotifyEventWorkorderFinishStatusOverdue": "Orden de trabajo no terminada a tiempo", "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", "NotifyEventOutsideServiceOverdue": "El servicio de terceros está atrasado",
"NotifyEventOutsideServiceReceived": "Servicio de terceros completado, unidad recibida de vuelta", "NotifyEventOutsideServiceReceived": "Servicio de terceros completado, unidad recibida de vuelta",
"NotifyEventPartRequestReceived": "Parte solicitada recibida", "NotifyEventPartRequestReceived": "Parte solicitada recibida",
@@ -1910,9 +1910,11 @@
"AyaNovaServerURL": "URL del servidor AyaNova", "AyaNovaServerURL": "URL del servidor AyaNova",
"DeliverAfter": "Entregar después", "DeliverAfter": "Entregar después",
"NotifyQueue": "Notificar cola de entrega de eventos", "NotifyQueue": "Notificar cola de entrega de eventos",
"DirectNotification": "Notificación directa", "DirectNotification": "Notificación directa",
"GlobalLogo":"Logotipos comerciales", "GlobalLogo": "Logotipos comerciales",
"SmallLogo":"Logotipo de tamaño pequeño", "SmallLogo": "Logotipo de tamaño pequeño",
"MediumLogo":"Logotipo de tamaño mediano", "MediumLogo": "Logotipo de tamaño mediano",
"LargeLogo":"Logotipo de gran tamaño" "LargeLogo": "Logotipo de gran tamaño",
"ShutDownServer": "Apagar el servidor",
"AreYouSureShutDown": "¿Estás segura de que quieres cerrar el servidor?"
} }

View File

@@ -953,9 +953,9 @@
"DateRangeOctober": "Octobre", "DateRangeOctober": "Octobre",
"DateRangeNovember": "Novembre", "DateRangeNovember": "Novembre",
"DateRangeDecember": "Décembre", "DateRangeDecember": "Décembre",
"DateRangePreviousYearThisMonth":"Année précédente - ce mois-ci", "DateRangePreviousYearThisMonth": "Année précédente - ce mois-ci",
"DateRangePreviousYearLastMonth":"Année précédente - le mois dernier", "DateRangePreviousYearLastMonth": "Année précédente - le mois dernier",
"DateRangePreviousYearNextMonth":"Année précédente - mois prochain", "DateRangePreviousYearNextMonth": "Année précédente - mois prochain",
"DayAny": "N'importe quel jour de la semaine", "DayAny": "N'importe quel jour de la semaine",
"DayFriday": "Vendredi", "DayFriday": "Vendredi",
"DayMonday": "Lundi", "DayMonday": "Lundi",
@@ -1574,7 +1574,7 @@
"AuthorizationRoleSalesFull": "Ventes - complète", "AuthorizationRoleSalesFull": "Ventes - complète",
"AuthorizationRoleAll": "Tous les rôles", "AuthorizationRoleAll": "Tous les rôles",
"Welcome": "Bienvenue chez AyaNova", "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", "ErrorFieldValueNotInteger": "La valeur doit être un entier",
"ErrorFieldValueNotDecimal": "La valeur doit être un nombre", "ErrorFieldValueNotDecimal": "La valeur doit être un nombre",
"ErrorAPI2000": "Le serveur est fermé", "ErrorAPI2000": "Le serveur est fermé",
@@ -1876,7 +1876,7 @@
"NotifyEventScheduledOnWorkorder": "Planifié sur ordre de travail", "NotifyEventScheduledOnWorkorder": "Planifié sur ordre de travail",
"NotifyEventScheduledOnWorkorderImminent": "Service planifié d'un ordre de travail imminent", "NotifyEventScheduledOnWorkorderImminent": "Service planifié d'un ordre de travail imminent",
"NotifyEventWorkorderFinishStatusOverdue": "Bon de travail non terminé à temps", "NotifyEventWorkorderFinishStatusOverdue": "Bon de travail non terminé à temps",
"NotifyEventWorkorderFinished":"Bon de travail terminé", "NotifyEventWorkorderFinished": "Bon de travail terminé",
"NotifyEventOutsideServiceOverdue": "Le service tiers est en retard", "NotifyEventOutsideServiceOverdue": "Le service tiers est en retard",
"NotifyEventOutsideServiceReceived": "Service tiers terminé, unité reçue", "NotifyEventOutsideServiceReceived": "Service tiers terminé, unité reçue",
"NotifyEventPartRequestReceived": "Pièce demandée reçue", "NotifyEventPartRequestReceived": "Pièce demandée reçue",
@@ -1910,9 +1910,11 @@
"AyaNovaServerURL": "URL du serveur AyaNova", "AyaNovaServerURL": "URL du serveur AyaNova",
"DeliverAfter": "Livrer après", "DeliverAfter": "Livrer après",
"NotifyQueue": "Notifier file d'attente de remise des événements", "NotifyQueue": "Notifier file d'attente de remise des événements",
"DirectNotification": "Notification directe", "DirectNotification": "Notification directe",
"GlobalLogo":"Logos d'entreprise", "GlobalLogo": "Logos d'entreprise",
"SmallLogo":"Logo de petite taille", "SmallLogo": "Logo de petite taille",
"MediumLogo":"Logo de taille moyenne", "MediumLogo": "Logo de taille moyenne",
"LargeLogo":"Logo de grande taille" "LargeLogo": "Logo de grande taille",
"ShutDownServer": "Arrêter le serveur",
"AreYouSureShutDown": "Êtes-vous certain de vouloir arrêter le serveur?"
} }