diff --git a/.vscode/launch.json b/.vscode/launch.json index 3a7a77fc..791271e4 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -47,7 +47,7 @@ "AYANOVA_DB_CONNECTION": "Server=localhost;Username=postgres;Password=raven;Database=AyaNova;CommandTimeout=120;", "AYANOVA_DATA_PATH": "c:\\temp\\ravendata", "AYANOVA_USE_URLS": "http://*:7575;", - "AYANOVA_SERVER_TEST_MODE": "true", + "AYANOVA_SERVER_TEST_MODE": "false", "AYANOVA_REPORT_RENDERING_TIMEOUT":"1", "AYANOVA_SERVER_TEST_MODE_SEEDLEVEL": "large", "AYANOVA_BACKUP_PG_DUMP_PATH": "C:\\data\\code\\postgres_14\\bin\\" diff --git a/server/AyaNova/Controllers/ReportController.cs b/server/AyaNova/Controllers/ReportController.cs index 98a134bf..58c268b9 100644 --- a/server/AyaNova/Controllers/ReportController.cs +++ b/server/AyaNova/Controllers/ReportController.cs @@ -229,7 +229,7 @@ namespace AyaNova.Api.Controllers } catch (ReportRenderTimeOutException) { - log.LogInformation($"Report render timeout report id: {reportRequest.ReportId}, record count:{reportRequest.SelectedRowIds.LongLength}, user:{UserNameFromContext.Name(HttpContext.Items)} "); + log.LogInformation($"Report render timeout, exceeded timeout setting of {ServerBootConfig.AYANOVA_REPORT_RENDERING_TIMEOUT} minutes, report id: {reportRequest.ReportId}, record count:{reportRequest.SelectedRowIds.LongLength}, user:{UserNameFromContext.Name(HttpContext.Items)} "); return Ok(ApiOkResponse.Response(new { timeout = true, timeoutconfigminutes = ServerBootConfig.AYANOVA_REPORT_RENDERING_TIMEOUT })); } catch (System.Exception ex) diff --git a/server/AyaNova/resource/de.json b/server/AyaNova/resource/de.json index 8e7ca237..c3659424 100644 --- a/server/AyaNova/resource/de.json +++ b/server/AyaNova/resource/de.json @@ -2303,7 +2303,7 @@ "LastServiceWorkOrderServiceDate": "Letztes Servicedatum", "FilterUsers": "Benutzer filtern", "UserCountExceeded": "Server wegen Überschreitung der Lizenz für aktive Servicetyp-Benutzer geschlossen", - "ReportRenderTimeOut": "Die Verarbeitung des Berichts hat zu lange gedauert, das Limit ist auf {0} Minuten festgelegt", + "ReportRenderTimeOut": "Die Verarbeitung des Berichts dauerte zu viele Minuten, das Limit ist auf {0} festgelegt", "NativeDateTimeInput": "Verwenden Sie die standardmäßigen Eingabesteuerelemente für Datum und Uhrzeit des Browsers", "CompanyInformation": "Firmeninformation", "CompanyEmail": "Email", diff --git a/server/AyaNova/resource/en.json b/server/AyaNova/resource/en.json index 3467e370..ab5ea945 100644 --- a/server/AyaNova/resource/en.json +++ b/server/AyaNova/resource/en.json @@ -2303,7 +2303,7 @@ "LastServiceWorkOrderServiceDate": "Last service date", "FilterUsers": "Filter Users", "UserCountExceeded": "Server locked due to exceeding licensed active scheduleable User limit", - "ReportRenderTimeOut": "The report was taking too long to process, the limit is set to {0} minutes", + "ReportRenderTimeOut": "The report was taking too many minutes to process, the limit is set to {0}", "NativeDateTimeInput": "Use browser's standard date time input controls", "CompanyInformation": "Company information", "CompanyEmail": "Email", diff --git a/server/AyaNova/resource/es.json b/server/AyaNova/resource/es.json index b584ceba..c758a4fc 100644 --- a/server/AyaNova/resource/es.json +++ b/server/AyaNova/resource/es.json @@ -2303,7 +2303,7 @@ "LastServiceWorkOrderServiceDate": "Última fecha de servicio", "FilterUsers": "Filtrar usuarios", "UserCountExceeded": "Servidor cerrado debido a que se superó la licencia para los usuarios del tipo de servicio activo", - "ReportRenderTimeOut": "El informe estaba tardando demasiado en procesarse, el límite está establecido en {0} minutos.", + "ReportRenderTimeOut": "El informe estaba tardando demasiados minutos en procesarse, el límite está establecido en {0}", "NativeDateTimeInput": "Utilice los controles de entrada de fecha y hora estándar del navegador", "CompanyInformation": "Información de la empresa", "CompanyEmail": "Email", diff --git a/server/AyaNova/resource/fr.json b/server/AyaNova/resource/fr.json index f785fef8..6ed0c8f2 100644 --- a/server/AyaNova/resource/fr.json +++ b/server/AyaNova/resource/fr.json @@ -2303,7 +2303,7 @@ "LastServiceWorkOrderServiceDate": "Dernière date de service", "FilterUsers": "Filtrer les utilisateurs", "UserCountExceeded": "Serveur fermé en raison d'un dépassement de licence pour les utilisateurs de type de service actif", - "ReportRenderTimeOut": "Le rapport prenait trop de temps à traiter, la limite est fixée à {0} minutes", + "ReportRenderTimeOut": "Le rapport prenait trop de minutes à traiter, la limite est définie sur {0}", "NativeDateTimeInput": "Utiliser les commandes de saisie de date et d'heure standard du navigateur", "CompanyInformation": "Informations sur la société", "CompanyEmail": "Email",