From ae03725a06c09de7736c4d2ac26104b8f29d7986 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Yana=C3=ABl=20GRETTE?= Date: Tue, 28 Jul 2020 09:18:01 +0200 Subject: [PATCH] =?UTF-8?q?S=C3=A9paration=20compl=C3=A8te=20en=20modules?= =?UTF-8?q?=20avec=20cr=C3=A9ation=20des=20fichiers=20module.ts=20et=20ajo?= =?UTF-8?q?ut=20d'un=20dossier=20shared?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/app/app-routing.module.ts | 5 + src/app/app.module.ts | 43 ++++---- .../collaborateur-routing.module.ts} | 0 .../collaborateurs.component.html} | 0 .../collaborateurs.component.ts | 18 ++++ .../collaborateurs/collaborateurs.module.ts | 36 +++++++ .../details-collaborateur.component.html} | 0 .../details-collaborateur.component.ts | 16 +++ .../evaluation.component.html | 0 .../evaluation.component.ts | 15 +++ .../edit-evaluation.component.html} | 0 .../edit-evaluation.component.ts | 15 +++ .../formations-collaborateur.component.html} | 0 .../formations-collaborateur.component.ts | 15 +++ src/app/collaborateurs/index.ts | 2 + .../demandes-delegation.component.html} | 0 .../demandes-delegation.component.ts | 15 +++ .../demandes-delegation.module.ts | 29 ++++++ .../demande-delegation.component.html} | 0 .../demande-delegation.component.ts | 15 +++ src/app/demandes-delegation/index.ts | 2 + .../demandes-formation.component.html} | 0 .../demandes-formation.component.ts | 15 +++ .../demandes-formation.module.ts | 31 ++++++ .../demande-formation.component.html} | 0 .../demande-formation.component.ts | 15 +++ src/app/demandes-formation/index.ts | 2 + .../new-demande-formation.component.html} | 0 .../new-demande-formation.component.ts | 15 +++ .../ep-saisie.component.html} | 0 src/app/ep-saisie/ep-saisie.component.ts | 15 +++ src/app/ep-saisie/ep-saisie.module.ts | 32 ++++++ .../epa-saisie/epa-saisie.component.html} | 0 .../epa-saisie/epa-saisie.component.ts | 15 +++ .../epa-six-ans-saisie.component.html} | 0 .../epa-six-ans-saisie.component.ts | 15 +++ .../eps-saisie/eps-saisie.component.html} | 0 .../eps-saisie/eps-saisie.component.ts | 15 +++ src/app/ep-saisie/index.ts | 2 + .../ep-augmentation-salaire.component.ts | 15 +++ .../ep-choix-date.component.html} | 0 .../ep-choix-date/ep-choix-date.component.ts | 15 +++ .../ep-consultation.component.html} | 0 .../ep-consultation.component.ts | 15 +++ .../ep-signature/ep-signature.component.html} | 0 .../ep-signature/ep-signature.component.ts | 15 +++ .../epa-six-ans/epa-six-ans.component.html} | 0 .../epa-six-ans/epa-six-ans.component.ts | 15 +++ .../ep-consultation/epa/epa.component.html} | 0 .../ep/ep-consultation/epa/epa.component.ts | 15 +++ .../ep-consultation/eps/eps.component.html} | 0 .../ep/ep-consultation/eps/eps.component.ts | 15 +++ .../ep-demande-delegation.component.html} | 0 .../ep-demande-delegation.component.ts | 15 +++ .../ep-demandes-formation.component.html} | 0 .../ep-demandes-formation.component.ts | 15 +++ .../ep-participants.component.html} | 0 .../ep-participants.component.ts | 15 +++ .../new-participant.component.html} | 0 .../new-participant.component.ts | 15 +++ .../ep-propositions-dates.component.html} | 0 .../ep-propositions-dates.component.ts | 15 +++ .../index.ts => ep/ep.component.html} | 0 src/app/ep/ep.component.ts | 15 +++ src/app/ep/ep.module.ts | 43 ++++++++ src/app/ep/index.ts | 2 + .../formation.component.html} | 0 .../details-formation/formation.component.ts | 15 +++ .../edit-formation.component.html} | 0 .../edit-formation.component.ts | 15 +++ src/app/formations/formations.component.html | 0 src/app/formations/formations.component.ts | 15 +++ src/app/formations/formations.module.ts | 31 ++++++ src/app/formations/index.ts | 2 + .../new-formation.component.html | 0 .../new-formation/new-formation.component.ts | 15 +++ .../home-assistante.component.ts | 28 +++--- src/app/home/home.component.ts | 4 +- src/app/home/home.module.ts | 32 ++++++ src/app/home/index.ts | 5 +- src/app/modeles/modele-collaborateur.ts | 14 --- src/app/modeles/modele-ep.ts | 76 -------------- src/app/modeles/modele-formation.ts | 69 ------------- src/app/nav-menu/index.ts | 5 - .../details-referent.component.html | 0 .../details-referent.component.ts | 15 +++ src/app/referents/index.ts | 2 + src/app/referents/referents.component.html | 0 src/app/referents/referents.component.ts | 15 +++ src/app/referents/referents.module.ts | 28 ++++++ src/app/service/index.ts | 3 - src/app/service/service-collaborateur.ts | 31 ------ src/app/service/service-ep.ts | 91 ----------------- src/app/service/service-formation.ts | 99 ------------------- .../angular-material.module.ts | 0 src/app/{ => shared}/api-swagger/.npmignore | 0 .../api-swagger/.swagger-codegen-ignore | 0 .../api-swagger/.swagger-codegen/VERSION | 0 .../{ => shared}/api-swagger/api.module.ts | 0 src/app/{ => shared}/api-swagger/api/api.ts | 0 .../api-swagger/api/default.service.ts | 0 .../{ => shared}/api-swagger/configuration.ts | 0 src/app/{ => shared}/api-swagger/encoder.ts | 0 src/app/{ => shared}/api-swagger/index.ts | 0 .../model/augmentationSalaireModel.ts | 0 .../api-swagger/model/businessUnitModel.ts | 0 .../api-swagger/model/champModel.ts | 0 .../api-swagger/model/collaborateurModel.ts | 10 +- .../api-swagger/model/critereModel.ts | 0 .../model/demandeDelegationModel.ts | 0 .../model/demandeFormationModel.ts | 0 .../api-swagger/model/engagementModel.ts | 8 +- .../{ => shared}/api-swagger/model/epModel.ts | 12 +-- .../api-swagger/model/erreurModel.ts | 0 .../model/evaluationFormationModel.ts | 0 .../api-swagger/model/formationModel.ts | 0 .../{ => shared}/api-swagger/model/models.ts | 0 .../api-swagger/model/notificationModel.ts | 0 .../model/participationFormationModel.ts | 0 .../api-swagger/model/particpantModel.ts | 0 .../api-swagger/model/rDVEntretienModel.ts | 0 .../api-swagger/model/saisieBoolTexteModel.ts | 0 .../model/saisieDeuxTextesModel.ts | 0 .../api-swagger/model/saisieModel.ts | 0 .../api-swagger/model/saisieNoteTexteModel.ts | 0 .../api-swagger/model/saisieObjectifsModel.ts | 0 .../api-swagger/model/saisieUnBoolModel.ts | 0 .../api-swagger/model/saisieUnTexteModel.ts | 0 .../api-swagger/model/themeModel.ts | 0 .../{ => shared}/api-swagger/ng-package.json | 0 src/app/{ => shared}/api-swagger/variables.ts | 0 .../displayInfo}/displayEP.ts | 4 +- src/app/shared/nav-menu/index.ts | 1 + .../nav-menu-assistante.component.html | 0 .../nav-menu-assistante.component.ts | 0 .../nav-menu-collaborateur.component.html | 0 .../nav-menu-collaborateur.component.ts | 0 .../nav-menu-commercial.component.html | 0 .../nav-menu-commercial.component.ts | 0 .../nav-menu-rh/nav-menu-rh.component.html | 0 .../nav-menu-rh/nav-menu-rh.component.ts | 0 .../nav-menu/nav-menu.component.html | 0 .../nav-menu/nav-menu.component.ts | 6 +- src/app/shared/nav-menu/nav-menu.module.ts | 28 ++++++ src/app/{ => shared}/utils/roles.ts | 0 src/app/utils/path-values-collaborateurs.ts | 7 -- src/app/utils/path-values-ep.ts | 28 ------ src/app/utils/path-values-formations.ts | 25 ----- src/environments/environment.ts | 7 +- tsconfig.json | 6 +- 150 files changed, 871 insertions(+), 519 deletions(-) rename src/app/{collaborateur/details-collaborateur/details-collaborateur.component.html => collaborateurs/collaborateur-routing.module.ts} (100%) rename src/app/{collaborateur/details-collaborateur/details-collaborateur.component.ts => collaborateurs/collaborateurs.component.html} (100%) create mode 100644 src/app/collaborateurs/collaborateurs.component.ts create mode 100644 src/app/collaborateurs/collaborateurs.module.ts rename src/app/{collaborateur/index.ts => collaborateurs/details-collaborateur/details-collaborateur.component.html} (100%) create mode 100644 src/app/collaborateurs/details-collaborateur/details-collaborateur.component.ts rename src/app/{collaborateur/liste-formations-collaborateur/evaluation-formation => collaborateurs/formations-collaborateur/details-evaluation}/evaluation.component.html (100%) create mode 100644 src/app/collaborateurs/formations-collaborateur/details-evaluation/evaluation.component.ts rename src/app/{collaborateur/liste-collaborateurs/liste-collaborateurs.component.html => collaborateurs/formations-collaborateur/edit-evaluation/edit-evaluation.component.html} (100%) create mode 100644 src/app/collaborateurs/formations-collaborateur/edit-evaluation/edit-evaluation.component.ts rename src/app/{collaborateur/liste-collaborateurs/liste-collaborateurs.component.ts => collaborateurs/formations-collaborateur/formations-collaborateur.component.html} (100%) create mode 100644 src/app/collaborateurs/formations-collaborateur/formations-collaborateur.component.ts create mode 100644 src/app/collaborateurs/index.ts rename src/app/{collaborateur/liste-formations-collaborateur/evaluation-formation/evaluation.component.ts => demandes-delegation/demandes-delegation.component.html} (100%) create mode 100644 src/app/demandes-delegation/demandes-delegation.component.ts create mode 100644 src/app/demandes-delegation/demandes-delegation.module.ts rename src/app/{collaborateur/liste-formations-collaborateur/liste-formations-collaborateur.component.html => demandes-delegation/details-demande-delegation/demande-delegation.component.html} (100%) create mode 100644 src/app/demandes-delegation/details-demande-delegation/demande-delegation.component.ts create mode 100644 src/app/demandes-delegation/index.ts rename src/app/{collaborateur/liste-formations-collaborateur/liste-formations-collaborateur.component.ts => demandes-formation/demandes-formation.component.html} (100%) create mode 100644 src/app/demandes-formation/demandes-formation.component.ts create mode 100644 src/app/demandes-formation/demandes-formation.module.ts rename src/app/{ep/ep-choix-date/ep-choix-date.html => demandes-formation/details-demande-formation/demande-formation.component.html} (100%) create mode 100644 src/app/demandes-formation/details-demande-formation/demande-formation.component.ts create mode 100644 src/app/demandes-formation/index.ts rename src/app/{ep/ep-consultation/ep-consultation.html => demandes-formation/new-demande-formation/new-demande-formation.component.html} (100%) create mode 100644 src/app/demandes-formation/new-demande-formation/new-demande-formation.component.ts rename src/app/{ep/ep-demande-formation/ep-demande-formation.component.html => ep-saisie/ep-saisie.component.html} (100%) create mode 100644 src/app/ep-saisie/ep-saisie.component.ts create mode 100644 src/app/ep-saisie/ep-saisie.module.ts rename src/app/{ep/ep-demande-formation/ep-demande-formation.component.ts => ep-saisie/epa-saisie/epa-saisie.component.html} (100%) create mode 100644 src/app/ep-saisie/epa-saisie/epa-saisie.component.ts rename src/app/{ep/ep-proposition-date/ep-proposition-date.componenent.ts => ep-saisie/epa-six-ans-saisie/epa-six-ans-saisie.component.html} (100%) create mode 100644 src/app/ep-saisie/epa-six-ans-saisie/epa-six-ans-saisie.component.ts rename src/app/{ep/ep-proposition-date/ep-proposition-date.component.html => ep-saisie/eps-saisie/eps-saisie.component.html} (100%) create mode 100644 src/app/ep-saisie/eps-saisie/eps-saisie.component.ts create mode 100644 src/app/ep-saisie/index.ts rename src/app/ep/{ep-saisie/saisie.component.html => ep-choix-date/ep-choix-date.component.html} (100%) rename src/app/ep/{ep-saisie/saisie.component.ts => ep-consultation/ep-consultation.component.html} (100%) rename src/app/{formation/details-formation/details-formation.component.html => ep/ep-consultation/ep-signature/ep-signature.component.html} (100%) create mode 100644 src/app/ep/ep-consultation/ep-signature/ep-signature.component.ts rename src/app/{formation/details-formation/details-formation.component.ts => ep/ep-consultation/epa-six-ans/epa-six-ans.component.html} (100%) create mode 100644 src/app/ep/ep-consultation/epa-six-ans/epa-six-ans.component.ts rename src/app/{formation/details-formation/evaluation-collaborateur/evaluation-collaborateur.component.html => ep/ep-consultation/epa/epa.component.html} (100%) create mode 100644 src/app/ep/ep-consultation/epa/epa.component.ts rename src/app/{formation/details-formation/evaluation-collaborateur/evaluation-collaborateur.component.ts => ep/ep-consultation/eps/eps.component.html} (100%) create mode 100644 src/app/ep/ep-consultation/eps/eps.component.ts rename src/app/{formation/index.ts => ep/ep-demande-delegation/ep-demande-delegation.component.html} (100%) create mode 100644 src/app/ep/ep-demande-delegation/ep-demande-delegation.component.ts rename src/app/{formation/liste-formations/liste-formations.component.html => ep/ep-demandes-formation/ep-demandes-formation.component.html} (100%) create mode 100644 src/app/ep/ep-demandes-formation/ep-demandes-formation.component.ts rename src/app/{formation/liste-formations/liste-formations.component.ts => ep/ep-participants/ep-participants.component.html} (100%) create mode 100644 src/app/ep/ep-participants/ep-participants.component.ts rename src/app/{referent/detail-referent/detail-referent.component.html => ep/ep-participants/new-participant/new-participant.component.html} (100%) create mode 100644 src/app/ep/ep-participants/new-participant/new-participant.component.ts rename src/app/{referent/detail-referent/detail-referent.component.ts => ep/ep-propositions-dates/ep-propositions-dates.component.html} (100%) create mode 100644 src/app/ep/ep-propositions-dates/ep-propositions-dates.component.ts rename src/app/{referent/index.ts => ep/ep.component.html} (100%) create mode 100644 src/app/ep/ep.component.ts create mode 100644 src/app/ep/ep.module.ts rename src/app/{referent/liste-referents/liste-referents.component.html => formations/details-formation/formation.component.html} (100%) create mode 100644 src/app/formations/details-formation/formation.component.ts rename src/app/{referent/liste-referents/liste-referents.component.ts => formations/edit-formation/edit-formation.component.html} (100%) create mode 100644 src/app/formations/edit-formation/edit-formation.component.ts create mode 100644 src/app/formations/formations.component.html create mode 100644 src/app/formations/formations.component.ts create mode 100644 src/app/formations/formations.module.ts create mode 100644 src/app/formations/index.ts create mode 100644 src/app/formations/new-formation/new-formation.component.html create mode 100644 src/app/formations/new-formation/new-formation.component.ts create mode 100644 src/app/home/home.module.ts delete mode 100644 src/app/modeles/modele-collaborateur.ts delete mode 100644 src/app/modeles/modele-ep.ts delete mode 100644 src/app/modeles/modele-formation.ts delete mode 100644 src/app/nav-menu/index.ts create mode 100644 src/app/referents/details-referent/details-referent.component.html create mode 100644 src/app/referents/details-referent/details-referent.component.ts create mode 100644 src/app/referents/index.ts create mode 100644 src/app/referents/referents.component.html create mode 100644 src/app/referents/referents.component.ts create mode 100644 src/app/referents/referents.module.ts delete mode 100644 src/app/service/index.ts delete mode 100644 src/app/service/service-collaborateur.ts delete mode 100644 src/app/service/service-ep.ts delete mode 100644 src/app/service/service-formation.ts rename src/app/{ => shared}/angular-material/angular-material.module.ts (100%) rename src/app/{ => shared}/api-swagger/.npmignore (100%) rename src/app/{ => shared}/api-swagger/.swagger-codegen-ignore (100%) rename src/app/{ => shared}/api-swagger/.swagger-codegen/VERSION (100%) rename src/app/{ => shared}/api-swagger/api.module.ts (100%) rename src/app/{ => shared}/api-swagger/api/api.ts (100%) rename src/app/{ => shared}/api-swagger/api/default.service.ts (100%) rename src/app/{ => shared}/api-swagger/configuration.ts (100%) rename src/app/{ => shared}/api-swagger/encoder.ts (100%) rename src/app/{ => shared}/api-swagger/index.ts (100%) rename src/app/{ => shared}/api-swagger/model/augmentationSalaireModel.ts (100%) rename src/app/{ => shared}/api-swagger/model/businessUnitModel.ts (100%) rename src/app/{ => shared}/api-swagger/model/champModel.ts (100%) rename src/app/{ => shared}/api-swagger/model/collaborateurModel.ts (86%) rename src/app/{ => shared}/api-swagger/model/critereModel.ts (100%) rename src/app/{ => shared}/api-swagger/model/demandeDelegationModel.ts (100%) rename src/app/{ => shared}/api-swagger/model/demandeFormationModel.ts (100%) rename src/app/{ => shared}/api-swagger/model/engagementModel.ts (88%) rename src/app/{ => shared}/api-swagger/model/epModel.ts (92%) rename src/app/{ => shared}/api-swagger/model/erreurModel.ts (100%) rename src/app/{ => shared}/api-swagger/model/evaluationFormationModel.ts (100%) rename src/app/{ => shared}/api-swagger/model/formationModel.ts (100%) rename src/app/{ => shared}/api-swagger/model/models.ts (100%) rename src/app/{ => shared}/api-swagger/model/notificationModel.ts (100%) rename src/app/{ => shared}/api-swagger/model/participationFormationModel.ts (100%) rename src/app/{ => shared}/api-swagger/model/particpantModel.ts (100%) rename src/app/{ => shared}/api-swagger/model/rDVEntretienModel.ts (100%) rename src/app/{ => shared}/api-swagger/model/saisieBoolTexteModel.ts (100%) rename src/app/{ => shared}/api-swagger/model/saisieDeuxTextesModel.ts (100%) rename src/app/{ => shared}/api-swagger/model/saisieModel.ts (100%) rename src/app/{ => shared}/api-swagger/model/saisieNoteTexteModel.ts (100%) rename src/app/{ => shared}/api-swagger/model/saisieObjectifsModel.ts (100%) rename src/app/{ => shared}/api-swagger/model/saisieUnBoolModel.ts (100%) rename src/app/{ => shared}/api-swagger/model/saisieUnTexteModel.ts (100%) rename src/app/{ => shared}/api-swagger/model/themeModel.ts (100%) rename src/app/{ => shared}/api-swagger/ng-package.json (100%) rename src/app/{ => shared}/api-swagger/variables.ts (100%) rename src/app/{utils => shared/displayInfo}/displayEP.ts (86%) create mode 100644 src/app/shared/nav-menu/index.ts rename src/app/{ => shared}/nav-menu/nav-menu-assistante/nav-menu-assistante.component.html (100%) rename src/app/{ => shared}/nav-menu/nav-menu-assistante/nav-menu-assistante.component.ts (100%) rename src/app/{ => shared}/nav-menu/nav-menu-collaborateur/nav-menu-collaborateur.component.html (100%) rename src/app/{ => shared}/nav-menu/nav-menu-collaborateur/nav-menu-collaborateur.component.ts (100%) rename src/app/{ => shared}/nav-menu/nav-menu-commercial/nav-menu-commercial.component.html (100%) rename src/app/{ => shared}/nav-menu/nav-menu-commercial/nav-menu-commercial.component.ts (100%) rename src/app/{ => shared}/nav-menu/nav-menu-rh/nav-menu-rh.component.html (100%) rename src/app/{ => shared}/nav-menu/nav-menu-rh/nav-menu-rh.component.ts (100%) rename src/app/{ => shared}/nav-menu/nav-menu.component.html (100%) rename src/app/{ => shared}/nav-menu/nav-menu.component.ts (93%) create mode 100644 src/app/shared/nav-menu/nav-menu.module.ts rename src/app/{ => shared}/utils/roles.ts (100%) delete mode 100644 src/app/utils/path-values-collaborateurs.ts delete mode 100644 src/app/utils/path-values-ep.ts delete mode 100644 src/app/utils/path-values-formations.ts diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts index 8c8f037..a8d9cbd 100644 --- a/src/app/app-routing.module.ts +++ b/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' diff --git a/src/app/app.module.ts b/src/app/app.module.ts index f71becb..d6ade4a 100644 --- a/src/app/app.module.ts +++ b/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 './api-swagger' +import { ApiModule } from '@shared/api-swagger' -import { HomeComponent, HomeAssistanteComponent, HomeCollaborateurComponent, - HomeCommercialComponent, HomeRHComponent } from './home'; +import { HomeModule } 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 { ServiceEP, ServiceFormation, ServiceCollaborateur } from "./service" - - -import { NavMenuComponent, NavMenuAssistanteComponent, - NavMenuCollaborateurComponent, NavMenuCommercialComponent, NavMenuRHComponent } from "./nav-menu"; - -import { environment } from '../environments/environment'; +import { environment } from '@env'; @@ -31,28 +29,27 @@ let keycloakService: KeycloakService = new KeycloakService(); @NgModule({ declarations: [ - AppComponent, HomeComponent, HomeAssistanteComponent - , HomeCollaborateurComponent, HomeCommercialComponent, HomeRHComponent, NavMenuComponent, - NavMenuAssistanteComponent, NavMenuCollaborateurComponent, NavMenuCommercialComponent, NavMenuRHComponent + AppComponent ], 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] }) diff --git a/src/app/collaborateur/details-collaborateur/details-collaborateur.component.html b/src/app/collaborateurs/collaborateur-routing.module.ts similarity index 100% rename from src/app/collaborateur/details-collaborateur/details-collaborateur.component.html rename to src/app/collaborateurs/collaborateur-routing.module.ts diff --git a/src/app/collaborateur/details-collaborateur/details-collaborateur.component.ts b/src/app/collaborateurs/collaborateurs.component.html similarity index 100% rename from src/app/collaborateur/details-collaborateur/details-collaborateur.component.ts rename to src/app/collaborateurs/collaborateurs.component.html diff --git a/src/app/collaborateurs/collaborateurs.component.ts b/src/app/collaborateurs/collaborateurs.component.ts new file mode 100644 index 0000000..16c952e --- /dev/null +++ b/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() { + } +} diff --git a/src/app/collaborateurs/collaborateurs.module.ts b/src/app/collaborateurs/collaborateurs.module.ts new file mode 100644 index 0000000..bc24f42 --- /dev/null +++ b/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 {} diff --git a/src/app/collaborateur/index.ts b/src/app/collaborateurs/details-collaborateur/details-collaborateur.component.html similarity index 100% rename from src/app/collaborateur/index.ts rename to src/app/collaborateurs/details-collaborateur/details-collaborateur.component.html diff --git a/src/app/collaborateurs/details-collaborateur/details-collaborateur.component.ts b/src/app/collaborateurs/details-collaborateur/details-collaborateur.component.ts new file mode 100644 index 0000000..3d27c0c --- /dev/null +++ b/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() { + } +} diff --git a/src/app/collaborateur/liste-formations-collaborateur/evaluation-formation/evaluation.component.html b/src/app/collaborateurs/formations-collaborateur/details-evaluation/evaluation.component.html similarity index 100% rename from src/app/collaborateur/liste-formations-collaborateur/evaluation-formation/evaluation.component.html rename to src/app/collaborateurs/formations-collaborateur/details-evaluation/evaluation.component.html diff --git a/src/app/collaborateurs/formations-collaborateur/details-evaluation/evaluation.component.ts b/src/app/collaborateurs/formations-collaborateur/details-evaluation/evaluation.component.ts new file mode 100644 index 0000000..5f11c72 --- /dev/null +++ b/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() { + } +} diff --git a/src/app/collaborateur/liste-collaborateurs/liste-collaborateurs.component.html b/src/app/collaborateurs/formations-collaborateur/edit-evaluation/edit-evaluation.component.html similarity index 100% rename from src/app/collaborateur/liste-collaborateurs/liste-collaborateurs.component.html rename to src/app/collaborateurs/formations-collaborateur/edit-evaluation/edit-evaluation.component.html diff --git a/src/app/collaborateurs/formations-collaborateur/edit-evaluation/edit-evaluation.component.ts b/src/app/collaborateurs/formations-collaborateur/edit-evaluation/edit-evaluation.component.ts new file mode 100644 index 0000000..2869bba --- /dev/null +++ b/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() { + } +} diff --git a/src/app/collaborateur/liste-collaborateurs/liste-collaborateurs.component.ts b/src/app/collaborateurs/formations-collaborateur/formations-collaborateur.component.html similarity index 100% rename from src/app/collaborateur/liste-collaborateurs/liste-collaborateurs.component.ts rename to src/app/collaborateurs/formations-collaborateur/formations-collaborateur.component.html diff --git a/src/app/collaborateurs/formations-collaborateur/formations-collaborateur.component.ts b/src/app/collaborateurs/formations-collaborateur/formations-collaborateur.component.ts new file mode 100644 index 0000000..97576be --- /dev/null +++ b/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() { + } +} diff --git a/src/app/collaborateurs/index.ts b/src/app/collaborateurs/index.ts new file mode 100644 index 0000000..7861865 --- /dev/null +++ b/src/app/collaborateurs/index.ts @@ -0,0 +1,2 @@ +export * from './collaborateurs.component'; +export * from './collaborateurs.module'; diff --git a/src/app/collaborateur/liste-formations-collaborateur/evaluation-formation/evaluation.component.ts b/src/app/demandes-delegation/demandes-delegation.component.html similarity index 100% rename from src/app/collaborateur/liste-formations-collaborateur/evaluation-formation/evaluation.component.ts rename to src/app/demandes-delegation/demandes-delegation.component.html diff --git a/src/app/demandes-delegation/demandes-delegation.component.ts b/src/app/demandes-delegation/demandes-delegation.component.ts new file mode 100644 index 0000000..b3fff19 --- /dev/null +++ b/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() { + } +} diff --git a/src/app/demandes-delegation/demandes-delegation.module.ts b/src/app/demandes-delegation/demandes-delegation.module.ts new file mode 100644 index 0000000..da19a78 --- /dev/null +++ b/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 {} diff --git a/src/app/collaborateur/liste-formations-collaborateur/liste-formations-collaborateur.component.html b/src/app/demandes-delegation/details-demande-delegation/demande-delegation.component.html similarity index 100% rename from src/app/collaborateur/liste-formations-collaborateur/liste-formations-collaborateur.component.html rename to src/app/demandes-delegation/details-demande-delegation/demande-delegation.component.html diff --git a/src/app/demandes-delegation/details-demande-delegation/demande-delegation.component.ts b/src/app/demandes-delegation/details-demande-delegation/demande-delegation.component.ts new file mode 100644 index 0000000..c62f626 --- /dev/null +++ b/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() { + } +} diff --git a/src/app/demandes-delegation/index.ts b/src/app/demandes-delegation/index.ts new file mode 100644 index 0000000..e6e0785 --- /dev/null +++ b/src/app/demandes-delegation/index.ts @@ -0,0 +1,2 @@ +export * from './demandes-delegation.component'; +export * from './demandes-delegation.module'; diff --git a/src/app/collaborateur/liste-formations-collaborateur/liste-formations-collaborateur.component.ts b/src/app/demandes-formation/demandes-formation.component.html similarity index 100% rename from src/app/collaborateur/liste-formations-collaborateur/liste-formations-collaborateur.component.ts rename to src/app/demandes-formation/demandes-formation.component.html diff --git a/src/app/demandes-formation/demandes-formation.component.ts b/src/app/demandes-formation/demandes-formation.component.ts new file mode 100644 index 0000000..e3a8f10 --- /dev/null +++ b/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() { + } +} diff --git a/src/app/demandes-formation/demandes-formation.module.ts b/src/app/demandes-formation/demandes-formation.module.ts new file mode 100644 index 0000000..6754fe6 --- /dev/null +++ b/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 {} diff --git a/src/app/ep/ep-choix-date/ep-choix-date.html b/src/app/demandes-formation/details-demande-formation/demande-formation.component.html similarity index 100% rename from src/app/ep/ep-choix-date/ep-choix-date.html rename to src/app/demandes-formation/details-demande-formation/demande-formation.component.html diff --git a/src/app/demandes-formation/details-demande-formation/demande-formation.component.ts b/src/app/demandes-formation/details-demande-formation/demande-formation.component.ts new file mode 100644 index 0000000..0b3b757 --- /dev/null +++ b/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() { + } +} diff --git a/src/app/demandes-formation/index.ts b/src/app/demandes-formation/index.ts new file mode 100644 index 0000000..1a0fac8 --- /dev/null +++ b/src/app/demandes-formation/index.ts @@ -0,0 +1,2 @@ +export * from './demandes-formation.component'; +export * from './demandes-formation.module'; diff --git a/src/app/ep/ep-consultation/ep-consultation.html b/src/app/demandes-formation/new-demande-formation/new-demande-formation.component.html similarity index 100% rename from src/app/ep/ep-consultation/ep-consultation.html rename to src/app/demandes-formation/new-demande-formation/new-demande-formation.component.html diff --git a/src/app/demandes-formation/new-demande-formation/new-demande-formation.component.ts b/src/app/demandes-formation/new-demande-formation/new-demande-formation.component.ts new file mode 100644 index 0000000..ffd13c1 --- /dev/null +++ b/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() { + } +} diff --git a/src/app/ep/ep-demande-formation/ep-demande-formation.component.html b/src/app/ep-saisie/ep-saisie.component.html similarity index 100% rename from src/app/ep/ep-demande-formation/ep-demande-formation.component.html rename to src/app/ep-saisie/ep-saisie.component.html diff --git a/src/app/ep-saisie/ep-saisie.component.ts b/src/app/ep-saisie/ep-saisie.component.ts new file mode 100644 index 0000000..a87b0f1 --- /dev/null +++ b/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() { + } +} diff --git a/src/app/ep-saisie/ep-saisie.module.ts b/src/app/ep-saisie/ep-saisie.module.ts new file mode 100644 index 0000000..7548d25 --- /dev/null +++ b/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 {} diff --git a/src/app/ep/ep-demande-formation/ep-demande-formation.component.ts b/src/app/ep-saisie/epa-saisie/epa-saisie.component.html similarity index 100% rename from src/app/ep/ep-demande-formation/ep-demande-formation.component.ts rename to src/app/ep-saisie/epa-saisie/epa-saisie.component.html diff --git a/src/app/ep-saisie/epa-saisie/epa-saisie.component.ts b/src/app/ep-saisie/epa-saisie/epa-saisie.component.ts new file mode 100644 index 0000000..5856ee8 --- /dev/null +++ b/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() { + } +} diff --git a/src/app/ep/ep-proposition-date/ep-proposition-date.componenent.ts b/src/app/ep-saisie/epa-six-ans-saisie/epa-six-ans-saisie.component.html similarity index 100% rename from src/app/ep/ep-proposition-date/ep-proposition-date.componenent.ts rename to src/app/ep-saisie/epa-six-ans-saisie/epa-six-ans-saisie.component.html diff --git a/src/app/ep-saisie/epa-six-ans-saisie/epa-six-ans-saisie.component.ts b/src/app/ep-saisie/epa-six-ans-saisie/epa-six-ans-saisie.component.ts new file mode 100644 index 0000000..0b28adc --- /dev/null +++ b/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() { + } +} diff --git a/src/app/ep/ep-proposition-date/ep-proposition-date.component.html b/src/app/ep-saisie/eps-saisie/eps-saisie.component.html similarity index 100% rename from src/app/ep/ep-proposition-date/ep-proposition-date.component.html rename to src/app/ep-saisie/eps-saisie/eps-saisie.component.html diff --git a/src/app/ep-saisie/eps-saisie/eps-saisie.component.ts b/src/app/ep-saisie/eps-saisie/eps-saisie.component.ts new file mode 100644 index 0000000..24b2358 --- /dev/null +++ b/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() { + } +} diff --git a/src/app/ep-saisie/index.ts b/src/app/ep-saisie/index.ts new file mode 100644 index 0000000..e77ea47 --- /dev/null +++ b/src/app/ep-saisie/index.ts @@ -0,0 +1,2 @@ +export * from './ep-saisie.component'; +export * from './ep-saisie.module'; diff --git a/src/app/ep/ep-augmentation-salaire/ep-augmentation-salaire.component.ts b/src/app/ep/ep-augmentation-salaire/ep-augmentation-salaire.component.ts index e69de29..efaf931 100644 --- a/src/app/ep/ep-augmentation-salaire/ep-augmentation-salaire.component.ts +++ b/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() { + } +} diff --git a/src/app/ep/ep-saisie/saisie.component.html b/src/app/ep/ep-choix-date/ep-choix-date.component.html similarity index 100% rename from src/app/ep/ep-saisie/saisie.component.html rename to src/app/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/ep-choix-date/ep-choix-date.component.ts index e69de29..b393ed5 100644 --- a/src/app/ep/ep-choix-date/ep-choix-date.component.ts +++ b/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() { + } +} diff --git a/src/app/ep/ep-saisie/saisie.component.ts b/src/app/ep/ep-consultation/ep-consultation.component.html similarity index 100% rename from src/app/ep/ep-saisie/saisie.component.ts rename to src/app/ep/ep-consultation/ep-consultation.component.html diff --git a/src/app/ep/ep-consultation/ep-consultation.component.ts b/src/app/ep/ep-consultation/ep-consultation.component.ts index e69de29..c948301 100644 --- a/src/app/ep/ep-consultation/ep-consultation.component.ts +++ b/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() { + } +} diff --git a/src/app/formation/details-formation/details-formation.component.html b/src/app/ep/ep-consultation/ep-signature/ep-signature.component.html similarity index 100% rename from src/app/formation/details-formation/details-formation.component.html rename to src/app/ep/ep-consultation/ep-signature/ep-signature.component.html diff --git a/src/app/ep/ep-consultation/ep-signature/ep-signature.component.ts b/src/app/ep/ep-consultation/ep-signature/ep-signature.component.ts new file mode 100644 index 0000000..fd4247a --- /dev/null +++ b/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() { + } +} diff --git a/src/app/formation/details-formation/details-formation.component.ts b/src/app/ep/ep-consultation/epa-six-ans/epa-six-ans.component.html similarity index 100% rename from src/app/formation/details-formation/details-formation.component.ts rename to src/app/ep/ep-consultation/epa-six-ans/epa-six-ans.component.html diff --git a/src/app/ep/ep-consultation/epa-six-ans/epa-six-ans.component.ts b/src/app/ep/ep-consultation/epa-six-ans/epa-six-ans.component.ts new file mode 100644 index 0000000..e2ea827 --- /dev/null +++ b/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() { + } +} diff --git a/src/app/formation/details-formation/evaluation-collaborateur/evaluation-collaborateur.component.html b/src/app/ep/ep-consultation/epa/epa.component.html similarity index 100% rename from src/app/formation/details-formation/evaluation-collaborateur/evaluation-collaborateur.component.html rename to src/app/ep/ep-consultation/epa/epa.component.html diff --git a/src/app/ep/ep-consultation/epa/epa.component.ts b/src/app/ep/ep-consultation/epa/epa.component.ts new file mode 100644 index 0000000..95553a0 --- /dev/null +++ b/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() { + } +} diff --git a/src/app/formation/details-formation/evaluation-collaborateur/evaluation-collaborateur.component.ts b/src/app/ep/ep-consultation/eps/eps.component.html similarity index 100% rename from src/app/formation/details-formation/evaluation-collaborateur/evaluation-collaborateur.component.ts rename to src/app/ep/ep-consultation/eps/eps.component.html diff --git a/src/app/ep/ep-consultation/eps/eps.component.ts b/src/app/ep/ep-consultation/eps/eps.component.ts new file mode 100644 index 0000000..fab883e --- /dev/null +++ b/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() { + } +} diff --git a/src/app/formation/index.ts b/src/app/ep/ep-demande-delegation/ep-demande-delegation.component.html similarity index 100% rename from src/app/formation/index.ts rename to src/app/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/ep-demande-delegation/ep-demande-delegation.component.ts new file mode 100644 index 0000000..a5cb6dd --- /dev/null +++ b/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() { + } +} diff --git a/src/app/formation/liste-formations/liste-formations.component.html b/src/app/ep/ep-demandes-formation/ep-demandes-formation.component.html similarity index 100% rename from src/app/formation/liste-formations/liste-formations.component.html rename to src/app/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/ep-demandes-formation/ep-demandes-formation.component.ts new file mode 100644 index 0000000..870dfca --- /dev/null +++ b/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() { + } +} diff --git a/src/app/formation/liste-formations/liste-formations.component.ts b/src/app/ep/ep-participants/ep-participants.component.html similarity index 100% rename from src/app/formation/liste-formations/liste-formations.component.ts rename to src/app/ep/ep-participants/ep-participants.component.html diff --git a/src/app/ep/ep-participants/ep-participants.component.ts b/src/app/ep/ep-participants/ep-participants.component.ts new file mode 100644 index 0000000..7c6e588 --- /dev/null +++ b/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() { + } +} diff --git a/src/app/referent/detail-referent/detail-referent.component.html b/src/app/ep/ep-participants/new-participant/new-participant.component.html similarity index 100% rename from src/app/referent/detail-referent/detail-referent.component.html rename to src/app/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/ep-participants/new-participant/new-participant.component.ts new file mode 100644 index 0000000..0696d40 --- /dev/null +++ b/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() { + } +} diff --git a/src/app/referent/detail-referent/detail-referent.component.ts b/src/app/ep/ep-propositions-dates/ep-propositions-dates.component.html similarity index 100% rename from src/app/referent/detail-referent/detail-referent.component.ts rename to src/app/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/ep-propositions-dates/ep-propositions-dates.component.ts new file mode 100644 index 0000000..3be3831 --- /dev/null +++ b/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() { + } +} diff --git a/src/app/referent/index.ts b/src/app/ep/ep.component.html similarity index 100% rename from src/app/referent/index.ts rename to src/app/ep/ep.component.html diff --git a/src/app/ep/ep.component.ts b/src/app/ep/ep.component.ts new file mode 100644 index 0000000..63482ac --- /dev/null +++ b/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() { + } +} diff --git a/src/app/ep/ep.module.ts b/src/app/ep/ep.module.ts new file mode 100644 index 0000000..e9ff108 --- /dev/null +++ b/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 {} diff --git a/src/app/ep/index.ts b/src/app/ep/index.ts index e69de29..38dc5ba 100644 --- a/src/app/ep/index.ts +++ b/src/app/ep/index.ts @@ -0,0 +1,2 @@ +export * from './ep.component'; +export * from './ep.module'; diff --git a/src/app/referent/liste-referents/liste-referents.component.html b/src/app/formations/details-formation/formation.component.html similarity index 100% rename from src/app/referent/liste-referents/liste-referents.component.html rename to src/app/formations/details-formation/formation.component.html diff --git a/src/app/formations/details-formation/formation.component.ts b/src/app/formations/details-formation/formation.component.ts new file mode 100644 index 0000000..187aa54 --- /dev/null +++ b/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() { + } +} diff --git a/src/app/referent/liste-referents/liste-referents.component.ts b/src/app/formations/edit-formation/edit-formation.component.html similarity index 100% rename from src/app/referent/liste-referents/liste-referents.component.ts rename to src/app/formations/edit-formation/edit-formation.component.html diff --git a/src/app/formations/edit-formation/edit-formation.component.ts b/src/app/formations/edit-formation/edit-formation.component.ts new file mode 100644 index 0000000..1418e17 --- /dev/null +++ b/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() { + } +} diff --git a/src/app/formations/formations.component.html b/src/app/formations/formations.component.html new file mode 100644 index 0000000..e69de29 diff --git a/src/app/formations/formations.component.ts b/src/app/formations/formations.component.ts new file mode 100644 index 0000000..71df05e --- /dev/null +++ b/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() { + } +} diff --git a/src/app/formations/formations.module.ts b/src/app/formations/formations.module.ts new file mode 100644 index 0000000..d7dbe76 --- /dev/null +++ b/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 {} diff --git a/src/app/formations/index.ts b/src/app/formations/index.ts new file mode 100644 index 0000000..a225250 --- /dev/null +++ b/src/app/formations/index.ts @@ -0,0 +1,2 @@ +export * from './formations.component'; +export * from './formations.module'; diff --git a/src/app/formations/new-formation/new-formation.component.html b/src/app/formations/new-formation/new-formation.component.html new file mode 100644 index 0000000..e69de29 diff --git a/src/app/formations/new-formation/new-formation.component.ts b/src/app/formations/new-formation/new-formation.component.ts new file mode 100644 index 0000000..ced0386 --- /dev/null +++ b/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() { + } +} diff --git a/src/app/home/home-assistante/home-assistante.component.ts b/src/app/home/home-assistante/home-assistante.component.ts index 4ca4104..6a241c2 100644 --- a/src/app/home/home-assistante/home-assistante.component.ts +++ b/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 "../../modeles/modele-collaborateur"; -import { EpModel } from "../../api-swagger/model/epModel"; -import { DisplayEP } from "../../utils/displayEP"; -import { DefaultService } from "../../api-swagger/api/api"; +import { CollaborateurModel } from "@shared/api-swagger/model/collaborateurModel"; +import { EpModel } from "@shared/api-swagger/model/epModel"; +import { DisplayProchainEPCollaborateur } from "@shared/displayInfo/displayEP"; +import { DefaultService } from "@shared/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; + dataSource : MatTableDataSource; /** * contenu de la recherche. @@ -74,8 +73,7 @@ export class HomeAssistanteComponent implements OnInit, AfterViewInit { */ chargement = true; - constructor(public keycloakService : KeycloakService, private serviceCollaborateur : ServiceCollaborateur, - private serviceEP : ServiceEP, private service:DefaultService) { + constructor(public keycloakService : KeycloakService, 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.id = ep.id; - epDisplay.agence = ep.collaborateur.bu.nom; + epDisplay = new DisplayProchainEPCollaborateur(); + epDisplay.id = ep.idEp; + epDisplay.agence = ep.collaborateur.businessunit.nom; epDisplay.collaborateur = ep.collaborateur; epDisplay.referent = ep.referent; epDisplay.dateentretien = ep.dateEntretien; diff --git a/src/app/home/home.component.ts b/src/app/home/home.component.ts index ef48173..0acfc59 100644 --- a/src/app/home/home.component.ts +++ b/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é. diff --git a/src/app/home/home.module.ts b/src/app/home/home.module.ts new file mode 100644 index 0000000..e0a19e4 --- /dev/null +++ b/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 {} diff --git a/src/app/home/index.ts b/src/app/home/index.ts index 56591d2..9136803 100644 --- a/src/app/home/index.ts +++ b/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'; diff --git a/src/app/modeles/modele-collaborateur.ts b/src/app/modeles/modele-collaborateur.ts deleted file mode 100644 index a694b29..0000000 --- a/src/app/modeles/modele-collaborateur.ts +++ /dev/null @@ -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; -}; diff --git a/src/app/modeles/modele-ep.ts b/src/app/modeles/modele-ep.ts deleted file mode 100644 index db4bf24..0000000 --- a/src/app/modeles/modele-ep.ts +++ /dev/null @@ -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; -} diff --git a/src/app/modeles/modele-formation.ts b/src/app/modeles/modele-formation.ts deleted file mode 100644 index 17b0356..0000000 --- a/src/app/modeles/modele-formation.ts +++ /dev/null @@ -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; -} diff --git a/src/app/nav-menu/index.ts b/src/app/nav-menu/index.ts deleted file mode 100644 index e6bc727..0000000 --- a/src/app/nav-menu/index.ts +++ /dev/null @@ -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"; diff --git a/src/app/referents/details-referent/details-referent.component.html b/src/app/referents/details-referent/details-referent.component.html new file mode 100644 index 0000000..e69de29 diff --git a/src/app/referents/details-referent/details-referent.component.ts b/src/app/referents/details-referent/details-referent.component.ts new file mode 100644 index 0000000..6b14e05 --- /dev/null +++ b/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() { + } +} diff --git a/src/app/referents/index.ts b/src/app/referents/index.ts new file mode 100644 index 0000000..d87aa94 --- /dev/null +++ b/src/app/referents/index.ts @@ -0,0 +1,2 @@ +export * from './referents.module'; +export * from './referents.component'; diff --git a/src/app/referents/referents.component.html b/src/app/referents/referents.component.html new file mode 100644 index 0000000..e69de29 diff --git a/src/app/referents/referents.component.ts b/src/app/referents/referents.component.ts new file mode 100644 index 0000000..21fea1d --- /dev/null +++ b/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() { + } +} diff --git a/src/app/referents/referents.module.ts b/src/app/referents/referents.module.ts new file mode 100644 index 0000000..d305812 --- /dev/null +++ b/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 {} diff --git a/src/app/service/index.ts b/src/app/service/index.ts deleted file mode 100644 index 26bf71c..0000000 --- a/src/app/service/index.ts +++ /dev/null @@ -1,3 +0,0 @@ -export * from "./service-ep"; -export * from "./service-formation"; -export * from "./service-collaborateur"; diff --git a/src/app/service/service-collaborateur.ts b/src/app/service/service-collaborateur.ts deleted file mode 100644 index 0e97c49..0000000 --- a/src/app/service/service-collaborateur.ts +++ /dev/null @@ -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 { - let token = this.keycloakService.getKeycloakInstance().token; - const headers = { Authorization: "Bearer "+token }; - return this.http.get(urlCollaborateur, { headers }); - } - - getCollaborateurByParam(params) : Observable { - let token = this.keycloakService.getKeycloakInstance().token; - const headers = { Authorization: "Bearer "+token }; - return this.http.get(urlCollaborateur, { params, headers }); - } - -} diff --git a/src/app/service/service-ep.ts b/src/app/service/service-ep.ts deleted file mode 100644 index 48c7207..0000000 --- a/src/app/service/service-ep.ts +++ /dev/null @@ -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 { - let token = this.keycloakService.getKeycloakInstance().token; - let params = { idReferent : id }; - const headers = { Authorization: "Bearer "+token }; - return this.http.get(urlsEP.prochainsEPReferent, { params, headers }); - } - - listeEPDisponibles() : Observable { - let token = this.keycloakService.getKeycloakInstance().token; - const headers = { Authorization: "Bearer "+token }; - return this.http.get(urlsEP.epDisponibles, {headers}); - } - - listeEPCollaborateur(id) : Observable { - let token = this.keycloakService.getKeycloakInstance().token; - let params = { idCollab : id }; - const headers = { Authorization: "Bearer "+token }; - return this.http.get(urlsEP.epCollaborateur, {params, headers}); - } - - listeEPReferent(id) : Observable { - let token = this.keycloakService.getKeycloakInstance().token; - let params = { idReferent : id }; - const headers = { Authorization: "Bearer "+token }; - return this.http.get(urlsEP.epReferent, { params, headers}); - } - - prochainEPCollaborateur(id) : Observable { - let token = this.keycloakService.getKeycloakInstance().token; - let params = { idCollab : id }; - const headers = { Authorization: "Bearer "+token }; - return this.http.get(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(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(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 - } - -} diff --git a/src/app/service/service-formation.ts b/src/app/service/service-formation.ts deleted file mode 100644 index c91a3b4..0000000 --- a/src/app/service/service-formation.ts +++ /dev/null @@ -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 { - let token = this.keycloakService.getKeycloakInstance().token; - const headers = { Authorization: "Bearer "+token }; - return this.http.get(urlsFormation.urlFormation, {headers}); - } - - - listeFormationsCollaborateur(id) : Observable { - let token = this.keycloakService.getKeycloakInstance().token; - const headers = { Authorization: "Bearer "+token }; - let params = { idCollab : id }; - return this.http.get(urlsFormation.urlFormation, { params, headers }); - } - - nouvelleFormation(formation) : Observable { - let token = this.keycloakService.getKeycloakInstance().token; - const headers = { - Authorization: "Bearer "+token, - ContentType: "application/json" - }; - return this.http.post(urlsFormation.newFormation, formation, {headers}); - } - - updateFormation(formation) { - let token = this.keycloakService.getKeycloakInstance().token; - const headers = { - Authorization: "Bearer "+token, - ContentType: "application/json" - }; - return this.http.put(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 { - let token = this.keycloakService.getKeycloakInstance().token; - const headers = { Authorization: "Bearer "+token }; - let params = { idFormation : id }; - return this.http.get(urlsFormation.evaluationsFormation, {headers, params}); - } - - evaluerFormation(evaluation) { - let token = this.keycloakService.getKeycloakInstance().token; - const headers = { - Authorization: "Bearer "+token, - ContentType: "application/json" - }; - return this.http.post(urlsFormation.evaluerFormation, evaluation, {headers}); - } - - listeDemandesFormation() : Observable { - let token = this.keycloakService.getKeycloakInstance().token; - const headers = { Authorization: "Bearer "+token }; - return this.http.get(urlsFormation.urlDemandesFormation, {headers}); - } - - reponseDemandeFormation(demandeFormation) { - let token = this.keycloakService.getKeycloakInstance().token; - const headers = { Authorization: "Bearer "+token }; - return this.http.post(urlsFormation.urlDemandesFormation, demandeFormation, {headers}); - } - - listeTheme() : Observable { - let token = this.keycloakService.getKeycloakInstance().token; - const headers = { Authorization: "Bearer "+token }; - return this.http.get(urlsFormation.urlTheme, {headers}); - } - - listeCritere() : Observable { - let token = this.keycloakService.getKeycloakInstance().token; - const headers = { Authorization: "Bearer "+token }; - return this.http.get(urlsFormation.urlCritere, {headers}); - } - -} diff --git a/src/app/angular-material/angular-material.module.ts b/src/app/shared/angular-material/angular-material.module.ts similarity index 100% rename from src/app/angular-material/angular-material.module.ts rename to src/app/shared/angular-material/angular-material.module.ts diff --git a/src/app/api-swagger/.npmignore b/src/app/shared/api-swagger/.npmignore similarity index 100% rename from src/app/api-swagger/.npmignore rename to src/app/shared/api-swagger/.npmignore diff --git a/src/app/api-swagger/.swagger-codegen-ignore b/src/app/shared/api-swagger/.swagger-codegen-ignore similarity index 100% rename from src/app/api-swagger/.swagger-codegen-ignore rename to src/app/shared/api-swagger/.swagger-codegen-ignore diff --git a/src/app/api-swagger/.swagger-codegen/VERSION b/src/app/shared/api-swagger/.swagger-codegen/VERSION similarity index 100% rename from src/app/api-swagger/.swagger-codegen/VERSION rename to src/app/shared/api-swagger/.swagger-codegen/VERSION diff --git a/src/app/api-swagger/api.module.ts b/src/app/shared/api-swagger/api.module.ts similarity index 100% rename from src/app/api-swagger/api.module.ts rename to src/app/shared/api-swagger/api.module.ts diff --git a/src/app/api-swagger/api/api.ts b/src/app/shared/api-swagger/api/api.ts similarity index 100% rename from src/app/api-swagger/api/api.ts rename to src/app/shared/api-swagger/api/api.ts diff --git a/src/app/api-swagger/api/default.service.ts b/src/app/shared/api-swagger/api/default.service.ts similarity index 100% rename from src/app/api-swagger/api/default.service.ts rename to src/app/shared/api-swagger/api/default.service.ts diff --git a/src/app/api-swagger/configuration.ts b/src/app/shared/api-swagger/configuration.ts similarity index 100% rename from src/app/api-swagger/configuration.ts rename to src/app/shared/api-swagger/configuration.ts diff --git a/src/app/api-swagger/encoder.ts b/src/app/shared/api-swagger/encoder.ts similarity index 100% rename from src/app/api-swagger/encoder.ts rename to src/app/shared/api-swagger/encoder.ts diff --git a/src/app/api-swagger/index.ts b/src/app/shared/api-swagger/index.ts similarity index 100% rename from src/app/api-swagger/index.ts rename to src/app/shared/api-swagger/index.ts diff --git a/src/app/api-swagger/model/augmentationSalaireModel.ts b/src/app/shared/api-swagger/model/augmentationSalaireModel.ts similarity index 100% rename from src/app/api-swagger/model/augmentationSalaireModel.ts rename to src/app/shared/api-swagger/model/augmentationSalaireModel.ts diff --git a/src/app/api-swagger/model/businessUnitModel.ts b/src/app/shared/api-swagger/model/businessUnitModel.ts similarity index 100% rename from src/app/api-swagger/model/businessUnitModel.ts rename to src/app/shared/api-swagger/model/businessUnitModel.ts diff --git a/src/app/api-swagger/model/champModel.ts b/src/app/shared/api-swagger/model/champModel.ts similarity index 100% rename from src/app/api-swagger/model/champModel.ts rename to src/app/shared/api-swagger/model/champModel.ts diff --git a/src/app/api-swagger/model/collaborateurModel.ts b/src/app/shared/api-swagger/model/collaborateurModel.ts similarity index 86% rename from src/app/api-swagger/model/collaborateurModel.ts rename to src/app/shared/api-swagger/model/collaborateurModel.ts index 08f943c..1e11fde 100644 --- a/src/app/api-swagger/model/collaborateurModel.ts +++ b/src/app/shared/api-swagger/model/collaborateurModel.ts @@ -3,7 +3,7 @@ * API qui seront utilisés afin de faire communiquer le client et le serveur ainsi que le serveur et la boîte noire. * * OpenAPI spec version: 1.0.0 - * + * * * NOTE: This class is auto generated by the swagger code generator program. * https://github.com/swagger-api/swagger-codegen.git @@ -11,14 +11,14 @@ */ import { BusinessUnitModel } from './businessUnitModel'; -export interface CollaborateurModel { +export interface CollaborateurModel { idCollaborateur: string; nom: string; prenom: string; mail?: string; agence: string; fonction: string; - dateEmbauche: string; - dateDepart?: string; + dateEmbauche: Date; + dateDepart?: Date; businessunit: BusinessUnitModel; -} \ No newline at end of file +} diff --git a/src/app/api-swagger/model/critereModel.ts b/src/app/shared/api-swagger/model/critereModel.ts similarity index 100% rename from src/app/api-swagger/model/critereModel.ts rename to src/app/shared/api-swagger/model/critereModel.ts diff --git a/src/app/api-swagger/model/demandeDelegationModel.ts b/src/app/shared/api-swagger/model/demandeDelegationModel.ts similarity index 100% rename from src/app/api-swagger/model/demandeDelegationModel.ts rename to src/app/shared/api-swagger/model/demandeDelegationModel.ts diff --git a/src/app/api-swagger/model/demandeFormationModel.ts b/src/app/shared/api-swagger/model/demandeFormationModel.ts similarity index 100% rename from src/app/api-swagger/model/demandeFormationModel.ts rename to src/app/shared/api-swagger/model/demandeFormationModel.ts diff --git a/src/app/api-swagger/model/engagementModel.ts b/src/app/shared/api-swagger/model/engagementModel.ts similarity index 88% rename from src/app/api-swagger/model/engagementModel.ts rename to src/app/shared/api-swagger/model/engagementModel.ts index 39493cb..f92566b 100644 --- a/src/app/api-swagger/model/engagementModel.ts +++ b/src/app/shared/api-swagger/model/engagementModel.ts @@ -3,7 +3,7 @@ * API qui seront utilisés afin de faire communiquer le client et le serveur ainsi que le serveur et la boîte noire. * * OpenAPI spec version: 1.0.0 - * + * * * NOTE: This class is auto generated by the swagger code generator program. * https://github.com/swagger-api/swagger-codegen.git @@ -11,10 +11,10 @@ */ import { EpModel } from './epModel'; -export interface EngagementModel { +export interface EngagementModel { idEngagement: number; engagement: string; - dateLimite: string; + dateLimite: Date; accomplie?: boolean; ep: EpModel; -} \ No newline at end of file +} diff --git a/src/app/api-swagger/model/epModel.ts b/src/app/shared/api-swagger/model/epModel.ts similarity index 92% rename from src/app/api-swagger/model/epModel.ts rename to src/app/shared/api-swagger/model/epModel.ts index e7682cd..788778f 100644 --- a/src/app/api-swagger/model/epModel.ts +++ b/src/app/shared/api-swagger/model/epModel.ts @@ -3,7 +3,7 @@ * API qui seront utilisés afin de faire communiquer le client et le serveur ainsi que le serveur et la boîte noire. * * OpenAPI spec version: 1.0.0 - * + * * * NOTE: This class is auto generated by the swagger code generator program. * https://github.com/swagger-api/swagger-codegen.git @@ -18,12 +18,12 @@ import { ParticpantModel } from './particpantModel'; import { RDVEntretienModel } from './rDVEntretienModel'; import { SaisieModel } from './saisieModel'; -export interface EpModel { +export interface EpModel { idEp: number; typeEP: string; - dateCreation: string; - dateDisponibilite: string; - dateSaisie?: string; + dateCreation: Date; + dateDisponibilite: Date; + dateSaisie?: Date; etat: number; cv?: string; dateEntretien?: Date; @@ -39,4 +39,4 @@ export interface EpModel { engagements?: Array; delegation?: DemandeDelegationModel; saisie?: Array; -} \ No newline at end of file +} diff --git a/src/app/api-swagger/model/erreurModel.ts b/src/app/shared/api-swagger/model/erreurModel.ts similarity index 100% rename from src/app/api-swagger/model/erreurModel.ts rename to src/app/shared/api-swagger/model/erreurModel.ts diff --git a/src/app/api-swagger/model/evaluationFormationModel.ts b/src/app/shared/api-swagger/model/evaluationFormationModel.ts similarity index 100% rename from src/app/api-swagger/model/evaluationFormationModel.ts rename to src/app/shared/api-swagger/model/evaluationFormationModel.ts diff --git a/src/app/api-swagger/model/formationModel.ts b/src/app/shared/api-swagger/model/formationModel.ts similarity index 100% rename from src/app/api-swagger/model/formationModel.ts rename to src/app/shared/api-swagger/model/formationModel.ts diff --git a/src/app/api-swagger/model/models.ts b/src/app/shared/api-swagger/model/models.ts similarity index 100% rename from src/app/api-swagger/model/models.ts rename to src/app/shared/api-swagger/model/models.ts diff --git a/src/app/api-swagger/model/notificationModel.ts b/src/app/shared/api-swagger/model/notificationModel.ts similarity index 100% rename from src/app/api-swagger/model/notificationModel.ts rename to src/app/shared/api-swagger/model/notificationModel.ts diff --git a/src/app/api-swagger/model/participationFormationModel.ts b/src/app/shared/api-swagger/model/participationFormationModel.ts similarity index 100% rename from src/app/api-swagger/model/participationFormationModel.ts rename to src/app/shared/api-swagger/model/participationFormationModel.ts diff --git a/src/app/api-swagger/model/particpantModel.ts b/src/app/shared/api-swagger/model/particpantModel.ts similarity index 100% rename from src/app/api-swagger/model/particpantModel.ts rename to src/app/shared/api-swagger/model/particpantModel.ts diff --git a/src/app/api-swagger/model/rDVEntretienModel.ts b/src/app/shared/api-swagger/model/rDVEntretienModel.ts similarity index 100% rename from src/app/api-swagger/model/rDVEntretienModel.ts rename to src/app/shared/api-swagger/model/rDVEntretienModel.ts diff --git a/src/app/api-swagger/model/saisieBoolTexteModel.ts b/src/app/shared/api-swagger/model/saisieBoolTexteModel.ts similarity index 100% rename from src/app/api-swagger/model/saisieBoolTexteModel.ts rename to src/app/shared/api-swagger/model/saisieBoolTexteModel.ts diff --git a/src/app/api-swagger/model/saisieDeuxTextesModel.ts b/src/app/shared/api-swagger/model/saisieDeuxTextesModel.ts similarity index 100% rename from src/app/api-swagger/model/saisieDeuxTextesModel.ts rename to src/app/shared/api-swagger/model/saisieDeuxTextesModel.ts diff --git a/src/app/api-swagger/model/saisieModel.ts b/src/app/shared/api-swagger/model/saisieModel.ts similarity index 100% rename from src/app/api-swagger/model/saisieModel.ts rename to src/app/shared/api-swagger/model/saisieModel.ts diff --git a/src/app/api-swagger/model/saisieNoteTexteModel.ts b/src/app/shared/api-swagger/model/saisieNoteTexteModel.ts similarity index 100% rename from src/app/api-swagger/model/saisieNoteTexteModel.ts rename to src/app/shared/api-swagger/model/saisieNoteTexteModel.ts diff --git a/src/app/api-swagger/model/saisieObjectifsModel.ts b/src/app/shared/api-swagger/model/saisieObjectifsModel.ts similarity index 100% rename from src/app/api-swagger/model/saisieObjectifsModel.ts rename to src/app/shared/api-swagger/model/saisieObjectifsModel.ts diff --git a/src/app/api-swagger/model/saisieUnBoolModel.ts b/src/app/shared/api-swagger/model/saisieUnBoolModel.ts similarity index 100% rename from src/app/api-swagger/model/saisieUnBoolModel.ts rename to src/app/shared/api-swagger/model/saisieUnBoolModel.ts diff --git a/src/app/api-swagger/model/saisieUnTexteModel.ts b/src/app/shared/api-swagger/model/saisieUnTexteModel.ts similarity index 100% rename from src/app/api-swagger/model/saisieUnTexteModel.ts rename to src/app/shared/api-swagger/model/saisieUnTexteModel.ts diff --git a/src/app/api-swagger/model/themeModel.ts b/src/app/shared/api-swagger/model/themeModel.ts similarity index 100% rename from src/app/api-swagger/model/themeModel.ts rename to src/app/shared/api-swagger/model/themeModel.ts diff --git a/src/app/api-swagger/ng-package.json b/src/app/shared/api-swagger/ng-package.json similarity index 100% rename from src/app/api-swagger/ng-package.json rename to src/app/shared/api-swagger/ng-package.json diff --git a/src/app/api-swagger/variables.ts b/src/app/shared/api-swagger/variables.ts similarity index 100% rename from src/app/api-swagger/variables.ts rename to src/app/shared/api-swagger/variables.ts diff --git a/src/app/utils/displayEP.ts b/src/app/shared/displayInfo/displayEP.ts similarity index 86% rename from src/app/utils/displayEP.ts rename to src/app/shared/displayInfo/displayEP.ts index 65ac83c..529907b 100644 --- a/src/app/utils/displayEP.ts +++ b/src/app/shared/displayInfo/displayEP.ts @@ -4,13 +4,13 @@ import {CollaborateurModel} from "../api-swagger/model/collaborateurModel"; -export class DisplayEP { +export class DisplayProchainEPCollaborateur { id : number; agence : string; collaborateur : CollaborateurModel; referent : CollaborateurModel; type : string; - etat : string; + etat : number; datemail : Date; dateentretien : Date; anciennete : number; diff --git a/src/app/shared/nav-menu/index.ts b/src/app/shared/nav-menu/index.ts new file mode 100644 index 0000000..8cdfd28 --- /dev/null +++ b/src/app/shared/nav-menu/index.ts @@ -0,0 +1 @@ +export * from "./nav-menu.module"; diff --git a/src/app/nav-menu/nav-menu-assistante/nav-menu-assistante.component.html b/src/app/shared/nav-menu/nav-menu-assistante/nav-menu-assistante.component.html similarity index 100% rename from src/app/nav-menu/nav-menu-assistante/nav-menu-assistante.component.html rename to src/app/shared/nav-menu/nav-menu-assistante/nav-menu-assistante.component.html diff --git a/src/app/nav-menu/nav-menu-assistante/nav-menu-assistante.component.ts b/src/app/shared/nav-menu/nav-menu-assistante/nav-menu-assistante.component.ts similarity index 100% rename from src/app/nav-menu/nav-menu-assistante/nav-menu-assistante.component.ts rename to src/app/shared/nav-menu/nav-menu-assistante/nav-menu-assistante.component.ts diff --git a/src/app/nav-menu/nav-menu-collaborateur/nav-menu-collaborateur.component.html b/src/app/shared/nav-menu/nav-menu-collaborateur/nav-menu-collaborateur.component.html similarity index 100% rename from src/app/nav-menu/nav-menu-collaborateur/nav-menu-collaborateur.component.html rename to src/app/shared/nav-menu/nav-menu-collaborateur/nav-menu-collaborateur.component.html diff --git a/src/app/nav-menu/nav-menu-collaborateur/nav-menu-collaborateur.component.ts b/src/app/shared/nav-menu/nav-menu-collaborateur/nav-menu-collaborateur.component.ts similarity index 100% rename from src/app/nav-menu/nav-menu-collaborateur/nav-menu-collaborateur.component.ts rename to src/app/shared/nav-menu/nav-menu-collaborateur/nav-menu-collaborateur.component.ts diff --git a/src/app/nav-menu/nav-menu-commercial/nav-menu-commercial.component.html b/src/app/shared/nav-menu/nav-menu-commercial/nav-menu-commercial.component.html similarity index 100% rename from src/app/nav-menu/nav-menu-commercial/nav-menu-commercial.component.html rename to src/app/shared/nav-menu/nav-menu-commercial/nav-menu-commercial.component.html diff --git a/src/app/nav-menu/nav-menu-commercial/nav-menu-commercial.component.ts b/src/app/shared/nav-menu/nav-menu-commercial/nav-menu-commercial.component.ts similarity index 100% rename from src/app/nav-menu/nav-menu-commercial/nav-menu-commercial.component.ts rename to src/app/shared/nav-menu/nav-menu-commercial/nav-menu-commercial.component.ts diff --git a/src/app/nav-menu/nav-menu-rh/nav-menu-rh.component.html b/src/app/shared/nav-menu/nav-menu-rh/nav-menu-rh.component.html similarity index 100% rename from src/app/nav-menu/nav-menu-rh/nav-menu-rh.component.html rename to src/app/shared/nav-menu/nav-menu-rh/nav-menu-rh.component.html diff --git a/src/app/nav-menu/nav-menu-rh/nav-menu-rh.component.ts b/src/app/shared/nav-menu/nav-menu-rh/nav-menu-rh.component.ts similarity index 100% rename from src/app/nav-menu/nav-menu-rh/nav-menu-rh.component.ts rename to src/app/shared/nav-menu/nav-menu-rh/nav-menu-rh.component.ts diff --git a/src/app/nav-menu/nav-menu.component.html b/src/app/shared/nav-menu/nav-menu.component.html similarity index 100% rename from src/app/nav-menu/nav-menu.component.html rename to src/app/shared/nav-menu/nav-menu.component.html diff --git a/src/app/nav-menu/nav-menu.component.ts b/src/app/shared/nav-menu/nav-menu.component.ts similarity index 93% rename from src/app/nav-menu/nav-menu.component.ts rename to src/app/shared/nav-menu/nav-menu.component.ts index e25a7a2..362d2b0 100644 --- a/src/app/nav-menu/nav-menu.component.ts +++ b/src/app/shared/nav-menu/nav-menu.component.ts @@ -1,9 +1,9 @@ import { Component } 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' /** * Le composant du nav menu de base. @@ -35,7 +35,7 @@ export class NavMenuComponent { } //isExpanded = false; - + async logout() { await this.keycloakService.logout(); } diff --git a/src/app/shared/nav-menu/nav-menu.module.ts b/src/app/shared/nav-menu/nav-menu.module.ts new file mode 100644 index 0000000..309afc2 --- /dev/null +++ b/src/app/shared/nav-menu/nav-menu.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 "../angular-material/angular-material.module"; + +import { NavMenuComponent } from "./nav-menu.component"; +import { NavMenuAssistanteComponent } from "./nav-menu-assistante/nav-menu-assistante.component"; +import { NavMenuCollaborateurComponent } from "./nav-menu-collaborateur/nav-menu-collaborateur.component"; +import { NavMenuCommercialComponent } from "./nav-menu-commercial/nav-menu-commercial.component"; +import { NavMenuRHComponent } from "./nav-menu-rh/nav-menu-rh.component"; + +@NgModule({ + declarations: [ + NavMenuComponent, NavMenuAssistanteComponent, NavMenuCollaborateurComponent, + NavMenuCommercialComponent, NavMenuRHComponent + ], + imports: [ + BrowserAnimationsModule, + FormsModule, + MaterialModule + ], + exports: [NavMenuComponent] +}) +export class NavMenuModule {} diff --git a/src/app/utils/roles.ts b/src/app/shared/utils/roles.ts similarity index 100% rename from src/app/utils/roles.ts rename to src/app/shared/utils/roles.ts diff --git a/src/app/utils/path-values-collaborateurs.ts b/src/app/utils/path-values-collaborateurs.ts deleted file mode 100644 index ac377cf..0000000 --- a/src/app/utils/path-values-collaborateurs.ts +++ /dev/null @@ -1,7 +0,0 @@ -import { environment } from '../../environments/environment'; - -const baseUrl = environment.serveurConfig.url; - -const urlCollaborateur = baseUrl+"/collaborateurs"; - -export { urlCollaborateur }; diff --git a/src/app/utils/path-values-ep.ts b/src/app/utils/path-values-ep.ts deleted file mode 100644 index 3f59c72..0000000 --- a/src/app/utils/path-values-ep.ts +++ /dev/null @@ -1,28 +0,0 @@ -import { environment } from '../../environments/environment'; - -const baseUrl = environment.serveurConfig.url; - -const urlEP = baseUrl+"/ep"; - -const prochainsEPReferent = urlEP+"/prochains"; -const epDisponibles = urlEP+"/disponible"; -const epCollaborateur = urlEP+"/collaborateur"; -const epReferent = urlEP+"/referent"; -const prochainEpCollaborateur = urlEP+"/prochain"; -const envoieEP = urlEP+"/envoieep"; -const propositionDate = urlEP+"/propositiondate"; -const rappelSignature = urlEP+"/rappelSignature"; -const epi = urlEP+"/epi"; - -export const urlsEP = { - urlEP, - prochainsEPReferent, - epDisponibles, - epCollaborateur, - epReferent, - prochainEpCollaborateur, - envoieEP, - propositionDate, - rappelSignature, - epi -}; diff --git a/src/app/utils/path-values-formations.ts b/src/app/utils/path-values-formations.ts deleted file mode 100644 index 39b5271..0000000 --- a/src/app/utils/path-values-formations.ts +++ /dev/null @@ -1,25 +0,0 @@ -import { environment } from '../../environments/environment'; - -const baseUrl = environment.serveurConfig.url; - -const urlFormation = baseUrl+"/formations"; -const newFormation = urlFormation+"/new"; -const updateFormation = urlFormation+"/update"; -const evaluationsFormation = urlFormation+"/evaluations"; -const evaluerFormation = urlFormation+"/evaluer"; -const evaluationCollaborateur = urlFormation+"/collaborateur"; -const urlDemandesFormation = urlFormation+"/demandesFormation"; -const urlTheme = urlFormation+"/themes"; -const urlCritere = urlFormation+"/criteres"; - -export const urlsFormation = { - urlFormation, - newFormation, - updateFormation, - evaluationsFormation, - evaluerFormation, - evaluationCollaborateur, - urlDemandesFormation, - urlTheme, - urlCritere -}; diff --git a/src/environments/environment.ts b/src/environments/environment.ts index 883a48e..d528f8d 100644 --- a/src/environments/environment.ts +++ b/src/environments/environment.ts @@ -11,14 +11,9 @@ const keycloakConfig: KeycloakConfig = { clientId: 'GestionEPA' }; -const serveurConfig = { - url : "http://localhost:3000/api" -} - export const environment = { production: false, - keycloakConfig, - serveurConfig + keycloakConfig }; /* diff --git a/tsconfig.json b/tsconfig.json index 8c4ef3b..d0626f6 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -1,7 +1,11 @@ { "compileOnSave": false, "compilerOptions": { - "baseUrl": "./", + "baseUrl": "src", + "paths": { + "@env": ["environments/environment"], + "@shared/*": ["app/shared/*"] + }, "outDir": "./dist/out-tsc", "sourceMap": true, "declaration": false,