From 19efd9401d4aba2381eba22f7d4a7db85ace4af6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Yana=C3=ABl=20GRETTE?= Date: Tue, 28 Jul 2020 16:37:19 +0200 Subject: [PATCH] =?UTF-8?q?Mise=20en=20place=20du=20routing=20au=20sein=20?= =?UTF-8?q?des=20diff=C3=A9rents=20modules?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/app/app-routing.module.ts | 36 ++++++++++- src/app/app.component.html | 1 - src/app/app.module.ts | 3 + .../collaborateurs.component.html | 2 + .../collaborateurs/collaborateurs.module.ts | 20 +++---- .../collaborateurs.routing.module.ts | 21 +++++++ .../demandes-delegation.component.html | 2 + .../demandes-delegation.module.ts | 16 ++--- .../demandes-delegation.routing.module.ts | 21 +++++++ .../demandes-formation.component.html | 2 + .../demandes-formation.module.ts | 9 +-- .../demandes-formation.routing.module.ts | 21 +++++++ src/app/ep-saisie/ep-saisie.component.html | 2 + src/app/ep-saisie/ep-saisie.module.ts | 16 ++--- src/app/ep-saisie/ep-saisie.routing.module.ts | 21 +++++++ src/app/ep/ep.component.html | 2 + src/app/ep/ep.module.ts | 16 ++--- src/app/ep/ep.routing.module.ts | 21 +++++++ src/app/formations/formations.component.html | 2 + src/app/formations/formations.module.ts | 24 ++++---- .../formations/formations.routing.module.ts | 21 +++++++ src/app/home/home.module.ts | 11 ++-- src/app/referents/referents.component.html | 2 + src/app/referents/referents.module.ts | 14 ++--- src/app/referents/referents.routing.module.ts | 21 +++++++ .../nav-menu-assistante.component.html | 6 +- .../nav-menu-assistante.component.ts | 2 +- .../nav-menu-commercial.component.html | 4 +- .../nav-menu-rh/nav-menu-rh.component.html | 4 +- .../shared/nav-menu/nav-menu.component.html | 6 +- src/app/shared/nav-menu/nav-menu.module.ts | 15 ++--- src/app/shared/utils/paths.ts | 60 +++++++++++++++++++ 32 files changed, 336 insertions(+), 88 deletions(-) create mode 100644 src/app/collaborateurs/collaborateurs.routing.module.ts create mode 100644 src/app/demandes-delegation/demandes-delegation.routing.module.ts create mode 100644 src/app/demandes-formation/demandes-formation.routing.module.ts create mode 100644 src/app/ep-saisie/ep-saisie.routing.module.ts create mode 100644 src/app/ep/ep.routing.module.ts create mode 100644 src/app/formations/formations.routing.module.ts create mode 100644 src/app/referents/referents.routing.module.ts create mode 100644 src/app/shared/utils/paths.ts diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts index a8d9cbd..c049bab 100644 --- a/src/app/app-routing.module.ts +++ b/src/app/app-routing.module.ts @@ -4,21 +4,51 @@ import { RouterModule } from '@angular/router'; import { Routes } from '@angular/router'; import { AppAuthGuard } from './app.authguard'; -import { HomeComponent } from './home/home.component'; +import { HomeComponent } from './home/'; +import { paths_collaborateurs, paths_demandes_delegation, paths_demandes_formation, + paths_ep, paths_saisie_ep, paths_formation, paths_home, paths_referents } from '@shared/utils/paths'; const routes: Routes = [ { path: '', - redirectTo: '/home', + redirectTo: paths_home.path, pathMatch: 'full' }, { - path: 'home', + path: paths_home.path, component: HomeComponent, canActivate: [AppAuthGuard], pathMatch: 'full' }, + { + path: paths_collaborateurs.path, + loadChildren: () => import('./collaborateurs/collaborateurs.module').then(m=> m.CollaborateursModule) + }, + { + path: paths_demandes_delegation.path, + loadChildren: () => import('./demandes-delegation/demandes-delegation.module').then(m=> m.DemandesDelegationModule) + }, + { + path: paths_demandes_formation.path, + loadChildren: () => import('./demandes-formation/demandes-formation.module').then(m=> m.DemandesFormationModule) + }, + { + path: paths_ep.path, + loadChildren: () => import('./ep/ep.module').then(m=> m.EpModule) + }, + { + path: paths_saisie_ep.path, + loadChildren: () => import('./ep-saisie/ep-saisie.module').then(m=> m.EpSaisieModule) + }, + { + path: paths_formation.path, + loadChildren: () => import('./formations/formations.module').then(m=> m.FormationsModule) + }, + { + path: paths_referents.path, + loadChildren: () => import('./referents/referents.module').then(m=> m.ReferentsModule) + } ]; @NgModule({ diff --git a/src/app/app.component.html b/src/app/app.component.html index adcb685..ec0f9fa 100644 --- a/src/app/app.component.html +++ b/src/app/app.component.html @@ -1,4 +1,3 @@ -
diff --git a/src/app/app.module.ts b/src/app/app.module.ts index d6ade4a..5ee2fd8 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -4,6 +4,7 @@ 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'; @@ -33,6 +34,7 @@ let keycloakService: KeycloakService = new KeycloakService(); ], imports: [ BrowserModule, + BrowserAnimationsModule, KeycloakAngularModule, AppRoutingModule, HttpClientModule, @@ -44,6 +46,7 @@ let keycloakService: KeycloakService = new KeycloakService(); DemandesFormationModule, DemandesDelegationModule, EpSaisieModule + ], providers: [ { diff --git a/src/app/collaborateurs/collaborateurs.component.html b/src/app/collaborateurs/collaborateurs.component.html index e69de29..4f89688 100644 --- a/src/app/collaborateurs/collaborateurs.component.html +++ b/src/app/collaborateurs/collaborateurs.component.html @@ -0,0 +1,2 @@ + +

Liste des collaborateurs

diff --git a/src/app/collaborateurs/collaborateurs.module.ts b/src/app/collaborateurs/collaborateurs.module.ts index bc24f42..3077bd2 100644 --- a/src/app/collaborateurs/collaborateurs.module.ts +++ b/src/app/collaborateurs/collaborateurs.module.ts @@ -1,10 +1,7 @@ -import { BrowserModule } from '@angular/platform-browser'; -import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; -import { FormsModule } from '@angular/forms'; - - import { NgModule } from "@angular/core"; import { CommonModule } from "@angular/common"; +import { FormsModule } from '@angular/forms'; +import { RouterModule } from '@angular/router'; import { MaterialModule } from "@shared/angular-material/angular-material.module"; @@ -12,12 +9,13 @@ import {NavMenuModule} from '@shared/nav-menu/nav-menu.module'; import { CollaborateursComponent } from "./collaborateurs.component"; import { DetailsCollaborateurComponent } from "./details-collaborateur/details-collaborateur.component"; - import { EvaluationComponent } from "./formations-collaborateur/details-evaluation/evaluation.component"; import { EditEvaluationComponent } from "./formations-collaborateur/edit-evaluation/edit-evaluation.component"; - import { FormationsCollaboateurComponent } from "./formations-collaborateur/formations-collaborateur.component"; +import { CollaborateursRoutingModule } from "./collaborateurs.routing.module"; + + @NgModule({ declarations: [ DetailsCollaborateurComponent, EvaluationComponent, EditEvaluationComponent, @@ -27,10 +25,12 @@ import { FormationsCollaboateurComponent } from "./formations-collaborateur/form CollaborateursComponent ], imports: [ - BrowserAnimationsModule, - FormsModule, + //FormsModule, + CommonModule, MaterialModule, - NavMenuModule + NavMenuModule, + CollaborateursRoutingModule, + RouterModule ], }) export class CollaborateursModule {} diff --git a/src/app/collaborateurs/collaborateurs.routing.module.ts b/src/app/collaborateurs/collaborateurs.routing.module.ts new file mode 100644 index 0000000..5eaf714 --- /dev/null +++ b/src/app/collaborateurs/collaborateurs.routing.module.ts @@ -0,0 +1,21 @@ +import { NgModule } from '@angular/core'; +import { Routes, RouterModule } from '@angular/router'; + + +import { CollaborateursComponent } from "./collaborateurs.component"; + + +const routes: Routes = [ + { + path:'', + component: CollaborateursComponent, + pathMatch: 'full' + } +]; + + +@NgModule({ + imports: [RouterModule.forChild(routes)], + exports: [RouterModule] +}) +export class CollaborateursRoutingModule {} diff --git a/src/app/demandes-delegation/demandes-delegation.component.html b/src/app/demandes-delegation/demandes-delegation.component.html index e69de29..0c6b256 100644 --- a/src/app/demandes-delegation/demandes-delegation.component.html +++ b/src/app/demandes-delegation/demandes-delegation.component.html @@ -0,0 +1,2 @@ + +

Liste des demandes de délégations

diff --git a/src/app/demandes-delegation/demandes-delegation.module.ts b/src/app/demandes-delegation/demandes-delegation.module.ts index da19a78..6b5e489 100644 --- a/src/app/demandes-delegation/demandes-delegation.module.ts +++ b/src/app/demandes-delegation/demandes-delegation.module.ts @@ -1,10 +1,7 @@ -import { BrowserModule } from '@angular/platform-browser'; -import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; -import { FormsModule } from '@angular/forms'; - - import { NgModule } from "@angular/core"; import { CommonModule } from "@angular/common"; +import { FormsModule } from '@angular/forms'; +import { RouterModule } from '@angular/router'; import { MaterialModule } from "@shared/angular-material/angular-material.module"; @@ -13,6 +10,8 @@ import {NavMenuModule} from '@shared/nav-menu/nav-menu.module'; import { DemandesDelegationComponent } from './demandes-delegation.component'; import { DemandeDelegationComponent } from './details-demande-delegation/demande-delegation.component'; +import { DemandesDelegationRoutingModule } from './demandes-delegation.routing.module'; + @NgModule({ declarations: [ DemandesDelegationComponent, DemandeDelegationComponent @@ -20,10 +19,11 @@ import { DemandeDelegationComponent } from './details-demande-delegation/demande exports: [ DemandesDelegationComponent ], imports: [ - BrowserAnimationsModule, - FormsModule, MaterialModule, - NavMenuModule + NavMenuModule, + DemandesDelegationRoutingModule, + RouterModule + ], }) export class DemandesDelegationModule {} diff --git a/src/app/demandes-delegation/demandes-delegation.routing.module.ts b/src/app/demandes-delegation/demandes-delegation.routing.module.ts new file mode 100644 index 0000000..0a6f501 --- /dev/null +++ b/src/app/demandes-delegation/demandes-delegation.routing.module.ts @@ -0,0 +1,21 @@ +import { NgModule } from '@angular/core'; +import { Routes, RouterModule } from '@angular/router'; + + +import { DemandesDelegationComponent } from "./demandes-delegation.component"; + + +const routes: Routes = [ + { + path:'', + component: DemandesDelegationComponent, + pathMatch: 'full' + } +]; + + +@NgModule({ + imports: [RouterModule.forChild(routes)], + exports: [RouterModule] +}) +export class DemandesDelegationRoutingModule {} diff --git a/src/app/demandes-formation/demandes-formation.component.html b/src/app/demandes-formation/demandes-formation.component.html index e69de29..59510c3 100644 --- a/src/app/demandes-formation/demandes-formation.component.html +++ b/src/app/demandes-formation/demandes-formation.component.html @@ -0,0 +1,2 @@ + +

Liste des demandes de formation

diff --git a/src/app/demandes-formation/demandes-formation.module.ts b/src/app/demandes-formation/demandes-formation.module.ts index 6754fe6..132244c 100644 --- a/src/app/demandes-formation/demandes-formation.module.ts +++ b/src/app/demandes-formation/demandes-formation.module.ts @@ -1,6 +1,6 @@ -import { BrowserModule } from '@angular/platform-browser'; import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; import { FormsModule } from '@angular/forms'; +import { RouterModule } from '@angular/router'; import { NgModule } from "@angular/core"; @@ -13,6 +13,7 @@ import {NavMenuModule} from '@shared/nav-menu/nav-menu.module'; 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 { DemandesFormationsRoutingModule } from './demandes-formation.routing.module'; @NgModule({ declarations: [ DemandesFormationComponent, DemandeFormationComponent, @@ -22,10 +23,10 @@ import { NewDemandeFormationComponent } from './new-demande-formation/new-demand DemandesFormationComponent ], imports: [ - BrowserAnimationsModule, - FormsModule, MaterialModule, - NavMenuModule + NavMenuModule, + DemandesFormationsRoutingModule, + RouterModule ], }) export class DemandesFormationModule {} diff --git a/src/app/demandes-formation/demandes-formation.routing.module.ts b/src/app/demandes-formation/demandes-formation.routing.module.ts new file mode 100644 index 0000000..7737f49 --- /dev/null +++ b/src/app/demandes-formation/demandes-formation.routing.module.ts @@ -0,0 +1,21 @@ +import { NgModule } from '@angular/core'; +import { Routes, RouterModule } from '@angular/router'; + + +import { DemandesFormationComponent } from "./demandes-formation.component"; + + +const routes: Routes = [ + { + path:'', + component: DemandesFormationComponent, + pathMatch: 'full' + } +]; + + +@NgModule({ + imports: [RouterModule.forChild(routes)], + exports: [RouterModule] +}) +export class DemandesFormationsRoutingModule {} diff --git a/src/app/ep-saisie/ep-saisie.component.html b/src/app/ep-saisie/ep-saisie.component.html index e69de29..c524b2b 100644 --- a/src/app/ep-saisie/ep-saisie.component.html +++ b/src/app/ep-saisie/ep-saisie.component.html @@ -0,0 +1,2 @@ + +

Saisie EP

diff --git a/src/app/ep-saisie/ep-saisie.module.ts b/src/app/ep-saisie/ep-saisie.module.ts index 7548d25..a51e349 100644 --- a/src/app/ep-saisie/ep-saisie.module.ts +++ b/src/app/ep-saisie/ep-saisie.module.ts @@ -1,10 +1,7 @@ -import { BrowserModule } from '@angular/platform-browser'; -import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; -import { FormsModule } from '@angular/forms'; - - import { NgModule } from "@angular/core"; import { CommonModule } from "@angular/common"; +import { FormsModule } from '@angular/forms'; +import { RouterModule } from '@angular/router' import { MaterialModule } from "@shared/angular-material/angular-material.module"; @@ -15,6 +12,7 @@ import { EpaSaisieComponent } from './epa-saisie/epa-saisie.component'; import { EpsSaisieComponent } from './eps-saisie/eps-saisie.component'; import { EpaSixAnsSaisieComponent } from './epa-six-ans-saisie/epa-six-ans-saisie.component'; +import { EpSaisieRoutingModule } from './ep-saisie.routing.module'; @NgModule({ declarations: [EpSaisieComponent, EpsSaisieComponent, EpaSaisieComponent, @@ -23,10 +21,12 @@ import { EpaSixAnsSaisieComponent } from './epa-six-ans-saisie/epa-six-ans-saisi exports: [EpSaisieComponent ], imports: [ - BrowserAnimationsModule, - FormsModule, + //BrowserAnimationsModule, + //FormsModule, MaterialModule, - NavMenuModule + NavMenuModule, + EpSaisieRoutingModule, + RouterModule ], }) export class EpSaisieModule {} diff --git a/src/app/ep-saisie/ep-saisie.routing.module.ts b/src/app/ep-saisie/ep-saisie.routing.module.ts new file mode 100644 index 0000000..2f0a755 --- /dev/null +++ b/src/app/ep-saisie/ep-saisie.routing.module.ts @@ -0,0 +1,21 @@ +import { NgModule } from '@angular/core'; +import { Routes, RouterModule } from '@angular/router'; + + +import { EpSaisieComponent } from "./ep-saisie.component"; + + +const routes: Routes = [ + { + path:'', + component: EpSaisieComponent, + pathMatch: 'full' + } +]; + + +@NgModule({ + imports: [RouterModule.forChild(routes)], + exports: [RouterModule] +}) +export class EpSaisieRoutingModule {} diff --git a/src/app/ep/ep.component.html b/src/app/ep/ep.component.html index e69de29..9a48c1b 100644 --- a/src/app/ep/ep.component.html +++ b/src/app/ep/ep.component.html @@ -0,0 +1,2 @@ + +

Liste des EP collaborateurs

diff --git a/src/app/ep/ep.module.ts b/src/app/ep/ep.module.ts index e9ff108..a431850 100644 --- a/src/app/ep/ep.module.ts +++ b/src/app/ep/ep.module.ts @@ -1,10 +1,7 @@ -import { BrowserModule } from '@angular/platform-browser'; -import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; -import { FormsModule } from '@angular/forms'; - - import { NgModule } from "@angular/core"; import { CommonModule } from "@angular/common"; +import { FormsModule } from '@angular/forms'; +import { RouterModule } from '@angular/router'; import { MaterialModule } from "@shared/angular-material/angular-material.module"; @@ -24,6 +21,9 @@ import { EpaComponent } from "./ep-consultation/epa/epa.component"; import { EpaSixAnsComponent } from "./ep-consultation/epa-six-ans/epa-six-ans.component"; import { EpsComponent } from "./ep-consultation/eps/eps.component"; + +import { EpRoutingModule } from './ep.routing.module'; + /**/ @NgModule({ declarations: [EpComponent, EpAugmentationSalaireComponent, EpChoixDateComponent, @@ -34,10 +34,10 @@ EpSignatureComponent, EpaComponent, EpaSixAnsComponent, EpsComponent exports: [EpComponent ], imports: [ - BrowserAnimationsModule, - FormsModule, MaterialModule, - NavMenuModule + NavMenuModule, + EpRoutingModule, + RouterModule ], }) export class EpModule {} diff --git a/src/app/ep/ep.routing.module.ts b/src/app/ep/ep.routing.module.ts new file mode 100644 index 0000000..4f64e1b --- /dev/null +++ b/src/app/ep/ep.routing.module.ts @@ -0,0 +1,21 @@ +import { NgModule } from '@angular/core'; +import { Routes, RouterModule } from '@angular/router'; + + +import { EpComponent } from "./ep.component"; + + +const routes: Routes = [ + { + path:'', + component: EpComponent, + pathMatch: 'full' + } +]; + + +@NgModule({ + imports: [RouterModule.forChild(routes)], + exports: [RouterModule] +}) +export class EpRoutingModule {} diff --git a/src/app/formations/formations.component.html b/src/app/formations/formations.component.html index e69de29..f59a99b 100644 --- a/src/app/formations/formations.component.html +++ b/src/app/formations/formations.component.html @@ -0,0 +1,2 @@ + +

Liste des formations

diff --git a/src/app/formations/formations.module.ts b/src/app/formations/formations.module.ts index d7dbe76..b5a93bb 100644 --- a/src/app/formations/formations.module.ts +++ b/src/app/formations/formations.module.ts @@ -1,31 +1,31 @@ -import { BrowserModule } from '@angular/platform-browser'; -import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; -import { FormsModule } from '@angular/forms'; - - import { NgModule } from "@angular/core"; import { CommonModule } from "@angular/common"; +import { RouterModule } from '@angular/router'; import { MaterialModule } from "@shared/angular-material/angular-material.module"; import {NavMenuModule} from '@shared/nav-menu/nav-menu.module'; import { FormationsComponent } from './formations.component'; -import { NewFormationComponent } from './new-formation/new-formation.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 { FormationComponent } from './details-formation/formation.component'; +import { EditFormationComponent } from './edit-formation/edit-formation.component'; + +import { FormationsRoutingModule } from './formations.routing.module'; + @NgModule({ - declarations: [ FormationsComponent, NewFormationComponent, + declarations: [ FormationsComponent, NewFormationComponent, FormationComponent, EditFormationComponent ], exports: [ FormationsComponent ], imports: [ - BrowserAnimationsModule, - FormsModule, + CommonModule, MaterialModule, - NavMenuModule + NavMenuModule, + RouterModule, + FormationsRoutingModule ], }) export class FormationsModule {} diff --git a/src/app/formations/formations.routing.module.ts b/src/app/formations/formations.routing.module.ts new file mode 100644 index 0000000..c7b56ad --- /dev/null +++ b/src/app/formations/formations.routing.module.ts @@ -0,0 +1,21 @@ +import { NgModule } from '@angular/core'; +import { Routes, RouterModule } from '@angular/router'; + + +import { FormationsComponent } from "./formations.component"; + + +const routes: Routes = [ + { + path:'', + component: FormationsComponent, + pathMatch: 'full' + } +]; + + +@NgModule({ + imports: [RouterModule.forChild(routes)], + exports: [RouterModule] +}) +export class FormationsRoutingModule {} diff --git a/src/app/home/home.module.ts b/src/app/home/home.module.ts index e0a19e4..192036a 100644 --- a/src/app/home/home.module.ts +++ b/src/app/home/home.module.ts @@ -1,9 +1,7 @@ -import { BrowserModule } from '@angular/platform-browser'; -import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; -import { FormsModule } from '@angular/forms'; - import { NgModule } from "@angular/core"; import { CommonModule } from "@angular/common"; +import { RouterModule } from '@angular/router'; +import { FormsModule } from '@angular/forms'; import { MaterialModule } from "@shared/angular-material/angular-material.module"; @@ -23,10 +21,11 @@ import {NavMenuModule} from '@shared/nav-menu/nav-menu.module'; HomeComponent ], imports: [ - BrowserAnimationsModule, + CommonModule, FormsModule, MaterialModule, - NavMenuModule + NavMenuModule, + RouterModule ], }) export class HomeModule {} diff --git a/src/app/referents/referents.component.html b/src/app/referents/referents.component.html index e69de29..835f8da 100644 --- a/src/app/referents/referents.component.html +++ b/src/app/referents/referents.component.html @@ -0,0 +1,2 @@ + +

Liste des référents

diff --git a/src/app/referents/referents.module.ts b/src/app/referents/referents.module.ts index d305812..931fff6 100644 --- a/src/app/referents/referents.module.ts +++ b/src/app/referents/referents.module.ts @@ -1,10 +1,6 @@ -import { BrowserModule } from '@angular/platform-browser'; -import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; -import { FormsModule } from '@angular/forms'; - - import { NgModule } from "@angular/core"; import { CommonModule } from "@angular/common"; +import { RouterModule } from '@angular/router'; import { MaterialModule } from "@shared/angular-material/angular-material.module"; @@ -12,6 +8,7 @@ import {NavMenuModule} from '@shared/nav-menu/nav-menu.module'; import { ReferentsComponent } from './referents.component'; import { DetailsReferentComponent } from './details-referent/details-referent.component'; +import { ReferentsRoutingModule } from './referents.routing.module'; @NgModule({ declarations: [ DetailsReferentComponent, ReferentsComponent @@ -19,10 +16,11 @@ import { DetailsReferentComponent } from './details-referent/details-referent.co exports: [ ReferentsComponent ], imports: [ - BrowserAnimationsModule, - FormsModule, + CommonModule, MaterialModule, - NavMenuModule + NavMenuModule, + RouterModule, + ReferentsRoutingModule ], }) export class ReferentsModule {} diff --git a/src/app/referents/referents.routing.module.ts b/src/app/referents/referents.routing.module.ts new file mode 100644 index 0000000..bc1ffb0 --- /dev/null +++ b/src/app/referents/referents.routing.module.ts @@ -0,0 +1,21 @@ +import { NgModule } from '@angular/core'; +import { Routes, RouterModule } from '@angular/router'; + + +import { ReferentsComponent } from "./referents.component"; + + +const routes: Routes = [ + { + path:'', + component: ReferentsComponent, + pathMatch: 'full' + } +]; + + +@NgModule({ + imports: [RouterModule.forChild(routes)], + exports: [RouterModule] +}) +export class ReferentsRoutingModule {} 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 0012a0d..866dc30 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 @@ -3,7 +3,7 @@ more_vert - - + + - + diff --git a/src/app/shared/nav-menu/nav-menu-assistante/nav-menu-assistante.component.ts b/src/app/shared/nav-menu/nav-menu-assistante/nav-menu-assistante.component.ts index bb920fe..7532c1a 100644 --- a/src/app/shared/nav-menu/nav-menu-assistante/nav-menu-assistante.component.ts +++ b/src/app/shared/nav-menu/nav-menu-assistante/nav-menu-assistante.component.ts @@ -1,5 +1,5 @@ import { Component } from "@angular/core"; - +import { CommonModule } from "@angular/common"; /** * Le nav-menu qui sera affiché pour l'assistante. * La navigation des assistantes : accès à la liste des référents, accès à la liste des collaborateurs, accès à la liste de tous les EP. diff --git a/src/app/shared/nav-menu/nav-menu-commercial/nav-menu-commercial.component.html b/src/app/shared/nav-menu/nav-menu-commercial/nav-menu-commercial.component.html index b0d798d..527ddd8 100644 --- a/src/app/shared/nav-menu/nav-menu-commercial/nav-menu-commercial.component.html +++ b/src/app/shared/nav-menu/nav-menu-commercial/nav-menu-commercial.component.html @@ -3,8 +3,8 @@ more_vert - + - + diff --git a/src/app/shared/nav-menu/nav-menu-rh/nav-menu-rh.component.html b/src/app/shared/nav-menu/nav-menu-rh/nav-menu-rh.component.html index bd27326..212e9eb 100644 --- a/src/app/shared/nav-menu/nav-menu-rh/nav-menu-rh.component.html +++ b/src/app/shared/nav-menu/nav-menu-rh/nav-menu-rh.component.html @@ -4,7 +4,7 @@ - + - + diff --git a/src/app/shared/nav-menu/nav-menu.component.html b/src/app/shared/nav-menu/nav-menu.component.html index 6160379..9f8d5b0 100644 --- a/src/app/shared/nav-menu/nav-menu.component.html +++ b/src/app/shared/nav-menu/nav-menu.component.html @@ -1,10 +1,10 @@
- + - - + + diff --git a/src/app/shared/nav-menu/nav-menu.module.ts b/src/app/shared/nav-menu/nav-menu.module.ts index 309afc2..6a5b1c3 100644 --- a/src/app/shared/nav-menu/nav-menu.module.ts +++ b/src/app/shared/nav-menu/nav-menu.module.ts @@ -1,9 +1,7 @@ -import { BrowserModule } from '@angular/platform-browser'; -import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; -import { FormsModule } from '@angular/forms'; - import { NgModule } from "@angular/core"; import { CommonModule } from "@angular/common"; +import { RouterModule } from '@angular/router'; + import { MaterialModule } from "../angular-material/angular-material.module"; @@ -14,14 +12,13 @@ import { NavMenuCommercialComponent } from "./nav-menu-commercial/nav-menu-comme import { NavMenuRHComponent } from "./nav-menu-rh/nav-menu-rh.component"; @NgModule({ - declarations: [ - NavMenuComponent, NavMenuAssistanteComponent, NavMenuCollaborateurComponent, + declarations: [ NavMenuComponent, NavMenuAssistanteComponent, NavMenuCollaborateurComponent, NavMenuCommercialComponent, NavMenuRHComponent ], imports: [ - BrowserAnimationsModule, - FormsModule, - MaterialModule + CommonModule, + MaterialModule, + RouterModule ], exports: [NavMenuComponent] }) diff --git a/src/app/shared/utils/paths.ts b/src/app/shared/utils/paths.ts new file mode 100644 index 0000000..ee44fa6 --- /dev/null +++ b/src/app/shared/utils/paths.ts @@ -0,0 +1,60 @@ +const paths_collaborateurs = { + base: "/collaborateurs", + path: "collaborateurs", + formation: "formations", + evaluation: "evaluation", + edit: "edit" +}; + +const paths_demandes_delegation = { + base: "/demandesdelegation", + path: "demandesdelegation" +}; + +const paths_demandes_formation = { + base: "/demandesformation", + path: "demandesformation", + new: "nouvelledemande" +}; + +const paths_ep = { + base: "/ep", + path: "ep", + salaire: "augmentationsalaire", + choixdate: "choixdate", + demandedelegation: "demandedelegation", + demandesformation: "demandesformation", + propositiondate: "propositiondate", + participants: "participants", + commentaireAssistante: "commentaireassistante", + commentaireReferent: "commentairereferent" +}; + +const paths_saisie_ep = { + base: "/saisieep", + path: "saisieep", + epa: "epa", + eps: "eps", + epa6ans: "epasixans" +}; + +const paths_formation = { + base: "/formations", + path: "formations", + new: "nouvelleformation", + evaluation: "evaluation" +}; + +const paths_home = { + base: "/home", + path: "home" +}; + + +const paths_referents = { + base: "/referents", + path: "referents" +}; + +export { paths_collaborateurs, paths_demandes_delegation, paths_demandes_formation, + paths_ep, paths_saisie_ep, paths_formation, paths_home, paths_referents};