From 707f528c7619ae75b94c43753c51b12a81f9e439 Mon Sep 17 00:00:00 2001 From: Vincent BENOIT Date: Tue, 3 Jan 2023 11:30:14 +0100 Subject: [PATCH] =?UTF-8?q?recuperation=20de=20la=20date=20et=20l'heure=20?= =?UTF-8?q?du=20syst=C3=A8me?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../home/workspace/infos/infos.component.html | 3 ++- .../home/workspace/infos/infos.component.ts | 19 ++++++++++++++++--- src/app/models/datetime.model.ts | 3 +++ src/app/services/backend/backend.service.ts | 12 ++++++++++++ 4 files changed, 33 insertions(+), 4 deletions(-) create mode 100644 src/app/models/datetime.model.ts diff --git a/src/app/components/home/workspace/infos/infos.component.html b/src/app/components/home/workspace/infos/infos.component.html index ce2f19a..256aacc 100644 --- a/src/app/components/home/workspace/infos/infos.component.html +++ b/src/app/components/home/workspace/infos/infos.component.html @@ -10,7 +10,8 @@
Date: -
{{today | date:'dd/MM/yyyy HH:mm:ss'}}
+ +
{{dateStr}}
Horloge matérielle: diff --git a/src/app/components/home/workspace/infos/infos.component.ts b/src/app/components/home/workspace/infos/infos.component.ts index b48bddf..efce719 100644 --- a/src/app/components/home/workspace/infos/infos.component.ts +++ b/src/app/components/home/workspace/infos/infos.component.ts @@ -4,6 +4,7 @@ import { MatDialog } from '@angular/material/dialog'; import { ConfirmComponent } from '../../../dialog/confirm/confirm.component'; import { BackendService } from '../../../../services/backend/backend.service'; import { Info } from '../../../../models/info.model'; +import { Datetime } from '../../../../models/datetime.model'; import { ToastrService } from 'ngx-toastr'; @Component({ @@ -20,7 +21,8 @@ export class InfosComponent implements OnInit { isProcessing:boolean = true; isAlive:boolean = false; RTCisAlive:boolean = false; - today:number = Date.now(); + today:number; + dateStr:string; constructor( private bs:BackendService, private router:Router, @@ -29,8 +31,19 @@ export class InfosComponent implements OnInit { ngOnInit(): void { setInterval(() => { - this.today = Date.now(); - }, 1000); + this.bs.retreiveDatetime().subscribe( + (data:Datetime) => { + this.dateStr = data.today; + console.log("=> retreive today: {}", this.today); + }, err => { + if(err.status == 401) { + this.router.navigateByUrl("/login"); + } else { + this.toast.error(err.error.description); + } + } + ); + }, 60000); this.bs.retreiveInfos().subscribe( (data:Info) => { diff --git a/src/app/models/datetime.model.ts b/src/app/models/datetime.model.ts new file mode 100644 index 0000000..5c6b244 --- /dev/null +++ b/src/app/models/datetime.model.ts @@ -0,0 +1,3 @@ +export interface Datetime { + today:string; +} diff --git a/src/app/services/backend/backend.service.ts b/src/app/services/backend/backend.service.ts index 79fa8e9..76f5593 100644 --- a/src/app/services/backend/backend.service.ts +++ b/src/app/services/backend/backend.service.ts @@ -5,6 +5,7 @@ import { environment } from '../../../environments/environment'; import { Utilisateur } from '../../models/utilisateur.model'; import { Parameters } from '../../models/parameters.model'; import { Scheduler } from '../../models/scheduler.model'; +import { Datetime } from '../../models/datetime.model'; import { Log } from '../../models/log.model'; import { Info } from '../../models/info.model'; @@ -205,4 +206,15 @@ export class BackendService { }; return this.http.get(host+"/api/configurateur/rtc_alive", options); } + + retreiveDatetime():Observable { + let host=environment.host; + const options = { + headers: new HttpHeaders({ + 'Content-Type' : 'application/json', + }), + withCredentials: true + }; + return this.http.get(host+"/api/configurateur/datetime", options); + } }