diff --git a/src/app/ep/details-ep/details-ep.component.html b/src/app/ep/details-ep/details-ep.component.html
new file mode 100644
index 0000000..e69de29
diff --git a/src/app/ep/details-ep/details-ep.component.ts b/src/app/ep/details-ep/details-ep.component.ts
new file mode 100644
index 0000000..e69de29
diff --git a/src/app/ep/ep-augmentation-salaire/ep-augmentation-salaire.component.html b/src/app/ep/details-ep/ep-augmentation-salaire/ep-augmentation-salaire.component.html
similarity index 100%
rename from src/app/ep/ep-augmentation-salaire/ep-augmentation-salaire.component.html
rename to src/app/ep/details-ep/ep-augmentation-salaire/ep-augmentation-salaire.component.html
diff --git a/src/app/ep/ep-augmentation-salaire/ep-augmentation-salaire.component.ts b/src/app/ep/details-ep/ep-augmentation-salaire/ep-augmentation-salaire.component.ts
similarity index 100%
rename from src/app/ep/ep-augmentation-salaire/ep-augmentation-salaire.component.ts
rename to src/app/ep/details-ep/ep-augmentation-salaire/ep-augmentation-salaire.component.ts
diff --git a/src/app/ep/ep-choix-date/ep-choix-date.component.html b/src/app/ep/details-ep/ep-choix-date/ep-choix-date.component.html
similarity index 100%
rename from src/app/ep/ep-choix-date/ep-choix-date.component.html
rename to src/app/ep/details-ep/ep-choix-date/ep-choix-date.component.html
diff --git a/src/app/ep/ep-choix-date/ep-choix-date.component.ts b/src/app/ep/details-ep/ep-choix-date/ep-choix-date.component.ts
similarity index 100%
rename from src/app/ep/ep-choix-date/ep-choix-date.component.ts
rename to src/app/ep/details-ep/ep-choix-date/ep-choix-date.component.ts
diff --git a/src/app/ep/ep-commentaire-assistant/ep-commentaire-assistant.component.html b/src/app/ep/details-ep/ep-commentaire-assistant/ep-commentaire-assistant.component.html
similarity index 100%
rename from src/app/ep/ep-commentaire-assistant/ep-commentaire-assistant.component.html
rename to src/app/ep/details-ep/ep-commentaire-assistant/ep-commentaire-assistant.component.html
diff --git a/src/app/ep/ep-commentaire-assistant/ep-commentaire-assistant.component.ts b/src/app/ep/details-ep/ep-commentaire-assistant/ep-commentaire-assistant.component.ts
similarity index 100%
rename from src/app/ep/ep-commentaire-assistant/ep-commentaire-assistant.component.ts
rename to src/app/ep/details-ep/ep-commentaire-assistant/ep-commentaire-assistant.component.ts
diff --git a/src/app/ep/ep-commentaire-referent/ep-commentaire-referent.component.html b/src/app/ep/details-ep/ep-commentaire-referent/ep-commentaire-referent.component.html
similarity index 100%
rename from src/app/ep/ep-commentaire-referent/ep-commentaire-referent.component.html
rename to src/app/ep/details-ep/ep-commentaire-referent/ep-commentaire-referent.component.html
diff --git a/src/app/ep/ep-commentaire-referent/ep-commentaire-referent.component.ts b/src/app/ep/details-ep/ep-commentaire-referent/ep-commentaire-referent.component.ts
similarity index 100%
rename from src/app/ep/ep-commentaire-referent/ep-commentaire-referent.component.ts
rename to src/app/ep/details-ep/ep-commentaire-referent/ep-commentaire-referent.component.ts
diff --git a/src/app/ep/ep-consultation/ep-consultation.component.html b/src/app/ep/details-ep/ep-consultation/ep-consultation.component.html
similarity index 100%
rename from src/app/ep/ep-consultation/ep-consultation.component.html
rename to src/app/ep/details-ep/ep-consultation/ep-consultation.component.html
diff --git a/src/app/ep/ep-consultation/ep-consultation.component.ts b/src/app/ep/details-ep/ep-consultation/ep-consultation.component.ts
similarity index 100%
rename from src/app/ep/ep-consultation/ep-consultation.component.ts
rename to src/app/ep/details-ep/ep-consultation/ep-consultation.component.ts
diff --git a/src/app/ep/ep-demande-delegation/ep-demande-delegation.component.html b/src/app/ep/details-ep/ep-demande-delegation/ep-demande-delegation.component.html
similarity index 100%
rename from src/app/ep/ep-demande-delegation/ep-demande-delegation.component.html
rename to src/app/ep/details-ep/ep-demande-delegation/ep-demande-delegation.component.html
diff --git a/src/app/ep/ep-demande-delegation/ep-demande-delegation.component.ts b/src/app/ep/details-ep/ep-demande-delegation/ep-demande-delegation.component.ts
similarity index 100%
rename from src/app/ep/ep-demande-delegation/ep-demande-delegation.component.ts
rename to src/app/ep/details-ep/ep-demande-delegation/ep-demande-delegation.component.ts
diff --git a/src/app/ep/ep-demandes-formation/ep-demandes-formation.component.html b/src/app/ep/details-ep/ep-demandes-formation/ep-demandes-formation.component.html
similarity index 100%
rename from src/app/ep/ep-demandes-formation/ep-demandes-formation.component.html
rename to src/app/ep/details-ep/ep-demandes-formation/ep-demandes-formation.component.html
diff --git a/src/app/ep/ep-demandes-formation/ep-demandes-formation.component.ts b/src/app/ep/details-ep/ep-demandes-formation/ep-demandes-formation.component.ts
similarity index 100%
rename from src/app/ep/ep-demandes-formation/ep-demandes-formation.component.ts
rename to src/app/ep/details-ep/ep-demandes-formation/ep-demandes-formation.component.ts
diff --git a/src/app/ep/ep-participants/ep-participants.component.html b/src/app/ep/details-ep/ep-participants/ep-participants.component.html
similarity index 100%
rename from src/app/ep/ep-participants/ep-participants.component.html
rename to src/app/ep/details-ep/ep-participants/ep-participants.component.html
diff --git a/src/app/ep/ep-participants/ep-participants.component.ts b/src/app/ep/details-ep/ep-participants/ep-participants.component.ts
similarity index 100%
rename from src/app/ep/ep-participants/ep-participants.component.ts
rename to src/app/ep/details-ep/ep-participants/ep-participants.component.ts
diff --git a/src/app/ep/ep-participants/new-participant/new-participant.component.html b/src/app/ep/details-ep/ep-participants/new-participant/new-participant.component.html
similarity index 100%
rename from src/app/ep/ep-participants/new-participant/new-participant.component.html
rename to src/app/ep/details-ep/ep-participants/new-participant/new-participant.component.html
diff --git a/src/app/ep/ep-participants/new-participant/new-participant.component.ts b/src/app/ep/details-ep/ep-participants/new-participant/new-participant.component.ts
similarity index 100%
rename from src/app/ep/ep-participants/new-participant/new-participant.component.ts
rename to src/app/ep/details-ep/ep-participants/new-participant/new-participant.component.ts
diff --git a/src/app/ep/ep-propositions-dates/ep-propositions-dates.component.html b/src/app/ep/details-ep/ep-propositions-dates/ep-propositions-dates.component.html
similarity index 100%
rename from src/app/ep/ep-propositions-dates/ep-propositions-dates.component.html
rename to src/app/ep/details-ep/ep-propositions-dates/ep-propositions-dates.component.html
diff --git a/src/app/ep/ep-propositions-dates/ep-propositions-dates.component.ts b/src/app/ep/details-ep/ep-propositions-dates/ep-propositions-dates.component.ts
similarity index 100%
rename from src/app/ep/ep-propositions-dates/ep-propositions-dates.component.ts
rename to src/app/ep/details-ep/ep-propositions-dates/ep-propositions-dates.component.ts
diff --git a/src/app/ep/ep-signature/ep-signature.component.html b/src/app/ep/details-ep/ep-signature/ep-signature.component.html
similarity index 100%
rename from src/app/ep/ep-signature/ep-signature.component.html
rename to src/app/ep/details-ep/ep-signature/ep-signature.component.html
diff --git a/src/app/ep/ep-signature/ep-signature.component.ts b/src/app/ep/details-ep/ep-signature/ep-signature.component.ts
similarity index 100%
rename from src/app/ep/ep-signature/ep-signature.component.ts
rename to src/app/ep/details-ep/ep-signature/ep-signature.component.ts
diff --git a/src/app/ep/epa-six-ans/epa-six-ans.component.html b/src/app/ep/details-ep/epa-six-ans/epa-six-ans.component.html
similarity index 100%
rename from src/app/ep/epa-six-ans/epa-six-ans.component.html
rename to src/app/ep/details-ep/epa-six-ans/epa-six-ans.component.html
diff --git a/src/app/ep/epa-six-ans/epa-six-ans.component.ts b/src/app/ep/details-ep/epa-six-ans/epa-six-ans.component.ts
similarity index 100%
rename from src/app/ep/epa-six-ans/epa-six-ans.component.ts
rename to src/app/ep/details-ep/epa-six-ans/epa-six-ans.component.ts
diff --git a/src/app/ep/epa/epa.component.html b/src/app/ep/details-ep/epa/epa.component.html
similarity index 100%
rename from src/app/ep/epa/epa.component.html
rename to src/app/ep/details-ep/epa/epa.component.html
diff --git a/src/app/ep/epa/epa.component.ts b/src/app/ep/details-ep/epa/epa.component.ts
similarity index 100%
rename from src/app/ep/epa/epa.component.ts
rename to src/app/ep/details-ep/epa/epa.component.ts
diff --git a/src/app/ep/eps/eps.component.html b/src/app/ep/details-ep/eps/eps.component.html
similarity index 100%
rename from src/app/ep/eps/eps.component.html
rename to src/app/ep/details-ep/eps/eps.component.html
diff --git a/src/app/ep/eps/eps.component.ts b/src/app/ep/details-ep/eps/eps.component.ts
similarity index 100%
rename from src/app/ep/eps/eps.component.ts
rename to src/app/ep/details-ep/eps/eps.component.ts
diff --git a/src/app/ep/ep-signes/ep-signes.component.html b/src/app/ep/ep-signes/ep-signes.component.html
new file mode 100644
index 0000000..f9085c1
--- /dev/null
+++ b/src/app/ep/ep-signes/ep-signes.component.html
@@ -0,0 +1,3 @@
+
+
Liste des EP collaborateurs signés
+
\ No newline at end of file
diff --git a/src/app/ep/ep-signes/ep-signes.component.ts b/src/app/ep/ep-signes/ep-signes.component.ts
new file mode 100644
index 0000000..1cc84ca
--- /dev/null
+++ b/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;
+ }
+ }
+}
diff --git a/src/app/ep/ep.component.html b/src/app/ep/ep.component.html
index 324d7c4..41f913d 100644
--- a/src/app/ep/ep.component.html
+++ b/src/app/ep/ep.component.html
@@ -1,3 +1 @@
-
-
Liste des EP collaborateurs
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/src/app/ep/ep.component.ts b/src/app/ep/ep.component.ts
index 7c906ab..3e986c6 100644
--- a/src/app/ep/ep.component.ts
+++ b/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){}
-
-
- 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;
- }
- }
+ constructor(){}
}
diff --git a/src/app/ep/ep.module.ts b/src/app/ep/ep.module.ts
index 80c0c0b..11b43ac 100644
--- a/src/app/ep/ep.module.ts
+++ b/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,
- EpDemandeDelegationComponent, EpDemandesFormationComponent, EpParticipantsComponent,
- EpPropositionsDatesComponent, NewParticipantComponent, EpConsultationComponent,
- EpSignatureComponent, EpaComponent, EpaSixAnsComponent, EpsComponent,
- EpCommentaireAssistantComponent, EpCommentaireReferentComponent
+ declarations: [
+ EpComponent, EpSignesComponent
],
exports: [EpComponent
],
diff --git a/src/app/ep/ep.routing.module.ts b/src/app/ep/ep.routing.module.ts
index df80f4e..30a48eb 100644
--- a/src/app/ep/ep.routing.module.ts
+++ b/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:'',
- component: EpComponent,
+ { path: paths_ep.signes,
+ component: EpSignesComponent,
canActivate: [AuthGuard]
},
{
- path:paths_ep.consultation,
- component: EpConsultationComponent,
- 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,
+ path:'',
+ component: EpComponent,
canActivate: [AuthGuard]
},
];
diff --git a/src/app/shared/nav-menu/nav-menu-assistante/nav-menu-assistante.component.html b/src/app/shared/nav-menu/nav-menu-assistante/nav-menu-assistante.component.html
index f23ad36..7831c6b 100644
--- a/src/app/shared/nav-menu/nav-menu-assistante/nav-menu-assistante.component.html
+++ b/src/app/shared/nav-menu/nav-menu-assistante/nav-menu-assistante.component.html
@@ -1,4 +1,4 @@
-
+