From c77f3df4de3f486465abd115b944b6547685597d Mon Sep 17 00:00:00 2001 From: LucasBrazi06 Date: Fri, 2 Apr 2021 10:58:48 +0200 Subject: [PATCH 01/18] Added Tag is inactive in Start Transaction + Use canListUsers to hide/display user's choice --- ...ging-stations-start-transaction-dialog-component.html | 7 +++++-- ...arging-stations-start-transaction-dialog-component.ts | 9 +++++++-- src/assets/i18n/de.json | 1 + src/assets/i18n/en.json | 1 + src/assets/i18n/es.json | 3 ++- src/assets/i18n/fr.json | 1 + src/assets/i18n/it.json | 1 + src/assets/i18n/pt.json | 1 + 8 files changed, 19 insertions(+), 5 deletions(-) diff --git a/src/app/pages/charging-stations/charging-station-start-transaction/charging-stations-start-transaction-dialog-component.html b/src/app/pages/charging-stations/charging-station-start-transaction/charging-stations-start-transaction-dialog-component.html index c4da1fd960..eee6d430f1 100644 --- a/src/app/pages/charging-stations/charging-station-start-transaction/charging-stations-start-transaction-dialog-component.html +++ b/src/app/pages/charging-stations/charging-station-start-transaction/charging-stations-start-transaction-dialog-component.html @@ -1,6 +1,6 @@

{{title | translate}}

-
+
@@ -42,7 +42,10 @@

{{title | translate}}

{{"general.mandatory_field" | translate}}
-
+ + {{"tags.not_active" | translate}} + +
diff --git a/src/app/pages/charging-stations/charging-station-start-transaction/charging-stations-start-transaction-dialog-component.ts b/src/app/pages/charging-stations/charging-station-start-transaction/charging-stations-start-transaction-dialog-component.ts index 7ca453c265..be657deb85 100644 --- a/src/app/pages/charging-stations/charging-station-start-transaction/charging-stations-start-transaction-dialog-component.ts +++ b/src/app/pages/charging-stations/charging-station-start-transaction/charging-stations-start-transaction-dialog-component.ts @@ -33,8 +33,10 @@ export class ChargingStationsStartTransactionDialogComponent implements OnInit { public tag!: AbstractControl; public tagID!: AbstractControl; + public userDefaultTagCar: UserDefaultTagCar; + public loggedUser: UserToken; - public isAdmin = false; + public canListUsers = false; public constructor( private dialog: MatDialog, @@ -51,7 +53,7 @@ export class ChargingStationsStartTransactionDialogComponent implements OnInit { this.title = data.title; this.chargeBoxID = data.chargeBoxID; this.loggedUser = centralServerService.getLoggedUser(); - this.isAdmin = this.authorizationService.isAdmin(); + this.canListUsers = this.authorizationService.canListUsers(); this.isCarComponentActive = this.componentService.isActive(TenantComponents.CAR); Utils.registerValidateCloseKeyEvents(this.dialogRef, this.startTransaction.bind(this), this.cancel.bind(this)); @@ -106,6 +108,9 @@ export class ChargingStationsStartTransactionDialogComponent implements OnInit { this.spinnerService.show(); this.centralServerService.getUserDefaultTagCar(this.userID.value).subscribe((userDefaultTagCar: UserDefaultTagCar) => { this.spinnerService.hide(); + this.userDefaultTagCar = userDefaultTagCar; + console.log(userDefaultTagCar); + // Set Tag this.tag.setValue(userDefaultTagCar.tag ? Utils.buildTagName(userDefaultTagCar.tag) : ''); this.tagID.setValue(userDefaultTagCar.tag?.id); diff --git a/src/assets/i18n/de.json b/src/assets/i18n/de.json index b302a76c3f..e6a880db38 100644 --- a/src/assets/i18n/de.json +++ b/src/assets/i18n/de.json @@ -1326,6 +1326,7 @@ }, "tags": { "id": "ID", + "not_active": "This badge is not active", "issuer": "Organisationseigentümer", "status": "Status", "activated": "Aktiv", diff --git a/src/assets/i18n/en.json b/src/assets/i18n/en.json index 0eeacde654..0a4748e448 100644 --- a/src/assets/i18n/en.json +++ b/src/assets/i18n/en.json @@ -1326,6 +1326,7 @@ }, "tags": { "id": "ID", + "not_active": "This badge is not active", "issuer": "Organization Owner", "status": "Status", "activated": "Active", diff --git a/src/assets/i18n/es.json b/src/assets/i18n/es.json index 7021f7ce1e..9a6758c65c 100644 --- a/src/assets/i18n/es.json +++ b/src/assets/i18n/es.json @@ -1326,7 +1326,8 @@ }, "tags": { "id": "ID", - "issuer": " Propietario de la organización", + "not_active": "This badge is not active", + "issuer": "Propietario de la organización", "status": "Estatus", "activated": "Active", "deactivated": "Inactive", diff --git a/src/assets/i18n/fr.json b/src/assets/i18n/fr.json index e648a57e10..1a785b2e2b 100644 --- a/src/assets/i18n/fr.json +++ b/src/assets/i18n/fr.json @@ -1326,6 +1326,7 @@ }, "tags": { "id": "ID", + "not_active": "Ce badge n'est pas actif", "issuer": "Propriétaire", "status": "Statut", "activated": "Activé", diff --git a/src/assets/i18n/it.json b/src/assets/i18n/it.json index 94325db7f7..3c938d41dc 100644 --- a/src/assets/i18n/it.json +++ b/src/assets/i18n/it.json @@ -1326,6 +1326,7 @@ }, "tags": { "id": "ID", + "not_active": "This badge is not active", "issuer": "Proprietario Organizzazione", "status": "Stato", "activated": "Active", diff --git a/src/assets/i18n/pt.json b/src/assets/i18n/pt.json index e110f70134..731868e000 100644 --- a/src/assets/i18n/pt.json +++ b/src/assets/i18n/pt.json @@ -1326,6 +1326,7 @@ }, "tags": { "id": "ID", + "not_active": "This badge is not active", "issuer": "Dono da Organização", "status": "Estados", "activated": "Active", From 87113cad584a858547f5c815b9a484093fdfe3a1 Mon Sep 17 00:00:00 2001 From: LucasBrazi06 Date: Fri, 2 Apr 2021 11:00:31 +0200 Subject: [PATCH 02/18] Removed debug log --- .../charging-stations-start-transaction-dialog-component.ts | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/app/pages/charging-stations/charging-station-start-transaction/charging-stations-start-transaction-dialog-component.ts b/src/app/pages/charging-stations/charging-station-start-transaction/charging-stations-start-transaction-dialog-component.ts index be657deb85..2eb9d43256 100644 --- a/src/app/pages/charging-stations/charging-station-start-transaction/charging-stations-start-transaction-dialog-component.ts +++ b/src/app/pages/charging-stations/charging-station-start-transaction/charging-stations-start-transaction-dialog-component.ts @@ -109,8 +109,6 @@ export class ChargingStationsStartTransactionDialogComponent implements OnInit { this.centralServerService.getUserDefaultTagCar(this.userID.value).subscribe((userDefaultTagCar: UserDefaultTagCar) => { this.spinnerService.hide(); this.userDefaultTagCar = userDefaultTagCar; - console.log(userDefaultTagCar); - // Set Tag this.tag.setValue(userDefaultTagCar.tag ? Utils.buildTagName(userDefaultTagCar.tag) : ''); this.tagID.setValue(userDefaultTagCar.tag?.id); From 764d6c49c1c6874efa8c8cf1a9f5db302ef731be Mon Sep 17 00:00:00 2001 From: LucasBrazi06 Date: Fri, 2 Apr 2021 12:07:10 +0200 Subject: [PATCH 03/18] Enable OCPI eMSP/CPO or both --- .../ocpi/settings-ocpi.component.html | 15 ++++++---- .../ocpi/settings-ocpi.component.ts | 28 ++++++++++++++++++- 2 files changed, 37 insertions(+), 6 deletions(-) diff --git a/src/app/pages/settings-integration/ocpi/settings-ocpi.component.html b/src/app/pages/settings-integration/ocpi/settings-ocpi.component.html index ad098f3f4e..52cb89420f 100644 --- a/src/app/pages/settings-integration/ocpi/settings-ocpi.component.html +++ b/src/app/pages/settings-integration/ocpi/settings-ocpi.component.html @@ -54,7 +54,6 @@

{{'ocpi.details' | translate}}

-

{{'ocpi.logo' | translate}}

@@ -114,11 +113,14 @@

{{'ocpi.details' | translate}}

- -

{{'ocpi.cpo' | translate}}

+
+ + {{'ocpi.cpo' | translate}} + +
{{'ocpi.details' | translate}}
- -

{{'ocpi.emsp' | translate}}

+
+ + {{'ocpi.emsp' | translate}} + +
{ @@ -154,12 +176,16 @@ export class SettingsOcpiComponent implements OnInit { if (settings.ocpi.cpo) { this.cpoCountryCode.setValue(settings.ocpi.cpo.countryCode); this.cpoPartyID.setValue(settings.ocpi.cpo.partyID); + this.cpoIsActive = this.cpoCountryCode.value && this.cpoPartyID.value; } + this.enableDisableCPO(this.cpoIsActive); // EMSP identifier - if (settings.ocpi.cpo) { + if (settings.ocpi.emsp) { this.emspCountryCode.setValue(settings.ocpi.emsp.countryCode); this.emspPartyID.setValue(settings.ocpi.emsp.partyID); + this.emspIsActive = this.emspCountryCode.value &&this.emspPartyID.value; } + this.enableDisableEMSP(this.emspIsActive); // Currency this.currency.setValue(settings.ocpi.currency); const businessDetails = settings.ocpi.businessDetails; From 40cbb2039ba079e43dcd2bbb4b6bde62f0a99960 Mon Sep 17 00:00:00 2001 From: LucasBrazi06 Date: Fri, 2 Apr 2021 14:52:32 +0200 Subject: [PATCH 04/18] Remove auth check in Concur refund table --- .../refund/transactions-refund-table-data-source.ts | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/src/app/pages/transactions/refund/transactions-refund-table-data-source.ts b/src/app/pages/transactions/refund/transactions-refund-table-data-source.ts index 3ed405de63..af36a0dc29 100644 --- a/src/app/pages/transactions/refund/transactions-refund-table-data-source.ts +++ b/src/app/pages/transactions/refund/transactions-refund-table-data-source.ts @@ -334,12 +334,10 @@ export class TransactionsRefundTableDataSource extends TableDataSource { - if (refundSettings) { - this.refundSetting = refundSettings; - } - }); - } + this.componentService.getRefundSettings().subscribe((refundSettings) => { + if (refundSettings) { + this.refundSetting = refundSettings; + } + }); } } From 3392305ce824c074fbd59da24a4977db59cae41b Mon Sep 17 00:00:00 2001 From: LucasBrazi06 Date: Fri, 2 Apr 2021 15:41:11 +0200 Subject: [PATCH 05/18] Async call of OCPI Push Token --- ...cpi-endpoints-details-table-data-source.ts | 9 ++-- src/app/services/central-server.service.ts | 2 +- src/app/types/DataResult.ts | 1 - src/assets/i18n/de.json | 45 +++++++++---------- src/assets/i18n/en.json | 45 +++++++++---------- src/assets/i18n/es.json | 45 +++++++++---------- src/assets/i18n/fr.json | 45 +++++++++---------- src/assets/i18n/it.json | 13 +++--- src/assets/i18n/pt.json | 13 +++--- 9 files changed, 104 insertions(+), 114 deletions(-) diff --git a/src/app/pages/settings-integration/ocpi/endpoints/ocpi-details/settings-ocpi-endpoints-details-table-data-source.ts b/src/app/pages/settings-integration/ocpi/endpoints/ocpi-details/settings-ocpi-endpoints-details-table-data-source.ts index 580f8b081e..8ac7cedd8b 100644 --- a/src/app/pages/settings-integration/ocpi/endpoints/ocpi-details/settings-ocpi-endpoints-details-table-data-source.ts +++ b/src/app/pages/settings-integration/ocpi/endpoints/ocpi-details/settings-ocpi-endpoints-details-table-data-source.ts @@ -2,6 +2,7 @@ import { Injectable } from '@angular/core'; import { Router } from '@angular/router'; import { TranslateService } from '@ngx-translate/core'; import { Observable } from 'rxjs'; +import { Constants } from 'utils/Constants'; import { CentralServerService } from '../../../../../services/central-server.service'; import { DialogService } from '../../../../../services/dialog.service'; @@ -275,13 +276,9 @@ export class SettingsOcpiEndpointsDetailsTableDataSource extends TableDataSource this.translateService.instant('ocpiendpoints.push_tokens_confirm', { name: ocpiendpoint.name }), ).subscribe((result) => { if (result === ButtonType.YES) { - this.messageService.showInfoMessage('ocpiendpoints.trigger_ocpi_action'); this.centralServerService.sendTokensOcpiEndpoint(ocpiendpoint).subscribe((response) => { - if (response.failure === 0 && response.success >= 0) { - this.messageService.showSuccessMessage('ocpiendpoints.push_tokens_success', { success: response.success }); - } else if (response.failure > 0 && response.success > 0) { - this.messageService.showWarningMessage('ocpiendpoints.push_tokens_partial', - { success: response.success, error: response.failure }); + if (response.status === Constants.REST_RESPONSE_SUCCESS) { + this.messageService.showSuccessMessage('ocpiendpoints.push_tokens_success'); } else { Utils.handleError(JSON.stringify(response), this.messageService, 'ocpiendpoints.push_tokens_error'); diff --git a/src/app/services/central-server.service.ts b/src/app/services/central-server.service.ts index dec4de7f83..5fcde70ab4 100644 --- a/src/app/services/central-server.service.ts +++ b/src/app/services/central-server.service.ts @@ -2205,7 +2205,7 @@ export class CentralServerService { ); } - public sendTokensOcpiEndpoint(ocpiEndpoint: OcpiEndpoint): Observable { + public sendTokensOcpiEndpoint(ocpiEndpoint: OcpiEndpoint): Observable { // Verify init this.checkInit(); // Execute diff --git a/src/app/types/DataResult.ts b/src/app/types/DataResult.ts index 13b334ff0f..7eacac1cc7 100644 --- a/src/app/types/DataResult.ts +++ b/src/app/types/DataResult.ts @@ -1,6 +1,5 @@ import { Company } from './Company'; import { Site } from './Site'; -import { Data } from './Table'; import { Transaction } from './Transaction'; import { UserStatus } from './User'; diff --git a/src/assets/i18n/de.json b/src/assets/i18n/de.json index e6a880db38..f8de947bd3 100644 --- a/src/assets/i18n/de.json +++ b/src/assets/i18n/de.json @@ -1733,41 +1733,41 @@ "trigger_jobs_title": "Jobs ausführen", "trigger_jobs_confirm": "Wollen Sie die Ausführung aller IOP '{{name}}' Jobs auslösen?", "trigger_ocpi_action": "Die Aktion wurde erfolgreich gesendet und braucht eventuell etwas Verarbeitungszeit", - "ocpi_action_in_progress": "Die Aktion läuft bereits", + "ocpi_action_in_progress": "You cannot start twice the same action, there is already one running in the background", "pull_locations_title": "Standorte abrufen", "pull_locations_confirm": "Wollen Sie alle Standorte von IOP '{{name}}' abrufen?", - "pull_locations_success": "Aktualisieren der Standorte '{{success}}' von IOP war erfolgreich", - "pull_locations_partial": "'{{success}}' Ort(e) aktualisiert - '{{error}}' Ort(e) nicht aktualisiert - überprüfen Sie die Logs für Details", + "pull_locations_success": "Aktualisieren der Standorte {{success}} von IOP war erfolgreich", + "pull_locations_partial": "{{success}} Ort(e) aktualisiert - {{error}} Ort(e) nicht aktualisiert - überprüfen Sie die Logs für Details", "pull_locations_error": "Beim Aktualisieren der IOP-Standorte ist ein Fehler aufgetreten - überprüfen Sie die Logs für Details", "get_sessions_title": "Ladevorgänge abrufen", "get_sessions_confirm": "Wollen Sie alle Ladevorgänge von IOP '{{name}}' abrufen?", - "get_sessions_success": "Aktualisieren von '{{success}}' Ladevorgängen von IOP war erfolgreich", - "get_sessions_partial": "'{{success}}' Ladevorgänge aktualisiert - '{{error}}' Ladevorgänge nicht aktualisiert - überprüfen Sie die Logs für Details", + "get_sessions_success": "Aktualisieren von {{success}} Ladevorgängen von IOP war erfolgreich", + "get_sessions_partial": "{{success}} Ladevorgänge aktualisiert - {{error}} Ladevorgänge nicht aktualisiert - überprüfen Sie die Logs für Details", "get_sessions_error": "Beim Aktualisieren der IOP-Ladevorgänge ist ein Fehler aufgetreten - überprüfen Sie die Logs für Details", "pull_tokens_title": "Tokens abrufen", "pull_tokens_confirm": "Wollen Sie wirklich alle Tokens von IOP '{{name}}' abrufen?", - "pull_tokens_success": "'{{success}}' Tokens von IOP erfolgreich aktualisiert ", - "pull_tokens_partial": "'{{success}}' Token(s) aktualisiert - '{{error}}' Token(s) nicht aktualisiert - überprüfen Sie die Logs für Details", + "pull_tokens_success": "{{success}} Tokens von IOP erfolgreich aktualisiert ", + "pull_tokens_partial": "{{success}} Token(s) aktualisiert - {{error}} Token(s) nicht aktualisiert - überprüfen Sie die Logs für Details", "pull_tokens_error": "Beim Abrufen der IOP Tokens ist ein Fehler aufgetreten - überprüfen Sie die Logs für Details", "pull_cdrs_title": "Abrufen von Ladevorgangsdetails", "pull_cdrs_confirm": "Wollen Sie wirlich alle Ladevorgangsdetails vom IOP '{{name}}' abrufen?", - "pull_cdrs_success": "'{{success}}' Ladevorgangsdetails von IOP erfolgreich aktualisiert", - "pull_cdrs_partial": "'{{success}}' Ladevorgangsdetails aktualisiert - '{{error}}' Ladevorgangsdetails nicht aktualisiert - überprüfen Sie die Logs für Details", + "pull_cdrs_success": "{{success}} Ladevorgangsdetails von IOP erfolgreich aktualisiert", + "pull_cdrs_partial": "{{success}} Ladevorgangsdetails aktualisiert - {{error}} Ladevorgangsdetails nicht aktualisiert - überprüfen Sie die Logs für Details", "pull_cdrs_error": "Beim Aktualisieren der Ladevorgangsdetails ist ein Fehler aufgetreten - überprüfen Sie die Logs für Details", "check_cdrs_title": "Ladevorgangsdetails überprüfen", "check_cdrs_confirm": "Wollen Sie wirlich alle Ladevorgangsdetails mit IOP '{{name}}' überprüfen?", - "check_cdrs_success": "'{{success}}' Ladevorgangsdetail-Einträge erfolgreich mit IOP überprüft", - "check_cdrs_partial": "'{{success}}' Ladevorgangsdetail-Einträge überprüft - '{{error}}' Ladevorgangsdetail-Einträge nicht überprüft - überprüfen Sie die Logs für Details", + "check_cdrs_success": "{{success}} Ladevorgangsdetail-Einträge erfolgreich mit IOP überprüft", + "check_cdrs_partial": "{{success}} Ladevorgangsdetail-Einträge überprüft - {{error}} Ladevorgangsdetail-Einträge nicht überprüft - überprüfen Sie die Logs für Details", "check_cdrs_error": "Beim Überprüfen der IOP-Ladevorgangsdetails ist ein Fehler aufgetreten - überprüfen Sie die Logs für Details", "check_sessions_title": "Ladevorgänge überprüfen", "check_sessions_confirm": "Wollen Sie alle Ladevorgäng mit IOP '{{name}}' überprüfen?", - "check_sessions_success": "'{{success}}' Ladevorgänge erfolgreich überprüft mit IOP", - "check_sessions_partial": "'{{success}}' Ladevorgänge überprüft - '{{error}}' Ladevorgänge nicht überprüft - überprüfen Sie die Logs für Details", + "check_sessions_success": "{{success}} Ladevorgänge erfolgreich überprüft mit IOP", + "check_sessions_partial": "{{success}} Ladevorgänge überprüft - {{error}} Ladevorgänge nicht überprüft - überprüfen Sie die Logs für Details", "check_sessions_error": "Während der Überprüfung der IOP-Ladevorgänge ist ein Fehler aufgetreten - überprüfen Sie die Logs für Details", "check_locations_title": "Standorte überprüfen", "check_locations_confirm": "Wollen Sie wirklch alle Standorte mit IOP '{{name}}' überprüfen?", - "check_locations_success": "'{{success}}' Standorte mit IOP erfolgreich überprüft", - "check_locations_partial": "'{{success}}' Standorte überprüft - '{{error}}' Standorte nicht überprüft - überprüfen Sie die Logs für Details", + "check_locations_success": "{{success}} Standorte mit IOP erfolgreich überprüft", + "check_locations_partial": "{{success}} Standorte überprüft - {{error}} Standorte nicht überprüft - überprüfen Sie die Logs für Details", "check_locations_error": "Während der Überprüng der IOP-Standorte ist ein Fehler aufgetreten - überprüfen Sie die Logs für Details", "trigger_jobs_error": "Während der Ausführung ist ein Fehler aufgetreten - Überprüfen Sie die Logs für Details", "success_ping": "Ping erfolgreich", @@ -1776,10 +1776,9 @@ "error_ping_412": "Ping fehlgeschlagen: Ungültige Antwort", "error_ping": "Ping Fehler", "error_generate_local_token": "Beim Generieren neuer lokaler Tokens ist ein Fehler aufgetreten", - "push_evse_statuses_success": "'{{success}}' EVSE Status erfolgreich aktualisiert", - "push_evse_statuses_partial": "'{{success}}' EVSE(s) aktualisiert - '{{error}}' EVSE(s) nicht aktualisiert - überprüfen Sie die Logs für Details", - "push_tokens_success": "'{{success}}' Token(s) erfolgreich aktualisiert", - "push_tokens_partial": "'{{success}}' Token(s) erfolgreich aktualisiert - '{{error}}' Token(s) nicht aktualisiert - überprüfen Sie die Logs für Details", + "push_evse_statuses_success": "{{success}} EVSE Status erfolgreich aktualisiert", + "push_evse_statuses_partial": "{{success}} EVSE(s) aktualisiert - {{error}} EVSE(s) nicht aktualisiert - überprüfen Sie die Logs für Details", + "push_tokens_success": "{{success}} Token(s) erfolgreich aktualisiert", "push_evse_statuses_error": "Beim Aktualisieren der EVSE Status ist ein Fehler aufgetreten - überprüfen Sie die Logs für Details", "push_tokens_error": "Beim Aktualisieren der User Tokens ist ein Fehler aufgetreten - überprüfen Sie die Logs für Details", "start_stop_job": "Aktiviere/Deaktiviere Hintergrundaktivitäten", @@ -1878,10 +1877,10 @@ "error_ping_404": "Ping fehlgeschlagen: Nicht gefunden", "error_ping_412": "Ping fehlgeschlagen: Ungültige Antwort", "error_ping": "Ping Fehler", - "push_evse_statuses_success": "'{{success}}' EVSE Status erfolgreich aktualisiert", - "push_evses_success": "'{{success}}' EVSEs erfolgreich aktualisiert", - "push_evse_statuses_partial": "'{{success}}' EVSE(s) aktualisiert - '{{error}}' EVSE(s) nicht aktualisiert - überprüfen Sie die Logs für Details", - "push_evses_partial": "'{{success}}' EVSE(s) aktualisiert - '{{error}}' EVSE(s) nicht aktualisiert - überprüfen Sie die Logs für Details", + "push_evse_statuses_success": "{{success}} EVSE Status erfolgreich aktualisiert", + "push_evses_success": "{{success}} EVSEs erfolgreich aktualisiert", + "push_evse_statuses_partial": "{{success}} EVSE(s) aktualisiert - {{error}} EVSE(s) nicht aktualisiert - überprüfen Sie die Logs für Details", + "push_evses_partial": "{{success}} EVSE(s) aktualisiert - {{error}} EVSE(s) nicht aktualisiert - überprüfen Sie die Logs für Details", "push_evse_statuses_error": "Beim Aktualisieren der EVSE Status ist ein Fehler aufgetreten - überprüfen Sie die Logs für Details", "push_evses_error": "Beim Aktualisieren der EVSEs ist ein Fehler aufgetreten - überprüfen Sie die Logs für Details", "start_stop_job": "Aktiviere/Deaktiviere Hintergrundaktivitäten", diff --git a/src/assets/i18n/en.json b/src/assets/i18n/en.json index 0a4748e448..eef6cce68f 100644 --- a/src/assets/i18n/en.json +++ b/src/assets/i18n/en.json @@ -1733,41 +1733,41 @@ "trigger_jobs_title": "Execute Jobs", "trigger_jobs_confirm": "Do you want to trigger all jobs of IOP '{{name}}'?", "trigger_ocpi_action": "The action has been successfully sent and may take time to be processed", - "ocpi_action_in_progress": "The action is already running", + "ocpi_action_in_progress": "You cannot start twice the same action, there is already one running in the background", "pull_locations_title": "Pull Locations", "pull_locations_confirm": "Do you want to retrieve all locations from IOP '{{name}}'?", - "pull_locations_success": "Successfully updated '{{success}}' locations from IOP", - "pull_locations_partial": "'{{success}}' location(s) updated - '{{error}}' location(s) not updated, check the logs", + "pull_locations_success": "Successfully updated {{success}} locations from IOP", + "pull_locations_partial": "{{success}} location(s) updated - {{error}} location(s) not updated, check the logs", "pull_locations_error": "Error occurred while updating the IOP locations, check the logs", "get_sessions_title": "Pull Sessions", "get_sessions_confirm": "Do you want to retrieve all sessions from IOP '{{name}}'?", - "get_sessions_success": "Successfully updated '{{success}}' sessions from IOP", - "get_sessions_partial": "'{{success}}' sessions(s) updated - '{{error}}' sessions(s) not updated, check the logs", + "get_sessions_success": "Successfully updated {{success}} sessions from IOP", + "get_sessions_partial": "{{success}} sessions(s) updated - {{error}} sessions(s) not updated, check the logs", "get_sessions_error": "Error occurred while updating the IOP sessions, check the logs", "pull_tokens_title": "Pull Tokens", "pull_tokens_confirm": "Do you want to retrieve all tokens from IOP '{{name}}'?", - "pull_tokens_success": "Successfully updated '{{success}}' tokens from IOP", - "pull_tokens_partial": "'{{success}}' token(s) updated - '{{error}}' token(s) not updated, check the logs", + "pull_tokens_success": "Successfully updated {{success}} tokens from IOP", + "pull_tokens_partial": "{{success}} token(s) updated - {{error}} token(s) not updated, check the logs", "pull_tokens_error": "Error occurred while updating the IOP tokens, check the logs", "pull_cdrs_title": "Pull Charge Detail Records", "pull_cdrs_confirm": "Do you want to retrieve all charge detail records from IOP '{{name}}'?", - "pull_cdrs_success": "Successfully updated '{{success}}' charge detail records from IOP", - "pull_cdrs_partial": "'{{success}}' charge detail record(s) updated - '{{error}}' charge detail record(s) not updated, check the logs", + "pull_cdrs_success": "Successfully updated {{success}} charge detail records from IOP", + "pull_cdrs_partial": "{{success}} charge detail record(s) updated - {{error}} charge detail record(s) not updated, check the logs", "pull_cdrs_error": "Error occurred while updating the IOP charge detail records, check the logs", "check_cdrs_title": "Check Charge Detail Records", "check_cdrs_confirm": "Do you want to check all charge detail records with IOP '{{name}}'?", - "check_cdrs_success": "Successfully checked '{{success}}' charge detail records with IOP", - "check_cdrs_partial": "'{{success}}' charge detail record(s) checked - '{{error}}' charge detail record(s) not checked, check the logs", + "check_cdrs_success": "Successfully checked {{success}} charge detail records with IOP", + "check_cdrs_partial": "{{success}} charge detail record(s) checked - {{error}} charge detail record(s) not checked, check the logs", "check_cdrs_error": "Error occurred while checking the IOP charge detail records, check the logs", "check_sessions_title": "Check Sessions", "check_sessions_confirm": "Do you want to check all sessions with IOP '{{name}}'?", - "check_sessions_success": "Successfully checked '{{success}}' sessions with IOP", - "check_sessions_partial": "'{{success}}' session(s) checked - '{{error}}' session(s) not checked, check the logs", + "check_sessions_success": "Successfully checked {{success}} sessions with IOP", + "check_sessions_partial": "{{success}} session(s) checked - {{error}} session(s) not checked, check the logs", "check_sessions_error": "Error occurred while checking the IOP sessions, check the logs", "check_locations_title": "Check Locations", "check_locations_confirm": "Do you want to check all locations with IOP '{{name}}'?", - "check_locations_success": "Successfully checked '{{success}}' locations with IOP", - "check_locations_partial": "'{{success}}' location(s) checked - '{{error}}' location(s) not checked, check the logs", + "check_locations_success": "Successfully checked {{success}} locations with IOP", + "check_locations_partial": "{{success}} location(s) checked - {{error}} location(s) not checked, check the logs", "check_locations_error": "Error occurred while checking the IOP locations, check the logs", "trigger_jobs_error": "Error occurred while executing jobs, check the logs", "success_ping": "Ping successful", @@ -1776,10 +1776,9 @@ "error_ping_412": "Ping failed: Invalid Response", "error_ping": "Ping failure", "error_generate_local_token": "Error occurred while generating new local token, check the logs", - "push_evse_statuses_success": "Successfully updated '{{success}}' EVSE statuses", - "push_evse_statuses_partial": "'{{success}}' EVSE(s) updated - '{{error}}' EVSE(s) not updated, check the logs", - "push_tokens_success": "'{{success}}' token(s) successfully updated", - "push_tokens_partial": "'{{success}}' token(s) successfully updated - '{{error}}' token(s) not updated, check the logs", + "push_evse_statuses_success": "Successfully updated {{success}} EVSE statuses", + "push_evse_statuses_partial": "{{success}} EVSE(s) updated - {{error}} EVSE(s) not updated, check the logs", + "push_tokens_success": "The command has been accepted and the token(s) will be sent asynchronously", "push_evse_statuses_error": "Error occurred while updating EVSE statuses, check the logs", "push_tokens_error": "Error occurred while updating user tokens, check the logs", "start_stop_job": "Enable/Disable background job", @@ -1878,10 +1877,10 @@ "error_ping_404": "Ping failed: Not Found", "error_ping_412": "Ping failed: Invalid Response", "error_ping": "Ping failure", - "push_evse_statuses_success": "Successfully updated '{{success}}' EVSE statuses", - "push_evse_statuses_partial": "'{{success}}' EVSE(s) updated - '{{error}}' EVSE(s) not updated, check the logs", - "push_evses_success": "Successfully updated '{{success}}' EVSEs", - "push_evses_partial": "'{{success}}' EVSE(s) updated - '{{error}}' EVSE(s) not updated, check the logs", + "push_evse_statuses_success": "Successfully updated {{success}} EVSE statuses", + "push_evse_statuses_partial": "{{success}} EVSE(s) updated - {{error}} EVSE(s) not updated, check the logs", + "push_evses_success": "Successfully updated {{success}} EVSEs", + "push_evses_partial": "{{success}} EVSE(s) updated - {{error}} EVSE(s) not updated, check the logs", "push_evse_statuses_error": "Error occurred while updating EVSE statuses, check the logs", "push_evses_error": "Error occurred while updating EVSEs, check the logs", "start_stop_job": "Enable/Disable background job", diff --git a/src/assets/i18n/es.json b/src/assets/i18n/es.json index 9a6758c65c..cb9e343662 100644 --- a/src/assets/i18n/es.json +++ b/src/assets/i18n/es.json @@ -1733,41 +1733,41 @@ "trigger_jobs_title": "Ejecución del proceso", "trigger_jobs_confirm": "¿Está seguro que desea ejecutar todos los procesos de IOP '{{name}}'?", "trigger_ocpi_action": "The action has been successfully sent and may take time to be processed", - "ocpi_action_in_progress": "The action is already running", + "ocpi_action_in_progress": "You cannot start twice the same action, there is already one running in the background", "pull_locations_title": "Descargando destinos", "pull_locations_confirm": "¿Está seguro que desea descargar los destinos IOP '{{name}}'?", - "pull_locations_success": "Los destinos '{{success}}' se han actualizado correctamente", - "pull_locations_partial": "'{{success}}' destinos actualizados - '{{error}}' destinos con errores - Consulte los registros para más detalles", + "pull_locations_success": "Los destinos {{success}} se han actualizado correctamente", + "pull_locations_partial": "{{success}} destinos actualizados - {{error}} destinos con errores - Consulte los registros para más detalles", "pull_locations_error": "Se produjo un error al descargar los destinos de IOP; Consulte los registros para obtener más detalles", "get_sessions_title": "Descarga de sesiones", "get_sessions_confirm": "¿Está seguro que desea descargar las sesiones de IOP '{{name}}'?", - "get_sessions_success": "Las sesiones '{{success}}' se han actualizado correctamente", - "get_sessions_partial": "'{{success}}' sesiones actualizadas - '{{error}}' sesiones con errores - Consulte los registros para más detalles", + "get_sessions_success": "Las sesiones {{success}} se han actualizado correctamente", + "get_sessions_partial": "{{success}} sesiones actualizadas - {{error}} sesiones con errores - Consulte los registros para más detalles", "get_sessions_error": "Se produjo un error al descargar las sesiones de IOP; Consulte los registros para obtener más detalles", "pull_tokens_title": "Descarga de token", "pull_tokens_confirm": "¿Está seguro que desea descargar los tokens IOP '{{name}}'?", - "pull_tokens_success": "{los tokens '{{success}}' se han actualizado correctamente", - "pull_tokens_partial": "'{{success}}' tokens actualizados - '{{error}}' tokens con errores - Consulte los registros para más detalles", + "pull_tokens_success": "{los tokens {{success}} se han actualizado correctamente", + "pull_tokens_partial": "{{success}} tokens actualizados - {{error}} tokens con errores - Consulte los registros para más detalles", "pull_tokens_error": "Se produjo un error al descargar los tokens de IOP; Consulte los registros para obtener más detalles", "pull_cdrs_title": "Descargando registros de carga", "pull_cdrs_confirm": "¿Está seguro de que desea descargar los registros de carga del IOP '{{name}}'?", - "pull_cdrs_success": "'{{success}}' los registros de carga se han actualizado correctamente", - "pull_cdrs_partial": "'{{success}}' datos de recarga actualizados - '{{error}}' datos de recarga con errores - Consulte los registros para más detalles", + "pull_cdrs_success": "{{success}} los registros de carga se han actualizado correctamente", + "pull_cdrs_partial": "{{success}} datos de recarga actualizados - {{error}} datos de recarga con errores - Consulte los registros para más detalles", "pull_cdrs_error": "Se produjo un error al descargar los datos de recarga del IOP; Consulte los registros para obtener más detalles", "check_cdrs_title": "Extraer registros detallados de carga", "check_cdrs_confirm": "¿Está seguro de que desea extraer los registros detallados de carga del IOP '{{name}}'?", - "check_cdrs_success": "'{{success}}' datos de carga verificados exitosamente", - "check_cdrs_partial": "'{{success}}' datos de carga verificados - '{{error}}' datos de recarga sin verificar - Consulte los registros para más detalles", + "check_cdrs_success": "{{success}} datos de carga verificados exitosamente", + "check_cdrs_partial": "{{success}} datos de carga verificados - {{error}} datos de recarga sin verificar - Consulte los registros para más detalles", "check_cdrs_error": "Se produjo un error al verificar los datos de recarga; Consulte los registros para obtener más detalles", "check_sessions_title": "Verificar sesiones", "check_sessions_confirm": "¿Está seguro que desea verificar las sesiones del IOP '{{name}}'?", - "check_sessions_success": "'{{success}}' sesiones verificadas exitosamente", - "check_sessions_partial": "'{{success}}' sesiones verificadas - '{{error}}' sesiones sin verificar - Consulte los registros para más detalles", + "check_sessions_success": "{{success}} sesiones verificadas exitosamente", + "check_sessions_partial": "{{success}} sesiones verificadas - {{error}} sesiones sin verificar - Consulte los registros para más detalles", "check_sessions_error": "Se produjo un error al verificar las sesiones; Consulte los registros para obtener más detalles", "check_locations_title": "Verificar sitios", "check_locations_confirm": "¿Está seguro que desea verificar los sitios IOP '{{name}}'?", - "check_locations_success": "'{{success}}' sitios verificados exitosamente", - "check_locations_partial": "'{{success}}' sitios verificados - '{{error}}' sitios no verificados - Consulte los registros para más detalles", + "check_locations_success": "{{success}} sitios verificados exitosamente", + "check_locations_partial": "{{success}} sitios verificados - {{error}} sitios no verificados - Consulte los registros para más detalles", "check_locations_error": "Se produjo un error al verificar los sitios; Consulte los registros para obtener más detalles", "trigger_jobs_error": "Se produjo un error durante la ejecución de los procesos de IOP; Consulte los registros para obtener más detalles", "success_ping": "Servidor accesible", @@ -1776,10 +1776,9 @@ "error_ping_412": "Servidor no accesible: Respuesta no válida", "error_ping": "Servidor no accesible", "error_generate_local_token": "Se produjo un error al generar el nuevo token", - "push_evse_statuses_success": "El estatus de '{{success}}' EVSE se ha actualizado correctamente", - "push_evse_statuses_partial": "El estatus de '{{success}}' EVSE se ha actualizado correctamente - '{{error}}' EVSE(s) en error; Consulte los registros para obtener más detalles", - "push_tokens_success": "'{{success}}' tokens se han actualizado correctamente", - "push_tokens_partial": "'{{success}}' tokens se han actualizado correctamente - '{{error}}' Tokens en error - Consulte los registros para más detalles", + "push_evse_statuses_success": "El estatus de {{success}} EVSE se ha actualizado correctamente", + "push_evse_statuses_partial": "El estatus de {{success}} EVSE se ha actualizado correctamente - {{error}} EVSE(s) en error; Consulte los registros para obtener más detalles", + "push_tokens_success": "The command has been accepted and the token(s) will be sent asynchronously", "push_evse_statuses_error": "Se produjo un error al actualizar el estado de EVSE; Consulte los registros para obtener más detalles", "push_tokens_error": "Se produjo un error al actualizar los tokens de usuario; Consulte los registros para obtener más detalles", "start_stop_job": "Activar / Desactivar el proceso", @@ -1878,10 +1877,10 @@ "error_ping_404": "Ping failed: Not Found", "error_ping_412": "Ping failed: Invalid Response", "error_ping": "Ping failure", - "push_evse_statuses_success": "Successfully updated '{{success}}' EVSE statuses", - "push_evse_statuses_partial": "'{{success}}' EVSE(s) updated - '{{error}}' EVSE(s) not updated, check the logs", - "push_evses_success": "Successfully updated '{{success}}' EVSEs", - "push_evses_partial": "'{{success}}' EVSE(s) updated - '{{error}}' EVSE(s) not updated, check the logs", + "push_evse_statuses_success": "Successfully updated {{success}} EVSE statuses", + "push_evse_statuses_partial": "{{success}} EVSE(s) updated - {{error}} EVSE(s) not updated, check the logs", + "push_evses_success": "Successfully updated {{success}} EVSEs", + "push_evses_partial": "{{success}} EVSE(s) updated - {{error}} EVSE(s) not updated, check the logs", "push_evse_statuses_error": "Error occurred while updating EVSE statuses, check the logs", "push_evses_error": "Error occurred while updating EVSEs, check the logs", "start_stop_job": "Enable/Disable background job", diff --git a/src/assets/i18n/fr.json b/src/assets/i18n/fr.json index 1a785b2e2b..ea6480eb9d 100644 --- a/src/assets/i18n/fr.json +++ b/src/assets/i18n/fr.json @@ -1733,41 +1733,41 @@ "trigger_jobs_title": "Execution des Processus", "trigger_jobs_confirm": "Voulez-vous vraiment exécuter tous les processus de l'IOP '{{name}}'?", "trigger_ocpi_action": "L'action a bien été envoyée et pourrait prendre du temps pour s'exécuter", - "ocpi_action_in_progress": "L'action est déjà en cours d'exécution", + "ocpi_action_in_progress": "Vous ne pouvez pas démarrer 2 fois la même action, il y en a déjà une en cours d'exécution en tâche de fond", "pull_locations_title": "Téléchargement des destinations", "pull_locations_confirm": "Voulez-vous vraiment télécharger les destinations de l'IOP '{{name}}'?", - "pull_locations_success": "'{{success}}' destinations ont été mis à jour avec succès", - "pull_locations_partial": "'{{success}}' destinations mis à jour - '{{error}}' destinations en erreur, vérifiez les logs", + "pull_locations_success": "{{success}} destinations ont été mis à jour avec succès", + "pull_locations_partial": "{{success}} destinations mis à jour - {{error}} destinations en erreur, vérifiez les logs", "pull_locations_error": "Une erreur est survenue lors du téléchargement des destinations de l'IOP, vérifiez les logs", "get_sessions_title": "Téléchargement des sessions", "get_sessions_confirm": "Voulez-vous vraiment télécharger les sessions de l'IOP '{{name}}'?", - "get_sessions_success": "'{{success}}' sessions ont été mis à jour avec succès", - "get_sessions_partial": "'{{success}}' sessions mis à jour - '{{error}}' sessions en erreur, vérifiez les logs", + "get_sessions_success": "{{success}} sessions ont été mis à jour avec succès", + "get_sessions_partial": "{{success}} sessions mis à jour - {{error}} sessions en erreur, vérifiez les logs", "get_sessions_error": "Une erreur est survenue lors du téléchargement des sessions de l'IOP, vérifiez les logs", "pull_tokens_title": "Téléchargement des jetons", "pull_tokens_confirm": "Voulez-vous vraiment télécharger les jetons de l'IOP '{{name}}'?", - "pull_tokens_success": "'{{success}}' jetons ont été mis à jour avec succès", - "pull_tokens_partial": "'{{success}}' jetons mis à jour - '{{error}}' jetons en erreur, vérifiez les logs", + "pull_tokens_success": "{{success}} jetons ont été mis à jour avec succès", + "pull_tokens_partial": "{{success}} jetons mis à jour - {{error}} jetons en erreur, vérifiez les logs", "pull_tokens_error": "Une erreur est survenue lors du téléchargement des jetons de l'IOP, vérifiez les logs", "pull_cdrs_title": "Téléchargement des données de recharge", "pull_cdrs_confirm": "Voulez-vous vraiment télécharger les données de recharge de l'IOP '{{name}}'?", - "pull_cdrs_success": "'{{success}}' données de recharge ont été mis à jour avec succès", - "pull_cdrs_partial": "'{{success}}' données de recharge mis à jour - '{{error}}' données de recharge en erreur, vérifiez les logs", + "pull_cdrs_success": "{{success}} données de recharge ont été mis à jour avec succès", + "pull_cdrs_partial": "{{success}} données de recharge mis à jour - {{error}} données de recharge en erreur, vérifiez les logs", "pull_cdrs_error": "Une erreur est survenue lors du téléchargement des données de recharge de l'IOP, vérifiez les logs", "check_cdrs_title": "Vérifier les données de recharge", "check_cdrs_confirm": "Voulez-vous vraiment vérifier les données de recharge de l'IOP '{{name}}'?", - "check_cdrs_success": "'{{success}}' données de recharge vérifiées avec succès", - "check_cdrs_partial": "'{{success}}' données de recharge vérifiées - '{{error}}' données de recharge non vérifiées, vérifiez les logs", + "check_cdrs_success": "{{success}} données de recharge vérifiées avec succès", + "check_cdrs_partial": "{{success}} données de recharge vérifiées - {{error}} données de recharge non vérifiées, vérifiez les logs", "check_cdrs_error": "Une erreur est survenue lors de la vérification des données de recharge, vérifiez les logs", "check_sessions_title": "Vérifier les sessions", "check_sessions_confirm": "Voulez-vous vraiment vérifier les sessions de l'IOP '{{name}}'?", - "check_sessions_success": "'{{success}}' sessions vérifiées avec succès", - "check_sessions_partial": "'{{success}}' session(s) vérifiées - '{{error}}' session(s) non vérifiées, vérifiez les logs", + "check_sessions_success": "{{success}} sessions vérifiées avec succès", + "check_sessions_partial": "{{success}} session(s) vérifiées - {{error}} session(s) non vérifiées, vérifiez les logs", "check_sessions_error": "Une erreur est survenue lors de la vérification des sessions, vérifiez les logs", "check_locations_title": "Vérifier les sites", "check_locations_confirm": "Voulez-vous vraiment vérifier les sites de l'IOP '{{name}}'?", - "check_locations_success": "'{{success}}' sites vérifiés avec succès", - "check_locations_partial": "'{{success}}' sites vérifiés - '{{error}}' sites non vérifiés, vérifiez les logs", + "check_locations_success": "{{success}} sites vérifiés avec succès", + "check_locations_partial": "{{success}} sites vérifiés - {{error}} sites non vérifiés, vérifiez les logs", "check_locations_error": "Une erreur est survenue lors de la vérification des sites, vérifiez les logs", "trigger_jobs_error": "Une erreur est survenue lors de l'exécution des processus de l'IOP, vérifiez les logs", "success_ping": "Serveur accessible", @@ -1776,10 +1776,9 @@ "error_ping_412": "Serveur non accessible: Reponse invalide", "error_ping": "Serveur non accessible", "error_generate_local_token": "Une erreur est survenue pendant la generation du nouveau jeton", - "push_evse_statuses_success": "Le status de '{{success}}' EVSE(s) a été mis à jour avec succès", - "push_evse_statuses_partial": "Le status de '{{success}}' EVSE(s) a été mis à jour avec succès - '{{error}}' EVSE(s) en erreur, vérifiez les logs", - "push_tokens_success": "'{{success}}' jeton(s) ont été mis à jour avec succès", - "push_tokens_partial": "'{{success}}' jeton(s) ont été mis à jour avec succès - '{{error}}' Jeton(s) en erreur, vérifiez les logs", + "push_evse_statuses_success": "Le status de {{success}} EVSE(s) a été mis à jour avec succès", + "push_evse_statuses_partial": "Le status de {{success}} EVSE(s) a été mis à jour avec succès - {{error}} EVSE(s) en erreur, vérifiez les logs", + "push_tokens_success": "La commande a été acceptée et les badges seront envoyés de manière asynchrone", "push_evse_statuses_error": "Une erreur est survenue lors de la mise à jour des status des EVSE(s), vérifiez les logs", "push_tokens_error": "Une erreur est survenue lors de la mise à jour des jetons des utilisateurs, vérifiez les logs", "start_stop_job": "Activer/Désactiver le processus", @@ -1878,10 +1877,10 @@ "error_ping_404": "Serveur non accessible: Ressource non trouvée", "error_ping_412": "Serveur non accessible: Reponse invalide", "error_ping": "Serveur non accessible", - "push_evse_statuses_success": "Le status de '{{success}}' EVSE(s) a été mis à jour avec succès", - "push_evse_statuses_partial": "Le status de '{{success}}' EVSE(s) a été mis à jour avec succès - '{{error}}' EVSE(s) en erreur, vérifiez les logs", - "push_evses_success": "'{{success}}' EVSE(s) ont été mis à jour avec succès", - "push_evses_partial": "'{{success}}' EVSE(s) ont été mis à jour avec succès - '{{error}}' EVSE(s) en erreur, vérifiez les logs", + "push_evse_statuses_success": "Le status de {{success}} EVSE(s) a été mis à jour avec succès", + "push_evse_statuses_partial": "Le status de {{success}} EVSE(s) a été mis à jour avec succès - {{error}} EVSE(s) en erreur, vérifiez les logs", + "push_evses_success": "{{success}} EVSE(s) ont été mis à jour avec succès", + "push_evses_partial": "{{success}} EVSE(s) ont été mis à jour avec succès - {{error}} EVSE(s) en erreur, vérifiez les logs", "push_evse_statuses_error": "Une erreur est survenue lors de la mise à jour des status des EVSE(s), vérifiez les logs", "push_evses_error": "Une erreur est survenue lors de la mise à jour des EVSE(s), vérifiez les logs", "start_stop_job": "Activer/Désactiver le processus", diff --git a/src/assets/i18n/it.json b/src/assets/i18n/it.json index 3c938d41dc..741b43d275 100644 --- a/src/assets/i18n/it.json +++ b/src/assets/i18n/it.json @@ -1733,7 +1733,7 @@ "trigger_jobs_title": "Esegui Job", "trigger_jobs_confirm": "Vuoi veramente avviare tutti i job dell'IOP '{{name}}'?", "trigger_ocpi_action": "L'azione è stata inviata correttamente e l'elaborazione potrebbe richiedere del tempo", - "ocpi_action_in_progress": "L'azione è già in corso", + "ocpi_action_in_progress": "You cannot start twice the same action, there is already one running in the background", "pull_locations_title": "Recupera Postazioni", "pull_locations_confirm": "Vuoi veramente recuperare tutte le postazioni dall'IOP '{{name}}'?", "pull_locations_success": "Aggiornate con successo {{success}} postazioni dall'IOP", @@ -1778,8 +1778,7 @@ "error_generate_local_token": "Si è verificato un errore durante la generazione di un nuovo token locale", "push_evse_statuses_success": "Sono stati aggiornati con successo {{success}} stati EVSE", "push_evse_statuses_partial": "{{success}} EVSE aggiornati - {{error}} EVSE non aggiornati - controlla i log per maggiori dettagli", - "push_tokens_success": "{{success}} token aggiornati(o) con successo", - "push_tokens_partial": "{{success}} token aggiornati(o) con successo - {{error}} token non aggiornati - controlla i log per maggiori dettagli", + "push_tokens_success": "The command has been accepted and the token(s) will be sent asynchronously", "push_evse_statuses_error": "Si è verificato un errore durante l'aggiornamento degli stati EVSE - controlla i log per maggiori dettagli", "push_tokens_error": "Si è verificato un errore durante l'aggiornamento dei token utente - controlla i log per maggiori dettagli", "start_stop_job": "Abilita/Disabilita job in background", @@ -1878,10 +1877,10 @@ "error_ping_404": "Ping failed: Not Found", "error_ping_412": "Ping failed: Invalid Response", "error_ping": "Ping failure", - "push_evse_statuses_success": "Successfully updated '{{success}}' EVSE statuses", - "push_evse_statuses_partial": "'{{success}}' EVSE(s) updated - '{{error}}' EVSE(s) not updated, check the logs", - "push_evses_success": "Successfully updated '{{success}}' EVSEs", - "push_evses_partial": "'{{success}}' EVSE(s) updated - '{{error}}' EVSE(s) not updated, check the logs", + "push_evse_statuses_success": "Successfully updated {{success}} EVSE statuses", + "push_evse_statuses_partial": "{{success}} EVSE(s) updated - {{error}} EVSE(s) not updated, check the logs", + "push_evses_success": "Successfully updated {{success}} EVSEs", + "push_evses_partial": "{{success}} EVSE(s) updated - {{error}} EVSE(s) not updated, check the logs", "push_evse_statuses_error": "Error occurred while updating EVSE statuses, check the logs", "push_evses_error": "Error occurred while updating EVSEs, check the logs", "start_stop_job": "Enable/Disable background job", diff --git a/src/assets/i18n/pt.json b/src/assets/i18n/pt.json index 731868e000..988285b5de 100644 --- a/src/assets/i18n/pt.json +++ b/src/assets/i18n/pt.json @@ -1733,7 +1733,7 @@ "trigger_jobs_title": "Executar trabalhos", "trigger_jobs_confirm": "Deseja acionar todos os trabalhos de IOP '{{name}}'?", "trigger_ocpi_action": "The action has been successfully sent and may take time to be processed", - "ocpi_action_in_progress": "The action is already running", + "ocpi_action_in_progress": "You cannot start twice the same action, there is already one running in the background", "pull_locations_title": "Localizações de extração", "pull_locations_confirm": "Deseja recuperar todas as localizações do IOP '{{name}}'?", "pull_locations_success": "Locais atualizados com sucesso {{success}} do IOP", @@ -1778,8 +1778,7 @@ "error_generate_local_token": "Ocorreu um erro ao gerar um novo token local", "push_evse_statuses_success": "Status EVSE de {{success}} atualizados com sucesso", "push_evse_statuses_partial": "{{success}} EVSE (s) atualizado (s) - {{error}} EVSE (s) não atualizado - consulte os logs para obter mais detalhes", - "push_tokens_success": "{{success}} token (s) atualizado (s) com sucesso", - "push_tokens_partial": "{{success}} token (s) atualizado (s) com sucesso - {{error}} token (s) não atualizado (s) - consulte os logs para obter mais detalhes", + "push_tokens_success": "The command has been accepted and the token(s) will be sent asynchronously", "push_evse_statuses_error": "Ocorreu um erro ao atualizar os status EVSE - consulte os registos para obter mais detalhes", "push_tokens_error": "Ocorreu um erro ao atualizar os tokens do usuário - consulte os logs para obter mais detalhes", "start_stop_job": "Ativar / desativar trabalho em segundo plano", @@ -1878,10 +1877,10 @@ "error_ping_404": "Ping failed: Not Found", "error_ping_412": "Ping failed: Invalid Response", "error_ping": "Ping failure", - "push_evse_statuses_success": "Successfully updated '{{success}}' EVSE statuses", - "push_evse_statuses_partial": "'{{success}}' EVSE(s) updated - '{{error}}' EVSE(s) not updated, check the logs", - "push_evses_success": "Successfully updated '{{success}}' EVSEs", - "push_evses_partial": "'{{success}}' EVSE(s) updated - '{{error}}' EVSE(s) not updated, check the logs", + "push_evse_statuses_success": "Successfully updated {{success}} EVSE statuses", + "push_evse_statuses_partial": "{{success}} EVSE(s) updated - {{error}} EVSE(s) not updated, check the logs", + "push_evses_success": "Successfully updated {{success}} EVSEs", + "push_evses_partial": "{{success}} EVSE(s) updated - {{error}} EVSE(s) not updated, check the logs", "push_evse_statuses_error": "Error occurred while updating EVSE statuses, check the logs", "push_evses_error": "Error occurred while updating EVSEs, check the logs", "start_stop_job": "Enable/Disable background job", From b0fd04baa81a767bfc7acbbdfab369821244ecb4 Mon Sep 17 00:00:00 2001 From: LucasBrazi06 Date: Fri, 2 Apr 2021 15:52:39 +0200 Subject: [PATCH 06/18] Renaming + Check auth for reading refund settings --- .../transactions-refund-table-data-source.ts | 18 ++++++++++-------- src/app/services/authorization.service.ts | 4 ++++ 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/src/app/pages/transactions/refund/transactions-refund-table-data-source.ts b/src/app/pages/transactions/refund/transactions-refund-table-data-source.ts index af36a0dc29..3f64441384 100644 --- a/src/app/pages/transactions/refund/transactions-refund-table-data-source.ts +++ b/src/app/pages/transactions/refund/transactions-refund-table-data-source.ts @@ -73,8 +73,8 @@ export class TransactionsRefundTableDataSource extends TableDataSource { - if (refundSettings) { - this.refundSetting = refundSettings; - } - }); + private loadRefundSettings() { + if (this.authorizationService.canReadSetting()) { + this.componentService.getRefundSettings().subscribe((refundSettings) => { + if (refundSettings) { + this.refundSetting = refundSettings; + } + }); + } } } diff --git a/src/app/services/authorization.service.ts b/src/app/services/authorization.service.ts index 333a18fc75..e4a2203068 100644 --- a/src/app/services/authorization.service.ts +++ b/src/app/services/authorization.service.ts @@ -144,6 +144,10 @@ export class AuthorizationService { return this.canAccess(Entity.SETTINGS, Action.LIST); } + public canReadSetting(): boolean { + return this.canAccess(Entity.SETTING, Action.READ); + } + public canDownloadInvoice(userId: string): boolean { if (this.canAccess(Entity.INVOICE, Action.DOWNLOAD)) { if (this.isAdmin() || (!!this.loggedUser && this.loggedUser.id === userId)) { From 5ceb53ea4750b72950b1bf84dbbd66e75fe92cec Mon Sep 17 00:00:00 2001 From: LucasBrazi06 Date: Fri, 2 Apr 2021 17:09:08 +0200 Subject: [PATCH 07/18] Made OCPI pull locations async --- .../settings-ocpi-endpoints-details-table-data-source.ts | 8 ++------ src/assets/i18n/de.json | 3 +-- src/assets/i18n/en.json | 5 ++--- src/assets/i18n/es.json | 5 ++--- src/assets/i18n/fr.json | 3 +-- src/assets/i18n/it.json | 5 ++--- src/assets/i18n/pt.json | 5 ++--- 7 files changed, 12 insertions(+), 22 deletions(-) diff --git a/src/app/pages/settings-integration/ocpi/endpoints/ocpi-details/settings-ocpi-endpoints-details-table-data-source.ts b/src/app/pages/settings-integration/ocpi/endpoints/ocpi-details/settings-ocpi-endpoints-details-table-data-source.ts index 8ac7cedd8b..374407afeb 100644 --- a/src/app/pages/settings-integration/ocpi/endpoints/ocpi-details/settings-ocpi-endpoints-details-table-data-source.ts +++ b/src/app/pages/settings-integration/ocpi/endpoints/ocpi-details/settings-ocpi-endpoints-details-table-data-source.ts @@ -308,13 +308,9 @@ export class SettingsOcpiEndpointsDetailsTableDataSource extends TableDataSource this.translateService.instant('ocpiendpoints.pull_locations_confirm', { name: ocpiendpoint.name }), ).subscribe((result) => { if (result === ButtonType.YES) { - this.messageService.showInfoMessage('ocpiendpoints.trigger_ocpi_action'); this.centralServerService.pullLocationsOcpiEndpoint(ocpiendpoint).subscribe((response) => { - if (response.failure === 0 && response.success >= 0) { - this.messageService.showSuccessMessage('ocpiendpoints.pull_locations_success', { success: response.success }); - } else if (response.failure > 0 && response.success > 0) { - this.messageService.showWarningMessage('ocpiendpoints.pull_locations_partial', - { success: response.success, error: response.failure }); + if (response.status === Constants.REST_RESPONSE_SUCCESS) { + this.messageService.showSuccessMessage('ocpiendpoints.pull_locations_success'); } else { Utils.handleError(JSON.stringify(response), this.messageService, 'ocpiendpoints.pull_locations_error'); diff --git a/src/assets/i18n/de.json b/src/assets/i18n/de.json index f8de947bd3..3133bbcd14 100644 --- a/src/assets/i18n/de.json +++ b/src/assets/i18n/de.json @@ -1736,8 +1736,7 @@ "ocpi_action_in_progress": "You cannot start twice the same action, there is already one running in the background", "pull_locations_title": "Standorte abrufen", "pull_locations_confirm": "Wollen Sie alle Standorte von IOP '{{name}}' abrufen?", - "pull_locations_success": "Aktualisieren der Standorte {{success}} von IOP war erfolgreich", - "pull_locations_partial": "{{success}} Ort(e) aktualisiert - {{error}} Ort(e) nicht aktualisiert - überprüfen Sie die Logs für Details", + "pull_locations_success": "The command has been accepted and the location(s) will be pulled asynchronously", "pull_locations_error": "Beim Aktualisieren der IOP-Standorte ist ein Fehler aufgetreten - überprüfen Sie die Logs für Details", "get_sessions_title": "Ladevorgänge abrufen", "get_sessions_confirm": "Wollen Sie alle Ladevorgänge von IOP '{{name}}' abrufen?", diff --git a/src/assets/i18n/en.json b/src/assets/i18n/en.json index eef6cce68f..d595e6a450 100644 --- a/src/assets/i18n/en.json +++ b/src/assets/i18n/en.json @@ -1736,8 +1736,7 @@ "ocpi_action_in_progress": "You cannot start twice the same action, there is already one running in the background", "pull_locations_title": "Pull Locations", "pull_locations_confirm": "Do you want to retrieve all locations from IOP '{{name}}'?", - "pull_locations_success": "Successfully updated {{success}} locations from IOP", - "pull_locations_partial": "{{success}} location(s) updated - {{error}} location(s) not updated, check the logs", + "pull_locations_success": "The command has been accepted and the location(s) will be pulled asynchronously", "pull_locations_error": "Error occurred while updating the IOP locations, check the logs", "get_sessions_title": "Pull Sessions", "get_sessions_confirm": "Do you want to retrieve all sessions from IOP '{{name}}'?", @@ -1778,7 +1777,7 @@ "error_generate_local_token": "Error occurred while generating new local token, check the logs", "push_evse_statuses_success": "Successfully updated {{success}} EVSE statuses", "push_evse_statuses_partial": "{{success}} EVSE(s) updated - {{error}} EVSE(s) not updated, check the logs", - "push_tokens_success": "The command has been accepted and the token(s) will be sent asynchronously", + "push_tokens_success": "The command has been accepted and the token(s) will be pushed asynchronously", "push_evse_statuses_error": "Error occurred while updating EVSE statuses, check the logs", "push_tokens_error": "Error occurred while updating user tokens, check the logs", "start_stop_job": "Enable/Disable background job", diff --git a/src/assets/i18n/es.json b/src/assets/i18n/es.json index cb9e343662..fc83cae8fd 100644 --- a/src/assets/i18n/es.json +++ b/src/assets/i18n/es.json @@ -1736,8 +1736,7 @@ "ocpi_action_in_progress": "You cannot start twice the same action, there is already one running in the background", "pull_locations_title": "Descargando destinos", "pull_locations_confirm": "¿Está seguro que desea descargar los destinos IOP '{{name}}'?", - "pull_locations_success": "Los destinos {{success}} se han actualizado correctamente", - "pull_locations_partial": "{{success}} destinos actualizados - {{error}} destinos con errores - Consulte los registros para más detalles", + "pull_locations_success": "The command has been accepted and the location(s) will be pulled asynchronously", "pull_locations_error": "Se produjo un error al descargar los destinos de IOP; Consulte los registros para obtener más detalles", "get_sessions_title": "Descarga de sesiones", "get_sessions_confirm": "¿Está seguro que desea descargar las sesiones de IOP '{{name}}'?", @@ -1778,7 +1777,7 @@ "error_generate_local_token": "Se produjo un error al generar el nuevo token", "push_evse_statuses_success": "El estatus de {{success}} EVSE se ha actualizado correctamente", "push_evse_statuses_partial": "El estatus de {{success}} EVSE se ha actualizado correctamente - {{error}} EVSE(s) en error; Consulte los registros para obtener más detalles", - "push_tokens_success": "The command has been accepted and the token(s) will be sent asynchronously", + "push_tokens_success": "The command has been accepted and the token(s) will be pushed asynchronously", "push_evse_statuses_error": "Se produjo un error al actualizar el estado de EVSE; Consulte los registros para obtener más detalles", "push_tokens_error": "Se produjo un error al actualizar los tokens de usuario; Consulte los registros para obtener más detalles", "start_stop_job": "Activar / Desactivar el proceso", diff --git a/src/assets/i18n/fr.json b/src/assets/i18n/fr.json index ea6480eb9d..482ca42393 100644 --- a/src/assets/i18n/fr.json +++ b/src/assets/i18n/fr.json @@ -1736,8 +1736,7 @@ "ocpi_action_in_progress": "Vous ne pouvez pas démarrer 2 fois la même action, il y en a déjà une en cours d'exécution en tâche de fond", "pull_locations_title": "Téléchargement des destinations", "pull_locations_confirm": "Voulez-vous vraiment télécharger les destinations de l'IOP '{{name}}'?", - "pull_locations_success": "{{success}} destinations ont été mis à jour avec succès", - "pull_locations_partial": "{{success}} destinations mis à jour - {{error}} destinations en erreur, vérifiez les logs", + "pull_locations_success": "La commande a été acceptée et les destinations seront récupérées de manière asynchrone", "pull_locations_error": "Une erreur est survenue lors du téléchargement des destinations de l'IOP, vérifiez les logs", "get_sessions_title": "Téléchargement des sessions", "get_sessions_confirm": "Voulez-vous vraiment télécharger les sessions de l'IOP '{{name}}'?", diff --git a/src/assets/i18n/it.json b/src/assets/i18n/it.json index 741b43d275..6b836829c0 100644 --- a/src/assets/i18n/it.json +++ b/src/assets/i18n/it.json @@ -1736,8 +1736,7 @@ "ocpi_action_in_progress": "You cannot start twice the same action, there is already one running in the background", "pull_locations_title": "Recupera Postazioni", "pull_locations_confirm": "Vuoi veramente recuperare tutte le postazioni dall'IOP '{{name}}'?", - "pull_locations_success": "Aggiornate con successo {{success}} postazioni dall'IOP", - "pull_locations_partial": "{{success}} postazione(i) aggiornata(e) - {{error}} postazione(i) non aggiornate - controlla i log per maggiori dettagli", + "pull_locations_success": "The command has been accepted and the location(s) will be pulled asynchronously", "pull_locations_error": "Si è verificato un errore durante l'aggiornamento delle postazioni dell'IOP - controlla i log per maggiori dettagli", "get_sessions_title": "Recupera Sessioni", "get_sessions_confirm": "Vuoi veramente recuperare tutte le sessioni dall'IOP '{{name}}'?", @@ -1778,7 +1777,7 @@ "error_generate_local_token": "Si è verificato un errore durante la generazione di un nuovo token locale", "push_evse_statuses_success": "Sono stati aggiornati con successo {{success}} stati EVSE", "push_evse_statuses_partial": "{{success}} EVSE aggiornati - {{error}} EVSE non aggiornati - controlla i log per maggiori dettagli", - "push_tokens_success": "The command has been accepted and the token(s) will be sent asynchronously", + "push_tokens_success": "The command has been accepted and the token(s) will be pushed asynchronously", "push_evse_statuses_error": "Si è verificato un errore durante l'aggiornamento degli stati EVSE - controlla i log per maggiori dettagli", "push_tokens_error": "Si è verificato un errore durante l'aggiornamento dei token utente - controlla i log per maggiori dettagli", "start_stop_job": "Abilita/Disabilita job in background", diff --git a/src/assets/i18n/pt.json b/src/assets/i18n/pt.json index 988285b5de..589db74e7f 100644 --- a/src/assets/i18n/pt.json +++ b/src/assets/i18n/pt.json @@ -1736,8 +1736,7 @@ "ocpi_action_in_progress": "You cannot start twice the same action, there is already one running in the background", "pull_locations_title": "Localizações de extração", "pull_locations_confirm": "Deseja recuperar todas as localizações do IOP '{{name}}'?", - "pull_locations_success": "Locais atualizados com sucesso {{success}} do IOP", - "pull_locations_partial": "{{success}} local (is) atualizado (s) - {{error}} local (is) não atualizado (s) - consulte os logs para obter mais detalhes", + "pull_locations_success": "The command has been accepted and the location(s) will be pulled asynchronously", "pull_locations_error": "Ocorreu um erro ao atualizar os locais IOP - consulte os registos para obter mais detalhes", "get_sessions_title": "Puxar Sessões", "get_sessions_confirm": "Deseja recuperar todas as sessões do IOP '{{name}}'?", @@ -1778,7 +1777,7 @@ "error_generate_local_token": "Ocorreu um erro ao gerar um novo token local", "push_evse_statuses_success": "Status EVSE de {{success}} atualizados com sucesso", "push_evse_statuses_partial": "{{success}} EVSE (s) atualizado (s) - {{error}} EVSE (s) não atualizado - consulte os logs para obter mais detalhes", - "push_tokens_success": "The command has been accepted and the token(s) will be sent asynchronously", + "push_tokens_success": "The command has been accepted and the token(s) will be pushed asynchronously", "push_evse_statuses_error": "Ocorreu um erro ao atualizar os status EVSE - consulte os registos para obter mais detalhes", "push_tokens_error": "Ocorreu um erro ao atualizar os tokens do usuário - consulte os logs para obter mais detalhes", "start_stop_job": "Ativar / desativar trabalho em segundo plano", From e9e83975e2a704ed1f1c93e608186de7a5ac7031 Mon Sep 17 00:00:00 2001 From: LucasBrazi06 Date: Fri, 2 Apr 2021 17:31:34 +0200 Subject: [PATCH 08/18] Made OCPI pull sessions async --- .../settings-ocpi-endpoints-details-table-data-source.ts | 8 ++------ src/assets/i18n/de.json | 3 +-- src/assets/i18n/en.json | 3 +-- src/assets/i18n/es.json | 3 +-- src/assets/i18n/fr.json | 3 +-- src/assets/i18n/it.json | 3 +-- src/assets/i18n/pt.json | 3 +-- 7 files changed, 8 insertions(+), 18 deletions(-) diff --git a/src/app/pages/settings-integration/ocpi/endpoints/ocpi-details/settings-ocpi-endpoints-details-table-data-source.ts b/src/app/pages/settings-integration/ocpi/endpoints/ocpi-details/settings-ocpi-endpoints-details-table-data-source.ts index 374407afeb..59c341a33f 100644 --- a/src/app/pages/settings-integration/ocpi/endpoints/ocpi-details/settings-ocpi-endpoints-details-table-data-source.ts +++ b/src/app/pages/settings-integration/ocpi/endpoints/ocpi-details/settings-ocpi-endpoints-details-table-data-source.ts @@ -340,13 +340,9 @@ export class SettingsOcpiEndpointsDetailsTableDataSource extends TableDataSource this.translateService.instant('ocpiendpoints.get_sessions_confirm', { name: ocpiendpoint.name }), ).subscribe((result) => { if (result === ButtonType.YES) { - this.messageService.showInfoMessage('ocpiendpoints.trigger_ocpi_action'); this.centralServerService.pullSessionsOcpiEndpoint(ocpiendpoint).subscribe((response) => { - if (response.failure === 0 && response.success >= 0) { - this.messageService.showSuccessMessage('ocpiendpoints.get_sessions_success', { success: response.success }); - } else if (response.failure > 0 && response.success > 0) { - this.messageService.showWarningMessage('ocpiendpoints.get_sessions_partial', - { success: response.success, error: response.failure }); + if (response.status === Constants.REST_RESPONSE_SUCCESS) { + this.messageService.showSuccessMessage('ocpiendpoints.get_sessions_success'); } else { Utils.handleError(JSON.stringify(response), this.messageService, 'ocpiendpoints.get_sessions_error'); diff --git a/src/assets/i18n/de.json b/src/assets/i18n/de.json index 3133bbcd14..aac33ff0d9 100644 --- a/src/assets/i18n/de.json +++ b/src/assets/i18n/de.json @@ -1740,8 +1740,7 @@ "pull_locations_error": "Beim Aktualisieren der IOP-Standorte ist ein Fehler aufgetreten - überprüfen Sie die Logs für Details", "get_sessions_title": "Ladevorgänge abrufen", "get_sessions_confirm": "Wollen Sie alle Ladevorgänge von IOP '{{name}}' abrufen?", - "get_sessions_success": "Aktualisieren von {{success}} Ladevorgängen von IOP war erfolgreich", - "get_sessions_partial": "{{success}} Ladevorgänge aktualisiert - {{error}} Ladevorgänge nicht aktualisiert - überprüfen Sie die Logs für Details", + "get_sessions_success": "The command has been accepted and the sessions(s) will be pulled asynchronously", "get_sessions_error": "Beim Aktualisieren der IOP-Ladevorgänge ist ein Fehler aufgetreten - überprüfen Sie die Logs für Details", "pull_tokens_title": "Tokens abrufen", "pull_tokens_confirm": "Wollen Sie wirklich alle Tokens von IOP '{{name}}' abrufen?", diff --git a/src/assets/i18n/en.json b/src/assets/i18n/en.json index d595e6a450..4a1452ff1d 100644 --- a/src/assets/i18n/en.json +++ b/src/assets/i18n/en.json @@ -1740,8 +1740,7 @@ "pull_locations_error": "Error occurred while updating the IOP locations, check the logs", "get_sessions_title": "Pull Sessions", "get_sessions_confirm": "Do you want to retrieve all sessions from IOP '{{name}}'?", - "get_sessions_success": "Successfully updated {{success}} sessions from IOP", - "get_sessions_partial": "{{success}} sessions(s) updated - {{error}} sessions(s) not updated, check the logs", + "get_sessions_success": "The command has been accepted and the sessions(s) will be pulled asynchronously", "get_sessions_error": "Error occurred while updating the IOP sessions, check the logs", "pull_tokens_title": "Pull Tokens", "pull_tokens_confirm": "Do you want to retrieve all tokens from IOP '{{name}}'?", diff --git a/src/assets/i18n/es.json b/src/assets/i18n/es.json index fc83cae8fd..0984fc3a5d 100644 --- a/src/assets/i18n/es.json +++ b/src/assets/i18n/es.json @@ -1740,8 +1740,7 @@ "pull_locations_error": "Se produjo un error al descargar los destinos de IOP; Consulte los registros para obtener más detalles", "get_sessions_title": "Descarga de sesiones", "get_sessions_confirm": "¿Está seguro que desea descargar las sesiones de IOP '{{name}}'?", - "get_sessions_success": "Las sesiones {{success}} se han actualizado correctamente", - "get_sessions_partial": "{{success}} sesiones actualizadas - {{error}} sesiones con errores - Consulte los registros para más detalles", + "get_sessions_success": "The command has been accepted and the sessions(s) will be pulled asynchronously", "get_sessions_error": "Se produjo un error al descargar las sesiones de IOP; Consulte los registros para obtener más detalles", "pull_tokens_title": "Descarga de token", "pull_tokens_confirm": "¿Está seguro que desea descargar los tokens IOP '{{name}}'?", diff --git a/src/assets/i18n/fr.json b/src/assets/i18n/fr.json index 482ca42393..c031a02487 100644 --- a/src/assets/i18n/fr.json +++ b/src/assets/i18n/fr.json @@ -1740,8 +1740,7 @@ "pull_locations_error": "Une erreur est survenue lors du téléchargement des destinations de l'IOP, vérifiez les logs", "get_sessions_title": "Téléchargement des sessions", "get_sessions_confirm": "Voulez-vous vraiment télécharger les sessions de l'IOP '{{name}}'?", - "get_sessions_success": "{{success}} sessions ont été mis à jour avec succès", - "get_sessions_partial": "{{success}} sessions mis à jour - {{error}} sessions en erreur, vérifiez les logs", + "get_sessions_success": "La commande a été acceptée et les sessions seront récupérées de manière asynchrone", "get_sessions_error": "Une erreur est survenue lors du téléchargement des sessions de l'IOP, vérifiez les logs", "pull_tokens_title": "Téléchargement des jetons", "pull_tokens_confirm": "Voulez-vous vraiment télécharger les jetons de l'IOP '{{name}}'?", diff --git a/src/assets/i18n/it.json b/src/assets/i18n/it.json index 6b836829c0..60f5db654e 100644 --- a/src/assets/i18n/it.json +++ b/src/assets/i18n/it.json @@ -1740,8 +1740,7 @@ "pull_locations_error": "Si è verificato un errore durante l'aggiornamento delle postazioni dell'IOP - controlla i log per maggiori dettagli", "get_sessions_title": "Recupera Sessioni", "get_sessions_confirm": "Vuoi veramente recuperare tutte le sessioni dall'IOP '{{name}}'?", - "get_sessions_success": "Sono state aggiornate con successo {{success}} sessioni dall'IOP", - "get_sessions_partial": "{{success}} sessione(i) aggiornata(e) - {{error}} sessione(i) non aggiornata(e) - controlla i log per maggiori dettagli", + "get_sessions_success": "The command has been accepted and the sessions(s) will be pulled asynchronously", "get_sessions_error": "Si è verificato un errore durante l'aggiornamento delle sessioni IOP - controlla i log per maggiori dettagli", "pull_tokens_title": "Recupera Token", "pull_tokens_confirm": "Vuoi veramente recuperare tutti i token dall'IOP '{{name}}'?", diff --git a/src/assets/i18n/pt.json b/src/assets/i18n/pt.json index 589db74e7f..0ced2b8a5b 100644 --- a/src/assets/i18n/pt.json +++ b/src/assets/i18n/pt.json @@ -1740,8 +1740,7 @@ "pull_locations_error": "Ocorreu um erro ao atualizar os locais IOP - consulte os registos para obter mais detalhes", "get_sessions_title": "Puxar Sessões", "get_sessions_confirm": "Deseja recuperar todas as sessões do IOP '{{name}}'?", - "get_sessions_success": "Sessões de IOP atualizadas com sucesso {{success}}", - "get_sessions_partial": "{{success}} sessões atualizadas - {{error}} sessões (s) não atualizadas - consulte os logs para obter mais detalhes", + "get_sessions_success": "The command has been accepted and the sessions(s) will be pulled asynchronously", "get_sessions_error": "Ocorreu um erro ao atualizar as sessões IOP - consulte os logs para obter mais detalhes", "pull_tokens_title": "Puxar Tokens", "pull_tokens_confirm": "Deseja recuperar todos os tokens do IOP '{{name}}'?", From a306e6155e00b469915bb98ca2101cae6047ecec Mon Sep 17 00:00:00 2001 From: LucasBrazi06 Date: Fri, 2 Apr 2021 17:45:07 +0200 Subject: [PATCH 09/18] Made OCPI pull cdrs async --- .../settings-ocpi-endpoints-details-table-data-source.ts | 6 +----- src/assets/i18n/de.json | 3 +-- src/assets/i18n/en.json | 3 +-- src/assets/i18n/es.json | 3 +-- src/assets/i18n/fr.json | 3 +-- src/assets/i18n/it.json | 3 +-- src/assets/i18n/pt.json | 3 +-- 7 files changed, 7 insertions(+), 17 deletions(-) diff --git a/src/app/pages/settings-integration/ocpi/endpoints/ocpi-details/settings-ocpi-endpoints-details-table-data-source.ts b/src/app/pages/settings-integration/ocpi/endpoints/ocpi-details/settings-ocpi-endpoints-details-table-data-source.ts index 59c341a33f..e671b85a24 100644 --- a/src/app/pages/settings-integration/ocpi/endpoints/ocpi-details/settings-ocpi-endpoints-details-table-data-source.ts +++ b/src/app/pages/settings-integration/ocpi/endpoints/ocpi-details/settings-ocpi-endpoints-details-table-data-source.ts @@ -516,13 +516,9 @@ export class SettingsOcpiEndpointsDetailsTableDataSource extends TableDataSource this.translateService.instant('ocpiendpoints.pull_cdrs_confirm', { name: ocpiendpoint.name }), ).subscribe((result) => { if (result === ButtonType.YES) { - this.messageService.showInfoMessage('ocpiendpoints.trigger_ocpi_action'); this.centralServerService.pullCdrsOcpiEndpoint(ocpiendpoint).subscribe((response) => { - if (response.failure === 0 && response.success >= 0) { + if (response.status === RestResponse.SUCCESS) { this.messageService.showSuccessMessage('ocpiendpoints.pull_cdrs_success', { success: response.success }); - } else if (response.failure > 0 && response.success > 0) { - this.messageService.showWarningMessage('ocpiendpoints.pull_cdrs_partial', - { success: response.success, error: response.failure }); } else { Utils.handleError(JSON.stringify(response), this.messageService, 'ocpiendpoints.pull_cdrs_error'); diff --git a/src/assets/i18n/de.json b/src/assets/i18n/de.json index aac33ff0d9..0ad33e9f93 100644 --- a/src/assets/i18n/de.json +++ b/src/assets/i18n/de.json @@ -1749,8 +1749,7 @@ "pull_tokens_error": "Beim Abrufen der IOP Tokens ist ein Fehler aufgetreten - überprüfen Sie die Logs für Details", "pull_cdrs_title": "Abrufen von Ladevorgangsdetails", "pull_cdrs_confirm": "Wollen Sie wirlich alle Ladevorgangsdetails vom IOP '{{name}}' abrufen?", - "pull_cdrs_success": "{{success}} Ladevorgangsdetails von IOP erfolgreich aktualisiert", - "pull_cdrs_partial": "{{success}} Ladevorgangsdetails aktualisiert - {{error}} Ladevorgangsdetails nicht aktualisiert - überprüfen Sie die Logs für Details", + "pull_cdrs_success": "The command has been accepted and the charge detail record(s) will be pulled asynchronously", "pull_cdrs_error": "Beim Aktualisieren der Ladevorgangsdetails ist ein Fehler aufgetreten - überprüfen Sie die Logs für Details", "check_cdrs_title": "Ladevorgangsdetails überprüfen", "check_cdrs_confirm": "Wollen Sie wirlich alle Ladevorgangsdetails mit IOP '{{name}}' überprüfen?", diff --git a/src/assets/i18n/en.json b/src/assets/i18n/en.json index 4a1452ff1d..1f0114bac2 100644 --- a/src/assets/i18n/en.json +++ b/src/assets/i18n/en.json @@ -1749,8 +1749,7 @@ "pull_tokens_error": "Error occurred while updating the IOP tokens, check the logs", "pull_cdrs_title": "Pull Charge Detail Records", "pull_cdrs_confirm": "Do you want to retrieve all charge detail records from IOP '{{name}}'?", - "pull_cdrs_success": "Successfully updated {{success}} charge detail records from IOP", - "pull_cdrs_partial": "{{success}} charge detail record(s) updated - {{error}} charge detail record(s) not updated, check the logs", + "pull_cdrs_success": "The command has been accepted and the charge detail record(s) will be pulled asynchronously", "pull_cdrs_error": "Error occurred while updating the IOP charge detail records, check the logs", "check_cdrs_title": "Check Charge Detail Records", "check_cdrs_confirm": "Do you want to check all charge detail records with IOP '{{name}}'?", diff --git a/src/assets/i18n/es.json b/src/assets/i18n/es.json index 0984fc3a5d..bf273eac5b 100644 --- a/src/assets/i18n/es.json +++ b/src/assets/i18n/es.json @@ -1749,8 +1749,7 @@ "pull_tokens_error": "Se produjo un error al descargar los tokens de IOP; Consulte los registros para obtener más detalles", "pull_cdrs_title": "Descargando registros de carga", "pull_cdrs_confirm": "¿Está seguro de que desea descargar los registros de carga del IOP '{{name}}'?", - "pull_cdrs_success": "{{success}} los registros de carga se han actualizado correctamente", - "pull_cdrs_partial": "{{success}} datos de recarga actualizados - {{error}} datos de recarga con errores - Consulte los registros para más detalles", + "pull_cdrs_success": "The command has been accepted and the charge detail record(s) will be pulled asynchronously", "pull_cdrs_error": "Se produjo un error al descargar los datos de recarga del IOP; Consulte los registros para obtener más detalles", "check_cdrs_title": "Extraer registros detallados de carga", "check_cdrs_confirm": "¿Está seguro de que desea extraer los registros detallados de carga del IOP '{{name}}'?", diff --git a/src/assets/i18n/fr.json b/src/assets/i18n/fr.json index c031a02487..046f2f3e66 100644 --- a/src/assets/i18n/fr.json +++ b/src/assets/i18n/fr.json @@ -1749,8 +1749,7 @@ "pull_tokens_error": "Une erreur est survenue lors du téléchargement des jetons de l'IOP, vérifiez les logs", "pull_cdrs_title": "Téléchargement des données de recharge", "pull_cdrs_confirm": "Voulez-vous vraiment télécharger les données de recharge de l'IOP '{{name}}'?", - "pull_cdrs_success": "{{success}} données de recharge ont été mis à jour avec succès", - "pull_cdrs_partial": "{{success}} données de recharge mis à jour - {{error}} données de recharge en erreur, vérifiez les logs", + "pull_cdrs_success": "La commande a été acceptée et les données de recharge seront récupérées de manière asynchrone", "pull_cdrs_error": "Une erreur est survenue lors du téléchargement des données de recharge de l'IOP, vérifiez les logs", "check_cdrs_title": "Vérifier les données de recharge", "check_cdrs_confirm": "Voulez-vous vraiment vérifier les données de recharge de l'IOP '{{name}}'?", diff --git a/src/assets/i18n/it.json b/src/assets/i18n/it.json index 60f5db654e..7465c4c14d 100644 --- a/src/assets/i18n/it.json +++ b/src/assets/i18n/it.json @@ -1749,8 +1749,7 @@ "pull_tokens_error": "Si è verificato un errore durante l'aggiornamento dei token IOP - controlla i log per maggiori dettagli", "pull_cdrs_title": "Recupera Rendiconti Sessioni Ricarica", "pull_cdrs_confirm": "Vuoi veramente recuperare i rendiconti di tutte le sessioni di ricarica dall'IOP '{{name}}'?", - "pull_cdrs_success": "Sono stati aggiornati con successo {{success}} rendiconto(i) di sessioni di ricarica dall'IOP", - "pull_cdrs_partial": "{{success}} rendiconti(o) di sessioni di ricarica aggiornati(o) - {{error}} rendiconti(o) di sessioni di ricarica non aggiornati(o) - controlla i log per maggiori dettagli", + "pull_cdrs_success": "The command has been accepted and the charge detail record(s) will be pulled asynchronously", "pull_cdrs_error": "Si è verificato un errore durante l'aggiornamento dei rendiconti di sessioni di ricarica dell'IOP - controlla i log per maggiori dettagli", "check_cdrs_title": "Controlla Rendiconti Sessioni Ricarica", "check_cdrs_confirm": "Vuoi veramente controllare tutti i rendiconti di sessioni di ricarica dell'IOP '{{name}}'?", diff --git a/src/assets/i18n/pt.json b/src/assets/i18n/pt.json index 0ced2b8a5b..3664d81047 100644 --- a/src/assets/i18n/pt.json +++ b/src/assets/i18n/pt.json @@ -1749,8 +1749,7 @@ "pull_tokens_error": "Ocorreu um erro ao atualizar os tokens IOP - consulte os logs para obter mais detalhes", "pull_cdrs_title": "Pull Charge Detail Records", "pull_cdrs_confirm": "Deseja recuperar todos os registos de detalhes de cobrança do IOP '{{name}}'?", - "pull_cdrs_success": "Atualizado com sucesso {{success}} registos de detalhes de cobrança do IOP", - "pull_cdrs_partial": "{{success}} registos (s) de detalhes de cobrança atualizados - {{error}} registos (s) de detalhes de cobrança não atualizados - consulte os logs para obter mais detalhes", + "pull_cdrs_success": "The command has been accepted and the charge detail record(s) will be pulled asynchronously", "pull_cdrs_error": "Ocorreu um erro ao atualizar os registos de detalhes de carga do IOP - consulte os registos para obter mais detalhes", "check_cdrs_title": "Verificar registos de detalhes de cobrança", "check_cdrs_confirm": "Deseja verificar todos os registos de detalhes de cobrança com IOP '{{name}}'?", From 893d221f438a004b35e3fed5d7bff8d3792db845 Mon Sep 17 00:00:00 2001 From: LucasBrazi06 Date: Fri, 2 Apr 2021 20:32:10 +0200 Subject: [PATCH 10/18] Made check of cdrs async --- .../settings-ocpi-endpoints-details-table-data-source.ts | 8 ++------ src/assets/i18n/de.json | 3 +-- src/assets/i18n/en.json | 3 +-- src/assets/i18n/es.json | 3 +-- src/assets/i18n/fr.json | 3 +-- src/assets/i18n/it.json | 3 +-- src/assets/i18n/pt.json | 3 +-- 7 files changed, 8 insertions(+), 18 deletions(-) diff --git a/src/app/pages/settings-integration/ocpi/endpoints/ocpi-details/settings-ocpi-endpoints-details-table-data-source.ts b/src/app/pages/settings-integration/ocpi/endpoints/ocpi-details/settings-ocpi-endpoints-details-table-data-source.ts index e671b85a24..74b0611add 100644 --- a/src/app/pages/settings-integration/ocpi/endpoints/ocpi-details/settings-ocpi-endpoints-details-table-data-source.ts +++ b/src/app/pages/settings-integration/ocpi/endpoints/ocpi-details/settings-ocpi-endpoints-details-table-data-source.ts @@ -480,13 +480,9 @@ export class SettingsOcpiEndpointsDetailsTableDataSource extends TableDataSource this.translateService.instant('ocpiendpoints.check_cdrs_confirm', { name: ocpiendpoint.name }), ).subscribe((result) => { if (result === ButtonType.YES) { - this.messageService.showInfoMessage('ocpiendpoints.trigger_ocpi_action'); this.centralServerService.checkCdrsOcpiEndpoint(ocpiendpoint).subscribe((response) => { - if (response.failure === 0 && response.success >= 0) { - this.messageService.showSuccessMessage('ocpiendpoints.check_cdrs_success', { success: response.success }); - } else if (response.failure > 0 && response.success > 0) { - this.messageService.showWarningMessage('ocpiendpoints.check_cdrs_partial', - { success: response.success, error: response.failure }); + if (response.status === RestResponse.SUCCESS) { + this.messageService.showSuccessMessage('ocpiendpoints.check_cdrs_success'); } else { Utils.handleError(JSON.stringify(response), this.messageService, 'ocpiendpoints.check_cdrs_error'); diff --git a/src/assets/i18n/de.json b/src/assets/i18n/de.json index 0ad33e9f93..280ebd7914 100644 --- a/src/assets/i18n/de.json +++ b/src/assets/i18n/de.json @@ -1753,8 +1753,7 @@ "pull_cdrs_error": "Beim Aktualisieren der Ladevorgangsdetails ist ein Fehler aufgetreten - überprüfen Sie die Logs für Details", "check_cdrs_title": "Ladevorgangsdetails überprüfen", "check_cdrs_confirm": "Wollen Sie wirlich alle Ladevorgangsdetails mit IOP '{{name}}' überprüfen?", - "check_cdrs_success": "{{success}} Ladevorgangsdetail-Einträge erfolgreich mit IOP überprüft", - "check_cdrs_partial": "{{success}} Ladevorgangsdetail-Einträge überprüft - {{error}} Ladevorgangsdetail-Einträge nicht überprüft - überprüfen Sie die Logs für Details", + "check_cdrs_success": "The command has been accepted and the charge detail record(s) will be checked asynchronously", "check_cdrs_error": "Beim Überprüfen der IOP-Ladevorgangsdetails ist ein Fehler aufgetreten - überprüfen Sie die Logs für Details", "check_sessions_title": "Ladevorgänge überprüfen", "check_sessions_confirm": "Wollen Sie alle Ladevorgäng mit IOP '{{name}}' überprüfen?", diff --git a/src/assets/i18n/en.json b/src/assets/i18n/en.json index 1f0114bac2..d5d900f307 100644 --- a/src/assets/i18n/en.json +++ b/src/assets/i18n/en.json @@ -1753,8 +1753,7 @@ "pull_cdrs_error": "Error occurred while updating the IOP charge detail records, check the logs", "check_cdrs_title": "Check Charge Detail Records", "check_cdrs_confirm": "Do you want to check all charge detail records with IOP '{{name}}'?", - "check_cdrs_success": "Successfully checked {{success}} charge detail records with IOP", - "check_cdrs_partial": "{{success}} charge detail record(s) checked - {{error}} charge detail record(s) not checked, check the logs", + "check_cdrs_success": "The command has been accepted and the charge detail record(s) will be checked asynchronously", "check_cdrs_error": "Error occurred while checking the IOP charge detail records, check the logs", "check_sessions_title": "Check Sessions", "check_sessions_confirm": "Do you want to check all sessions with IOP '{{name}}'?", diff --git a/src/assets/i18n/es.json b/src/assets/i18n/es.json index bf273eac5b..e1e65f8e81 100644 --- a/src/assets/i18n/es.json +++ b/src/assets/i18n/es.json @@ -1753,8 +1753,7 @@ "pull_cdrs_error": "Se produjo un error al descargar los datos de recarga del IOP; Consulte los registros para obtener más detalles", "check_cdrs_title": "Extraer registros detallados de carga", "check_cdrs_confirm": "¿Está seguro de que desea extraer los registros detallados de carga del IOP '{{name}}'?", - "check_cdrs_success": "{{success}} datos de carga verificados exitosamente", - "check_cdrs_partial": "{{success}} datos de carga verificados - {{error}} datos de recarga sin verificar - Consulte los registros para más detalles", + "check_cdrs_success": "The command has been accepted and the charge detail record(s) will be checked asynchronously", "check_cdrs_error": "Se produjo un error al verificar los datos de recarga; Consulte los registros para obtener más detalles", "check_sessions_title": "Verificar sesiones", "check_sessions_confirm": "¿Está seguro que desea verificar las sesiones del IOP '{{name}}'?", diff --git a/src/assets/i18n/fr.json b/src/assets/i18n/fr.json index 046f2f3e66..1e6bacf35d 100644 --- a/src/assets/i18n/fr.json +++ b/src/assets/i18n/fr.json @@ -1753,8 +1753,7 @@ "pull_cdrs_error": "Une erreur est survenue lors du téléchargement des données de recharge de l'IOP, vérifiez les logs", "check_cdrs_title": "Vérifier les données de recharge", "check_cdrs_confirm": "Voulez-vous vraiment vérifier les données de recharge de l'IOP '{{name}}'?", - "check_cdrs_success": "{{success}} données de recharge vérifiées avec succès", - "check_cdrs_partial": "{{success}} données de recharge vérifiées - {{error}} données de recharge non vérifiées, vérifiez les logs", + "check_cdrs_success": "La commande a été acceptée et les données de recharge seront vérifiées de manière asynchrone", "check_cdrs_error": "Une erreur est survenue lors de la vérification des données de recharge, vérifiez les logs", "check_sessions_title": "Vérifier les sessions", "check_sessions_confirm": "Voulez-vous vraiment vérifier les sessions de l'IOP '{{name}}'?", diff --git a/src/assets/i18n/it.json b/src/assets/i18n/it.json index 7465c4c14d..c57be6f2f8 100644 --- a/src/assets/i18n/it.json +++ b/src/assets/i18n/it.json @@ -1753,8 +1753,7 @@ "pull_cdrs_error": "Si è verificato un errore durante l'aggiornamento dei rendiconti di sessioni di ricarica dell'IOP - controlla i log per maggiori dettagli", "check_cdrs_title": "Controlla Rendiconti Sessioni Ricarica", "check_cdrs_confirm": "Vuoi veramente controllare tutti i rendiconti di sessioni di ricarica dell'IOP '{{name}}'?", - "check_cdrs_success": "Sono stati verificati con successo {{success}} rendiconti di sessioni di ricarica dell'IOP", - "check_cdrs_partial": "{{success}} rendiconti(o) di sessioni di ricarica verificati(o) - {{error}} rendiconti(o) di sessioni di ricarica non verificati(o) - controlla i log per maggiori dettagli", + "check_cdrs_success": "The command has been accepted and the charge detail record(s) will be checked asynchronously", "check_cdrs_error": "Si è verificato un errore durante il controllo dei rendiconti di sessioni di ricarica dell'IOP - controlla i log per maggiori dettagli", "check_sessions_title": "Verifica Sessioni", "check_sessions_confirm": "Vuoi veramente verificare tutte le sessioni con IOP '{{name}}'?", diff --git a/src/assets/i18n/pt.json b/src/assets/i18n/pt.json index 3664d81047..e022b87636 100644 --- a/src/assets/i18n/pt.json +++ b/src/assets/i18n/pt.json @@ -1753,8 +1753,7 @@ "pull_cdrs_error": "Ocorreu um erro ao atualizar os registos de detalhes de carga do IOP - consulte os registos para obter mais detalhes", "check_cdrs_title": "Verificar registos de detalhes de cobrança", "check_cdrs_confirm": "Deseja verificar todos os registos de detalhes de cobrança com IOP '{{name}}'?", - "check_cdrs_success": "Registos de detalhes de carga verificados com sucesso {{success}} com IOP", - "check_cdrs_partial": "{{success}} registos (s) de detalhes de cobrança verificados - {{error}} registos (s) de detalhes de cobrança não verificados - consulte os logs para obter mais detalhes", + "check_cdrs_success": "The command has been accepted and the charge detail record(s) will be checked asynchronously", "check_cdrs_error": "Ocorreu um erro ao verificar os registos de detalhes de carga do IOP - consulte os registos para obter mais detalhes", "check_sessions_title": "Verificar sessões", "check_sessions_confirm": "Deseja verificar todas as sessões com IOP '{{name}}'?", From 48059dcb62423479a5f5a70069b338d1bbb5a36f Mon Sep 17 00:00:00 2001 From: LucasBrazi06 Date: Fri, 2 Apr 2021 20:54:43 +0200 Subject: [PATCH 11/18] Made check sessions async --- .../settings-ocpi-endpoints-details-table-data-source.ts | 8 ++------ src/assets/i18n/de.json | 3 +-- src/assets/i18n/en.json | 3 +-- src/assets/i18n/es.json | 3 +-- src/assets/i18n/fr.json | 3 +-- src/assets/i18n/it.json | 3 +-- src/assets/i18n/pt.json | 3 +-- 7 files changed, 8 insertions(+), 18 deletions(-) diff --git a/src/app/pages/settings-integration/ocpi/endpoints/ocpi-details/settings-ocpi-endpoints-details-table-data-source.ts b/src/app/pages/settings-integration/ocpi/endpoints/ocpi-details/settings-ocpi-endpoints-details-table-data-source.ts index 74b0611add..d803b4933c 100644 --- a/src/app/pages/settings-integration/ocpi/endpoints/ocpi-details/settings-ocpi-endpoints-details-table-data-source.ts +++ b/src/app/pages/settings-integration/ocpi/endpoints/ocpi-details/settings-ocpi-endpoints-details-table-data-source.ts @@ -444,13 +444,9 @@ export class SettingsOcpiEndpointsDetailsTableDataSource extends TableDataSource this.translateService.instant('ocpiendpoints.check_sessions_confirm', { name: ocpiendpoint.name }), ).subscribe((result) => { if (result === ButtonType.YES) { - this.messageService.showInfoMessage('ocpiendpoints.trigger_ocpi_action'); this.centralServerService.checkSessionsOcpiEndpoint(ocpiendpoint).subscribe((response) => { - if (response.failure === 0 && response.success >= 0) { - this.messageService.showSuccessMessage('ocpiendpoints.check_sessions_success', { success: response.success }); - } else if (response.failure > 0 && response.success > 0) { - this.messageService.showWarningMessage('ocpiendpoints.check_sessions_partial', - { success: response.success, error: response.failure }); + if (response.status === RestResponse.SUCCESS) { + this.messageService.showSuccessMessage('ocpiendpoints.check_sessions_success'); } else { Utils.handleError(JSON.stringify(response), this.messageService, 'ocpiendpoints.check_sessions_error'); diff --git a/src/assets/i18n/de.json b/src/assets/i18n/de.json index 280ebd7914..545027eac5 100644 --- a/src/assets/i18n/de.json +++ b/src/assets/i18n/de.json @@ -1757,8 +1757,7 @@ "check_cdrs_error": "Beim Überprüfen der IOP-Ladevorgangsdetails ist ein Fehler aufgetreten - überprüfen Sie die Logs für Details", "check_sessions_title": "Ladevorgänge überprüfen", "check_sessions_confirm": "Wollen Sie alle Ladevorgäng mit IOP '{{name}}' überprüfen?", - "check_sessions_success": "{{success}} Ladevorgänge erfolgreich überprüft mit IOP", - "check_sessions_partial": "{{success}} Ladevorgänge überprüft - {{error}} Ladevorgänge nicht überprüft - überprüfen Sie die Logs für Details", + "check_sessions_success": "The command has been accepted and the session(s) will be checked asynchronously", "check_sessions_error": "Während der Überprüfung der IOP-Ladevorgänge ist ein Fehler aufgetreten - überprüfen Sie die Logs für Details", "check_locations_title": "Standorte überprüfen", "check_locations_confirm": "Wollen Sie wirklch alle Standorte mit IOP '{{name}}' überprüfen?", diff --git a/src/assets/i18n/en.json b/src/assets/i18n/en.json index d5d900f307..7221beb71e 100644 --- a/src/assets/i18n/en.json +++ b/src/assets/i18n/en.json @@ -1757,8 +1757,7 @@ "check_cdrs_error": "Error occurred while checking the IOP charge detail records, check the logs", "check_sessions_title": "Check Sessions", "check_sessions_confirm": "Do you want to check all sessions with IOP '{{name}}'?", - "check_sessions_success": "Successfully checked {{success}} sessions with IOP", - "check_sessions_partial": "{{success}} session(s) checked - {{error}} session(s) not checked, check the logs", + "check_sessions_success": "The command has been accepted and the session(s) will be checked asynchronously", "check_sessions_error": "Error occurred while checking the IOP sessions, check the logs", "check_locations_title": "Check Locations", "check_locations_confirm": "Do you want to check all locations with IOP '{{name}}'?", diff --git a/src/assets/i18n/es.json b/src/assets/i18n/es.json index e1e65f8e81..012f8680f2 100644 --- a/src/assets/i18n/es.json +++ b/src/assets/i18n/es.json @@ -1757,8 +1757,7 @@ "check_cdrs_error": "Se produjo un error al verificar los datos de recarga; Consulte los registros para obtener más detalles", "check_sessions_title": "Verificar sesiones", "check_sessions_confirm": "¿Está seguro que desea verificar las sesiones del IOP '{{name}}'?", - "check_sessions_success": "{{success}} sesiones verificadas exitosamente", - "check_sessions_partial": "{{success}} sesiones verificadas - {{error}} sesiones sin verificar - Consulte los registros para más detalles", + "check_sessions_success": "The command has been accepted and the session(s) will be checked asynchronously", "check_sessions_error": "Se produjo un error al verificar las sesiones; Consulte los registros para obtener más detalles", "check_locations_title": "Verificar sitios", "check_locations_confirm": "¿Está seguro que desea verificar los sitios IOP '{{name}}'?", diff --git a/src/assets/i18n/fr.json b/src/assets/i18n/fr.json index 1e6bacf35d..e1d1712195 100644 --- a/src/assets/i18n/fr.json +++ b/src/assets/i18n/fr.json @@ -1757,8 +1757,7 @@ "check_cdrs_error": "Une erreur est survenue lors de la vérification des données de recharge, vérifiez les logs", "check_sessions_title": "Vérifier les sessions", "check_sessions_confirm": "Voulez-vous vraiment vérifier les sessions de l'IOP '{{name}}'?", - "check_sessions_success": "{{success}} sessions vérifiées avec succès", - "check_sessions_partial": "{{success}} session(s) vérifiées - {{error}} session(s) non vérifiées, vérifiez les logs", + "check_sessions_success": "La commande a été acceptée et les sessions seront vérifiées de manière asynchrone", "check_sessions_error": "Une erreur est survenue lors de la vérification des sessions, vérifiez les logs", "check_locations_title": "Vérifier les sites", "check_locations_confirm": "Voulez-vous vraiment vérifier les sites de l'IOP '{{name}}'?", diff --git a/src/assets/i18n/it.json b/src/assets/i18n/it.json index c57be6f2f8..8180b99bc7 100644 --- a/src/assets/i18n/it.json +++ b/src/assets/i18n/it.json @@ -1757,8 +1757,7 @@ "check_cdrs_error": "Si è verificato un errore durante il controllo dei rendiconti di sessioni di ricarica dell'IOP - controlla i log per maggiori dettagli", "check_sessions_title": "Verifica Sessioni", "check_sessions_confirm": "Vuoi veramente verificare tutte le sessioni con IOP '{{name}}'?", - "check_sessions_success": "Sono state verificate con successo {{success}} sessioni con IOP", - "check_sessions_partial": "{{success}} sessioni(e) controllate(a) - {{error}} sessioni(e) non controllate(a) - controlla i log per maggiori dettagli", + "check_sessions_success": "The command has been accepted and the session(s) will be checked asynchronously", "check_sessions_error": "Si è verificato un errore durante il controllo delle sessioni IOP - controlla i log per maggiori dettagli", "check_locations_title": "Verifica Postazioni", "check_locations_confirm": "Vuoi veramente controllare tutte le postazioni con IOP '{{name}}'?", diff --git a/src/assets/i18n/pt.json b/src/assets/i18n/pt.json index e022b87636..7fd87aaa9e 100644 --- a/src/assets/i18n/pt.json +++ b/src/assets/i18n/pt.json @@ -1757,8 +1757,7 @@ "check_cdrs_error": "Ocorreu um erro ao verificar os registos de detalhes de carga do IOP - consulte os registos para obter mais detalhes", "check_sessions_title": "Verificar sessões", "check_sessions_confirm": "Deseja verificar todas as sessões com IOP '{{name}}'?", - "check_sessions_success": "Sessões verificadas com sucesso {{success}} com IOP", - "check_sessions_partial": "{{success}} sessão (ões) verificada (s) - {{error}} sessão (ões) não verificada (s) - veja os logs para mais detalhes", + "check_sessions_success": "The command has been accepted and the session(s) will be checked asynchronously", "check_sessions_error": "Ocorreu um erro ao verificar as sessões de IOP - consulte os registos para obter mais detalhes", "check_locations_title": "Verificar locais", "check_locations_confirm": "Deseja verificar todos os locais com IOP '{{name}}'?", From dedbda748e9a8aabb7fba1b61458fadb72a0ed01 Mon Sep 17 00:00:00 2001 From: LucasBrazi06 Date: Fri, 2 Apr 2021 21:08:35 +0200 Subject: [PATCH 12/18] Made check locations async --- .../settings-ocpi-endpoints-details-table-data-source.ts | 6 +----- src/assets/i18n/de.json | 3 +-- src/assets/i18n/en.json | 3 +-- src/assets/i18n/es.json | 3 +-- src/assets/i18n/fr.json | 3 +-- src/assets/i18n/it.json | 3 +-- src/assets/i18n/pt.json | 3 +-- 7 files changed, 7 insertions(+), 17 deletions(-) diff --git a/src/app/pages/settings-integration/ocpi/endpoints/ocpi-details/settings-ocpi-endpoints-details-table-data-source.ts b/src/app/pages/settings-integration/ocpi/endpoints/ocpi-details/settings-ocpi-endpoints-details-table-data-source.ts index d803b4933c..3e09c4f8a1 100644 --- a/src/app/pages/settings-integration/ocpi/endpoints/ocpi-details/settings-ocpi-endpoints-details-table-data-source.ts +++ b/src/app/pages/settings-integration/ocpi/endpoints/ocpi-details/settings-ocpi-endpoints-details-table-data-source.ts @@ -408,13 +408,9 @@ export class SettingsOcpiEndpointsDetailsTableDataSource extends TableDataSource this.translateService.instant('ocpiendpoints.check_locations_confirm', { name: ocpiendpoint.name }), ).subscribe((result) => { if (result === ButtonType.YES) { - this.messageService.showInfoMessage('ocpiendpoints.trigger_ocpi_action'); this.centralServerService.checkLocationsOcpiEndpoint(ocpiendpoint).subscribe((response) => { - if (response.failure === 0 && response.success >= 0) { + if (response.status === RestResponse.SUCCESS) { this.messageService.showSuccessMessage('ocpiendpoints.check_locations_success', { success: response.success }); - } else if (response.failure > 0 && response.success > 0) { - this.messageService.showWarningMessage('ocpiendpoints.check_locations_partial', - { success: response.success, error: response.failure }); } else { Utils.handleError(JSON.stringify(response), this.messageService, 'ocpiendpoints.check_locations_error'); diff --git a/src/assets/i18n/de.json b/src/assets/i18n/de.json index 545027eac5..d4bda112a6 100644 --- a/src/assets/i18n/de.json +++ b/src/assets/i18n/de.json @@ -1761,8 +1761,7 @@ "check_sessions_error": "Während der Überprüfung der IOP-Ladevorgänge ist ein Fehler aufgetreten - überprüfen Sie die Logs für Details", "check_locations_title": "Standorte überprüfen", "check_locations_confirm": "Wollen Sie wirklch alle Standorte mit IOP '{{name}}' überprüfen?", - "check_locations_success": "{{success}} Standorte mit IOP erfolgreich überprüft", - "check_locations_partial": "{{success}} Standorte überprüft - {{error}} Standorte nicht überprüft - überprüfen Sie die Logs für Details", + "check_locations_success": "The command has been accepted and the location(s) will be checked asynchronously", "check_locations_error": "Während der Überprüng der IOP-Standorte ist ein Fehler aufgetreten - überprüfen Sie die Logs für Details", "trigger_jobs_error": "Während der Ausführung ist ein Fehler aufgetreten - Überprüfen Sie die Logs für Details", "success_ping": "Ping erfolgreich", diff --git a/src/assets/i18n/en.json b/src/assets/i18n/en.json index 7221beb71e..179df0a12b 100644 --- a/src/assets/i18n/en.json +++ b/src/assets/i18n/en.json @@ -1761,8 +1761,7 @@ "check_sessions_error": "Error occurred while checking the IOP sessions, check the logs", "check_locations_title": "Check Locations", "check_locations_confirm": "Do you want to check all locations with IOP '{{name}}'?", - "check_locations_success": "Successfully checked {{success}} locations with IOP", - "check_locations_partial": "{{success}} location(s) checked - {{error}} location(s) not checked, check the logs", + "check_locations_success": "The command has been accepted and the location(s) will be checked asynchronously", "check_locations_error": "Error occurred while checking the IOP locations, check the logs", "trigger_jobs_error": "Error occurred while executing jobs, check the logs", "success_ping": "Ping successful", diff --git a/src/assets/i18n/es.json b/src/assets/i18n/es.json index 012f8680f2..271aa4744c 100644 --- a/src/assets/i18n/es.json +++ b/src/assets/i18n/es.json @@ -1761,8 +1761,7 @@ "check_sessions_error": "Se produjo un error al verificar las sesiones; Consulte los registros para obtener más detalles", "check_locations_title": "Verificar sitios", "check_locations_confirm": "¿Está seguro que desea verificar los sitios IOP '{{name}}'?", - "check_locations_success": "{{success}} sitios verificados exitosamente", - "check_locations_partial": "{{success}} sitios verificados - {{error}} sitios no verificados - Consulte los registros para más detalles", + "check_locations_success": "The command has been accepted and the location(s) will be checked asynchronously", "check_locations_error": "Se produjo un error al verificar los sitios; Consulte los registros para obtener más detalles", "trigger_jobs_error": "Se produjo un error durante la ejecución de los procesos de IOP; Consulte los registros para obtener más detalles", "success_ping": "Servidor accesible", diff --git a/src/assets/i18n/fr.json b/src/assets/i18n/fr.json index e1d1712195..3c010ced0a 100644 --- a/src/assets/i18n/fr.json +++ b/src/assets/i18n/fr.json @@ -1761,8 +1761,7 @@ "check_sessions_error": "Une erreur est survenue lors de la vérification des sessions, vérifiez les logs", "check_locations_title": "Vérifier les sites", "check_locations_confirm": "Voulez-vous vraiment vérifier les sites de l'IOP '{{name}}'?", - "check_locations_success": "{{success}} sites vérifiés avec succès", - "check_locations_partial": "{{success}} sites vérifiés - {{error}} sites non vérifiés, vérifiez les logs", + "check_locations_success": "La commande a été acceptée et les destinations seront vérifiées de manière asynchrone", "check_locations_error": "Une erreur est survenue lors de la vérification des sites, vérifiez les logs", "trigger_jobs_error": "Une erreur est survenue lors de l'exécution des processus de l'IOP, vérifiez les logs", "success_ping": "Serveur accessible", diff --git a/src/assets/i18n/it.json b/src/assets/i18n/it.json index 8180b99bc7..2f06328cb5 100644 --- a/src/assets/i18n/it.json +++ b/src/assets/i18n/it.json @@ -1761,8 +1761,7 @@ "check_sessions_error": "Si è verificato un errore durante il controllo delle sessioni IOP - controlla i log per maggiori dettagli", "check_locations_title": "Verifica Postazioni", "check_locations_confirm": "Vuoi veramente controllare tutte le postazioni con IOP '{{name}}'?", - "check_locations_success": "Sono state verificate con successo {{success}} postazioni con IOP", - "check_locations_partial": "{{success}} postazioni(e) controllate(a) - {{error}} postazioni(e) non controllate(a) - controlla i log per maggiori dettagli", + "check_locations_success": "The command has been accepted and the location(s) will be checked asynchronously", "check_locations_error": "Si è verificato un errore durante il controllo delle postazioni IOP - controlla i log per maggiori dettagli", "trigger_jobs_error": "Si è verificato un errore durante l'esecuzione dei job - controlla i log per maggiori dettagli", "success_ping": "Ping eseguito con successo", diff --git a/src/assets/i18n/pt.json b/src/assets/i18n/pt.json index 7fd87aaa9e..77c01116db 100644 --- a/src/assets/i18n/pt.json +++ b/src/assets/i18n/pt.json @@ -1761,8 +1761,7 @@ "check_sessions_error": "Ocorreu um erro ao verificar as sessões de IOP - consulte os registos para obter mais detalhes", "check_locations_title": "Verificar locais", "check_locations_confirm": "Deseja verificar todos os locais com IOP '{{name}}'?", - "check_locations_success": "Locais verificados com sucesso em {{success}} com IOP", - "check_locations_partial": "{{success}} localização (ões) verificada (s) - {{error}} localização (ões) não verificada (s) - consulte os logs para obter mais detalhes", + "check_locations_success": "The command has been accepted and the location(s) will be checked asynchronously", "check_locations_error": "Ocorreu um erro ao verificar os locais de IOP - consulte os registos para obter mais detalhes", "trigger_jobs_error": "Ocorreu um erro durante a execução de trabalhos - consulte os registos para obter mais detalhes", "success_ping": "Ping bem sucedido", From 53fc4f9bc666d198eb4286d53f94387bad886874 Mon Sep 17 00:00:00 2001 From: LucasBrazi06 Date: Fri, 2 Apr 2021 21:29:13 +0200 Subject: [PATCH 13/18] Made async pull tokens --- ...ttings-ocpi-endpoints-details-table-data-source.ts | 6 +----- src/assets/i18n/de.json | 11 +++++------ src/assets/i18n/en.json | 11 +++++------ src/assets/i18n/es.json | 11 +++++------ src/assets/i18n/fr.json | 3 +-- src/assets/i18n/it.json | 11 +++++------ src/assets/i18n/pt.json | 11 +++++------ 7 files changed, 27 insertions(+), 37 deletions(-) diff --git a/src/app/pages/settings-integration/ocpi/endpoints/ocpi-details/settings-ocpi-endpoints-details-table-data-source.ts b/src/app/pages/settings-integration/ocpi/endpoints/ocpi-details/settings-ocpi-endpoints-details-table-data-source.ts index 3e09c4f8a1..1cdb907082 100644 --- a/src/app/pages/settings-integration/ocpi/endpoints/ocpi-details/settings-ocpi-endpoints-details-table-data-source.ts +++ b/src/app/pages/settings-integration/ocpi/endpoints/ocpi-details/settings-ocpi-endpoints-details-table-data-source.ts @@ -372,13 +372,9 @@ export class SettingsOcpiEndpointsDetailsTableDataSource extends TableDataSource this.translateService.instant('ocpiendpoints.pull_tokens_confirm', { name: ocpiendpoint.name }), ).subscribe((result) => { if (result === ButtonType.YES) { - this.messageService.showInfoMessage('ocpiendpoints.trigger_ocpi_action'); this.centralServerService.pullTokensOcpiEndpoint(ocpiendpoint).subscribe((response) => { - if (response.failure === 0 && response.success >= 0) { + if (response.status === RestResponse.SUCCESS) { this.messageService.showSuccessMessage('ocpiendpoints.pull_tokens_success', { success: response.success }); - } else if (response.failure > 0 && response.success > 0) { - this.messageService.showWarningMessage('ocpiendpoints.pull_tokens_partial', - { success: response.success, error: response.failure }); } else { Utils.handleError(JSON.stringify(response), this.messageService, 'ocpiendpoints.pull_tokens_error'); diff --git a/src/assets/i18n/de.json b/src/assets/i18n/de.json index d4bda112a6..1fa67128af 100644 --- a/src/assets/i18n/de.json +++ b/src/assets/i18n/de.json @@ -1740,12 +1740,11 @@ "pull_locations_error": "Beim Aktualisieren der IOP-Standorte ist ein Fehler aufgetreten - überprüfen Sie die Logs für Details", "get_sessions_title": "Ladevorgänge abrufen", "get_sessions_confirm": "Wollen Sie alle Ladevorgänge von IOP '{{name}}' abrufen?", - "get_sessions_success": "The command has been accepted and the sessions(s) will be pulled asynchronously", + "get_sessions_success": "The command has been accepted and the sessions will be pulled asynchronously", "get_sessions_error": "Beim Aktualisieren der IOP-Ladevorgänge ist ein Fehler aufgetreten - überprüfen Sie die Logs für Details", "pull_tokens_title": "Tokens abrufen", "pull_tokens_confirm": "Wollen Sie wirklich alle Tokens von IOP '{{name}}' abrufen?", - "pull_tokens_success": "{{success}} Tokens von IOP erfolgreich aktualisiert ", - "pull_tokens_partial": "{{success}} Token(s) aktualisiert - {{error}} Token(s) nicht aktualisiert - überprüfen Sie die Logs für Details", + "pull_tokens_success": "The command has been accepted and the tokens will be pulled asynchronously", "pull_tokens_error": "Beim Abrufen der IOP Tokens ist ein Fehler aufgetreten - überprüfen Sie die Logs für Details", "pull_cdrs_title": "Abrufen von Ladevorgangsdetails", "pull_cdrs_confirm": "Wollen Sie wirlich alle Ladevorgangsdetails vom IOP '{{name}}' abrufen?", @@ -1753,15 +1752,15 @@ "pull_cdrs_error": "Beim Aktualisieren der Ladevorgangsdetails ist ein Fehler aufgetreten - überprüfen Sie die Logs für Details", "check_cdrs_title": "Ladevorgangsdetails überprüfen", "check_cdrs_confirm": "Wollen Sie wirlich alle Ladevorgangsdetails mit IOP '{{name}}' überprüfen?", - "check_cdrs_success": "The command has been accepted and the charge detail record(s) will be checked asynchronously", + "check_cdrs_success": "The command has been accepted and the charge detail records will be checked asynchronously", "check_cdrs_error": "Beim Überprüfen der IOP-Ladevorgangsdetails ist ein Fehler aufgetreten - überprüfen Sie die Logs für Details", "check_sessions_title": "Ladevorgänge überprüfen", "check_sessions_confirm": "Wollen Sie alle Ladevorgäng mit IOP '{{name}}' überprüfen?", - "check_sessions_success": "The command has been accepted and the session(s) will be checked asynchronously", + "check_sessions_success": "The command has been accepted and the sessions will be checked asynchronously", "check_sessions_error": "Während der Überprüfung der IOP-Ladevorgänge ist ein Fehler aufgetreten - überprüfen Sie die Logs für Details", "check_locations_title": "Standorte überprüfen", "check_locations_confirm": "Wollen Sie wirklch alle Standorte mit IOP '{{name}}' überprüfen?", - "check_locations_success": "The command has been accepted and the location(s) will be checked asynchronously", + "check_locations_success": "The command has been accepted and the locations will be checked asynchronously", "check_locations_error": "Während der Überprüng der IOP-Standorte ist ein Fehler aufgetreten - überprüfen Sie die Logs für Details", "trigger_jobs_error": "Während der Ausführung ist ein Fehler aufgetreten - Überprüfen Sie die Logs für Details", "success_ping": "Ping erfolgreich", diff --git a/src/assets/i18n/en.json b/src/assets/i18n/en.json index 179df0a12b..ce8a3ff59e 100644 --- a/src/assets/i18n/en.json +++ b/src/assets/i18n/en.json @@ -1740,12 +1740,11 @@ "pull_locations_error": "Error occurred while updating the IOP locations, check the logs", "get_sessions_title": "Pull Sessions", "get_sessions_confirm": "Do you want to retrieve all sessions from IOP '{{name}}'?", - "get_sessions_success": "The command has been accepted and the sessions(s) will be pulled asynchronously", + "get_sessions_success": "The command has been accepted and the sessions will be pulled asynchronously", "get_sessions_error": "Error occurred while updating the IOP sessions, check the logs", "pull_tokens_title": "Pull Tokens", "pull_tokens_confirm": "Do you want to retrieve all tokens from IOP '{{name}}'?", - "pull_tokens_success": "Successfully updated {{success}} tokens from IOP", - "pull_tokens_partial": "{{success}} token(s) updated - {{error}} token(s) not updated, check the logs", + "pull_tokens_success": "The command has been accepted and the tokens will be pulled asynchronously", "pull_tokens_error": "Error occurred while updating the IOP tokens, check the logs", "pull_cdrs_title": "Pull Charge Detail Records", "pull_cdrs_confirm": "Do you want to retrieve all charge detail records from IOP '{{name}}'?", @@ -1753,15 +1752,15 @@ "pull_cdrs_error": "Error occurred while updating the IOP charge detail records, check the logs", "check_cdrs_title": "Check Charge Detail Records", "check_cdrs_confirm": "Do you want to check all charge detail records with IOP '{{name}}'?", - "check_cdrs_success": "The command has been accepted and the charge detail record(s) will be checked asynchronously", + "check_cdrs_success": "The command has been accepted and the charge detail records will be checked asynchronously", "check_cdrs_error": "Error occurred while checking the IOP charge detail records, check the logs", "check_sessions_title": "Check Sessions", "check_sessions_confirm": "Do you want to check all sessions with IOP '{{name}}'?", - "check_sessions_success": "The command has been accepted and the session(s) will be checked asynchronously", + "check_sessions_success": "The command has been accepted and the sessions will be checked asynchronously", "check_sessions_error": "Error occurred while checking the IOP sessions, check the logs", "check_locations_title": "Check Locations", "check_locations_confirm": "Do you want to check all locations with IOP '{{name}}'?", - "check_locations_success": "The command has been accepted and the location(s) will be checked asynchronously", + "check_locations_success": "The command has been accepted and the locations will be checked asynchronously", "check_locations_error": "Error occurred while checking the IOP locations, check the logs", "trigger_jobs_error": "Error occurred while executing jobs, check the logs", "success_ping": "Ping successful", diff --git a/src/assets/i18n/es.json b/src/assets/i18n/es.json index 271aa4744c..206642d4ad 100644 --- a/src/assets/i18n/es.json +++ b/src/assets/i18n/es.json @@ -1740,12 +1740,11 @@ "pull_locations_error": "Se produjo un error al descargar los destinos de IOP; Consulte los registros para obtener más detalles", "get_sessions_title": "Descarga de sesiones", "get_sessions_confirm": "¿Está seguro que desea descargar las sesiones de IOP '{{name}}'?", - "get_sessions_success": "The command has been accepted and the sessions(s) will be pulled asynchronously", + "get_sessions_success": "The command has been accepted and the sessions will be pulled asynchronously", "get_sessions_error": "Se produjo un error al descargar las sesiones de IOP; Consulte los registros para obtener más detalles", "pull_tokens_title": "Descarga de token", "pull_tokens_confirm": "¿Está seguro que desea descargar los tokens IOP '{{name}}'?", - "pull_tokens_success": "{los tokens {{success}} se han actualizado correctamente", - "pull_tokens_partial": "{{success}} tokens actualizados - {{error}} tokens con errores - Consulte los registros para más detalles", + "pull_tokens_success": "The command has been accepted and the tokens will be pulled asynchronously", "pull_tokens_error": "Se produjo un error al descargar los tokens de IOP; Consulte los registros para obtener más detalles", "pull_cdrs_title": "Descargando registros de carga", "pull_cdrs_confirm": "¿Está seguro de que desea descargar los registros de carga del IOP '{{name}}'?", @@ -1753,15 +1752,15 @@ "pull_cdrs_error": "Se produjo un error al descargar los datos de recarga del IOP; Consulte los registros para obtener más detalles", "check_cdrs_title": "Extraer registros detallados de carga", "check_cdrs_confirm": "¿Está seguro de que desea extraer los registros detallados de carga del IOP '{{name}}'?", - "check_cdrs_success": "The command has been accepted and the charge detail record(s) will be checked asynchronously", + "check_cdrs_success": "The command has been accepted and the charge detail records will be checked asynchronously", "check_cdrs_error": "Se produjo un error al verificar los datos de recarga; Consulte los registros para obtener más detalles", "check_sessions_title": "Verificar sesiones", "check_sessions_confirm": "¿Está seguro que desea verificar las sesiones del IOP '{{name}}'?", - "check_sessions_success": "The command has been accepted and the session(s) will be checked asynchronously", + "check_sessions_success": "The command has been accepted and the sessions will be checked asynchronously", "check_sessions_error": "Se produjo un error al verificar las sesiones; Consulte los registros para obtener más detalles", "check_locations_title": "Verificar sitios", "check_locations_confirm": "¿Está seguro que desea verificar los sitios IOP '{{name}}'?", - "check_locations_success": "The command has been accepted and the location(s) will be checked asynchronously", + "check_locations_success": "The command has been accepted and the locations will be checked asynchronously", "check_locations_error": "Se produjo un error al verificar los sitios; Consulte los registros para obtener más detalles", "trigger_jobs_error": "Se produjo un error durante la ejecución de los procesos de IOP; Consulte los registros para obtener más detalles", "success_ping": "Servidor accesible", diff --git a/src/assets/i18n/fr.json b/src/assets/i18n/fr.json index 3c010ced0a..d60ac46eda 100644 --- a/src/assets/i18n/fr.json +++ b/src/assets/i18n/fr.json @@ -1744,8 +1744,7 @@ "get_sessions_error": "Une erreur est survenue lors du téléchargement des sessions de l'IOP, vérifiez les logs", "pull_tokens_title": "Téléchargement des jetons", "pull_tokens_confirm": "Voulez-vous vraiment télécharger les jetons de l'IOP '{{name}}'?", - "pull_tokens_success": "{{success}} jetons ont été mis à jour avec succès", - "pull_tokens_partial": "{{success}} jetons mis à jour - {{error}} jetons en erreur, vérifiez les logs", + "pull_tokens_success": "La commande a été acceptée et les jetons seront récupérées de manière asynchrone", "pull_tokens_error": "Une erreur est survenue lors du téléchargement des jetons de l'IOP, vérifiez les logs", "pull_cdrs_title": "Téléchargement des données de recharge", "pull_cdrs_confirm": "Voulez-vous vraiment télécharger les données de recharge de l'IOP '{{name}}'?", diff --git a/src/assets/i18n/it.json b/src/assets/i18n/it.json index 2f06328cb5..2fcf9c86dc 100644 --- a/src/assets/i18n/it.json +++ b/src/assets/i18n/it.json @@ -1740,12 +1740,11 @@ "pull_locations_error": "Si è verificato un errore durante l'aggiornamento delle postazioni dell'IOP - controlla i log per maggiori dettagli", "get_sessions_title": "Recupera Sessioni", "get_sessions_confirm": "Vuoi veramente recuperare tutte le sessioni dall'IOP '{{name}}'?", - "get_sessions_success": "The command has been accepted and the sessions(s) will be pulled asynchronously", + "get_sessions_success": "The command has been accepted and the sessions will be pulled asynchronously", "get_sessions_error": "Si è verificato un errore durante l'aggiornamento delle sessioni IOP - controlla i log per maggiori dettagli", "pull_tokens_title": "Recupera Token", "pull_tokens_confirm": "Vuoi veramente recuperare tutti i token dall'IOP '{{name}}'?", - "pull_tokens_success": "Sono stati aggiornati con successo {{success}} token dall'IOP", - "pull_tokens_partial": "{{success}} token aggiornato(i) - {{error}} token non aggiornato(i) - controlla i log per maggiori dettagli", + "pull_tokens_success": "The command has been accepted and the tokens will be pulled asynchronously", "pull_tokens_error": "Si è verificato un errore durante l'aggiornamento dei token IOP - controlla i log per maggiori dettagli", "pull_cdrs_title": "Recupera Rendiconti Sessioni Ricarica", "pull_cdrs_confirm": "Vuoi veramente recuperare i rendiconti di tutte le sessioni di ricarica dall'IOP '{{name}}'?", @@ -1753,15 +1752,15 @@ "pull_cdrs_error": "Si è verificato un errore durante l'aggiornamento dei rendiconti di sessioni di ricarica dell'IOP - controlla i log per maggiori dettagli", "check_cdrs_title": "Controlla Rendiconti Sessioni Ricarica", "check_cdrs_confirm": "Vuoi veramente controllare tutti i rendiconti di sessioni di ricarica dell'IOP '{{name}}'?", - "check_cdrs_success": "The command has been accepted and the charge detail record(s) will be checked asynchronously", + "check_cdrs_success": "The command has been accepted and the charge detail records will be checked asynchronously", "check_cdrs_error": "Si è verificato un errore durante il controllo dei rendiconti di sessioni di ricarica dell'IOP - controlla i log per maggiori dettagli", "check_sessions_title": "Verifica Sessioni", "check_sessions_confirm": "Vuoi veramente verificare tutte le sessioni con IOP '{{name}}'?", - "check_sessions_success": "The command has been accepted and the session(s) will be checked asynchronously", + "check_sessions_success": "The command has been accepted and the sessions will be checked asynchronously", "check_sessions_error": "Si è verificato un errore durante il controllo delle sessioni IOP - controlla i log per maggiori dettagli", "check_locations_title": "Verifica Postazioni", "check_locations_confirm": "Vuoi veramente controllare tutte le postazioni con IOP '{{name}}'?", - "check_locations_success": "The command has been accepted and the location(s) will be checked asynchronously", + "check_locations_success": "The command has been accepted and the locations will be checked asynchronously", "check_locations_error": "Si è verificato un errore durante il controllo delle postazioni IOP - controlla i log per maggiori dettagli", "trigger_jobs_error": "Si è verificato un errore durante l'esecuzione dei job - controlla i log per maggiori dettagli", "success_ping": "Ping eseguito con successo", diff --git a/src/assets/i18n/pt.json b/src/assets/i18n/pt.json index 77c01116db..0b9cf1a3f2 100644 --- a/src/assets/i18n/pt.json +++ b/src/assets/i18n/pt.json @@ -1740,12 +1740,11 @@ "pull_locations_error": "Ocorreu um erro ao atualizar os locais IOP - consulte os registos para obter mais detalhes", "get_sessions_title": "Puxar Sessões", "get_sessions_confirm": "Deseja recuperar todas as sessões do IOP '{{name}}'?", - "get_sessions_success": "The command has been accepted and the sessions(s) will be pulled asynchronously", + "get_sessions_success": "The command has been accepted and the sessionss will be pulled asynchronously", "get_sessions_error": "Ocorreu um erro ao atualizar as sessões IOP - consulte os logs para obter mais detalhes", "pull_tokens_title": "Puxar Tokens", "pull_tokens_confirm": "Deseja recuperar todos os tokens do IOP '{{name}}'?", - "pull_tokens_success": "Tokens {{success}} atualizados com sucesso do IOP", - "pull_tokens_partial": "{{success}} token (s) atualizado (s) - {{error}} token (s) não atualizado (s) - consulte os logs para obter mais detalhes", + "pull_tokens_success": "The command has been accepted and the tokens will be pulled asynchronously", "pull_tokens_error": "Ocorreu um erro ao atualizar os tokens IOP - consulte os logs para obter mais detalhes", "pull_cdrs_title": "Pull Charge Detail Records", "pull_cdrs_confirm": "Deseja recuperar todos os registos de detalhes de cobrança do IOP '{{name}}'?", @@ -1753,15 +1752,15 @@ "pull_cdrs_error": "Ocorreu um erro ao atualizar os registos de detalhes de carga do IOP - consulte os registos para obter mais detalhes", "check_cdrs_title": "Verificar registos de detalhes de cobrança", "check_cdrs_confirm": "Deseja verificar todos os registos de detalhes de cobrança com IOP '{{name}}'?", - "check_cdrs_success": "The command has been accepted and the charge detail record(s) will be checked asynchronously", + "check_cdrs_success": "The command has been accepted and the charge detail records will be checked asynchronously", "check_cdrs_error": "Ocorreu um erro ao verificar os registos de detalhes de carga do IOP - consulte os registos para obter mais detalhes", "check_sessions_title": "Verificar sessões", "check_sessions_confirm": "Deseja verificar todas as sessões com IOP '{{name}}'?", - "check_sessions_success": "The command has been accepted and the session(s) will be checked asynchronously", + "check_sessions_success": "The command has been accepted and the sessions will be checked asynchronously", "check_sessions_error": "Ocorreu um erro ao verificar as sessões de IOP - consulte os registos para obter mais detalhes", "check_locations_title": "Verificar locais", "check_locations_confirm": "Deseja verificar todos os locais com IOP '{{name}}'?", - "check_locations_success": "The command has been accepted and the location(s) will be checked asynchronously", + "check_locations_success": "The command has been accepted and the locations will be checked asynchronously", "check_locations_error": "Ocorreu um erro ao verificar os locais de IOP - consulte os registos para obter mais detalhes", "trigger_jobs_error": "Ocorreu um erro durante a execução de trabalhos - consulte os registos para obter mais detalhes", "success_ping": "Ping bem sucedido", From 7d2adae97f4e115d494ca0d78036f69f8e798855 Mon Sep 17 00:00:00 2001 From: LucasBrazi06 Date: Fri, 2 Apr 2021 21:47:19 +0200 Subject: [PATCH 14/18] Made push of evse statuses async --- .../settings-ocpi-endpoints-details-table-data-source.ts | 6 +----- src/assets/i18n/de.json | 3 +-- src/assets/i18n/en.json | 3 +-- src/assets/i18n/es.json | 3 +-- src/assets/i18n/fr.json | 3 +-- src/assets/i18n/it.json | 3 +-- src/assets/i18n/pt.json | 3 +-- 7 files changed, 7 insertions(+), 17 deletions(-) diff --git a/src/app/pages/settings-integration/ocpi/endpoints/ocpi-details/settings-ocpi-endpoints-details-table-data-source.ts b/src/app/pages/settings-integration/ocpi/endpoints/ocpi-details/settings-ocpi-endpoints-details-table-data-source.ts index 1cdb907082..2d655cbfa4 100644 --- a/src/app/pages/settings-integration/ocpi/endpoints/ocpi-details/settings-ocpi-endpoints-details-table-data-source.ts +++ b/src/app/pages/settings-integration/ocpi/endpoints/ocpi-details/settings-ocpi-endpoints-details-table-data-source.ts @@ -240,13 +240,9 @@ export class SettingsOcpiEndpointsDetailsTableDataSource extends TableDataSource this.translateService.instant('ocpiendpoints.push_evse_statuses_confirm', { name: ocpiendpoint.name }), ).subscribe((result) => { if (result === ButtonType.YES) { - this.messageService.showInfoMessage('ocpiendpoints.trigger_ocpi_action'); this.centralServerService.sendEVSEStatusesOcpiEndpoint(ocpiendpoint).subscribe((response) => { - if (response.failure === 0 && response.success > 0) { + if (response.status === Constants.REST_RESPONSE_SUCCESS) { this.messageService.showSuccessMessage('ocpiendpoints.push_evse_statuses_success', { success: response.success }); - } else if (response.failure > 0 && response.success > 0) { - this.messageService.showWarningMessage('ocpiendpoints.push_evse_statuses_partial', - { success: response.success, error: response.failure }); } else { Utils.handleError(JSON.stringify(response), this.messageService, 'ocpiendpoints.push_evse_statuses_error'); diff --git a/src/assets/i18n/de.json b/src/assets/i18n/de.json index 1fa67128af..7bdcfb754f 100644 --- a/src/assets/i18n/de.json +++ b/src/assets/i18n/de.json @@ -1769,8 +1769,7 @@ "error_ping_412": "Ping fehlgeschlagen: Ungültige Antwort", "error_ping": "Ping Fehler", "error_generate_local_token": "Beim Generieren neuer lokaler Tokens ist ein Fehler aufgetreten", - "push_evse_statuses_success": "{{success}} EVSE Status erfolgreich aktualisiert", - "push_evse_statuses_partial": "{{success}} EVSE(s) aktualisiert - {{error}} EVSE(s) nicht aktualisiert - überprüfen Sie die Logs für Details", + "push_evse_statuses_success": "The command has been accepted and the EVSE's statuses will be pushed asynchronously", "push_tokens_success": "{{success}} Token(s) erfolgreich aktualisiert", "push_evse_statuses_error": "Beim Aktualisieren der EVSE Status ist ein Fehler aufgetreten - überprüfen Sie die Logs für Details", "push_tokens_error": "Beim Aktualisieren der User Tokens ist ein Fehler aufgetreten - überprüfen Sie die Logs für Details", diff --git a/src/assets/i18n/en.json b/src/assets/i18n/en.json index ce8a3ff59e..bce8897102 100644 --- a/src/assets/i18n/en.json +++ b/src/assets/i18n/en.json @@ -1769,8 +1769,7 @@ "error_ping_412": "Ping failed: Invalid Response", "error_ping": "Ping failure", "error_generate_local_token": "Error occurred while generating new local token, check the logs", - "push_evse_statuses_success": "Successfully updated {{success}} EVSE statuses", - "push_evse_statuses_partial": "{{success}} EVSE(s) updated - {{error}} EVSE(s) not updated, check the logs", + "push_evse_statuses_success": "The command has been accepted and the EVSE's statuses will be pushed asynchronously", "push_tokens_success": "The command has been accepted and the token(s) will be pushed asynchronously", "push_evse_statuses_error": "Error occurred while updating EVSE statuses, check the logs", "push_tokens_error": "Error occurred while updating user tokens, check the logs", diff --git a/src/assets/i18n/es.json b/src/assets/i18n/es.json index 206642d4ad..c7267ace76 100644 --- a/src/assets/i18n/es.json +++ b/src/assets/i18n/es.json @@ -1769,8 +1769,7 @@ "error_ping_412": "Servidor no accesible: Respuesta no válida", "error_ping": "Servidor no accesible", "error_generate_local_token": "Se produjo un error al generar el nuevo token", - "push_evse_statuses_success": "El estatus de {{success}} EVSE se ha actualizado correctamente", - "push_evse_statuses_partial": "El estatus de {{success}} EVSE se ha actualizado correctamente - {{error}} EVSE(s) en error; Consulte los registros para obtener más detalles", + "push_evse_statuses_success": "The command has been accepted and the EVSE's statuses will be pushed asynchronously", "push_tokens_success": "The command has been accepted and the token(s) will be pushed asynchronously", "push_evse_statuses_error": "Se produjo un error al actualizar el estado de EVSE; Consulte los registros para obtener más detalles", "push_tokens_error": "Se produjo un error al actualizar los tokens de usuario; Consulte los registros para obtener más detalles", diff --git a/src/assets/i18n/fr.json b/src/assets/i18n/fr.json index d60ac46eda..65bbbc01c9 100644 --- a/src/assets/i18n/fr.json +++ b/src/assets/i18n/fr.json @@ -1769,8 +1769,7 @@ "error_ping_412": "Serveur non accessible: Reponse invalide", "error_ping": "Serveur non accessible", "error_generate_local_token": "Une erreur est survenue pendant la generation du nouveau jeton", - "push_evse_statuses_success": "Le status de {{success}} EVSE(s) a été mis à jour avec succès", - "push_evse_statuses_partial": "Le status de {{success}} EVSE(s) a été mis à jour avec succès - {{error}} EVSE(s) en erreur, vérifiez les logs", + "push_evse_statuses_success": "La commande a été acceptée et les statuts des bornes seront envoyés de manière asynchrone", "push_tokens_success": "La commande a été acceptée et les badges seront envoyés de manière asynchrone", "push_evse_statuses_error": "Une erreur est survenue lors de la mise à jour des status des EVSE(s), vérifiez les logs", "push_tokens_error": "Une erreur est survenue lors de la mise à jour des jetons des utilisateurs, vérifiez les logs", diff --git a/src/assets/i18n/it.json b/src/assets/i18n/it.json index 2fcf9c86dc..aaa2e537af 100644 --- a/src/assets/i18n/it.json +++ b/src/assets/i18n/it.json @@ -1769,8 +1769,7 @@ "error_ping_412": "Ping fallito: Risposta Non Valida", "error_ping": "Errore Ping", "error_generate_local_token": "Si è verificato un errore durante la generazione di un nuovo token locale", - "push_evse_statuses_success": "Sono stati aggiornati con successo {{success}} stati EVSE", - "push_evse_statuses_partial": "{{success}} EVSE aggiornati - {{error}} EVSE non aggiornati - controlla i log per maggiori dettagli", + "push_evse_statuses_success": "The command has been accepted and the EVSE's statuses will be pushed asynchronously", "push_tokens_success": "The command has been accepted and the token(s) will be pushed asynchronously", "push_evse_statuses_error": "Si è verificato un errore durante l'aggiornamento degli stati EVSE - controlla i log per maggiori dettagli", "push_tokens_error": "Si è verificato un errore durante l'aggiornamento dei token utente - controlla i log per maggiori dettagli", diff --git a/src/assets/i18n/pt.json b/src/assets/i18n/pt.json index 0b9cf1a3f2..be35827254 100644 --- a/src/assets/i18n/pt.json +++ b/src/assets/i18n/pt.json @@ -1769,8 +1769,7 @@ "error_ping_412": "Falha no ping: Resposta inválida", "error_ping": "Falha de ping", "error_generate_local_token": "Ocorreu um erro ao gerar um novo token local", - "push_evse_statuses_success": "Status EVSE de {{success}} atualizados com sucesso", - "push_evse_statuses_partial": "{{success}} EVSE (s) atualizado (s) - {{error}} EVSE (s) não atualizado - consulte os logs para obter mais detalhes", + "push_evse_statuses_success": "The command has been accepted and the EVSE's statuses will be pushed asynchronously", "push_tokens_success": "The command has been accepted and the token(s) will be pushed asynchronously", "push_evse_statuses_error": "Ocorreu um erro ao atualizar os status EVSE - consulte os registos para obter mais detalhes", "push_tokens_error": "Ocorreu um erro ao atualizar os tokens do usuário - consulte os logs para obter mais detalhes", From 5b69e540a2b05a5334214638509abd89f3122e73 Mon Sep 17 00:00:00 2001 From: LucasBrazi06 Date: Fri, 2 Apr 2021 22:20:27 +0200 Subject: [PATCH 15/18] Made car catalog syncro async --- src/app/services/central-server.service.ts | 4 ++-- .../actions/cars/table-sync-car-catalogs-action.ts | 13 +++++++++---- src/assets/i18n/de.json | 6 ++---- src/assets/i18n/en.json | 6 ++---- src/assets/i18n/es.json | 6 ++---- src/assets/i18n/fr.json | 6 ++---- src/assets/i18n/it.json | 6 ++---- src/assets/i18n/pt.json | 6 ++---- 8 files changed, 23 insertions(+), 30 deletions(-) diff --git a/src/app/services/central-server.service.ts b/src/app/services/central-server.service.ts index 5fcde70ab4..a6c6d48621 100644 --- a/src/app/services/central-server.service.ts +++ b/src/app/services/central-server.service.ts @@ -2865,11 +2865,11 @@ export class CentralServerService { ); } - public synchronizeCarsCatalog(): Observable { + public synchronizeCarsCatalog(): Observable { // Verify init this.checkInit(); // Execute - return this.httpClient.put(`${this.centralRestServerServiceSecuredURL}/${ServerAction.SYNCHRONIZE_CAR_CATALOGS}`, {}, + return this.httpClient.put(`${this.centralRestServerServiceSecuredURL}/${ServerAction.SYNCHRONIZE_CAR_CATALOGS}`, {}, { headers: this.buildHttpHeaders(), }) diff --git a/src/app/shared/table/actions/cars/table-sync-car-catalogs-action.ts b/src/app/shared/table/actions/cars/table-sync-car-catalogs-action.ts index 698e2fe2fa..46badbf9ad 100644 --- a/src/app/shared/table/actions/cars/table-sync-car-catalogs-action.ts +++ b/src/app/shared/table/actions/cars/table-sync-car-catalogs-action.ts @@ -2,6 +2,7 @@ import { Router } from '@angular/router'; import { TranslateService } from '@ngx-translate/core'; import { Observable } from 'rxjs'; import { HTTPError } from 'types/HTTPError'; +import { Constants } from 'utils/Constants'; import { CentralServerService } from '../../../../services/central-server.service'; import { DialogService } from '../../../../services/dialog.service'; @@ -37,8 +38,12 @@ export class TableSyncCarCatalogsAction extends TableSynchronizeAction { spinnerService.show(); centralServerService.synchronizeCarsCatalog().subscribe((synchronizeResponse) => { spinnerService.hide(); - messageService.showActionsMessage(synchronizeResponse, 'cars.synchronize_car_catalogs_success', - 'cars.synchronize_car_catalogs_error', 'cars.synchronize_car_catalogs_partial', 'cars.synchronize_car_catalogs_up_to_date' ); + if (synchronizeResponse.status === Constants.REST_RESPONSE_SUCCESS) { + messageService.showSuccessMessage('cars.synchronize_car_catalogs_success'); + } else { + Utils.handleError(JSON.stringify(response), + messageService, 'cars.synchronize_car_catalogs_error'); + } if (refresh) { refresh().subscribe(); } @@ -48,11 +53,11 @@ export class TableSyncCarCatalogsAction extends TableSynchronizeAction { switch (error.status) { // Email already exists case HTTPError.CANNOT_ACQUIRE_LOCK: - messageService.showErrorMessage('cars.synchronize_car_catalogs_ongoing'); + messageService.showWarningMessage('cars.synchronize_car_catalogs_ongoing'); break; // Unexpected error` default: - Utils.handleHttpError(error, router, messageService, centralServerService, 'cars.synchronize_car_catalogs_unknown_error'); + Utils.handleHttpError(error, router, messageService, centralServerService, 'cars.synchronize_car_catalogs_error'); } }); } diff --git a/src/assets/i18n/de.json b/src/assets/i18n/de.json index 7bdcfb754f..ceec192292 100644 --- a/src/assets/i18n/de.json +++ b/src/assets/i18n/de.json @@ -1994,10 +1994,8 @@ "charge_power": "Ladeleistung", "charge_time": "Ladezeit", "charge_speed": "Ladegeschwindigkeit", - "synchronize_car_catalogs_partial": "{{inSuccess}} Fahrzeuge wurden erfolgreich synchronisiert und {{inError}} Fahrzeuge sind fehlerhaft", - "synchronize_car_catalogs_success": "{{inSuccess}} Fahrzeuge wurden erfolgreich synchronisiert", - "synchronize_car_catalogs_error": "{{inError}} Fahrzeuge konnten nicht synchronisiert werden, bitte überprüfen Sie die Logs", - "synchronize_car_catalogs_unknown_error": "Bei der Synchronisierung der Fahrzeuge ist ein unerwarteter Fehler aufgetreten, bitte überprüfen Sie die Logs", + "synchronize_car_catalogs_success": "The car synchronization request has been accepted and will be performed asynchronously", + "synchronize_car_catalogs_error": "Cars failed to be synchronized, check the logs", "synchronize_car_catalogs_ongoing": "Die Synchronisierung der Fahrzeuge wird bereits ausgeführt", "synchronize_car_catalogs_up_to_date": "Fahrzeuge sind bereits auf dem neusten Stand", "select_car_maker": "Fahrzeughersteller auswählen", diff --git a/src/assets/i18n/en.json b/src/assets/i18n/en.json index bce8897102..6506afb572 100644 --- a/src/assets/i18n/en.json +++ b/src/assets/i18n/en.json @@ -1994,10 +1994,8 @@ "charge_power": "Charge Power", "charge_time": "Charge Time", "charge_speed": "Charge Speed", - "synchronize_car_catalogs_partial": "{{inSuccess}} car(s) have been synchronized successfully and {{inError}} car(s) have encountered an error, check the logs", - "synchronize_car_catalogs_success": "{{inSuccess}} car(s) have been synchronized successfully", - "synchronize_car_catalogs_error": "{{inError}} cars failed to be synchronized, check the logs", - "synchronize_car_catalogs_unknown_error": "The synchronization of the cars encountered an unexpected error, check the logs", + "synchronize_car_catalogs_success": "The car synchronization request has been accepted and will be performed asynchronously", + "synchronize_car_catalogs_error": "Cars failed to be synchronized, check the logs", "synchronize_car_catalogs_ongoing": "The synchronization of the cars is already ongoing", "synchronize_car_catalogs_up_to_date": "Cars already up to date", "select_car_maker": "Select Car Maker", diff --git a/src/assets/i18n/es.json b/src/assets/i18n/es.json index c7267ace76..5d75449068 100644 --- a/src/assets/i18n/es.json +++ b/src/assets/i18n/es.json @@ -1994,10 +1994,8 @@ "charge_power": "Potencia de carga", "charge_time": "Tiempo de carga", "charge_speed": "Velocidad de carga", - "synchronize_car_catalogs_partial": "{{inSuccess}} vehículos se sincronizaron correctamente y en {{inError}} vehículos se encontraron errores", - "synchronize_car_catalogs_success": "{{inSuccess}} vehículos se han sincronizado correctamente", - "synchronize_car_catalogs_error": "{{inError}} cars failed to be synchronized, check the logs", - "synchronize_car_catalogs_unknown_error": "The synchronization of the cars encountered an unexpected error, check the logs", + "synchronize_car_catalogs_success": "The car synchronization request has been accepted and will be performed asynchronously", + "synchronize_car_catalogs_error": "Cars failed to be synchronized, check the logs", "synchronize_car_catalogs_ongoing": "The synchronization of the cars is already ongoing", "synchronize_car_catalogs_up_to_date": "Los vehículos ya están actualizados", "select_car_maker": "Seleccionar fabricante del vehículo", diff --git a/src/assets/i18n/fr.json b/src/assets/i18n/fr.json index 65bbbc01c9..5c063aa18d 100644 --- a/src/assets/i18n/fr.json +++ b/src/assets/i18n/fr.json @@ -1994,10 +1994,8 @@ "charge_power": "Charge Power", "charge_time": "Temps De Chargement", "charge_speed": "Vitesse De Chargement", - "synchronize_car_catalogs_partial": "{{inSuccess}} véhicules ont été synchronisés avec succès et {{inError}} vehicules ont rencontré une erreur", - "synchronize_car_catalogs_success": "{{inSuccess}} véhicules ont été synchronisés avec succès", - "synchronize_car_catalogs_error": "{{inError}} véhicules ont rencontré une erreur, vérifiez les logs", - "synchronize_car_catalogs_unknown_error": "'La synchronisation des véhicules a rencontré une erreur inattendue, vérifiez les logs", + "synchronize_car_catalogs_success": "La requête a été acceptée et la synchronisation des véhicules sera effectuée de manière asynchrone", + "synchronize_car_catalogs_error": "La synchronisation des véhicules a rencontré une erreur, vérifiez les logs", "synchronize_car_catalogs_ongoing": "La synchronisation des véhicules est déjà en cours", "synchronize_car_catalogs_up_to_date": "Les véhicules sont déjà tous à jour", "select_car_maker": "Selection Constructeur Véhicules", diff --git a/src/assets/i18n/it.json b/src/assets/i18n/it.json index aaa2e537af..674866531d 100644 --- a/src/assets/i18n/it.json +++ b/src/assets/i18n/it.json @@ -1994,10 +1994,8 @@ "charge_power": "Potenza Ricarica", "charge_time": "Tempo Ricarica", "charge_speed": "Velocità Ricarica", - "synchronize_car_catalogs_partial": "{{inSuccess}} veicoli sono stati sincronizzati con successo e {{inError}} veicoli hanno riscontrato un errore", - "synchronize_car_catalogs_success": "{{inSuccess}} veicoli sono stati sincronizzati con successo", - "synchronize_car_catalogs_error": "{{inError}} cars failed to be synchronized, check the logs", - "synchronize_car_catalogs_unknown_error": "The synchronization of the cars encountered an unexpected error, check the logs", + "synchronize_car_catalogs_success": "The car synchronization request has been accepted and will be performed asynchronously", + "synchronize_car_catalogs_error": "Cars failed to be synchronized, check the logs", "synchronize_car_catalogs_ongoing": "The synchronization of the cars is already ongoing", "synchronize_car_catalogs_up_to_date": "Veicoli già aggiornati", "select_car_maker": "Seleziona Costruttore", diff --git a/src/assets/i18n/pt.json b/src/assets/i18n/pt.json index be35827254..ee31b54e48 100644 --- a/src/assets/i18n/pt.json +++ b/src/assets/i18n/pt.json @@ -1994,10 +1994,8 @@ "charge_power": "Poder de carga", "charge_time": "Hora de carregar", "charge_speed": "Velocidade de carga", - "synchronize_car_catalogs_partial": "{{inSuccess}} carro (s) foram sincronizados com sucesso e {{inError}} carro (s) encontraram um erro", - "synchronize_car_catalogs_success": "{{inSuccess}} carro (s) foram sincronizados com sucesso", - "synchronize_car_catalogs_error": "{{inError}} cars failed to be synchronized, check the logs", - "synchronize_car_catalogs_unknown_error": "The synchronization of the cars encountered an unexpected error, check the logs", + "synchronize_car_catalogs_success": "The car synchronization request has been accepted and will be performed asynchronously", + "synchronize_car_catalogs_error": "Cars failed to be synchronized, check the logs", "synchronize_car_catalogs_ongoing": "The synchronization of the cars is already ongoing", "synchronize_car_catalogs_up_to_date": "Carros já atualizados", "select_car_maker": "Selecione fabricante de automóveis", From 918e45970d310f01e0e9ddd6f7d0fc4cce224c65 Mon Sep 17 00:00:00 2001 From: LucasBrazi06 Date: Sat, 3 Apr 2021 10:46:59 +0200 Subject: [PATCH 16/18] Fixed null Ocpp version in roaming charger list --- .../list/charging-stations-list-table-data-source.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/app/pages/charging-stations/list/charging-stations-list-table-data-source.ts b/src/app/pages/charging-stations/list/charging-stations-list-table-data-source.ts index c8347c6631..a69bca672e 100644 --- a/src/app/pages/charging-stations/list/charging-stations-list-table-data-source.ts +++ b/src/app/pages/charging-stations/list/charging-stations-list-table-data-source.ts @@ -3,7 +3,6 @@ import { MatDialog } from '@angular/material/dialog'; import { Router } from '@angular/router'; import { TranslateService } from '@ngx-translate/core'; import { Observable } from 'rxjs'; -import { ConnectorTableFilter } from 'shared/table/filters/connector-table-filter'; import { AuthorizationService } from '../../../services/authorization.service'; import { CentralServerNotificationService } from '../../../services/central-server-notification.service'; @@ -213,7 +212,8 @@ export class ChargingStationsListTableDataSource extends TableDataSource `${ocppVersion} / ${row.ocppProtocol}` + formatter: (ocppVersion: string, row: ChargingStation) => + (ocppVersion && row.ocppProtocol) ? `${ocppVersion} / ${row.ocppProtocol}` : '-' }, ); } From 18b16a572934107ac92f238bc0f5674f860cbf4d Mon Sep 17 00:00:00 2001 From: LucasBrazi06 Date: Sat, 3 Apr 2021 12:52:24 +0200 Subject: [PATCH 17/18] Cannot change chargers site assignment with roaming objects --- ...rea-charging-stations-table-data-source.ts | 42 ++++++++++--------- 1 file changed, 23 insertions(+), 19 deletions(-) diff --git a/src/app/pages/organization/site-areas/site-area-charging-stations/site-area-charging-stations-table-data-source.ts b/src/app/pages/organization/site-areas/site-area-charging-stations/site-area-charging-stations-table-data-source.ts index 3e9df64441..d3d4463fa2 100644 --- a/src/app/pages/organization/site-areas/site-area-charging-stations/site-area-charging-stations-table-data-source.ts +++ b/src/app/pages/organization/site-areas/site-area-charging-stations/site-area-charging-stations-table-data-source.ts @@ -74,18 +74,20 @@ export class SiteAreaChargingStationsDataSource extends TableDataSource Date: Sat, 3 Apr 2021 13:58:55 +0200 Subject: [PATCH 18/18] Updated server actions with missing OCPI actions --- src/app/types/Server.ts | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/app/types/Server.ts b/src/app/types/Server.ts index 2ed35fcf57..d1d793d08b 100644 --- a/src/app/types/Server.ts +++ b/src/app/types/Server.ts @@ -122,9 +122,13 @@ export enum ServerAction { OCPI_ENDPOINT = 'OcpiEndpoint', OCPI_REGISTER = 'OcpiRegister', OCPI_AUTHORIZE_TOKEN = 'OcpiAuthorizeToken', + OCPI_PUT_TOKEN = 'OcpiPutToken', OCPI_PATCH_TOKEN = 'OcpiPatchToken', - OCPI_PATCH_LOCATIONS = 'OcpiPatchLocations', + OCPI_PATCH_LOCATION = 'OcpiPatchLocation', OCPI_PATCH_STATUS = 'OcpiPatchStatus', + OCPI_PATCH_SESSION = 'OcpiPatchSession', + OCPI_PUT_LOCATION = 'OcpiPutLocation', + OCPI_PUT_SESSION = 'OcpiPutSession', OCPI_CHECK_CDRS = 'OcpiCheckCdrs', OCPI_CHECK_SESSIONS = 'OcpiCheckSessions', OCPI_CHECK_LOCATIONS = 'OcpiCheckLocations', @@ -145,6 +149,7 @@ export enum ServerAction { OCPI_UNLOCK_CONNECTOR = 'OcpiUnlockConnector', OCPI_GET_VERSIONS = 'OcpiGetVersions', OCPI_GET_LOCATIONS = 'OcpiGetLocations', + OCPI_GET_TOKEN = 'OcpiGetToken', OCPI_GET_TARIFF = 'OcpiGetTariff', OCPI_GET_TARIFFS = 'OcpiGetTariffs', OCPI_POST_CREDENTIALS = 'OcpiPostCredentials',