Mise en place du routing dans les différents modules de l'application

src/app/app-routing.module.ts

@@ -2,10 +2,11 @@ import { NgModule } from '@angular/core';
 import { RouterModule } from '@angular/router';
 
 import { Routes } from '@angular/router';
-import { AppAuthGuard } from './app.authguard';
 
 import { HomeComponent } from './home/';
 
+import { KeycloakGuard } from '@shared/guards/keycloakguard';
+
 import { paths_collaborateurs, paths_demandes_delegation, paths_demandes_formation,
   paths_ep, paths_saisie_ep, paths_formation, paths_home, paths_referents } from '@shared/utils/paths';
 
@@ -18,7 +19,7 @@ const routes: Routes = [
   {
     path: paths_home.path,
     component: HomeComponent,
-    canActivate: [AppAuthGuard],
+    canActivate: [KeycloakGuard],
     pathMatch: 'full'
   },
   {
@@ -54,6 +55,6 @@ const routes: Routes = [
 @NgModule({
   imports: [RouterModule.forRoot(routes)],
   exports: [RouterModule],
-  providers: [AppAuthGuard]
+  providers: [KeycloakGuard]
 })
 export class AppRoutingModule {}

src/app/collaborateurs/collaborateurs.routing.module.ts

@@ -3,14 +3,22 @@ import { Routes, RouterModule } from '@angular/router';
 
 
 import { CollaborateursComponent } from "./collaborateurs.component";
+import { DetailsCollaborateurComponent } from "./details-collaborateur/details-collaborateur.component";
+import { FormationsCollaboateurComponent } from "./formations-collaborateur/formations-collaborateur.component";
+import { EvaluationComponent } from './formations-collaborateur/details-evaluation/evaluation.component';
+import { EditEvaluationComponent } from './formations-collaborateur/edit-evaluation/edit-evaluation.component';
+
+import { paths_collaborateurs } from '@shared/utils/paths';
+
+import { KeycloakGuard } from '@shared/guards/keycloakguard';
 
 
 const routes: Routes = [
-  {
+  { path:'', component: CollaborateursComponent, pathMatch: 'full', canActivate: [KeycloakGuard] },
-    path:'',
+  { path:paths_collaborateurs.get, component: DetailsCollaborateurComponent, canActivate: [KeycloakGuard] },
-    component: CollaborateursComponent,
+  { path:paths_collaborateurs.formations, component: FormationsCollaboateurComponent, canActivate: [KeycloakGuard] },
-    pathMatch: 'full'
+  { path:paths_collaborateurs.evaluation, component: EvaluationComponent, canActivate: [KeycloakGuard] },
-  }
+  { path:paths_collaborateurs.edit, component: EditEvaluationComponent, canActivate: [KeycloakGuard] }
 ];
 
 

src/app/collaborateurs/details-collaborateur/details-collaborateur.component.html

@@ -0,0 +1,2 @@
+<app-nav-menu></app-nav-menu>
+<h1>DETAILS COLLAB</h1>

src/app/collaborateurs/formations-collaborateur/details-evaluation/evaluation.component.html

@@ -0,0 +1,2 @@
+<app-nav-menu></app-nav-menu>
+<h1>Evaluation</h1>

src/app/collaborateurs/formations-collaborateur/edit-evaluation/edit-evaluation.component.html

@@ -0,0 +1,2 @@
+<app-nav-menu></app-nav-menu>
+<h1>Edit Evaluation</h1>

src/app/collaborateurs/formations-collaborateur/formations-collaborateur.component.html

@@ -0,0 +1,2 @@
+<app-nav-menu></app-nav-menu>
+<h1>FORMATIONS COLLAB</h1>

src/app/demandes-delegation/demandes-delegation.routing.module.ts

@@ -3,13 +3,23 @@ import { Routes, RouterModule } from '@angular/router';
 
 
 import { DemandesDelegationComponent } from "./demandes-delegation.component";
+import { DemandeDelegationComponent } from "./details-demande-delegation/demande-delegation.component";
 
+import { KeycloakGuard } from '@shared/guards/keycloakguard';
+
+import { paths_demandes_delegation } from "@shared/utils/paths";
 
 const routes: Routes = [
   {
     path:'',
     component: DemandesDelegationComponent,
-    pathMatch: 'full'
+    pathMatch: 'full',
+    canActivate: [KeycloakGuard]
+  },
+  {
+    path: paths_demandes_delegation.get,
+    component: DemandeDelegationComponent,
+    canActivate: [KeycloakGuard]
   }
 ];
 

src/app/demandes-delegation/details-demande-delegation/demande-delegation.component.html

@@ -0,0 +1,2 @@
+<app-nav-menu></app-nav-menu>
+<h1> Demande delegation </h1>

src/app/demandes-formation/demandes-formation.routing.module.ts

@@ -3,17 +3,19 @@ import { Routes, RouterModule } from '@angular/router';
 
 
 import { DemandesFormationComponent } from "./demandes-formation.component";
+import { DemandeFormationComponent } from "./details-demande-formation/demande-formation.component";
+import { NewDemandeFormationComponent } from "./new-demande-formation/new-demande-formation.component";
 
+import { KeycloakGuard } from '@shared/guards/keycloakguard';
+
+import { paths_demandes_formation } from "@shared/utils/paths";
 
 const routes: Routes = [
-  {
+  { path:'', component: DemandesFormationComponent, pathMatch: 'full', canActivate: [KeycloakGuard] },
-    path:'',
+  { path:paths_demandes_formation.get, component: DemandeFormationComponent, canActivate: [KeycloakGuard] },
-    component: DemandesFormationComponent,
+  { path:paths_demandes_formation.new, component: NewDemandeFormationComponent, canActivate: [KeycloakGuard] }
-    pathMatch: 'full'
-  }
 ];
 
-
 @NgModule({
   imports: [RouterModule.forChild(routes)],
   exports: [RouterModule]

src/app/demandes-formation/details-demande-formation/demande-formation.component.html

@@ -0,0 +1,2 @@
+<app-nav-menu></app-nav-menu>
+<h1> Une demande de formation </h1>

src/app/demandes-formation/new-demande-formation/new-demande-formation.component.html

@@ -0,0 +1,2 @@
+<app-nav-menu></app-nav-menu>
+<h1>  Nouvelle demande de formation </h1>

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

@@ -1,2 +1,5 @@
 <app-nav-menu></app-nav-menu>
-<h1>Saisie EP </h1>
+<h1>Saisie EP</h1>
+<h2>AU DESSUS</h2>
+<router-outlet></router-outlet>
+<h2>EN DESSOUS</h2>

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

@@ -3,16 +3,32 @@ import { Routes, RouterModule } from '@angular/router';
 
 
 import { EpSaisieComponent } from "./ep-saisie.component";
+import { EpsSaisieComponent } from "./eps-saisie/eps-saisie.component";
+import { EpaSaisieComponent } from "./epa-saisie/epa-saisie.component";
+import { EpaSixAnsSaisieComponent } from "./epa-six-ans-saisie/epa-six-ans-saisie.component";
 
+import { KeycloakGuard } from '@shared/guards/keycloakguard';
+
+import { paths_saisie_ep } from "@shared/utils/paths";
 
 const routes: Routes = [
-  {
+  { path:'',
-    path:'',
     component: EpSaisieComponent,
-    pathMatch: 'full'
+    canActivate: [KeycloakGuard],
+    children: [
+      { path:paths_saisie_ep.epa, component: EpaSaisieComponent, canActivate: [KeycloakGuard] },
+      { path:paths_saisie_ep.eps, component: EpsSaisieComponent, canActivate: [KeycloakGuard] },
+      { path:paths_saisie_ep.epa6ans, component: EpaSixAnsSaisieComponent, canActivate: [KeycloakGuard] }
+    ]
   }
 ];
 
+/*
+/saisie-ep
+/saisie-ep/eps
+/saisie-ep/epa
+/saisie-ep/epasixans
+*/
 
 @NgModule({
   imports: [RouterModule.forChild(routes)],

src/app/ep-saisie/epa-saisie/epa-saisie.component.html

@@ -0,0 +1 @@
+<h1> Saisie EPA </h1>

src/app/ep-saisie/epa-six-ans-saisie/epa-six-ans-saisie.component.html

@@ -0,0 +1 @@
+<h1> Saisie Six Ans </h1>

src/app/ep-saisie/eps-saisie/eps-saisie.component.html

@@ -0,0 +1 @@
+<h1> Saisie EPS </h1>

src/app/ep/ep-augmentation-salaire/ep-augmentation-salaire.component.html

@@ -0,0 +1 @@
+<h1>Consultation salaire </h1>

src/app/ep/ep-choix-date/ep-choix-date.component.html

@@ -0,0 +1 @@
+<h1>Consultation choix date</h1>

src/app/ep/ep-commentaire-assistant/ep-commentaire-assistant.component.html

@@ -0,0 +1 @@
+<h1>Consultation commentaire assistant</h1>

src/app/ep/ep-commentaire-assistant/ep-commentaire-assistant.component.ts

@@ -0,0 +1,15 @@
+import { Component, OnInit } from '@angular/core';
+
+/**
+    */
+@Component({
+  selector: 'app-ep-commentaire-assistant',
+  templateUrl: './ep-commentaire-assistant.component.html'
+})
+export class EpCommentaireAssistantComponent implements OnInit {
+
+  constructor() {}
+
+  ngOnInit() {
+  }
+}

src/app/ep/ep-commentaire-referent/ep-commentaire-referent.component.html

@@ -0,0 +1 @@
+<h1>Consultation commentaire referent</h1>

src/app/ep/ep-commentaire-referent/ep-commentaire-referent.component.ts

@@ -0,0 +1,15 @@
+import { Component, OnInit } from '@angular/core';
+
+/**
+    */
+@Component({
+  selector: 'app-ep-commentaire-referent',
+  templateUrl: './ep-commentaire-referent.component.html'
+})
+export class EpCommentaireReferentComponent implements OnInit {
+
+  constructor() {}
+
+  ngOnInit() {
+  }
+}

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

@@ -0,0 +1,3 @@
+<app-nav-menu></app-nav-menu>
+<h1>Consultation EP</h1>
+<router-outlet></router-outlet>

src/app/ep/ep-demande-delegation/ep-demande-delegation.component.html

@@ -0,0 +1 @@
+<h1>Consultation demande delegation</h1>

src/app/ep/ep-demandes-formation/ep-demandes-formation.component.html

@@ -0,0 +1 @@
+<h1>Consultation demandes formation</h1>

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

@@ -0,0 +1 @@
+<h1>Consultation participants </h1>

src/app/ep/ep-participants/new-participant/new-participant.component.html

@@ -0,0 +1,2 @@
+<app-nav-menu></app-nav-menu>
+<h1>New participant </h1>

src/app/ep/ep-propositions-dates/ep-propositions-dates.component.html

@@ -0,0 +1 @@
+<h1>Saisie propositions dates</h1>

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

@@ -0,0 +1 @@
+<h1>Consultation signature </h1>

src/app/ep/ep.module.ts

@@ -16,11 +16,12 @@ import { EpPropositionsDatesComponent } from "./ep-propositions-dates/ep-proposi
 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-consultation/ep-signature/ep-signature.component";
+import { EpSignatureComponent } from "./ep-signature/ep-signature.component";
-import { EpaComponent } from "./ep-consultation/epa/epa.component";
+import { EpaComponent } from "./epa/epa.component";
-import { EpaSixAnsComponent } from "./ep-consultation/epa-six-ans/epa-six-ans.component";
+import { EpaSixAnsComponent } from "./epa-six-ans/epa-six-ans.component";
-import { EpsComponent } from "./ep-consultation/eps/eps.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';
 
@@ -29,7 +30,8 @@ import { EpRoutingModule } from './ep.routing.module';
   declarations: [EpComponent, EpAugmentationSalaireComponent, EpChoixDateComponent,
     EpDemandeDelegationComponent, EpDemandesFormationComponent, EpParticipantsComponent,
     EpPropositionsDatesComponent, NewParticipantComponent, EpConsultationComponent,
-EpSignatureComponent, EpaComponent, EpaSixAnsComponent, EpsComponent
+    EpSignatureComponent, EpaComponent, EpaSixAnsComponent, EpsComponent,
+    EpCommentaireAssistantComponent, EpCommentaireReferentComponent
   ],
   exports: [EpComponent
   ],

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

@@ -3,14 +3,55 @@ 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 { KeycloakGuard } from '@shared/guards/keycloakguard';
+import { paths_ep } from "@shared/utils/paths";
 
 
 const routes: Routes = [
   {
     path:'',
     component: EpComponent,
-    pathMatch: 'full'
+    canActivate: [KeycloakGuard]
-  }
+  },
+  {
+    path:paths_ep.consultation,
+    component: EpConsultationComponent,
+    canActivate: [KeycloakGuard],
+    children: [
+      {path:paths_ep.salaire, component: EpAugmentationSalaireComponent, canActivate: [KeycloakGuard]},
+      {path:paths_ep.choixdate, component: EpChoixDateComponent, canActivate: [KeycloakGuard]},
+      {path:paths_ep.demandedelegation, component: EpDemandeDelegationComponent, canActivate: [KeycloakGuard]},
+      {path:paths_ep.demandesformation, component: EpDemandesFormationComponent, canActivate: [KeycloakGuard]},
+      {path:paths_ep.participants, component: EpParticipantsComponent, canActivate: [KeycloakGuard]},
+      {path:paths_ep.propositionsdates, component: EpPropositionsDatesComponent, canActivate: [KeycloakGuard]},
+      {path:paths_ep.signature, component: EpSignatureComponent, canActivate: [KeycloakGuard]},
+      {path:paths_ep.epa, component: EpaComponent, canActivate: [KeycloakGuard]},
+      {path:paths_ep.eps, component: EpsComponent, canActivate: [KeycloakGuard]},
+      {path:paths_ep.epa6ans, component: EpaSixAnsComponent, canActivate: [KeycloakGuard]},
+      {path:paths_ep.assistant, component: EpCommentaireAssistantComponent, canActivate: [KeycloakGuard]},
+      {path:paths_ep.referent, component: EpCommentaireReferentComponent, canActivate: [KeycloakGuard]}
+    ]
+  },
+  {
+    path:paths_ep.newparticipant,
+    component: NewParticipantComponent,
+    canActivate: [KeycloakGuard]
+  },
 ];
 
 

src/app/ep/epa-six-ans/epa-six-ans.component.html

@@ -0,0 +1 @@
+<h1>Consultation epa 6 ans</h1>

src/app/ep/epa/epa.component.html

@@ -0,0 +1 @@
+<h1>Consultation epa</h1>

src/app/ep/eps/eps.component.html

@@ -0,0 +1 @@
+<h1>Consultation eps</h1>

src/app/formations/details-formation/formation.component.html

@@ -0,0 +1,2 @@
+<app-nav-menu></app-nav-menu>
+<h1> Formation </h1>

src/app/formations/edit-formation/edit-formation.component.html

@@ -0,0 +1,2 @@
+<app-nav-menu></app-nav-menu>
+<h1> Edit formation </h1>

src/app/formations/formations.routing.module.ts

@@ -3,14 +3,19 @@ import { Routes, RouterModule } from '@angular/router';
 
 
 import { FormationsComponent } from "./formations.component";
+import { FormationComponent } from "./details-formation/formation.component";
+import { EditFormationComponent } from "./edit-formation/edit-formation.component";
+import { NewFormationComponent } from "./new-formation/new-formation.component";
 
+import { KeycloakGuard } from '@shared/guards/keycloakguard';
+
+import { paths_formation } from "@shared/utils/paths";
 
 const routes: Routes = [
-  {
+  { path:'', component: FormationsComponent, pathMatch: 'full', canActivate: [KeycloakGuard] },
-    path:'',
+  { path:paths_formation.get, component: FormationComponent, canActivate: [KeycloakGuard] },
-    component: FormationsComponent,
+  { path:paths_formation.edit, component: EditFormationComponent, canActivate: [KeycloakGuard] },
-    pathMatch: 'full'
+  { path:paths_formation.new, component: NewFormationComponent, canActivate: [KeycloakGuard] },
-  }
 ];
 
 

src/app/formations/new-formation/new-formation.component.html

@@ -0,0 +1,2 @@
+<app-nav-menu></app-nav-menu>
+<h1> Nouvelle formation </h1>

src/app/referents/details-referent/details-referent.component.html

@@ -0,0 +1,2 @@
+<app-nav-menu></app-nav-menu>
+<h1> referent </h1>

src/app/referents/referents.routing.module.ts

@@ -3,16 +3,32 @@ import { Routes, RouterModule } from '@angular/router';
 
 
 import { ReferentsComponent } from "./referents.component";
+import { DetailsReferentComponent } from "./details-referent/details-referent.component";
 
+import { paths_referents } from "@shared/utils/paths";
+
+import { KeycloakGuard } from '@shared/guards/keycloakguard';
 
 const routes: Routes = [
   {
     path:'',
     component: ReferentsComponent,
-    pathMatch: 'full'
+    pathMatch: 'full',
+    canActivate: [KeycloakGuard]
+  },
+  {
+    path:paths_referents.get,
+    component: ReferentsComponent,
+    pathMatch: 'full',
+    canActivate: [KeycloakGuard]
   }
 ];
 
+/*
+/referents
+/referents/:id (id référent)
+
+*/
 
 @NgModule({
   imports: [RouterModule.forChild(routes)],

src/app/shared/guards/keycloakguard.ts

@@ -4,10 +4,10 @@ import { KeycloakService, KeycloakAuthGuard } from 'keycloak-angular';
 
 
 /**
-  * AppAuthGuard est la fonction qui va gérer l'authentificatione et les droits d'accès en fonction des rôles.
+  * KeycloakGuard est la classe qui va gérer l'authentification et les droits d'accès en fonction des rôles Keycloak.
   */
 @Injectable()
-export class AppAuthGuard extends KeycloakAuthGuard {
+export class KeycloakGuard extends KeycloakAuthGuard {
   constructor(protected router: Router, protected keycloakAngular: KeycloakService) {
     super(router, keycloakAngular);
   }

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

@@ -3,7 +3,7 @@
   <mat-icon>more_vert</mat-icon>
 </button>
 <mat-menu #menuCollaborateurs="matMenu">
-  <button mat-menu-item routerLink="/collaborateurs">Liste des collaborateurs</button>
+  <button mat-menu-item routerLink="/collaborateurs" routerLinkActive>Liste des collaborateurs</button>
   <button mat-menu-item routerLink="/ep">Liste des EP</button>
 </mat-menu>
 <button mat-button routerLink="/referents">Liste des référents</button>

src/app/shared/utils/paths.ts

@@ -1,20 +1,23 @@
 const paths_collaborateurs = {
   base: "/collaborateurs",
   path: "collaborateurs",
-  formation: "formations",
+  get: ":id",
-  evaluation: "evaluation",
+  formations: ":id/formations",
-  edit: "edit"
+  evaluation: ":id/formations/evaluation/:id",
+  edit: ":id/formations/evaluation/:id/edit"
 };
 
 const paths_demandes_delegation = {
   base: "/demandesdelegation",
-  path: "demandesdelegation"
+  path: "demandesdelegation",
+  get: ":id"
 };
 
 const paths_demandes_formation = {
   base: "/demandesformation",
   path: "demandesformation",
-  new: "nouvelledemande"
+  get: ":id",
+  new: "nouvelledemandeformation"
 };
 
 const paths_ep = {
@@ -24,10 +27,18 @@ const paths_ep = {
   choixdate: "choixdate",
   demandedelegation: "demandedelegation",
   demandesformation: "demandesformation",
-  propositiondate: "propositiondate",
+  propositionsdates: "propositiondate",
   participants: "participants",
   commentaireAssistante: "commentaireassistante",
-  commentaireReferent: "commentairereferent"
+  commentaireReferent: "commentairereferent",
+  signature: "signature",
+  epa: "epa",
+  eps: "eps",
+  epa6ans: "epasixans",
+  assistant: "commentaireassistant",
+  referent: "commentairereferent",
+  consultation: ":id",
+  newparticipant: "ajoutparticipant"
 };
 
 const paths_saisie_ep = {
@@ -41,8 +52,10 @@ const paths_saisie_ep = {
 const paths_formation = {
   base: "/formations",
   path: "formations",
-  new: "nouvelleformation",
+  get: ":id",
-  evaluation: "evaluation"
+  edit: ":id/edit",
+  //evaluation: ":id/evaluation/ideval",
+  new: "nouvelleformation"
 };
 
 const paths_home = {
@@ -53,7 +66,8 @@ const paths_home = {
 
 const paths_referents = {
   base: "/referents",
-  path: "referents"
+  path: "referents",
+  get: ":id"
 };
 
 export { paths_collaborateurs, paths_demandes_delegation, paths_demandes_formation,