Séparation complète en modules avec création des fichiers module.ts et ajout d'un dossier shared

src/app/app-routing.module.ts

@@ -10,6 +10,11 @@ import { HomeComponent } from './home/home.component';
 const routes: Routes = [
   {
     path: '',
+    redirectTo: '/home',
+    pathMatch: 'full'
+  },
+  {
+    path: 'home',
     component: HomeComponent,
     canActivate: [AppAuthGuard],
     pathMatch: 'full'

src/app/app.module.ts

@@ -7,20 +7,18 @@ import { KeycloakAngularModule, KeycloakService } from 'keycloak-angular';
 
 import { AppComponent } from './app.component';
 import { AppRoutingModule } from './app-routing.module';
-import { MaterialModule } from "./angular-material/angular-material.module";
+import { ApiModule } from '@shared/api-swagger'
-import { ApiModule } from './api-swagger'
 
-import { HomeComponent, HomeAssistanteComponent, HomeCollaborateurComponent,
+import { HomeModule } from './home';
-   HomeCommercialComponent, HomeRHComponent } from './home';
+import { CollaborateursModule } from './collaborateurs';
+import { ReferentsModule } from './referents';
+import { FormationsModule } from './formations';
+import { DemandesFormationModule } from './demandes-formation';
+import { DemandesDelegationModule } from './demandes-delegation';
+import { EpSaisieModule } from "./ep-saisie";
+import { EpModule } from "./ep"
 
-
+import { environment } from '@env';
-import { ServiceEP, ServiceFormation, ServiceCollaborateur } from "./service"
-
-
-import { NavMenuComponent, NavMenuAssistanteComponent,
-   NavMenuCollaborateurComponent, NavMenuCommercialComponent, NavMenuRHComponent } from "./nav-menu";
-
-import { environment } from '../environments/environment';
 
 
 
@@ -31,28 +29,27 @@ let keycloakService: KeycloakService = new KeycloakService();
 
 @NgModule({
   declarations: [
-    AppComponent, HomeComponent, HomeAssistanteComponent
+    AppComponent
-    , HomeCollaborateurComponent, HomeCommercialComponent, HomeRHComponent, NavMenuComponent,
-    NavMenuAssistanteComponent, NavMenuCollaborateurComponent, NavMenuCommercialComponent, NavMenuRHComponent
   ],
   imports: [
     BrowserModule,
     KeycloakAngularModule,
     AppRoutingModule,
-    BrowserAnimationsModule,
-    MaterialModule,
     HttpClientModule,
-    FormsModule,
+    ApiModule,
-    ApiModule
+    HomeModule,
+    CollaborateursModule,
+    ReferentsModule,
+    FormationsModule,
+    DemandesFormationModule,
+    DemandesDelegationModule,
+    EpSaisieModule
   ],
   providers: [
     {
       provide: KeycloakService,
       useValue: keycloakService
-    },
+    }
-    ServiceEP,
-    ServiceCollaborateur,
-    ServiceFormation
   ],
   entryComponents: [AppComponent]
 })

src/app/collaborateurs/collaborateurs.component.ts

@@ -0,0 +1,18 @@
+import { Component, OnInit } from '@angular/core';
+
+/**
+    * Composant qui sert à l'affichage de la liste des collaborateurs en fonction de l'agence de son utilitateur.
+    * Seuls les commerciaux, RH et assistantes pourront accéder à la liste des collaborateurs.
+    * Les données affichées : Agence-Nom Prénom-Date Embauche-Responsable Commercial-Date Prochain EP
+    */
+@Component({
+  selector: 'app-collaborateurs',
+  templateUrl: './collaborateurs.component.html'
+})
+export class CollaborateursComponent implements OnInit {
+
+  constructor() {}
+
+  ngOnInit() {
+  }
+}

src/app/collaborateurs/collaborateurs.module.ts

@@ -0,0 +1,36 @@
+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 { MaterialModule } from "@shared/angular-material/angular-material.module";
+
+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";
+
+@NgModule({
+  declarations: [
+    DetailsCollaborateurComponent, EvaluationComponent, EditEvaluationComponent,
+    CollaborateursComponent, FormationsCollaboateurComponent
+  ],
+  exports: [
+    CollaborateursComponent
+  ],
+  imports: [
+    BrowserAnimationsModule,
+    FormsModule,
+    MaterialModule,
+    NavMenuModule
+  ],
+})
+export class CollaborateursModule {}

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

@@ -0,0 +1,16 @@
+import { Component, OnInit } from '@angular/core';
+
+
+/**
+    */
+@Component({
+  selector: 'app-details-collaborateur',
+  templateUrl: './details-collaborateur.component.html'
+})
+export class DetailsCollaborateurComponent implements OnInit {
+
+  constructor() {}
+
+  ngOnInit() {
+  }
+}

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

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

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

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

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

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

src/app/collaborateurs/index.ts

@@ -0,0 +1,2 @@
+export * from './collaborateurs.component';
+export * from './collaborateurs.module';

src/app/demandes-delegation/demandes-delegation.component.ts

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

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

@@ -0,0 +1,29 @@
+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 { MaterialModule } from "@shared/angular-material/angular-material.module";
+
+import {NavMenuModule} from '@shared/nav-menu/nav-menu.module';
+
+
+import { DemandesDelegationComponent } from './demandes-delegation.component';
+import { DemandeDelegationComponent } from './details-demande-delegation/demande-delegation.component';
+
+@NgModule({
+  declarations: [ DemandesDelegationComponent, DemandeDelegationComponent
+  ],
+  exports: [ DemandesDelegationComponent
+  ],
+  imports: [
+    BrowserAnimationsModule,
+    FormsModule,
+    MaterialModule,
+    NavMenuModule
+  ],
+})
+export class DemandesDelegationModule {}

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

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

src/app/demandes-delegation/index.ts

@@ -0,0 +1,2 @@
+export * from './demandes-delegation.component';
+export * from './demandes-delegation.module';

src/app/demandes-formation/demandes-formation.component.ts

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

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

@@ -0,0 +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 { MaterialModule } from "@shared/angular-material/angular-material.module";
+
+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'
+
+@NgModule({
+  declarations: [ DemandesFormationComponent, DemandeFormationComponent,
+    NewDemandeFormationComponent
+  ],
+  exports: [
+      DemandesFormationComponent
+  ],
+  imports: [
+    BrowserAnimationsModule,
+    FormsModule,
+    MaterialModule,
+    NavMenuModule
+  ],
+})
+export class DemandesFormationModule {}

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

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

src/app/demandes-formation/index.ts

@@ -0,0 +1,2 @@
+export * from './demandes-formation.component';
+export * from './demandes-formation.module';

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

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

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

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

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

@@ -0,0 +1,32 @@
+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 { MaterialModule } from "@shared/angular-material/angular-material.module";
+
+import {NavMenuModule} from '@shared/nav-menu/nav-menu.module';
+
+import { EpSaisieComponent } from './ep-saisie.component';
+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';
+
+
+@NgModule({
+  declarations: [EpSaisieComponent, EpsSaisieComponent, EpaSaisieComponent,
+    EpaSixAnsSaisieComponent
+  ],
+  exports: [EpSaisieComponent
+  ],
+  imports: [
+    BrowserAnimationsModule,
+    FormsModule,
+    MaterialModule,
+    NavMenuModule
+  ],
+})
+export class EpSaisieModule {}

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

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

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

@@ -0,0 +1,15 @@
+import { Component, OnInit } from '@angular/core';
+
+/**
+    */
+@Component({
+  selector: 'app-epa-six-ans-saisie',
+  templateUrl: './epa-six-ans-saisie.component.html'
+})
+export class EpaSixAnsSaisieComponent implements OnInit {
+
+  constructor() {}
+
+  ngOnInit() {
+  }
+}

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

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

src/app/ep-saisie/index.ts

@@ -0,0 +1,2 @@
+export * from './ep-saisie.component';
+export * from './ep-saisie.module';

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

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

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

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

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

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

src/app/ep/ep-consultation/ep-signature/ep-signature.component.ts

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

src/app/ep/ep-consultation/epa-six-ans/epa-six-ans.component.ts

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

src/app/ep/ep-consultation/epa/epa.component.ts

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

src/app/ep/ep-consultation/eps/eps.component.ts

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

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

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

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

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

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

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

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

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

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

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

src/app/ep/ep.component.ts

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

src/app/ep/ep.module.ts

@@ -0,0 +1,43 @@
+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 { 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-consultation/ep-signature/ep-signature.component";
+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";
+
+/**/
+@NgModule({
+  declarations: [EpComponent, EpAugmentationSalaireComponent, EpChoixDateComponent,
+    EpDemandeDelegationComponent, EpDemandesFormationComponent, EpParticipantsComponent,
+    EpPropositionsDatesComponent, NewParticipantComponent, EpConsultationComponent,
+EpSignatureComponent, EpaComponent, EpaSixAnsComponent, EpsComponent
+  ],
+  exports: [EpComponent
+  ],
+  imports: [
+    BrowserAnimationsModule,
+    FormsModule,
+    MaterialModule,
+    NavMenuModule
+  ],
+})
+export class EpModule {}

src/app/ep/index.ts

@@ -0,0 +1,2 @@
+export * from './ep.component';
+export * from './ep.module';

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

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

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

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

src/app/formations/formations.component.ts

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

src/app/formations/formations.module.ts

@@ -0,0 +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 { 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'
+@NgModule({
+  declarations: [ FormationsComponent, NewFormationComponent, 
+    FormationComponent, EditFormationComponent
+  ],
+  exports: [
+      FormationsComponent
+  ],
+  imports: [
+    BrowserAnimationsModule,
+    FormsModule,
+    MaterialModule,
+    NavMenuModule
+  ],
+})
+export class FormationsModule {}

src/app/formations/index.ts

@@ -0,0 +1,2 @@
+export * from './formations.component';
+export * from './formations.module';

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

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

src/app/home/home-assistante/home-assistante.component.ts

@@ -7,11 +7,10 @@ import {MatTableDataSource} from '@angular/material/table';
 import {MatPaginator} from '@angular/material/paginator';
 import {MatSort} from '@angular/material/sort';
 
-import { ServiceCollaborateur, ServiceEP } from "../../service";
+import { CollaborateurModel } from "@shared/api-swagger/model/collaborateurModel";
-import { CollaborateurModel } from "../../modeles/modele-collaborateur";
+import { EpModel } from "@shared/api-swagger/model/epModel";
-import { EpModel } from "../../api-swagger/model/epModel";
+import { DisplayProchainEPCollaborateur } from "@shared/displayInfo/displayEP";
-import { DisplayEP } from "../../utils/displayEP";
+import { DefaultService } from "@shared/api-swagger/api/api";
-import { DefaultService } from "../../api-swagger/api/api";
 
 
 /**
@@ -31,12 +30,12 @@ export class HomeAssistanteComponent implements OnInit, AfterViewInit {
   /**
     * Une liste qui contiendra la liste des EP avec les informations à faire conserver.
     */
-  epDisponibles : DisplayEP[];
+  epDisponibles : DisplayProchainEPCollaborateur[];
 
   /**
     * Liste des EP qui seront affichées en fonction des filtres.
     */
-  epFiltre : DisplayEP[];
+  epFiltre : DisplayProchainEPCollaborateur[];
 
   /**
     * Subscription pour récupérer les EP.
@@ -52,7 +51,7 @@ export class HomeAssistanteComponent implements OnInit, AfterViewInit {
   /**
     * source pour l'affichage des EP dans le tableau qui est affichée.
     */
-  dataSource : MatTableDataSource<DisplayEP>;
+  dataSource : MatTableDataSource<DisplayProchainEPCollaborateur>;
 
   /**
     * contenu de la recherche.
@@ -74,8 +73,7 @@ export class HomeAssistanteComponent implements OnInit, AfterViewInit {
     */
   chargement = true;
 
-  constructor(public keycloakService : KeycloakService, private serviceCollaborateur : ServiceCollaborateur,
+  constructor(public keycloakService : KeycloakService, private service:DefaultService) {
-                                        private serviceEP : ServiceEP, private service:DefaultService) {
   }
 
   ngAfterViewInit() {
@@ -85,14 +83,14 @@ export class HomeAssistanteComponent implements OnInit, AfterViewInit {
   /**
     * Initialisation de l'affichage des EP dans le tableau.
     */
-  initDisplay(eps) {
+  initDisplay(eps: EpModel[]) {
     this.epDisponibles = []
-    let epDisplay : DisplayEP;
+    let epDisplay : DisplayProchainEPCollaborateur;
     let today = new Date();
     for(let ep of eps) {
-      epDisplay = new DisplayEP();
+      epDisplay = new DisplayProchainEPCollaborateur();
-      epDisplay.id = ep.id;
+      epDisplay.id = ep.idEp;
-      epDisplay.agence = ep.collaborateur.bu.nom;
+      epDisplay.agence = ep.collaborateur.businessunit.nom;
       epDisplay.collaborateur = ep.collaborateur;
       epDisplay.referent = ep.referent;
       epDisplay.dateentretien = ep.dateEntretien;

src/app/home/home.component.ts

@@ -2,9 +2,9 @@ import { Component, OnInit } from '@angular/core';
 
 import { KeycloakService } from 'keycloak-angular';
 
-import { Role } from '../utils/roles';
+import { Role } from '@shared/utils/roles';
 
-import { environment } from '../../environments/'
+import { environment } from '@env'
 
 /**
   * Home principale qui fera affiché le home correspondant au rôle de l'utilisateur connecté.

src/app/home/home.module.ts

@@ -0,0 +1,32 @@
+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 { MaterialModule } from "@shared/angular-material/angular-material.module";
+
+import {HomeAssistanteComponent} from './home-assistante/home-assistante.component';
+import {HomeCollaborateurComponent} from './home-collaborateur/home-collaborateur.component';
+import {HomeCommercialComponent} from './home-commercial/home-commercial.component';
+import {HomeRHComponent} from './home-rh/home-rh.component';
+import {HomeComponent} from './home.component';
+import {NavMenuModule} from '@shared/nav-menu/nav-menu.module';
+
+@NgModule({
+  declarations: [
+    HomeComponent, HomeAssistanteComponent, HomeCollaborateurComponent,
+    HomeCommercialComponent, HomeRHComponent
+  ],
+  exports: [
+    HomeComponent
+  ],
+  imports: [
+    BrowserAnimationsModule,
+    FormsModule,
+    MaterialModule,
+    NavMenuModule
+  ],
+})
+export class HomeModule {}

src/app/home/index.ts

@@ -1,5 +1,2 @@
-export * from './home-assistante/home-assistante.component';
-export * from './home-collaborateur/home-collaborateur.component';
-export * from './home-commercial/home-commercial.component';
-export * from './home-rh/home-rh.component';
 export * from './home.component';
+export * from './home.module';

src/app/modeles/modele-collaborateur.ts

@@ -1,14 +0,0 @@
-/**
-  * Model qui contient les informations du collaborateur.
-  * Cette classe est aussi utilisé pour les commerciaux.
-  */
-export interface CollaborateurModel {
-  idCollaborateur? : number;
-  nom? : string;
-  prenom? : string;
-  mail? : string;
-  agence? : string;
-  fonction? : string;
-  dateEmbauche? : Date;
-  dateDepart? : Date;
-};

src/app/modeles/modele-ep.ts

@@ -1,76 +0,0 @@
-import { CollaborateurModel } from "./modele-collaborateur";
-//PLUSIEURS REFERENT AVEC LE DROIT D'ECRITURE ?!
-
-/**
-  * Modèle des EP que passent le collaborateur.
-  */
-export class EpModel {
-  idEp? : number;
-  type? : string;
-  dateCreation? : Date;
-  dateDisponibilite? : Date;
-  dateSaisie? : Date;
-  etat? : string;
-  cv? : string;
-  dateEntretien? : Date;
-  typeEntretien? : string;
-  commentaireCommercial? : string;
-  rdvEntretien? : RDVEntretienModel[];
-  augmentationSalaire? : AugmentationSalaireModel;
-  participants? : ParticipantModel[];
-  collaborateur?: CollaborateurModel;
-  referent?: CollaborateurModel;
-  engagement? : EngagementModel;
-  nbRappelSignature?: number;
-  notifications?: Notification[];
-};
-
-/**
-  * Modèle de l'augmentation de salaire d'un collaborateur.
-  */
-export class AugmentationSalaireModel {
-  idAugmentation? : number;
-  nouveauSalaire? : number;
-  dateDemande? : Date;
-};
-
-/**
-  * Ce modèle correspond au proposition de date et heure de RDV et de type d'entretien fait par le référent.
-  */
-export class RDVEntretienModel {
-  idTypeEntretien? : number;
-  typeEntretien? :string;
-  dateEntretien? : Date;
-};
-
-/**
-  * L'engagement que prend un référent vis-à-vis d'un collaborateur suite à son Ep.
-  */
-export class EngagementModel {
-  idEngagement? : number;
-  engagement? : string;
-  dateLimie? : Date;
-  accomplie? : boolean;
-};
-
-
-/**
-  * Modèle d'un participant à un EP.
-  */
-export class ParticipantModel {
-  idParticipant? : number;
-  collaborateur? : CollaborateurModel;
-  role? : string;
-};
-
-
-/**
-  * Notification que reçoivent les collaborateurs et commerciaux.
-  */
-export class Notification {
-  idNotification? : number;
-  type? : string;
-  titre?: string;
-  description?: string;
-  lu?: boolean;
-}

src/app/modeles/modele-formation.ts

@@ -1,69 +0,0 @@
-import { CollaborateurModel } from "./modele-collaborateur";
-
-/**
-  * Modèle des formations.
-  */
-export class FormationModel {
-  idFormation? : number;
-  intitule? : string;
-  dateDebut? : Date;
-  dateFin? : Date;
-  statut? : string;
-  lieu? : string;
-  duree? : number;
-  organisme? : string;
-  nomFormateur? : string;
-  participantsFormation : ParticipationFormationModel[];
-};
-
-
-/**
-  * Modèle des demandes de formations effectués suite à un EP ou par une RH.
-  */
-export class DemandeFormationModel {
-  idDemandeFormation? : number;
-  idEp? : number;
-  statut? : string;
-  libelle? : string;
-  description? : string;
-  theme? : ThemeModel;
-};
-
-/**
-  * Modèle des Theme auxquels peuvent appartenir une formation.
-  */
-export interface ThemeModel {
-  idTheme : number;
-  nom : string;
-};
-
-/**
-  * La partcipation d'un collaborateur à une formation.
-  */
-export interface ParticipationFormationModel {
-  idParticipation : number;
-  formation : FormationModel;
-  collaborateur : CollaborateurModel;
-  evaluation : EvaluationFormationModel[];
-}
-
-
-/**
-  * Le modèle des évaluations, il contient les réponses à  un critère.
-  */
-export class EvaluationFormationModel {
-  note? : number;
-  commentaire?: string;
-  critere? : CritereModel;
-}
-
-/**
-  * Les critères sont les questions qui sont posées au collaborateur.
-  */
-export interface CritereModel {
-  idCritere?: number;
-  texte?: string;
-  type?: string;
-  ordre?: string;
-  section?: string;
-}

src/app/nav-menu/index.ts

@@ -1,5 +0,0 @@
-export * from "./nav-menu.component";
-export * from "./nav-menu-assistante/nav-menu-assistante.component";
-export * from "./nav-menu-collaborateur/nav-menu-collaborateur.component";
-export * from "./nav-menu-commercial/nav-menu-commercial.component";
-export * from "./nav-menu-rh/nav-menu-rh.component";

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

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

src/app/referents/index.ts

@@ -0,0 +1,2 @@
+export * from './referents.module';
+export * from './referents.component';

src/app/referents/referents.component.ts

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

src/app/referents/referents.module.ts

@@ -0,0 +1,28 @@
+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 { MaterialModule } from "@shared/angular-material/angular-material.module";
+
+import {NavMenuModule} from '@shared/nav-menu/nav-menu.module';
+
+import { ReferentsComponent } from './referents.component';
+import { DetailsReferentComponent } from './details-referent/details-referent.component';
+
+@NgModule({
+  declarations: [ DetailsReferentComponent, ReferentsComponent
+  ],
+  exports: [ ReferentsComponent
+  ],
+  imports: [
+    BrowserAnimationsModule,
+    FormsModule,
+    MaterialModule,
+    NavMenuModule
+  ],
+})
+export class ReferentsModule {}

src/app/service/index.ts

@@ -1,3 +0,0 @@
-export * from "./service-ep";
-export * from "./service-formation";
-export * from "./service-collaborateur";

src/app/service/service-collaborateur.ts

@@ -1,31 +0,0 @@
-import { Injectable } from "@angular/core";
-import { HttpClient } from "@angular/common/http";
-import { Observable } from 'rxjs';
-import { map } from 'rxjs/operators';
-
-
-import { KeycloakService } from 'keycloak-angular';
-
-import { urlCollaborateur } from "../utils/path-values-collaborateurs";
-import { CollaborateurModel } from "../modeles/modele-collaborateur";
-
-@Injectable({
-  providedIn : 'root'
-})
-export class ServiceCollaborateur {
-  constructor(private http: HttpClient, private keycloakService : KeycloakService) {
-  }
-
-  listeCollaborateurs() : Observable<CollaborateurModel[]> {
-    let token = this.keycloakService.getKeycloakInstance().token;
-    const headers = { Authorization: "Bearer "+token };
-    return this.http.get<CollaborateurModel[]>(urlCollaborateur, { headers });
-  }
-
-  getCollaborateurByParam(params) : Observable<CollaborateurModel> {
-    let token = this.keycloakService.getKeycloakInstance().token;
-    const headers = { Authorization: "Bearer "+token };
-    return this.http.get<CollaborateurModel>(urlCollaborateur, { params, headers });
-  }
-
-}

src/app/service/service-ep.ts

@@ -1,91 +0,0 @@
-import { Injectable } from "@angular/core";
-import { HttpClient } from "@angular/common/http";
-import { Observable } from 'rxjs';
-
-import { KeycloakService } from 'keycloak-angular';
-
-import { urlsEP } from "../utils/path-values-ep";
-import { EpModel, RDVEntretienModel } from "../modeles/modele-ep";
-
-@Injectable({
-  providedIn : 'root'
-})
-export class ServiceEP {
-  constructor(private http: HttpClient, private keycloakService : KeycloakService) {}
-
-  listeProchainsEPReferent(id) : Observable<EpModel[]> {
-    let token = this.keycloakService.getKeycloakInstance().token;
-    let params = { idReferent : id };
-    const headers = { Authorization: "Bearer "+token };
-    return this.http.get<EpModel[]>(urlsEP.prochainsEPReferent, { params, headers });
-  }
-
-  listeEPDisponibles() : Observable<EpModel[]> {
-    let token = this.keycloakService.getKeycloakInstance().token;
-    const headers = { Authorization: "Bearer "+token };
-    return this.http.get<EpModel[]>(urlsEP.epDisponibles, {headers});
-  }
-
-  listeEPCollaborateur(id) : Observable<EpModel[]> {
-    let token = this.keycloakService.getKeycloakInstance().token;
-    let params = { idCollab : id };
-    const headers = { Authorization: "Bearer "+token };
-    return this.http.get<EpModel[]>(urlsEP.epCollaborateur,  {params, headers});
-  }
-
-  listeEPReferent(id) : Observable<EpModel[]> {
-    let token = this.keycloakService.getKeycloakInstance().token;
-    let params = { idReferent : id };
-    const headers = { Authorization: "Bearer "+token };
-    return this.http.get<EpModel[]>(urlsEP.epReferent, { params, headers});
-  }
-
-  prochainEPCollaborateur(id) : Observable<EpModel> {
-    let token = this.keycloakService.getKeycloakInstance().token;
-    let params = { idCollab : id };
-    const headers = { Authorization: "Bearer "+token };
-    return this.http.get<EpModel>(urlsEP.prochainEpCollaborateur, { params, headers});
-  }
-
-  envoieEP(ep : EpModel, action) {
-    let token = this.keycloakService.getKeycloakInstance().token;
-    let params = { action };
-    const headers = {
-      Authorization: "Bearer "+token,
-      ContentType: "application/json"
-   };
-    return this.http.put<EpModel>(urlsEP.envoieEP, ep, {params, headers});
-  }
-
-  propositionDate(dates) {
-    let token = this.keycloakService.getKeycloakInstance().token;
-    const headers = {
-      Authorization: "Bearer "+token,
-      ContentType: "application/json"
-   };
-    return this.http.post<RDVEntretienModel>(urlsEP.propositionDate, dates, {headers});
-  }
-
-  rappelerSignature(id) {
-    let token = this.keycloakService.getKeycloakInstance().token;
-    const headers = { Authorization: "Bearer "+token };
-    let params = { idEp : id };
-    return this.http.post(urlsEP.rappelSignature, null, {params, headers});
-  }
-
-  demandeEPI(id) {
-    let token = this.keycloakService.getKeycloakInstance().token;
-    const headers = { Authorization: "Bearer "+token };
-    let params = { IdCollab : id };
-    return this.http.post(urlsEP.epi, null, { params, headers});
-  }
-
-  ajouterParticipant(idParticipant, idEp) {
-    //TODO
-  }
-
-  deleguerEP(idNewRef, idEp){
-    //TODO
-  }
-
-}

src/app/service/service-formation.ts

@@ -1,99 +0,0 @@
-import { Injectable } from "@angular/core";
-import { HttpClient } from "@angular/common/http";
-import { Observable } from "rxjs";
-
-import { KeycloakService } from 'keycloak-angular';
-
-import {FormationModel, DemandeFormationModel, EvaluationFormationModel, ThemeModel, CritereModel, ParticipationFormationModel } from "../modeles/modele-formation";
-import { urlsFormation } from "../utils/path-values-formations";
-
-
-
-@Injectable({
-  providedIn : 'root'
-})
-export class ServiceFormation {
-  constructor(private http: HttpClient, private keycloakService : KeycloakService) {}
-
-
-
-  listeFormations() : Observable<FormationModel[]> {
-    let token = this.keycloakService.getKeycloakInstance().token;
-    const headers = { Authorization: "Bearer "+token };
-    return this.http.get<FormationModel[]>(urlsFormation.urlFormation, {headers});
-  }
-
-
-  listeFormationsCollaborateur(id) : Observable<ParticipationFormationModel[]> {
-    let token = this.keycloakService.getKeycloakInstance().token;
-    const headers = { Authorization: "Bearer "+token };
-    let params = { idCollab : id };
-    return this.http.get<ParticipationFormationModel[]>(urlsFormation.urlFormation, { params, headers });
-  }
-
-  nouvelleFormation(formation) : Observable<FormationModel> {
-    let token = this.keycloakService.getKeycloakInstance().token;
-    const headers = {
-      Authorization: "Bearer "+token,
-      ContentType: "application/json"
-    };
-    return this.http.post<FormationModel>(urlsFormation.newFormation, formation, {headers});
-  }
-
-  updateFormation(formation) {
-    let token = this.keycloakService.getKeycloakInstance().token;
-    const headers = {
-      Authorization: "Bearer "+token,
-      ContentType: "application/json"
-    };
-    return this.http.put<FormationModel>(urlsFormation.newFormation, formation, {headers});
-  }
-
-  deleteFormation(id) {
-    let token = this.keycloakService.getKeycloakInstance().token;
-    const headers = { Authorization: "Bearer "+token };
-    let params = { idFormation : id };
-    return this.http.delete(urlsFormation.urlFormation, {headers, params});
-  }
-
-  evaluationsFormation(id) : Observable<EvaluationFormationModel[]> {
-    let token = this.keycloakService.getKeycloakInstance().token;
-    const headers = { Authorization: "Bearer "+token };
-    let params = { idFormation : id };
-    return this.http.get<EvaluationFormationModel[]>(urlsFormation.evaluationsFormation, {headers, params});
-  }
-
-  evaluerFormation(evaluation) {
-    let token = this.keycloakService.getKeycloakInstance().token;
-    const headers = {
-      Authorization: "Bearer "+token,
-      ContentType: "application/json"
-    };
-    return this.http.post<EvaluationFormationModel>(urlsFormation.evaluerFormation, evaluation, {headers});
-  }
-
-  listeDemandesFormation() : Observable<DemandeFormationModel[]> {
-    let token = this.keycloakService.getKeycloakInstance().token;
-    const headers = { Authorization: "Bearer "+token };
-    return this.http.get<DemandeFormationModel[]>(urlsFormation.urlDemandesFormation, {headers});
-  }
-
-  reponseDemandeFormation(demandeFormation) {
-    let token = this.keycloakService.getKeycloakInstance().token;
-    const headers = { Authorization: "Bearer "+token };
-    return this.http.post<DemandeFormationModel>(urlsFormation.urlDemandesFormation, demandeFormation, {headers});
-  }
-
-  listeTheme() : Observable<ThemeModel[]> {
-    let token = this.keycloakService.getKeycloakInstance().token;
-    const headers = { Authorization: "Bearer "+token };
-    return this.http.get<ThemeModel[]>(urlsFormation.urlTheme, {headers});
-  }
-
-  listeCritere() : Observable<CritereModel[]> {
-    let token = this.keycloakService.getKeycloakInstance().token;
-    const headers = { Authorization: "Bearer "+token };
-    return this.http.get<CritereModel[]>(urlsFormation.urlCritere, {headers});
-  }
-
-}