From 39e8595d3d1d20d795d81d3f9eaf7f3422b37380 Mon Sep 17 00:00:00 2001
From: OliveGerste <33114317+OliveGerste@users.noreply.github.com>
Date: Thu, 15 Jul 2021 16:48:55 +0200
Subject: [PATCH 01/14] Added Lacroix connection settings

---
 .../Lacroix-asset-connection.component.html   | 24 +++++++++
 .../Lacroix-asset-connection.component.ts     | 51 +++++++++++++++++++
 .../asset-connection.component.html           |  7 +++
 .../connection/asset-connection.component.ts  | 12 ++++-
 .../settings-integration.module.ts            |  3 ++
 src/app/services/component.service.ts         |  3 ++
 src/app/types/Setting.ts                      |  4 ++
 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 +-
 13 files changed, 114 insertions(+), 8 deletions(-)
 create mode 100644 src/app/pages/settings-integration/asset/connection/Lacroix/Lacroix-asset-connection.component.html
 create mode 100644 src/app/pages/settings-integration/asset/connection/Lacroix/Lacroix-asset-connection.component.ts

diff --git a/src/app/pages/settings-integration/asset/connection/Lacroix/Lacroix-asset-connection.component.html b/src/app/pages/settings-integration/asset/connection/Lacroix/Lacroix-asset-connection.component.html
new file mode 100644
index 0000000000..22a541ff71
--- /dev/null
+++ b/src/app/pages/settings-integration/asset/connection/Lacroix/Lacroix-asset-connection.component.html
@@ -0,0 +1,24 @@
+<div class="row">
+  <!-- User -->
+  <div class="col-md-6">
+    <div class="form-group">
+      <mat-form-field>
+        <input appAutofocus matInput
+          placeholder="{{'settings.asset.connection.user' | translate}}"
+          type="text" [formControl]="user" required>
+        <mat-error *ngIf="user.errors?.required">{{"general.mandatory_field" | translate}}</mat-error>
+      </mat-form-field>
+    </div>
+  </div>
+  <!-- Password -->
+  <div class="col-md-6">
+    <div class="form-group">
+    <mat-form-field>
+        <input matInput
+          placeholder="{{'settings.asset.connection.password' | translate}}"
+          type="password" [formControl]="password" required>
+        <mat-error *ngIf="password.errors?.required">{{"general.mandatory_field" | translate}}</mat-error>
+      </mat-form-field>
+    </div>
+  </div>
+</div>
diff --git a/src/app/pages/settings-integration/asset/connection/Lacroix/Lacroix-asset-connection.component.ts b/src/app/pages/settings-integration/asset/connection/Lacroix/Lacroix-asset-connection.component.ts
new file mode 100644
index 0000000000..f8b5394b71
--- /dev/null
+++ b/src/app/pages/settings-integration/asset/connection/Lacroix/Lacroix-asset-connection.component.ts
@@ -0,0 +1,51 @@
+import { Component, Input, OnInit } from '@angular/core';
+import { AbstractControl, FormControl, FormGroup, Validators } from '@angular/forms';
+
+import { AssetLacroixConnectionType } from '../../../../../types/Setting';
+
+@Component({
+  selector: 'app-settings-lacroix-connection',
+  templateUrl: './lacroix-asset-connection.component.html'
+})
+export class LacroixAssetConnectionComponent implements OnInit {
+  @Input() public formGroup!: FormGroup;
+  @Input() public lacroixConnection!: AssetLacroixConnectionType;
+
+  public lacroixLoginForm!: FormGroup;
+  public user!: AbstractControl;
+  public password!: AbstractControl;
+
+  public ngOnInit(): void {
+    // Set login credentials form
+    this.lacroixLoginForm = new FormGroup({
+      user: new FormControl('',
+        Validators.compose([
+          Validators.required,
+        ])),
+      password: new FormControl('',
+        Validators.compose([
+          Validators.required,
+        ])),
+    });
+    if (!this.formGroup.disabled) {
+      this.formGroup.addControl('lacroixConnection', this.lacroixLoginForm);
+    } else {
+      this.lacroixLoginForm.disable();
+    }
+    this.user = this.lacroixLoginForm.controls['user'];
+    this.password = this.lacroixLoginForm.controls['password'];
+    // Load existing credentials
+    this.loadCredentials();
+  }
+
+  public loadCredentials(): void {
+    if (this.lacroixConnection) {
+      if (this.lacroixConnection.user) {
+        this.lacroixLoginForm.controls.user.setValue(this.lacroixConnection.user);
+      }
+      if (this.lacroixConnection.password) {
+        this.lacroixLoginForm.controls.password.setValue(this.lacroixConnection.password);
+      }
+    }
+  }
+}
diff --git a/src/app/pages/settings-integration/asset/connection/asset-connection.component.html b/src/app/pages/settings-integration/asset/connection/asset-connection.component.html
index 1039456c9f..c433d4bd75 100644
--- a/src/app/pages/settings-integration/asset/connection/asset-connection.component.html
+++ b/src/app/pages/settings-integration/asset/connection/asset-connection.component.html
@@ -111,6 +111,13 @@
                   </app-settings-wit-connection>
                 </div>
               </div>
+              <div class="row" *ngIf="type.value === 'lacroix'">
+                <div class="col-md-12">
+                  <app-settings-lacroix-connection
+                    [formGroup]="formGroup" [lacroixConnection]="lacroixConnection">
+                  </app-settings-lacroix-connection>
+                </div>
+              </div>
               <div class="card-footer mat-dialog-actions" align="end">
                 <button mat-raised-button color="warn" (click)="setConnectionAndClose(formGroup.value)"
                   [disabled]="!formGroup.valid || !formGroup.dirty">
diff --git a/src/app/pages/settings-integration/asset/connection/asset-connection.component.ts b/src/app/pages/settings-integration/asset/connection/asset-connection.component.ts
index 137d140dd8..e42e64e1b2 100644
--- a/src/app/pages/settings-integration/asset/connection/asset-connection.component.ts
+++ b/src/app/pages/settings-integration/asset/connection/asset-connection.component.ts
@@ -4,7 +4,7 @@ import { MatDialogRef } from '@angular/material/dialog';
 import { TranslateService } from '@ngx-translate/core';
 
 import { KeyValue } from '../../../../types/GlobalType';
-import { AssetConnectionSetting, AssetConnectionType, AssetGreencomConnectionType, AssetIothinkConnectionType, AssetSchneiderConnectionType, AssetWitConnectionType } from '../../../../types/Setting';
+import { AssetConnectionSetting, AssetConnectionType, AssetGreencomConnectionType, AssetIothinkConnectionType, AssetLacroixConnectionType, AssetSchneiderConnectionType, AssetWitConnectionType } from '../../../../types/Setting';
 import { Constants } from '../../../../utils/Constants';
 import { AssetConnectionDialogComponent } from './asset-connection.dialog.component';
 
@@ -29,11 +29,13 @@ export class AssetConnectionComponent implements OnInit {
   public greencomConnection!: AssetGreencomConnectionType;
   public iothinkConnection!: AssetIothinkConnectionType;
   public witConnection!: AssetWitConnectionType;
+  public lacroixConnection!: AssetLacroixConnectionType;
   public assetConnectionTypes: KeyValue[] = [
     { key: AssetConnectionType.SCHNEIDER, value: 'settings.asset.types.schneider' },
     { key: AssetConnectionType.GREENCOM, value: 'settings.asset.types.greencom' },
     { key: AssetConnectionType.IOTHINK, value: 'settings.asset.types.iothink' },
-    { key: AssetConnectionType.WIT, value: 'settings.asset.types.wit' }
+    { key: AssetConnectionType.WIT, value: 'settings.asset.types.wit' },
+    { key: AssetConnectionType.LACROIX, value: 'settings.asset.types.lacroix' }
   ];
   public submitButtonTranslation!: any;
 
@@ -117,6 +119,9 @@ export class AssetConnectionComponent implements OnInit {
       case AssetConnectionType.WIT:
         this.witConnection = this.currentAssetConnection.witConnection;
         break;
+      case AssetConnectionType.LACROIX:
+        this.lacroixConnection = this.currentAssetConnection.lacroixConnection;
+        break;
     }
   }
 
@@ -156,5 +161,8 @@ export class AssetConnectionComponent implements OnInit {
     if (this.formGroup.controls.witConnection && type !== AssetConnectionType.WIT) {
       delete this.formGroup.controls.witConnection;
     }
+    if (this.formGroup.controls.lacroixConnection && type !== AssetConnectionType.LACROIX) {
+      delete this.formGroup.controls.lacroixConnection;
+    }
   }
 }
diff --git a/src/app/pages/settings-integration/settings-integration.module.ts b/src/app/pages/settings-integration/settings-integration.module.ts
index 356100875b..7ad7b07705 100644
--- a/src/app/pages/settings-integration/settings-integration.module.ts
+++ b/src/app/pages/settings-integration/settings-integration.module.ts
@@ -17,6 +17,7 @@ import { AssetConnectionComponent } from './asset/connection/asset-connection.co
 import { AssetConnectionDialogComponent } from './asset/connection/asset-connection.dialog.component';
 import { GreencomAssetConnectionComponent } from './asset/connection/greencom/greencom-asset-connection.component';
 import { IothinkAssetConnectionComponent } from './asset/connection/iothink/iothink-asset-connection.component';
+import { LacroixAssetConnectionComponent } from './asset/connection/Lacroix/Lacroix-asset-connection.component';
 import { SchneiderAssetConnectionComponent } from './asset/connection/schneider/schneider-asset-connection.component';
 import { WitAssetConnectionComponent } from './asset/connection/wit/wit-asset-connection.component';
 import { SettingsAssetConnectionEditableTableDataSource } from './asset/settings-asset-connections-list-table-data-source';
@@ -114,6 +115,7 @@ import { SettingsSmartChargingComponent } from './smart-charging/settings-smart-
     GreencomAssetConnectionComponent,
     IothinkAssetConnectionComponent,
     WitAssetConnectionComponent,
+    LacroixAssetConnectionComponent,
     SettingsCarConnectorComponent,
     CarConnectorConnectionComponent,
     CarConnectorConnectionDialogComponent,
@@ -174,6 +176,7 @@ import { SettingsSmartChargingComponent } from './smart-charging/settings-smart-
     GreencomAssetConnectionComponent,
     IothinkAssetConnectionComponent,
     WitAssetConnectionComponent,
+    LacroixAssetConnectionComponent,
     SettingsCarConnectorComponent,
     CarConnectorConnectionComponent,
     CarConnectorConnectionDialogComponent,
diff --git a/src/app/services/component.service.ts b/src/app/services/component.service.ts
index f96a1bafea..42553db84d 100644
--- a/src/app/services/component.service.ts
+++ b/src/app/services/component.service.ts
@@ -183,6 +183,9 @@ export class ComponentService {
           settingsToSave.sensitiveData.push(`content.asset.connections[${index}].witConnection.password`);
           settingsToSave.sensitiveData.push(`content.asset.connections[${index}].witConnection.clientSecret`);
           break;
+        case AssetConnectionType.LACROIX:
+          settingsToSave.sensitiveData.push(`content.asset.connections[${index}].lacroixConnection.password`);
+          break;
       }
 
     });
diff --git a/src/app/types/Setting.ts b/src/app/types/Setting.ts
index 376bdaf61a..89e020dcbc 100644
--- a/src/app/types/Setting.ts
+++ b/src/app/types/Setting.ts
@@ -246,6 +246,7 @@ export interface AssetConnectionSetting extends TableData {
   greencomConnection?: AssetGreencomConnectionType;
   iothinkConnection?: AssetIothinkConnectionType;
   witConnection?: AssetWitConnectionType;
+  lacroixConnection?: AssetLacroixConnectionType;
 }
 
 export enum AssetConnectionType {
@@ -254,6 +255,7 @@ export enum AssetConnectionType {
   GREENCOM = 'greencom',
   IOTHINK = 'iothink',
   WIT = 'wit',
+  LACROIX = 'lacroix',
 }
 
 export interface AssetUserPasswordConnectionType {
@@ -265,6 +267,8 @@ export type AssetSchneiderConnectionType = AssetUserPasswordConnectionType;
 
 export type AssetIothinkConnectionType = AssetUserPasswordConnectionType;
 
+export type AssetLacroixConnectionType = AssetUserPasswordConnectionType;
+
 export interface AssetGreencomConnectionType {
   clientId: string;
   clientSecret: string;
diff --git a/src/assets/i18n/de.json b/src/assets/i18n/de.json
index f1eb9bcd2e..ec70ee6267 100644
--- a/src/assets/i18n/de.json
+++ b/src/assets/i18n/de.json
@@ -1647,7 +1647,8 @@
         "schneider": "Schneider Building Management System",
         "greencom": "GreenCom Asset Management System",
         "iothink": "ioThink Asset Management System",
-        "wit": "WIT Asset Management System"
+        "wit": "WIT Asset Management System",
+        "lacroix": "LACROIX Asset Management System"
       },
       "connection_success": "Die Verbindung zum System wurde erfolgreich getestet.",
       "unknown_connection_error": "Unbekannter Verbindungsfehler",
diff --git a/src/assets/i18n/en.json b/src/assets/i18n/en.json
index f7059b6698..2b38476303 100644
--- a/src/assets/i18n/en.json
+++ b/src/assets/i18n/en.json
@@ -1647,7 +1647,8 @@
         "schneider": "Schneider Building Management System",
         "greencom": "GreenCom Asset Management System",
         "iothink": "ioThink Asset Management System",
-        "wit": "WIT Asset Management System"
+        "wit": "WIT Asset Management System",
+        "lacroix": "LACROIX Asset Management System"
       },
       "connection_success": "Connection to the system was tested successfully",
       "unknown_connection_error": "Unknown connection error",
diff --git a/src/assets/i18n/es.json b/src/assets/i18n/es.json
index 6d58983167..98c8d45f83 100644
--- a/src/assets/i18n/es.json
+++ b/src/assets/i18n/es.json
@@ -1647,7 +1647,8 @@
         "schneider": "Gestión de edificios Schneider",
         "greencom": "GreenCom Asset Management System",
         "iothink": "ioThink Asset Management System",
-        "wit": "WIT Asset Management System"
+        "wit": "WIT Asset Management System",
+        "lacroix": "LACROIX Asset Management System"
       },
       "connection_success": "Connection to the system was tested successfully",
       "unknown_connection_error": "Error de conexión desconocido",
diff --git a/src/assets/i18n/fr.json b/src/assets/i18n/fr.json
index 1edc1436fd..df1dac15f4 100644
--- a/src/assets/i18n/fr.json
+++ b/src/assets/i18n/fr.json
@@ -1647,7 +1647,8 @@
         "schneider": "Gestion Bâtiment Schneider",
         "greencom": "GreenCom Gestion des Ressources",
         "iothink": "ioThink Gestion des Ressources",
-        "wit": "WIT Asset Management System"
+        "wit": "WIT Asset Management System",
+        "lacroix": "LACROIX Asset Management System"
       },
       "connection_success": "Connexion vers le système vérifiée avec succès",
       "unknown_connection_error": "Erreur de connexion inconnue",
diff --git a/src/assets/i18n/it.json b/src/assets/i18n/it.json
index d707441463..da1d253231 100644
--- a/src/assets/i18n/it.json
+++ b/src/assets/i18n/it.json
@@ -1647,7 +1647,8 @@
         "schneider": "Sistema Gestione Edifici Schneider",
         "greencom": "GreenCom Asset Management System",
         "iothink": "ioThink Asset Management System",
-        "wit": "WIT Asset Management System"
+        "wit": "WIT Asset Management System",
+        "lacroix": "LACROIX Asset Management System"
       },
       "connection_success": "La connessione al sistema è stata testata con successo",
       "unknown_connection_error": "Errore di connessione sconosciuto",
diff --git a/src/assets/i18n/pt.json b/src/assets/i18n/pt.json
index de9fe866fc..4648535abe 100644
--- a/src/assets/i18n/pt.json
+++ b/src/assets/i18n/pt.json
@@ -1647,7 +1647,8 @@
         "schneider": "Schneider Building Management System",
         "greencom": "GreenCom Asset Management System",
         "iothink": "ioThink Asset Management System",
-        "wit": "WIT Asset Management System"
+        "wit": "WIT Asset Management System",
+        "lacroix": "LACROIX Asset Management System"
       },
       "connection_success": "A conexão com o sistema foi testada com sucesso",
       "unknown_connection_error": "Erro de conexão desconhecido",

From b47f90e40415f70e0ea618a09567405c86c17231 Mon Sep 17 00:00:00 2001
From: LucasBrazi06 <sergefabiano@free.fr>
Date: Wed, 21 Jul 2021 19:03:31 +0200
Subject: [PATCH 02/14] Updated app title

---
 src/assets/i18n/de.json | 4 ++--
 src/assets/i18n/en.json | 4 ++--
 src/assets/i18n/es.json | 4 ++--
 src/assets/i18n/fr.json | 4 ++--
 src/assets/i18n/it.json | 4 ++--
 src/assets/i18n/pt.json | 4 ++--
 src/index.html          | 2 +-
 7 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/assets/i18n/de.json b/src/assets/i18n/de.json
index 7636c3a76e..513a8287c7 100644
--- a/src/assets/i18n/de.json
+++ b/src/assets/i18n/de.json
@@ -26,7 +26,7 @@
     "nbr_of_records": "Einträge",
     "connectors": "Verknüpfungen",
     "notifications": "Benachrichtungen",
-    "app_name": "e-Mobility",
+    "app_name": "Open e-Mobility",
     "version": "Version",
     "about_us": "About Us",
     "unexpected_error_backend": "Ein unerwarteter Fehler ist aufgetreten",
@@ -505,7 +505,7 @@
     "eula": "Endnutzer Lizenzvereinbarung",
     "must_accept_eula": "Sie müssen die Endnutzer Lizenzvereinbarung akzeptieren",
     "no_space_in_password": "Am Anfang und am Ende ist kein Leerzeichen erlaubt",
-    "title": "Anmelden bei e-Mobility",
+    "title": "Anmelden bei Open e-Mobility",
     "register": "Registrieren",
     "signup_link": "Neuer Nutzer? Registrieren!",
     "signin_link": "Haben Sie bereits einen Account? Melden Sie sich an!",
diff --git a/src/assets/i18n/en.json b/src/assets/i18n/en.json
index 64fe3bdfde..d0f8dbb7b2 100644
--- a/src/assets/i18n/en.json
+++ b/src/assets/i18n/en.json
@@ -26,7 +26,7 @@
     "nbr_of_records": "Records",
     "connectors": "Connections",
     "notifications": "Notifications",
-    "app_name": "e-Mobility",
+    "app_name": "Open e-Mobility",
     "version": "Version",
     "about_us": "About Us",
     "unexpected_error_backend": "An unexpected error occurred, check the logs",
@@ -505,7 +505,7 @@
     "eula": "End-user License Agreement",
     "must_accept_eula": "You must accept the End-user License Agreement",
     "no_space_in_password": "No space is allowed at the beginning and the end",
-    "title": "Sign in to e-Mobility",
+    "title": "Sign in to Open e-Mobility",
     "register": "Register",
     "signup_link": "New user? Register!",
     "signin_link": "Already have an account? Sign in!",
diff --git a/src/assets/i18n/es.json b/src/assets/i18n/es.json
index d3b9ab57c8..5c38259fa8 100644
--- a/src/assets/i18n/es.json
+++ b/src/assets/i18n/es.json
@@ -26,7 +26,7 @@
     "nbr_of_records": "Registros",
     "connectors": "Conexiones",
     "notifications": "Notificaciones",
-    "app_name": "e-Mobility",
+    "app_name": "Open e-Mobility",
     "version": "Versión",
     "about_us": "Sobre nosotros",
     "unexpected_error_backend": "Ocurrió un error inesperado",
@@ -505,7 +505,7 @@
     "eula": "acuerdo de licencia de usuario final",
     "must_accept_eula": "Debe aceptar el acuerdo de licencia de usuario final",
     "no_space_in_password": "No se permite espacio al principio ni al final",
-    "title": "Iniciar sesión en e-Mobility",
+    "title": "Iniciar sesión en Open e-Mobility",
     "register": "Registrarse",
     "signup_link": "¿Nuevo Usuario? ¡Registrarse!",
     "signin_link": "¿Ya tiene una cuenta? ¡Inicie sesión!",
diff --git a/src/assets/i18n/fr.json b/src/assets/i18n/fr.json
index 1ca16e047b..09ea78265c 100644
--- a/src/assets/i18n/fr.json
+++ b/src/assets/i18n/fr.json
@@ -26,7 +26,7 @@
     "nbr_of_records": "Enregistrements",
     "connectors": "Connexions",
     "notifications": "Notifications",
-    "app_name": "e-Mobility",
+    "app_name": "Open e-Mobility",
     "version": "Version",
     "about_us": "A Propos",
     "unexpected_error_backend": "Une erreur inattendue s'est produite, vérifiez les logs",
@@ -505,7 +505,7 @@
     "eula": "Conditions Générales d'Utilisation",
     "must_accept_eula": "Vous devez accepter les Conditions Générales d'Utilisation",
     "no_space_in_password": "Espace interdit au debut et à la fin",
-    "title": "Connectez-vous sur e-Mobility",
+    "title": "Connectez-vous sur Open e-Mobility",
     "register": "Enregistrez-vous sur e-Mobility",
     "signup_link": "Nouvel utilisateur? Créez un compte!",
     "signin_link": "Vous avez déjà un compte? Connectez vous!",
diff --git a/src/assets/i18n/it.json b/src/assets/i18n/it.json
index 2ab5b7114b..7117e84022 100644
--- a/src/assets/i18n/it.json
+++ b/src/assets/i18n/it.json
@@ -26,7 +26,7 @@
     "nbr_of_records": "Record",
     "connectors": "Prese",
     "notifications": "Notifiche",
-    "app_name": "e-Mobility",
+    "app_name": "Open e-Mobility",
     "version": "Versione",
     "about_us": "A proposito di noi",
     "unexpected_error_backend": "Si è verificato un errore imprevisto",
@@ -505,7 +505,7 @@
     "eula": "Accordo di Licenza con l'Utente Finale",
     "must_accept_eula": "Devi accettare l'Accordo di Licenza con l'Utente Finale",
     "no_space_in_password": "Nessuno spazio è consentito all'inizo e alla fine",
-    "title": "Accedi a e-Mobility",
+    "title": "Accedi a Open e-Mobility",
     "register": "Registrati",
     "signup_link": "Nuovo utente? Registrati!",
     "signin_link": "Hai già un account? Accedi!",
diff --git a/src/assets/i18n/pt.json b/src/assets/i18n/pt.json
index f7b2423706..52a06f1c4a 100644
--- a/src/assets/i18n/pt.json
+++ b/src/assets/i18n/pt.json
@@ -26,7 +26,7 @@
     "nbr_of_records": "Registos",
     "connectors": "Conexões",
     "notifications": "Notificações",
-    "app_name": "e-Mobility",
+    "app_name": "Open e-Mobility",
     "version": "Versão",
     "about_us": "Sobre Nós",
     "unexpected_error_backend": "Ocurreu um erro inesperado",
@@ -505,7 +505,7 @@
     "eula": "Acordo de licenciamento unico",
     "must_accept_eula": "Você deve aceitar o licneciamento unico",
     "no_space_in_password": "Nenhum espaço é permitido no início e no final",
-    "title": "Faça login no e-Mobility",
+    "title": "Faça login no Open e-Mobility",
     "register": "Registar",
     "signup_link": "Novo utilizador? Registar!",
     "signin_link": "Você ja tem uma conta? Faça Login!",
diff --git a/src/index.html b/src/index.html
index bceb46091d..9888202c5d 100644
--- a/src/index.html
+++ b/src/index.html
@@ -5,7 +5,7 @@
   <base href='/'>
   <meta charset="utf-8" />
   <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
-  <title>e-Mobility</title>
+  <title>Open e-Mobility</title>
   <meta content='width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0' name='viewport' />
   <meta name="viewport" content="width=device-width" />
   <!--    icons     -->

From 2b00dacb0e63ac98ac3ad4688394835459d1e983 Mon Sep 17 00:00:00 2001
From: OliveGerste <33114317+OliveGerste@users.noreply.github.com>
Date: Fri, 23 Jul 2021 12:25:16 +0200
Subject: [PATCH 03/14] Renamed lacroix files

---
 .../pages/settings-integration/settings-integration.module.ts   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/pages/settings-integration/settings-integration.module.ts b/src/app/pages/settings-integration/settings-integration.module.ts
index 7ad7b07705..9d2a7e6339 100644
--- a/src/app/pages/settings-integration/settings-integration.module.ts
+++ b/src/app/pages/settings-integration/settings-integration.module.ts
@@ -17,7 +17,7 @@ import { AssetConnectionComponent } from './asset/connection/asset-connection.co
 import { AssetConnectionDialogComponent } from './asset/connection/asset-connection.dialog.component';
 import { GreencomAssetConnectionComponent } from './asset/connection/greencom/greencom-asset-connection.component';
 import { IothinkAssetConnectionComponent } from './asset/connection/iothink/iothink-asset-connection.component';
-import { LacroixAssetConnectionComponent } from './asset/connection/Lacroix/Lacroix-asset-connection.component';
+import { LacroixAssetConnectionComponent } from './asset/connection/lacroix/lacroix-asset-connection.component';
 import { SchneiderAssetConnectionComponent } from './asset/connection/schneider/schneider-asset-connection.component';
 import { WitAssetConnectionComponent } from './asset/connection/wit/wit-asset-connection.component';
 import { SettingsAssetConnectionEditableTableDataSource } from './asset/settings-asset-connections-list-table-data-source';

From 1051b9afd7a53daa06e41d55659a526249a63aac Mon Sep 17 00:00:00 2001
From: OliveGerste <33114317+OliveGerste@users.noreply.github.com>
Date: Fri, 23 Jul 2021 12:30:32 +0200
Subject: [PATCH 04/14] Rename
 src/app/pages/settings-integration/asset/connection/Lacroix/Lacroix-asset-connection.component.html
 to
 src/app/pages/settings-integration/asset/connection/lacroix/lacroix-asset-connection.component.html

---
 .../lacroix-asset-connection.component.html}                      | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename src/app/pages/settings-integration/asset/connection/{Lacroix/Lacroix-asset-connection.component.html => lacroix/lacroix-asset-connection.component.html} (100%)

diff --git a/src/app/pages/settings-integration/asset/connection/Lacroix/Lacroix-asset-connection.component.html b/src/app/pages/settings-integration/asset/connection/lacroix/lacroix-asset-connection.component.html
similarity index 100%
rename from src/app/pages/settings-integration/asset/connection/Lacroix/Lacroix-asset-connection.component.html
rename to src/app/pages/settings-integration/asset/connection/lacroix/lacroix-asset-connection.component.html

From 3481709f6d1061bc8263cb3d300637e2828ee8cf Mon Sep 17 00:00:00 2001
From: OliveGerste <33114317+OliveGerste@users.noreply.github.com>
Date: Fri, 23 Jul 2021 12:31:37 +0200
Subject: [PATCH 05/14] Rename
 src/app/pages/settings-integration/asset/connection/Lacroix/Lacroix-asset-connection.component.ts
 to
 src/app/pages/settings-integration/asset/connection/lacroix/lacroix-asset-connection.component.ts

---
 .../lacroix-asset-connection.component.ts}                        | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename src/app/pages/settings-integration/asset/connection/{Lacroix/Lacroix-asset-connection.component.ts => lacroix/lacroix-asset-connection.component.ts} (100%)

diff --git a/src/app/pages/settings-integration/asset/connection/Lacroix/Lacroix-asset-connection.component.ts b/src/app/pages/settings-integration/asset/connection/lacroix/lacroix-asset-connection.component.ts
similarity index 100%
rename from src/app/pages/settings-integration/asset/connection/Lacroix/Lacroix-asset-connection.component.ts
rename to src/app/pages/settings-integration/asset/connection/lacroix/lacroix-asset-connection.component.ts

From cf0a4d3233314825231f9d28a334b13290f5825e Mon Sep 17 00:00:00 2001
From: LucasBrazi06 <sergefabiano@free.fr>
Date: Sat, 24 Jul 2021 08:23:07 +0200
Subject: [PATCH 06/14] Updated release notes

---
 package-lock.json                                |  2 +-
 package.json                                     |  2 +-
 src/app/release-notes/release-notes.component.ts | 13 +++++++++++++
 3 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index dc6c450499..6b17809e80 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "ev-dashboard",
-  "version": "2.4.78",
+  "version": "2.4.79",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index cd14231e60..3b33c75d41 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
   "name": "ev-dashboard",
   "description": "Dashboard for Electric Vehicle charging station",
   "homepage": "https://github.com/sap-labs-france/ev-dashboard",
-  "version": "2.4.78",
+  "version": "2.4.79",
   "engines": {
     "npm": "6.x.x."
   },
diff --git a/src/app/release-notes/release-notes.component.ts b/src/app/release-notes/release-notes.component.ts
index bcfc85d712..f4ca5fc8e9 100644
--- a/src/app/release-notes/release-notes.component.ts
+++ b/src/app/release-notes/release-notes.component.ts
@@ -23,6 +23,19 @@ export class ReleaseNotesComponent {
 
   public buildReleaseNotes() {
     this.releaseNotes = [
+      {
+        version: '2.4.79',
+        date: new Date('2021-07-24'),
+        componentChanges: [
+          {
+            name: 'Dashboard',
+            changes: [
+              `Fixed Site Admin cannot see Statistics of his Users`,
+              `Fixed missing IDs in RESTful file documentation`,
+            ],
+          },
+        ],
+      },
       {
         version: '2.4.78',
         date: new Date('2021-07-20'),

From 333520a4e094e38b938478fe72b091bc00feec69 Mon Sep 17 00:00:00 2001
From: LucasBrazi06 <sergefabiano@free.fr>
Date: Sat, 24 Jul 2021 08:50:05 +0200
Subject: [PATCH 07/14] Updated release notes

---
 src/app/release-notes/release-notes.component.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/app/release-notes/release-notes.component.ts b/src/app/release-notes/release-notes.component.ts
index f4ca5fc8e9..ee6d708fd4 100644
--- a/src/app/release-notes/release-notes.component.ts
+++ b/src/app/release-notes/release-notes.component.ts
@@ -32,6 +32,7 @@ export class ReleaseNotesComponent {
             changes: [
               `Fixed Site Admin cannot see Statistics of his Users`,
               `Fixed missing IDs in RESTful file documentation`,
+              `Lacroix / Linky Asset integration`,
             ],
           },
         ],

From 1c8dd9e224ac178b4ee2091eb7cbdde3743377ec Mon Sep 17 00:00:00 2001
From: LucasBrazi06 <sergefabiano@free.fr>
Date: Sat, 24 Jul 2021 15:35:26 +0200
Subject: [PATCH 08/14] Updated release notes

---
 src/app/release-notes/release-notes.component.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/app/release-notes/release-notes.component.ts b/src/app/release-notes/release-notes.component.ts
index ee6d708fd4..b82cfe6431 100644
--- a/src/app/release-notes/release-notes.component.ts
+++ b/src/app/release-notes/release-notes.component.ts
@@ -33,6 +33,7 @@ export class ReleaseNotesComponent {
               `Fixed Site Admin cannot see Statistics of his Users`,
               `Fixed missing IDs in RESTful file documentation`,
               `Lacroix / Linky Asset integration`,
+              `Set OCPI opening hours at SLF Caen`,
             ],
           },
         ],

From 21ae49509d8dadadd5012d482ca568f640e67f93 Mon Sep 17 00:00:00 2001
From: LucasBrazi06 <sergefabiano@free.fr>
Date: Sat, 24 Jul 2021 15:54:45 +0200
Subject: [PATCH 09/14] Updated reelase notes

---
 src/app/release-notes/release-notes.component.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/release-notes/release-notes.component.ts b/src/app/release-notes/release-notes.component.ts
index b82cfe6431..23469a546d 100644
--- a/src/app/release-notes/release-notes.component.ts
+++ b/src/app/release-notes/release-notes.component.ts
@@ -33,7 +33,7 @@ export class ReleaseNotesComponent {
               `Fixed Site Admin cannot see Statistics of his Users`,
               `Fixed missing IDs in RESTful file documentation`,
               `Lacroix / Linky Asset integration`,
-              `Set OCPI opening hours at SLF Caen`,
+              `Set OCPI Opening Hours and Tariff ID for SLF Caen`,
             ],
           },
         ],

From 1c394ee2fb826b17a4a8a3105618c9e14830bf9b Mon Sep 17 00:00:00 2001
From: LucasBrazi06 <sergefabiano@free.fr>
Date: Sat, 24 Jul 2021 17:20:21 +0200
Subject: [PATCH 10/14] Updated release notes

---
 src/app/release-notes/release-notes.component.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/app/release-notes/release-notes.component.ts b/src/app/release-notes/release-notes.component.ts
index 23469a546d..fc9a6663e0 100644
--- a/src/app/release-notes/release-notes.component.ts
+++ b/src/app/release-notes/release-notes.component.ts
@@ -33,6 +33,7 @@ export class ReleaseNotesComponent {
               `Fixed Site Admin cannot see Statistics of his Users`,
               `Fixed missing IDs in RESTful file documentation`,
               `Lacroix / Linky Asset integration`,
+              `Check Charging Station Registration Token at Web Socket connection and refuse it if not valid`,
               `Set OCPI Opening Hours and Tariff ID for SLF Caen`,
             ],
           },

From c1d22b61b3be0d281c5302c0539dd440b0472d9e Mon Sep 17 00:00:00 2001
From: LucasBrazi06 <sergefabiano@free.fr>
Date: Mon, 26 Jul 2021 09:35:08 +0200
Subject: [PATCH 11/14] Updated sub-modules

---
 src/assets/configs-aws | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/assets/configs-aws b/src/assets/configs-aws
index c643cc20d9..d60f6b08be 160000
--- a/src/assets/configs-aws
+++ b/src/assets/configs-aws
@@ -1 +1 @@
-Subproject commit c643cc20d9f0e21f50ecc9e396373e00c686ed83
+Subproject commit d60f6b08be5421586c6bdb6ddfebd2b8def91bc5

From 7eff044b1348d4bca10978d31597a11aa62c22d6 Mon Sep 17 00:00:00 2001
From: LucasBrazi06 <sergefabiano@free.fr>
Date: Mon, 26 Jul 2021 10:07:14 +0200
Subject: [PATCH 12/14] Updated the release notes

---
 src/app/release-notes/release-notes.component.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/app/release-notes/release-notes.component.ts b/src/app/release-notes/release-notes.component.ts
index fc9a6663e0..68ba216f6f 100644
--- a/src/app/release-notes/release-notes.component.ts
+++ b/src/app/release-notes/release-notes.component.ts
@@ -25,7 +25,7 @@ export class ReleaseNotesComponent {
     this.releaseNotes = [
       {
         version: '2.4.79',
-        date: new Date('2021-07-24'),
+        date: new Date('2021-07-26'),
         componentChanges: [
           {
             name: 'Dashboard',
@@ -35,6 +35,7 @@ export class ReleaseNotesComponent {
               `Lacroix / Linky Asset integration`,
               `Check Charging Station Registration Token at Web Socket connection and refuse it if not valid`,
               `Set OCPI Opening Hours and Tariff ID for SLF Caen`,
+              `Set the OCPP heartbeat to 60 secs in OCPP 1.6-J`,
             ],
           },
         ],

From 974b48c70d95fefd17f9c5238e2bf9c099bf496e Mon Sep 17 00:00:00 2001
From: LucasBrazi06 <sergefabiano@free.fr>
Date: Mon, 26 Jul 2021 10:43:41 +0200
Subject: [PATCH 13/14] Fixed CSS

---
 ...ons-registration-token-status.component.ts |  2 +-
 .../log-level-formatter.component.ts          |  2 +-
 ...ailure-evses-status-formatter.component.ts |  2 +-
 ...uccess-evses-status-formatter.component.ts |  2 +-
 ...-total-evses-status-formatter.component.ts |  2 +-
 ...ailure-evses-status-formatter.component.ts |  2 +-
 ...uccess-evses-status-formatter.component.ts |  2 +-
 ...-total-evses-status-formatter.component.ts |  2 +-
 .../user-status-formatter.component.ts        |  2 +-
 ..._settings-ocpi-endpoints-source-table.scss | 21 -------------------
 10 files changed, 9 insertions(+), 30 deletions(-)

diff --git a/src/app/pages/charging-stations/registration-tokens/registration-token/charging-stations-registration-token-status.component.ts b/src/app/pages/charging-stations/registration-tokens/registration-token/charging-stations-registration-token-status.component.ts
index 4443c63c62..de7bce08fb 100644
--- a/src/app/pages/charging-stations/registration-tokens/registration-token/charging-stations-registration-token-status.component.ts
+++ b/src/app/pages/charging-stations/registration-tokens/registration-token/charging-stations-registration-token-status.component.ts
@@ -31,7 +31,7 @@ export class AppRegistrationTokenStatusPipe implements PipeTransform {
   }
 
   public buildStatusClasses(registrationToken: RegistrationToken): string {
-    let classNames = 'chip-width-5em ';
+    let classNames = 'chip-width-8em ';
     if (this.isExpired(registrationToken)) {
       classNames += ChipType.DANGER;
     } else if (this.isRevoked(registrationToken)) {
diff --git a/src/app/pages/logs/formatters/log-level-formatter.component.ts b/src/app/pages/logs/formatters/log-level-formatter.component.ts
index f20d9a3683..eb1bbc886e 100644
--- a/src/app/pages/logs/formatters/log-level-formatter.component.ts
+++ b/src/app/pages/logs/formatters/log-level-formatter.component.ts
@@ -31,7 +31,7 @@ export class AppFormatLogLevelPipe implements PipeTransform {
   }
 
   public buildLogLevelClasses(logLevel: string): string {
-    let classNames = 'chip-width-5em ';
+    let classNames = 'chip-width-8em ';
     switch (logLevel) {
       case 'E':
         classNames += ChipType.DANGER;
diff --git a/src/app/pages/settings-integration/ocpi/endpoints/formatters/ocpi-detail-failure-evses-status-formatter.component.ts b/src/app/pages/settings-integration/ocpi/endpoints/formatters/ocpi-detail-failure-evses-status-formatter.component.ts
index c35aa1c896..a6075a2c4a 100644
--- a/src/app/pages/settings-integration/ocpi/endpoints/formatters/ocpi-detail-failure-evses-status-formatter.component.ts
+++ b/src/app/pages/settings-integration/ocpi/endpoints/formatters/ocpi-detail-failure-evses-status-formatter.component.ts
@@ -21,7 +21,7 @@ export class OcpiDetailFailureEvsesStatusFormatterComponent extends CellContentT
 export class AppFormatOcpiEvsesFailurePipe implements PipeTransform {
   public transform(failureNbr: number, type: string): string {
     if (type === 'class') {
-      let classNames = 'chip-width-4em ';
+      let classNames = 'chip-width-5em ';
       if (failureNbr > 0) {
         classNames += ChipType.DANGER;
       } else {
diff --git a/src/app/pages/settings-integration/ocpi/endpoints/formatters/ocpi-detail-success-evses-status-formatter.component.ts b/src/app/pages/settings-integration/ocpi/endpoints/formatters/ocpi-detail-success-evses-status-formatter.component.ts
index d362bcaa46..c649bcdb42 100644
--- a/src/app/pages/settings-integration/ocpi/endpoints/formatters/ocpi-detail-success-evses-status-formatter.component.ts
+++ b/src/app/pages/settings-integration/ocpi/endpoints/formatters/ocpi-detail-success-evses-status-formatter.component.ts
@@ -6,7 +6,7 @@ import { OcpiEndpointDetail } from '../../../../../types/ocpi/OCPIEndpoint';
 @Component({
   template: `
     <mat-chip-list [selectable]="false">
-      <mat-chip ngClass="chip-width-4em chip-success" [disabled]="true">
+      <mat-chip ngClass="chip-width-5em chip-success" [disabled]="true">
         {{row.successNbr}}
       </mat-chip>
     </mat-chip-list>
diff --git a/src/app/pages/settings-integration/ocpi/endpoints/formatters/ocpi-detail-total-evses-status-formatter.component.ts b/src/app/pages/settings-integration/ocpi/endpoints/formatters/ocpi-detail-total-evses-status-formatter.component.ts
index e3bf0cd975..db7f2a1bbe 100644
--- a/src/app/pages/settings-integration/ocpi/endpoints/formatters/ocpi-detail-total-evses-status-formatter.component.ts
+++ b/src/app/pages/settings-integration/ocpi/endpoints/formatters/ocpi-detail-total-evses-status-formatter.component.ts
@@ -21,7 +21,7 @@ export class OcpiDetailTotalEvsesStatusFormatterComponent extends CellContentTem
 export class AppFormatOcpiEvsesTotalPipe implements PipeTransform {
   public transform(totalNbr: number, type: string): string {
     if (type === 'class') {
-      let classNames = 'chip-width-4em ';
+      let classNames = 'chip-width-5em ';
       if (totalNbr > 0) {
         classNames += ChipType.INFO;
       } else {
diff --git a/src/app/pages/settings-integration/oicp/endpoints/formatters/oicp-detail-failure-evses-status-formatter.component.ts b/src/app/pages/settings-integration/oicp/endpoints/formatters/oicp-detail-failure-evses-status-formatter.component.ts
index 9fb7de5da7..edbbe1dc1f 100644
--- a/src/app/pages/settings-integration/oicp/endpoints/formatters/oicp-detail-failure-evses-status-formatter.component.ts
+++ b/src/app/pages/settings-integration/oicp/endpoints/formatters/oicp-detail-failure-evses-status-formatter.component.ts
@@ -21,7 +21,7 @@ export class OicpDetailFailureEvsesStatusFormatterComponent extends CellContentT
 export class AppFormatOicpEvsesFailurePipe implements PipeTransform {
   public transform(failureNbr: number, type: string): string {
     if (type === 'class') {
-      let classNames = 'chip-width-4em ';
+      let classNames = 'chip-width-5em ';
       if (failureNbr > 0) {
         classNames += ChipType.DANGER;
       } else {
diff --git a/src/app/pages/settings-integration/oicp/endpoints/formatters/oicp-detail-success-evses-status-formatter.component.ts b/src/app/pages/settings-integration/oicp/endpoints/formatters/oicp-detail-success-evses-status-formatter.component.ts
index d19ce39546..484e673070 100644
--- a/src/app/pages/settings-integration/oicp/endpoints/formatters/oicp-detail-success-evses-status-formatter.component.ts
+++ b/src/app/pages/settings-integration/oicp/endpoints/formatters/oicp-detail-success-evses-status-formatter.component.ts
@@ -6,7 +6,7 @@ import { OicpEndpointDetail } from '../../../../../types/oicp/OICPEndpoint';
 @Component({
   template: `
     <mat-chip-list [selectable]="false">
-      <mat-chip ngClass="chip-width-4em chip-success" [disabled]="true">
+      <mat-chip ngClass="chip-width-5em chip-success" [disabled]="true">
         {{row.successNbr}}
       </mat-chip>
     </mat-chip-list>
diff --git a/src/app/pages/settings-integration/oicp/endpoints/formatters/oicp-detail-total-evses-status-formatter.component.ts b/src/app/pages/settings-integration/oicp/endpoints/formatters/oicp-detail-total-evses-status-formatter.component.ts
index 539581d5a0..00164f0ccd 100644
--- a/src/app/pages/settings-integration/oicp/endpoints/formatters/oicp-detail-total-evses-status-formatter.component.ts
+++ b/src/app/pages/settings-integration/oicp/endpoints/formatters/oicp-detail-total-evses-status-formatter.component.ts
@@ -21,7 +21,7 @@ export class OicpDetailTotalEvsesStatusFormatterComponent extends CellContentTem
 export class AppFormatOicpEvsesTotalPipe implements PipeTransform {
   public transform(totalNbr: number, type: string): string {
     if (type === 'class') {
-      let classNames = 'chip-width-4em ';
+      let classNames = 'chip-width-5em ';
       if (totalNbr > 0) {
         classNames += ChipType.INFO;
       } else {
diff --git a/src/app/pages/users/formatters/user-status-formatter.component.ts b/src/app/pages/users/formatters/user-status-formatter.component.ts
index 2032a68045..640537d10f 100644
--- a/src/app/pages/users/formatters/user-status-formatter.component.ts
+++ b/src/app/pages/users/formatters/user-status-formatter.component.ts
@@ -32,7 +32,7 @@ export class AppFormatUserStatusPipe implements PipeTransform {
   }
 
   public buildUserStatusClasses(status: string): string {
-    let classNames = 'chip-width-5em ';
+    let classNames = 'chip-width-8em ';
     switch (status) {
       case UserStatus.ACTIVE:
         classNames += ChipType.SUCCESS;
diff --git a/src/assets/scss/views/settings/_settings-ocpi-endpoints-source-table.scss b/src/assets/scss/views/settings/_settings-ocpi-endpoints-source-table.scss
index 4606db79e7..6f8661b2a8 100644
--- a/src/assets/scss/views/settings/_settings-ocpi-endpoints-source-table.scss
+++ b/src/assets/scss/views/settings/_settings-ocpi-endpoints-source-table.scss
@@ -10,24 +10,3 @@
       justify-content: center;
     }
   }
-
-.chip-width-4em {
-  max-width: 4em;
-  min-width: 4em;
-}
-
-.chip-width-5em {
-  min-width: 4em;
-}
-
-.chip-width-8em {
-  min-width: 4em;
-}
-
-.chip-width-10em {
-  min-width: 10em!important
-}
-
-.chip-width-13em {
-  min-width: 13em !important;
-}

From c1f727a55fe359fd76a0aa19177fe1f1dbbd8fae Mon Sep 17 00:00:00 2001
From: LucasBrazi06 <sergefabiano@free.fr>
Date: Mon, 26 Jul 2021 21:48:52 +0200
Subject: [PATCH 14/14] Updated release notes

---
 src/app/release-notes/release-notes.component.ts | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/app/release-notes/release-notes.component.ts b/src/app/release-notes/release-notes.component.ts
index 68ba216f6f..b4854a18e5 100644
--- a/src/app/release-notes/release-notes.component.ts
+++ b/src/app/release-notes/release-notes.component.ts
@@ -36,6 +36,11 @@ export class ReleaseNotesComponent {
               `Check Charging Station Registration Token at Web Socket connection and refuse it if not valid`,
               `Set OCPI Opening Hours and Tariff ID for SLF Caen`,
               `Set the OCPP heartbeat to 60 secs in OCPP 1.6-J`,
+              `Stop OCPI Transaction if receiving OCPP Meter Values with unknown Transaction ID`,
+              `Do not create a Transaction before checking Roaming Authorization`,
+              `Request OCPI Authorization Token also in OCPP Start Transaction in addition to OCPP Authorize`,
+              `Restrain OCPI Remote Authorization Token validity from 10 mins to 2 mins`
+
             ],
           },
         ],