From d6192d422f0324be3f9fba9730a1da2a78504a8e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Yana=C3=ABl=20GRETTE?= Date: Wed, 3 Mar 2021 10:07:31 +0100 Subject: [PATCH] =?UTF-8?q?D=C3=A9but=20mpl=C3=A9mentation=20visuelle=20de?= =?UTF-8?q?s=20d=C3=A9tails=20d'un=20EP?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ep/details-ep/details-ep.component.css | 4 + .../ep/details-ep/details-ep.component.html | 104 ++++++++++++++++++ src/app/ep/details-ep/details-ep.component.ts | 35 ++++++ src/app/ep/ep.module.ts | 7 +- src/app/ep/ep.routing.module.ts | 6 + 5 files changed, 153 insertions(+), 3 deletions(-) create mode 100644 src/app/ep/details-ep/details-ep.component.css diff --git a/src/app/ep/details-ep/details-ep.component.css b/src/app/ep/details-ep/details-ep.component.css new file mode 100644 index 0000000..bf89f1e --- /dev/null +++ b/src/app/ep/details-ep/details-ep.component.css @@ -0,0 +1,4 @@ +.saisie { + overflow-y: scroll; + height: 60%; +} \ No newline at end of file diff --git a/src/app/ep/details-ep/details-ep.component.html b/src/app/ep/details-ep/details-ep.component.html index e69de29..c90b58b 100644 --- a/src/app/ep/details-ep/details-ep.component.html +++ b/src/app/ep/details-ep/details-ep.component.html @@ -0,0 +1,104 @@ + +
+

Collaborateur : NOM PRENOM (AGENCE)

+

Référent : NOM PRENOM

+

Entretien le : dd/MM/yyyy

+

EPA

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Ajout et consultation des commentaires (pour les assistants) + + + + Le collaborateur choisi une date parmi la liste des dates proposés (collaborateur) + + + + Le référent propose trois dates d'entretien (référent) + + + Effectuer une demande de délégation (Assistant et référent) + + + Ajouter et enlever des participants (Assistants et référent) + + + +
+ + \ No newline at end of file diff --git a/src/app/ep/details-ep/details-ep.component.ts b/src/app/ep/details-ep/details-ep.component.ts index e69de29..4c0d0c9 100644 --- a/src/app/ep/details-ep/details-ep.component.ts +++ b/src/app/ep/details-ep/details-ep.component.ts @@ -0,0 +1,35 @@ +import { Component, OnInit } from "@angular/core"; +import { ActivatedRoute } from "@angular/router"; +import { EpDTO, EpService } from "@shared/api-swagger"; +import { AuthService } from "@shared/auth/auth.service"; +import { Role } from "@shared/utils/roles"; +import { Subscription } from "rxjs"; + +@Component({ + selector : "details-ep", + templateUrl: "./details-ep.component.html", + styleUrls: ["./details-ep.component.css"] +}) +export class DetailsEPComponent implements OnInit { + + epSubscription : Subscription; + + idEp: any; + + role : Role; + roleUtilisateur: string; + + ep : EpDTO; + constructor(private epService : EpService, private route : ActivatedRoute, private authService: AuthService) { + this.roleUtilisateur = authService.firstRole; + } + + ngOnInit() { + /* + this.idEp = this.route.snapshot.paramMap.get("id"); + this.epSubscription = this.epService.getEPById(this.idEp).subscribe( + ep => this.ep = ep, + err => console.log(err) + );*/ + } +} \ No newline at end of file diff --git a/src/app/ep/ep.module.ts b/src/app/ep/ep.module.ts index c464c44..a4badb6 100644 --- a/src/app/ep/ep.module.ts +++ b/src/app/ep/ep.module.ts @@ -12,15 +12,16 @@ import { EpComponent } from './ep.component'; import { EpRoutingModule } from './ep.routing.module'; import { MatTablesModule } from "@shared/mat-tables/mat-tables.module"; import { EpSignesComponent } from "./ep-signes/ep-signes.component"; +import { DetailsEPComponent } from "./details-ep/details-ep.component"; /** * Module de l'ep */ @NgModule({ declarations: [ - EpComponent, EpSignesComponent + EpComponent, EpSignesComponent, DetailsEPComponent ], - exports: [EpComponent + exports: [EpComponent, DetailsEPComponent ], imports: [ MaterialModule, @@ -28,7 +29,7 @@ import { EpSignesComponent } from "./ep-signes/ep-signes.component"; EpRoutingModule, RouterModule, MatTablesModule, - CommonModule + CommonModule, ], }) export class EpModule {} diff --git a/src/app/ep/ep.routing.module.ts b/src/app/ep/ep.routing.module.ts index 30a48eb..99e512a 100644 --- a/src/app/ep/ep.routing.module.ts +++ b/src/app/ep/ep.routing.module.ts @@ -7,6 +7,7 @@ import { EpComponent } from "./ep.component"; import { AuthGuard } from '@shared/auth/auth.guard'; import { paths_ep } from "@shared/utils/paths"; import { EpSignesComponent } from './ep-signes/ep-signes.component'; +import { DetailsEPComponent } from './details-ep/details-ep.component'; /** * Routes du module ep @@ -16,6 +17,11 @@ const routes: Routes = [ component: EpSignesComponent, canActivate: [AuthGuard] }, + { + path: paths_ep.consultation, + component: DetailsEPComponent, + canActivate: [AuthGuard] + }, { path:'', component: EpComponent,