From 05a51f0a125d6e32b688dc80e41fc6446c475910 Mon Sep 17 00:00:00 2001
From: Vincent BENOIT <vincent.benoit@benserv.fr>
Date: Mon, 2 Jan 2023 19:16:48 +0100
Subject: [PATCH] correction de bugs pour l'affichage ou la maj de la date et
 heure

---
 .../home/workspace/datetime/datetime.component.ts           | 6 +++---
 .../components/home/workspace/infos/infos.component.html    | 2 +-
 src/app/components/home/workspace/infos/infos.component.ts  | 1 +
 src/app/services/backend/backend.service.ts                 | 2 +-
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/app/components/home/workspace/datetime/datetime.component.ts b/src/app/components/home/workspace/datetime/datetime.component.ts
index 99c227e..18608ae 100644
--- a/src/app/components/home/workspace/datetime/datetime.component.ts
+++ b/src/app/components/home/workspace/datetime/datetime.component.ts
@@ -37,7 +37,7 @@ export class DatetimeComponent implements OnInit {
 
 	dateChanged(event:MatDatepickerInputEvent<Date>): void {
 		var date = moment(event.value);
-		this.date = date.format("DD/MM/YYYY").toString();
+		this.date = date.format("YYYY-MM-DD").toString();
 		if(this.time && this.date) {
 			this.isDisabled = false;
 		}
@@ -61,9 +61,9 @@ export class DatetimeComponent implements OnInit {
 
 	onUpdate(): void {
 		this.setTimeoutDisabledButton(5);
-		var newDateTime:string = this.date + " " + this.time;
+		var newDateTime:string = this.date + " " + this.time + ":00";
 		console.log("Nouvelle date et heure: ", newDateTime);
-		this.bs.updateDatetime(newDateTime).subscribe(
+		this.bs.updateDatetime({'datetime':newDateTime}).subscribe(
 			data => {
 				this.toast.success("Mise à jour de la date et heure réussie");
 			}, err => {
diff --git a/src/app/components/home/workspace/infos/infos.component.html b/src/app/components/home/workspace/infos/infos.component.html
index 9cef14c..ce2f19a 100644
--- a/src/app/components/home/workspace/infos/infos.component.html
+++ b/src/app/components/home/workspace/infos/infos.component.html
@@ -13,7 +13,7 @@
 				<div style="display: grid; align-items: center;">{{today | date:'dd/MM/yyyy HH:mm:ss'}}</div>
 			</div>
 			<div fxLayout="row" style="width:100%; margin-bottom: 0.25rem;">
-				<span fxFlex="50" style="display: grid; align-items: center;"><b>RTC:</b></span>
+				<span fxFlex="50" style="display: grid; align-items: center;"><b>Horloge matérielle:</b></span>
 				<div *ngIf="RTCisAlive" style="display: grid; align-items: center;"><mat-icon style="color: green;">check_circle</mat-icon></div>
 				<div *ngIf="!RTCisAlive" style="display: grid; align-items: center;"><mat-icon style="color: red;">cancel</mat-icon></div>
 			</div>
diff --git a/src/app/components/home/workspace/infos/infos.component.ts b/src/app/components/home/workspace/infos/infos.component.ts
index e4f9564..b48bddf 100644
--- a/src/app/components/home/workspace/infos/infos.component.ts
+++ b/src/app/components/home/workspace/infos/infos.component.ts
@@ -68,6 +68,7 @@ export class InfosComponent implements OnInit {
 						this.isAlive = data['alive'];
 						this.bs.RTCAlive().subscribe(
 							data => {
+								this.RTCisAlive = data['RTCalive'];
 								this.isProcessing = false;
 							}, err => {
 								if(err.status == 401) {
diff --git a/src/app/services/backend/backend.service.ts b/src/app/services/backend/backend.service.ts
index d02d395..79fa8e9 100644
--- a/src/app/services/backend/backend.service.ts
+++ b/src/app/services/backend/backend.service.ts
@@ -183,7 +183,7 @@ export class BackendService {
 		return this.http.post<any>(host+"/api/configurateur/shutdown", {}, options);
 	}
 
-	updateDatetime(val:string):Observable<any> {
+	updateDatetime(val:any):Observable<any> {
 		let host=environment.host;
 		const options = {
 			headers: new HttpHeaders({