Mise à jour de l'architecture du module EP

src/app/ep/ep-signes/ep-signes.component.html

@@ -0,0 +1,3 @@
+<app-nav-menu></app-nav-menu>
+<h1>Liste des EP collaborateurs signés</h1>
+<ep-table [typeRechercheEP]="typeRechercheEP" [displayedColumns]="displayedColumns" (eventEmitter)="eventEmitter($event)"></ep-table>

src/app/ep/ep-signes/ep-signes.component.ts

@@ -0,0 +1,35 @@
+import { Component } from '@angular/core';
+import { Router } from '@angular/router';
+import { epTypeRecherche } from '@shared/utils/cles';
+
+/**
+  * Composant qui permet la consultation de la liste des EP signés collaborateur
+  */
+@Component({
+  selector: 'app-ep-signes',
+  templateUrl: './ep-signes.component.html'
+})
+export class EpSignesComponent {
+  displayedColumns: string[] = ["agence", "collaborateur", "referent", "datearrivee", "statutep", "typeep", "dateentretien", "consultation"];
+  
+  typeRechercheEP : string = epTypeRecherche.EPSignes;
+
+  constructor(private router: Router){}
+
+
+  eventEmitter(event: any) {
+    switch(event.type) {
+      case "collaborateur":
+        if(event.ep.collaborateur != undefined)
+          this.router.navigate(["/collaborateurs", event.ep.collaborateur.id])
+        break;
+      case "referent":
+        if(event.ep.referent != undefined)
+          this.router.navigate(["/referents", event.ep.referent.id])
+        break;
+      case "ep":
+        this.router.navigate(["/ep", event.ep.id]);
+        break;
+    }
+  }
+}

src/app/ep/ep.component.html

@@ -1,3 +1 @@
 <app-nav-menu></app-nav-menu>
-<h1>Liste des EP collaborateurs</h1>
-<ep-table [typeRechercheEP]="typeRechercheEP" [displayedColumns]="displayedColumns" (eventEmitter)="eventEmitter($event)"></ep-table>

src/app/ep/ep.component.ts

@@ -1,35 +1,11 @@
 import { Component } from '@angular/core';
-import { Router } from '@angular/router';
-import { epTypeRecherche } from '@shared/utils/cles';
 
-/**
+
-  * Composant qui permet la consultation d'un EP
-  */
 @Component({
   selector: 'app-ep',
   templateUrl: './ep.component.html'
 })
 export class EpComponent {
-  displayedColumns: string[] = ["agence", "collaborateur", "referent", "datearrivee", "statutep", "typeep", "dateentretien", "consultation"];
-  
-  typeRechercheEP : string = epTypeRecherche.EPSignes;
-
-  constructor(private router: Router){}
   
-
+  constructor(){}
-  eventEmitter(event: any) {
-    switch(event.type) {
-      case "collaborateur":
-        if(event.ep.collaborateur != undefined)
-          this.router.navigate(["/collaborateurs", event.ep.collaborateur.id])
-        break;
-      case "referent":
-        if(event.ep.referent != undefined)
-          this.router.navigate(["/referents", event.ep.referent.id])
-        break;
-      case "ep":
-        this.router.navigate(["/ep", event.ep.id]);
-        break;
-    }
-  }
 }

src/app/ep/ep.module.ts

@@ -8,33 +8,17 @@ import { MaterialModule } from "@shared/angular-material/angular-material.module
 import {NavMenuModule} from '@shared/nav-menu/nav-menu.module';
 
 import { EpComponent } from './ep.component';
-import { EpAugmentationSalaireComponent } from "./ep-augmentation-salaire/ep-augmentation-salaire.component";
-import { EpChoixDateComponent } from "./ep-choix-date/ep-choix-date.component";
-import { EpDemandeDelegationComponent } from "./ep-demande-delegation/ep-demande-delegation.component";
-import { EpDemandesFormationComponent } from "./ep-demandes-formation/ep-demandes-formation.component";
-import { EpPropositionsDatesComponent } from "./ep-propositions-dates/ep-propositions-dates.component";
-import { EpParticipantsComponent } from "./ep-participants/ep-participants.component";
-import { NewParticipantComponent } from "./ep-participants/new-participant/new-participant.component";
-import { EpConsultationComponent } from "./ep-consultation/ep-consultation.component";
-import { EpSignatureComponent } from "./ep-signature/ep-signature.component";
-import { EpaComponent } from "./epa/epa.component";
-import { EpaSixAnsComponent } from "./epa-six-ans/epa-six-ans.component";
-import { EpsComponent } from "./eps/eps.component";
-import { EpCommentaireAssistantComponent } from "./ep-commentaire-assistant/ep-commentaire-assistant.component";
-import { EpCommentaireReferentComponent } from "./ep-commentaire-referent/ep-commentaire-referent.component";
 
 import { EpRoutingModule } from './ep.routing.module';
 import { MatTablesModule } from "@shared/mat-tables/mat-tables.module";
+import { EpSignesComponent } from "./ep-signes/ep-signes.component";
 
 /**
   * Module de l'ep
   */
 @NgModule({
-  declarations: [EpComponent, EpAugmentationSalaireComponent, EpChoixDateComponent,
+  declarations: [
-    EpDemandeDelegationComponent, EpDemandesFormationComponent, EpParticipantsComponent,
+    EpComponent, EpSignesComponent
-    EpPropositionsDatesComponent, NewParticipantComponent, EpConsultationComponent,
-    EpSignatureComponent, EpaComponent, EpaSixAnsComponent, EpsComponent,
-    EpCommentaireAssistantComponent, EpCommentaireReferentComponent
   ],
   exports: [EpComponent
   ],

src/app/ep/ep.routing.module.ts

@@ -3,55 +3,22 @@ import { Routes, RouterModule } from '@angular/router';
 
 
 import { EpComponent } from "./ep.component";
-import { EpAugmentationSalaireComponent } from "./ep-augmentation-salaire/ep-augmentation-salaire.component";
-import { EpChoixDateComponent } from "./ep-choix-date/ep-choix-date.component";
-import { EpConsultationComponent } from './ep-consultation/ep-consultation.component';
-import { EpDemandeDelegationComponent } from "./ep-demande-delegation/ep-demande-delegation.component";
-import { EpDemandesFormationComponent } from "./ep-demandes-formation/ep-demandes-formation.component";
-import { EpParticipantsComponent } from "./ep-participants/ep-participants.component";
-import { EpPropositionsDatesComponent } from "./ep-propositions-dates/ep-propositions-dates.component";
-import { EpSignatureComponent } from "./ep-signature/ep-signature.component";
-import { EpaComponent } from "./epa/epa.component";
-import { EpaSixAnsComponent } from "./epa-six-ans/epa-six-ans.component";
-import { EpsComponent } from "./eps/eps.component";
-import { EpCommentaireAssistantComponent } from "./ep-commentaire-assistant/ep-commentaire-assistant.component";
-import { EpCommentaireReferentComponent } from "./ep-commentaire-referent/ep-commentaire-referent.component";
-import { NewParticipantComponent } from "./ep-participants/new-participant/new-participant.component";
 
 import { AuthGuard } from '@shared/auth/auth.guard';
 import { paths_ep } from "@shared/utils/paths";
+import { EpSignesComponent } from './ep-signes/ep-signes.component';
 
 /**
   * Routes du module ep
   */
 const routes: Routes = [
-  {
+  { path: paths_ep.signes,
-    path:'',
+    component: EpSignesComponent,
-    component: EpComponent,
     canActivate: [AuthGuard]
   },
   {
-    path:paths_ep.consultation,
+    path:'',
-    component: EpConsultationComponent,
+    component: EpComponent,
-    canActivate: [AuthGuard],
-    children: [
-      {path:paths_ep.salaire, component: EpAugmentationSalaireComponent, canActivate: [AuthGuard]},
-      {path:paths_ep.choixdate, component: EpChoixDateComponent, canActivate: [AuthGuard]},
-      {path:paths_ep.demandedelegation, component: EpDemandeDelegationComponent, canActivate: [AuthGuard]},
-      {path:paths_ep.demandesformation, component: EpDemandesFormationComponent, canActivate: [AuthGuard]},
-      {path:paths_ep.participants, component: EpParticipantsComponent, canActivate: [AuthGuard]},
-      {path:paths_ep.propositionsdates, component: EpPropositionsDatesComponent, canActivate: [AuthGuard]},
-      {path:paths_ep.signature, component: EpSignatureComponent, canActivate: [AuthGuard]},
-      {path:paths_ep.epa, component: EpaComponent, canActivate: [AuthGuard]},
-      {path:paths_ep.eps, component: EpsComponent, canActivate: [AuthGuard]},
-      {path:paths_ep.epa6ans, component: EpaSixAnsComponent, canActivate: [AuthGuard]},
-      {path:paths_ep.assistant, component: EpCommentaireAssistantComponent, canActivate: [AuthGuard]},
-      {path:paths_ep.referent, component: EpCommentaireReferentComponent, canActivate: [AuthGuard]}
-    ]
-  },
-  {
-    path:paths_ep.newparticipant,
-    component: NewParticipantComponent,
     canActivate: [AuthGuard]
   },
 ];

src/app/shared/nav-menu/nav-menu-assistante/nav-menu-assistante.component.html

@@ -1,4 +1,4 @@
-<button mat-button routerLink="/ep">Liste des EP signés</button>
+<button mat-button routerLink="/ep/signes">Liste des EP signés</button>
 <button mat-button routerLink="/collaborateurs" routerLinkActive>Liste des collaborateurs</button>
 
 <button mat-button [matMenuTriggerFor]="menuReferents">

src/app/shared/utils/paths.ts

@@ -35,22 +35,8 @@ const paths_demandes_formation = {
 const paths_ep = {
   base: "/ep",
   path: "ep",
-  salaire: "augmentationsalaire",
-  choixdate: "choixdate",
-  demandedelegation: "demandedelegation",
-  demandesformation: "demandesformation",
-  propositionsdates: "propositiondate",
-  participants: "participants",
-  commentaireAssistante: "commentaireassistante",
-  commentaireReferent: "commentairereferent",
-  signature: "signature",
-  epa: "epa",
-  eps: "eps",
-  epa6ans: "epasixans",
-  assistant: "commentaireassistant",
-  referent: "commentairereferent",
   consultation: ":id",
-  newparticipant: "ajoutparticipant"
+  signes: "signes"
 };
 
 /**