diff --git a/package-lock.json b/package-lock.json index 0ccaf2d..eb697d7 100644 --- a/package-lock.json +++ b/package-lock.json @@ -200,6 +200,14 @@ } } }, + "@angular-material-components/datetime-picker": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/@angular-material-components/datetime-picker/-/datetime-picker-2.0.4.tgz", + "integrity": "sha512-3nXGFz7GXbFYeBI2/72rcmPFTWtcC1ERlgdkaY+65dFHXPIc8hKGv6o+JbtCoYPg7xmVCCy4xhmOgfd/CFGyOw==", + "requires": { + "tslib": "^1.9.0" + } + }, "@angular/animations": { "version": "9.1.9", "resolved": "https://registry.npmjs.org/@angular/animations/-/animations-9.1.9.tgz", @@ -4872,9 +4880,9 @@ "dev": true }, "elliptic": { - "version": "6.5.2", - "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.2.tgz", - "integrity": "sha512-f4x70okzZbIQl/NSRLkI/+tteV/9WqL98zx+SQ69KbXxmVrmjwsNUPn/gYJJ0sHvEak24cZgHIPegRePAtA/xw==", + "version": "6.5.3", + "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.3.tgz", + "integrity": "sha512-IMqzv5wNQf+E6aHeIqATs0tOLeOTwj1QKbRcS3jBbYkl5oLAserA8yJTT7/VyHUYG91PRmPyeQDObKLPpeS4dw==", "dev": true, "requires": { "bn.js": "^4.4.0", diff --git a/package.json b/package.json index cdb8ca2..943d64e 100644 --- a/package.json +++ b/package.json @@ -12,6 +12,7 @@ }, "private": true, "dependencies": { + "@angular-material-components/datetime-picker": "^2.0.4", "@angular/animations": "~9.1.9", "@angular/cdk": "^9.2.4", "@angular/common": "~9.1.9", diff --git a/src/app/app.module.ts b/src/app/app.module.ts index 5ee2fd8..01b8275 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -2,11 +2,11 @@ import { BrowserModule } from '@angular/platform-browser'; import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; import { NgModule, DoBootstrap } from '@angular/core'; import { HttpClientModule } from '@angular/common/http'; -import { FormsModule } from '@angular/forms'; import { KeycloakAngularModule, KeycloakService } from 'keycloak-angular'; import { RouterModule } from '@angular/router'; import { AppComponent } from './app.component'; + import { AppRoutingModule } from './app-routing.module'; import { ApiModule } from '@shared/api-swagger' @@ -33,20 +33,13 @@ let keycloakService: KeycloakService = new KeycloakService(); AppComponent ], imports: [ - BrowserModule, - BrowserAnimationsModule, - KeycloakAngularModule, - AppRoutingModule, - HttpClientModule, - ApiModule, - HomeModule, - CollaborateursModule, - ReferentsModule, - FormationsModule, - DemandesFormationModule, - DemandesDelegationModule, + BrowserModule, BrowserAnimationsModule, + KeycloakAngularModule, AppRoutingModule, + HttpClientModule, ApiModule, + HomeModule, CollaborateursModule, + ReferentsModule, FormationsModule, + DemandesFormationModule, DemandesDelegationModule, EpSaisieModule - ], providers: [ { diff --git a/src/app/formations/details-formation/formation.component.html b/src/app/formations/details-formation/formation.component.html index 2fe0f24..7363ee2 100644 --- a/src/app/formations/details-formation/formation.component.html +++ b/src/app/formations/details-formation/formation.component.html @@ -6,13 +6,18 @@
Etat : {{getStatut(formation.statut)}}
-{{dateTexte}} {{formation.dateDebut | date:"dd/MM/yyyy"}}
+{{dateTexte}} {{formation.dateDebut | date:'dd/MM/yyyy à hh:mm'}}
Origine : {{formation.origine}}
Organisme : {{ formation.organisme}}
Mode formation : {{ formation.mode}}
Type formation : {{ formation.type}}
-