From e6541acd078681cde0f7f90b16f1979a4eb42cd3 Mon Sep 17 00:00:00 2001 From: VANNEAU Date: Fri, 12 Nov 2021 13:09:06 +0100 Subject: [PATCH] Passage en version 12 + image docker OK --- Dockerfile | 19 +- angular.json | 6 +- package.json | 9 +- src/app/app-routing.module.ts | 8 +- src/app/app.component.ts | 6 +- src/app/app.module.ts | 37 ++-- src/app/app.theme.scss | 61 ++++--- .../collaborateurs.component.ts | 3 +- .../collaborateurs/collaborateurs.module.ts | 18 +- .../collaborateurs.routing.module.ts | 8 +- .../affichage-details-collaborateur.html | 0 .../affichage-details-collaborateur.module.ts | 11 +- .../affichage-details-collaborateur.ts | 7 +- ...log-assignation-rapide-collaborateurs.html | 0 .../dialog-assignation-rapide-referent.html | 0 .../dialog-assignation-rapide.component.ts | 7 +- .../prochain-ep/prochain-ep.component.html | 0 .../prochain-ep/prochain-ep.component.ts | 3 +- .../{shared => commun}/auth/auth-config.ts | 0 .../auth/auth-module-config.ts | 0 src/app/{shared => commun}/auth/auth.guard.ts | 0 .../{shared => commun}/auth/auth.module.ts | 0 .../auth/auth.service.spec.ts | 0 .../{shared => commun}/auth/auth.service.ts | 0 src/app/commun/commun-api.module.ts | 34 ++++ src/app/commun/commun-ui.module.ts | 166 ++++++++++++++++++ .../config}/configuration.ts | 0 .../api-swagger => commun/config}/encoder.ts | 0 .../config}/variables.ts | 0 .../checkbox-filter/checkbox-filter.html | 0 .../checkbox-filter/checkbox-filter.scss | 0 .../filter/checkbox-filter/checkbox-filter.ts | 4 +- src/app/commun/filter/filter.module.ts | 24 +++ .../filter/select-filter/select-filter.html | 0 .../filter/select-filter/select-filter.scss | 0 .../filter/select-filter/select-filter.ts | 2 +- .../filter/selected-element.ts | 0 .../collaborateurs.table.html | 0 .../collaborateurs.table.scss | 0 .../collaborateurs.table.ts | 7 +- .../demandes-formation.table.html | 0 .../demandes-formation.table.scss | 0 .../demandes-formation.table.ts | 9 +- .../engagements-table/engagements-table.html | 0 .../engagements-table/engagements-table.scss | 0 .../engagements-table/engagements-table.ts | 8 +- .../mat-tables/ep-table/ep-table.html | 0 .../mat-tables/ep-table/ep-table.scss | 0 .../mat-tables/ep-table/ep-table.ts | 8 +- .../formations-table/formations.table.html | 0 .../formations-table/formations.table.scss | 0 .../formations-table/formations.table.ts | 8 +- .../participations-formation.table.html | 0 .../participations-formation.table.scss | 0 .../participations-formation.table.ts | 3 +- .../model/affichageNoteDTO.ts | 0 .../api-swagger => commun}/model/agenceDTO.ts | 0 .../model/augmentationSalaireDTO.ts | 0 .../model/businessUnitDTO.ts | 0 .../api-swagger => commun}/model/champDTO.ts | 0 .../model/collaborateurDTO.ts | 0 .../model/commentaireAssistantDTO.ts | 0 .../model/demandeDelegationDTO.ts | 0 .../model/demandeEPIDTO.ts | 0 .../model/demandeFormationDTO.ts | 0 .../model/detailsNoteDTO.ts | 0 .../model/documentDTO.ts | 0 .../model/engagementDTO.ts | 0 .../api-swagger => commun}/model/epDTO.ts | 0 .../model/epInformationDTO.ts | 0 .../model/epSaisieDTO.ts | 0 .../api-swagger => commun}/model/erreurDTO.ts | 0 .../model/etatDemande.ts | 0 .../model/etatEngagement.ts | 0 .../model/evaluationDTO.ts | 0 .../model/formationDTO.ts | 0 .../model/formationDetailsDTO.ts | 0 .../model/modeFormationDTO.ts | 0 .../api-swagger => commun}/model/models.ts | 0 .../model/objectifDTO.ts | 0 .../model/objectifPrecedentDTO.ts | 0 .../model/origineDemandeFormationDTO.ts | 0 .../model/origineFormationDTO.ts | 0 .../model/participationEPDTO.ts | 0 .../model/participationFormationDTO.ts | 0 .../model/prochainEPDTO.ts | 0 .../model/rDVEntretienDTO.ts | 0 .../model/referentEPDTO.ts | 0 .../api-swagger => commun}/model/saisieDTO.ts | 0 .../api-swagger => commun}/model/statutEp.ts | 0 .../model/statutFormationDTO.ts | 0 .../model/statutObjectif.ts | 0 .../model/typeChamps.ts | 0 .../model/typeEntretienDTO.ts | 0 .../api-swagger => commun}/model/typeEp.ts | 0 .../model/typeFormationDTO.ts | 0 .../model/typeSaisie.ts | 0 src/app/{shared => commun}/nav-menu/index.ts | 0 .../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 | 9 +- .../services}/collaborateurs.service.ts | 6 +- .../services}/demandesDelegation.service.ts | 6 +- .../services}/demandesEPI.service.ts | 6 +- .../services}/demandesformation.service.ts | 6 +- .../services}/engagements.service.ts | 6 +- .../api => commun/services}/ep.service.ts | 6 +- .../services}/formations.service.ts | 6 +- .../api => commun/services}/notes.service.ts | 6 +- .../participationsFormations.service.ts | 6 +- .../services}/referentsEP.service.ts | 6 +- src/app/{shared => commun}/utils/cles.ts | 0 src/app/{shared => commun}/utils/paths.ts | 0 src/app/{shared => commun}/utils/roles.ts | 0 src/app/{shared => commun}/utils/typeenums.ts | 0 .../demandes-delegation.component.ts | 6 +- .../demandes-delegation.module.ts | 11 +- .../demandes-delegation.routing.module.ts | 4 +- .../demande-delegation.component.ts | 5 +- .../demandes-formation.component.ts | 2 +- .../demandes-formation.module.ts | 9 +- .../demandes-formation.routing.module.ts | 5 +- .../dialog-demande-formation.component.ts | 3 +- .../new-demande-formation.component.ts | 7 +- src/app/engagements/engagements.component.ts | 6 +- src/app/engagements/engagements.module.ts | 14 +- .../engagements/engagements.routing.module.ts | 4 +- src/app/ep-saisie/ep-saisie.module.ts | 9 +- src/app/ep-saisie/ep-saisie.routing.module.ts | 6 +- src/app/ep/details-ep/details-ep.component.ts | 9 +- .../ep-choix-date/ep-choix-date.component.ts | 2 +- .../ep-commentaires-assistant.component.ts | 5 +- .../ep-demande-delegation.component.ts | 3 +- .../ep-demandes-formation.component.ts | 2 +- .../ep-engagements.component.ts | 2 +- .../ep-objectifs/ep-objectifs.component.ts | 3 +- .../ep-participants.component.ts | 2 +- .../ep-propositions-dates.component.ts | 2 +- src/app/ep/ep-signes/ep-signes.component.ts | 2 +- src/app/ep/ep.component.ts | 8 +- src/app/ep/ep.module.ts | 31 ++-- src/app/ep/ep.routing.module.ts | 4 +- .../details-formation/formation.component.ts | 4 +- .../edit-formation.component.ts | 5 +- src/app/formations/formations.module.ts | 10 +- .../formations/formations.routing.module.ts | 5 +- .../new-formation/new-formation.component.ts | 5 +- .../home-assistante.component.ts | 2 +- .../home-collaborateur.component.ts | 5 +- .../home-commercial.component.ts | 5 +- src/app/home/home.component.ts | 5 +- src/app/home/home.module.ts | 16 +- .../details-note/details-note.component.ts | 3 +- .../modifier-note/modifier-note.component.ts | 3 +- src/app/notes/notes.component.ts | 5 +- src/app/notes/notes.module.ts | 21 +-- src/app/notes/notes.routing.module.ts | 5 +- .../nouvelle-note/nouvelle-note.component.ts | 5 +- .../assignation-referent.component.ts | 6 +- src/app/referents/referents.component.ts | 2 +- src/app/referents/referents.module.ts | 21 +-- src/app/referents/referents.routing.module.ts | 5 +- .../angular-material.module.ts | 59 ------- src/app/shared/api-swagger/.npmignore | 5 - .../api-swagger/.swagger-codegen-ignore | 23 --- .../api-swagger/.swagger-codegen/VERSION | 1 - src/app/shared/api-swagger/api.module.ts | 51 ------ src/app/shared/api-swagger/api/api.ts | 21 --- src/app/shared/api-swagger/index.ts | 5 - src/app/shared/api-swagger/ng-package.json | 6 - src/app/shared/filter/filter.module.ts | 28 --- .../shared/mat-tables/mat-tables.module.ts | 41 ----- src/app/shared/nav-menu/nav-menu.module.ts | 28 --- src/environments/environment.prod.ts | 37 +++- tsconfig.json | 5 +- 182 files changed, 567 insertions(+), 592 deletions(-) rename src/app/{shared => commun}/affichage-details-collaboarteur/affichage-details-collaborateur.html (100%) rename src/app/{shared => commun}/affichage-details-collaboarteur/affichage-details-collaborateur.module.ts (52%) rename src/app/{shared => commun}/affichage-details-collaboarteur/affichage-details-collaborateur.ts (89%) rename src/app/{shared => commun}/affichage-details-collaboarteur/dialog-assignation-rapide/dialog-assignation-rapide-collaborateurs.html (100%) rename src/app/{shared => commun}/affichage-details-collaboarteur/dialog-assignation-rapide/dialog-assignation-rapide-referent.html (100%) rename src/app/{shared => commun}/affichage-details-collaboarteur/dialog-assignation-rapide/dialog-assignation-rapide.component.ts (93%) rename src/app/{shared => commun}/affichage-details-collaboarteur/prochain-ep/prochain-ep.component.html (100%) rename src/app/{shared => commun}/affichage-details-collaboarteur/prochain-ep/prochain-ep.component.ts (88%) rename src/app/{shared => commun}/auth/auth-config.ts (100%) rename src/app/{shared => commun}/auth/auth-module-config.ts (100%) rename src/app/{shared => commun}/auth/auth.guard.ts (100%) rename src/app/{shared => commun}/auth/auth.module.ts (100%) rename src/app/{shared => commun}/auth/auth.service.spec.ts (100%) rename src/app/{shared => commun}/auth/auth.service.ts (100%) create mode 100644 src/app/commun/commun-api.module.ts create mode 100644 src/app/commun/commun-ui.module.ts rename src/app/{shared/api-swagger => commun/config}/configuration.ts (100%) rename src/app/{shared/api-swagger => commun/config}/encoder.ts (100%) rename src/app/{shared/api-swagger => commun/config}/variables.ts (100%) rename src/app/{shared => commun}/filter/checkbox-filter/checkbox-filter.html (100%) rename src/app/{shared => commun}/filter/checkbox-filter/checkbox-filter.scss (100%) rename src/app/{shared => commun}/filter/checkbox-filter/checkbox-filter.ts (98%) create mode 100644 src/app/commun/filter/filter.module.ts rename src/app/{shared => commun}/filter/select-filter/select-filter.html (100%) rename src/app/{shared => commun}/filter/select-filter/select-filter.scss (100%) rename src/app/{shared => commun}/filter/select-filter/select-filter.ts (98%) rename src/app/{shared => commun}/filter/selected-element.ts (100%) rename src/app/{shared => commun}/mat-tables/collaborateurs-table/collaborateurs.table.html (100%) rename src/app/{shared => commun}/mat-tables/collaborateurs-table/collaborateurs.table.scss (100%) rename src/app/{shared => commun}/mat-tables/collaborateurs-table/collaborateurs.table.ts (97%) rename src/app/{shared => commun}/mat-tables/demandes-formation-table/demandes-formation.table.html (100%) rename src/app/{shared => commun}/mat-tables/demandes-formation-table/demandes-formation.table.scss (100%) rename src/app/{shared => commun}/mat-tables/demandes-formation-table/demandes-formation.table.ts (95%) rename src/app/{shared => commun}/mat-tables/engagements-table/engagements-table.html (100%) rename src/app/{shared => commun}/mat-tables/engagements-table/engagements-table.scss (100%) rename src/app/{shared => commun}/mat-tables/engagements-table/engagements-table.ts (93%) rename src/app/{shared => commun}/mat-tables/ep-table/ep-table.html (100%) rename src/app/{shared => commun}/mat-tables/ep-table/ep-table.scss (100%) rename src/app/{shared => commun}/mat-tables/ep-table/ep-table.ts (95%) rename src/app/{shared => commun}/mat-tables/formations-table/formations.table.html (100%) rename src/app/{shared => commun}/mat-tables/formations-table/formations.table.scss (100%) rename src/app/{shared => commun}/mat-tables/formations-table/formations.table.ts (95%) rename src/app/{shared => commun}/mat-tables/participations-formation-table/participations-formation.table.html (100%) rename src/app/{shared => commun}/mat-tables/participations-formation-table/participations-formation.table.scss (100%) rename src/app/{shared => commun}/mat-tables/participations-formation-table/participations-formation.table.ts (95%) rename src/app/{shared/api-swagger => commun}/model/affichageNoteDTO.ts (100%) rename src/app/{shared/api-swagger => commun}/model/agenceDTO.ts (100%) rename src/app/{shared/api-swagger => commun}/model/augmentationSalaireDTO.ts (100%) rename src/app/{shared/api-swagger => commun}/model/businessUnitDTO.ts (100%) rename src/app/{shared/api-swagger => commun}/model/champDTO.ts (100%) rename src/app/{shared/api-swagger => commun}/model/collaborateurDTO.ts (100%) rename src/app/{shared/api-swagger => commun}/model/commentaireAssistantDTO.ts (100%) rename src/app/{shared/api-swagger => commun}/model/demandeDelegationDTO.ts (100%) rename src/app/{shared/api-swagger => commun}/model/demandeEPIDTO.ts (100%) rename src/app/{shared/api-swagger => commun}/model/demandeFormationDTO.ts (100%) rename src/app/{shared/api-swagger => commun}/model/detailsNoteDTO.ts (100%) rename src/app/{shared/api-swagger => commun}/model/documentDTO.ts (100%) rename src/app/{shared/api-swagger => commun}/model/engagementDTO.ts (100%) rename src/app/{shared/api-swagger => commun}/model/epDTO.ts (100%) rename src/app/{shared/api-swagger => commun}/model/epInformationDTO.ts (100%) rename src/app/{shared/api-swagger => commun}/model/epSaisieDTO.ts (100%) rename src/app/{shared/api-swagger => commun}/model/erreurDTO.ts (100%) rename src/app/{shared/api-swagger => commun}/model/etatDemande.ts (100%) rename src/app/{shared/api-swagger => commun}/model/etatEngagement.ts (100%) rename src/app/{shared/api-swagger => commun}/model/evaluationDTO.ts (100%) rename src/app/{shared/api-swagger => commun}/model/formationDTO.ts (100%) rename src/app/{shared/api-swagger => commun}/model/formationDetailsDTO.ts (100%) rename src/app/{shared/api-swagger => commun}/model/modeFormationDTO.ts (100%) rename src/app/{shared/api-swagger => commun}/model/models.ts (100%) rename src/app/{shared/api-swagger => commun}/model/objectifDTO.ts (100%) rename src/app/{shared/api-swagger => commun}/model/objectifPrecedentDTO.ts (100%) rename src/app/{shared/api-swagger => commun}/model/origineDemandeFormationDTO.ts (100%) rename src/app/{shared/api-swagger => commun}/model/origineFormationDTO.ts (100%) rename src/app/{shared/api-swagger => commun}/model/participationEPDTO.ts (100%) rename src/app/{shared/api-swagger => commun}/model/participationFormationDTO.ts (100%) rename src/app/{shared/api-swagger => commun}/model/prochainEPDTO.ts (100%) rename src/app/{shared/api-swagger => commun}/model/rDVEntretienDTO.ts (100%) rename src/app/{shared/api-swagger => commun}/model/referentEPDTO.ts (100%) rename src/app/{shared/api-swagger => commun}/model/saisieDTO.ts (100%) rename src/app/{shared/api-swagger => commun}/model/statutEp.ts (100%) rename src/app/{shared/api-swagger => commun}/model/statutFormationDTO.ts (100%) rename src/app/{shared/api-swagger => commun}/model/statutObjectif.ts (100%) rename src/app/{shared/api-swagger => commun}/model/typeChamps.ts (100%) rename src/app/{shared/api-swagger => commun}/model/typeEntretienDTO.ts (100%) rename src/app/{shared/api-swagger => commun}/model/typeEp.ts (100%) rename src/app/{shared/api-swagger => commun}/model/typeFormationDTO.ts (100%) rename src/app/{shared/api-swagger => commun}/model/typeSaisie.ts (100%) rename src/app/{shared => commun}/nav-menu/index.ts (100%) rename src/app/{shared => commun}/nav-menu/nav-menu-assistante/nav-menu-assistante.component.html (100%) rename src/app/{shared => commun}/nav-menu/nav-menu-assistante/nav-menu-assistante.component.ts (100%) rename src/app/{shared => commun}/nav-menu/nav-menu-collaborateur/nav-menu-collaborateur.component.html (100%) rename src/app/{shared => commun}/nav-menu/nav-menu-collaborateur/nav-menu-collaborateur.component.ts (100%) rename src/app/{shared => commun}/nav-menu/nav-menu-commercial/nav-menu-commercial.component.html (100%) rename src/app/{shared => commun}/nav-menu/nav-menu-commercial/nav-menu-commercial.component.ts (100%) rename src/app/{shared => commun}/nav-menu/nav-menu-rh/nav-menu-rh.component.html (100%) rename src/app/{shared => commun}/nav-menu/nav-menu-rh/nav-menu-rh.component.ts (100%) rename src/app/{shared => commun}/nav-menu/nav-menu.component.html (100%) rename src/app/{shared => commun}/nav-menu/nav-menu.component.ts (90%) rename src/app/{shared/api-swagger/api => commun/services}/collaborateurs.service.ts (99%) rename src/app/{shared/api-swagger/api => commun/services}/demandesDelegation.service.ts (98%) rename src/app/{shared/api-swagger/api => commun/services}/demandesEPI.service.ts (99%) rename src/app/{shared/api-swagger/api => commun/services}/demandesformation.service.ts (99%) rename src/app/{shared/api-swagger/api => commun/services}/engagements.service.ts (99%) rename src/app/{shared/api-swagger/api => commun/services}/ep.service.ts (99%) rename src/app/{shared/api-swagger/api => commun/services}/formations.service.ts (99%) rename src/app/{shared/api-swagger/api => commun/services}/notes.service.ts (99%) rename src/app/{shared/api-swagger/api => commun/services}/participationsFormations.service.ts (99%) rename src/app/{shared/api-swagger/api => commun/services}/referentsEP.service.ts (99%) rename src/app/{shared => commun}/utils/cles.ts (100%) rename src/app/{shared => commun}/utils/paths.ts (100%) rename src/app/{shared => commun}/utils/roles.ts (100%) rename src/app/{shared => commun}/utils/typeenums.ts (100%) delete mode 100644 src/app/shared/angular-material/angular-material.module.ts delete mode 100644 src/app/shared/api-swagger/.npmignore delete mode 100644 src/app/shared/api-swagger/.swagger-codegen-ignore delete mode 100644 src/app/shared/api-swagger/.swagger-codegen/VERSION delete mode 100644 src/app/shared/api-swagger/api.module.ts delete mode 100644 src/app/shared/api-swagger/api/api.ts delete mode 100644 src/app/shared/api-swagger/index.ts delete mode 100644 src/app/shared/api-swagger/ng-package.json delete mode 100644 src/app/shared/filter/filter.module.ts delete mode 100644 src/app/shared/mat-tables/mat-tables.module.ts delete mode 100644 src/app/shared/nav-menu/nav-menu.module.ts diff --git a/Dockerfile b/Dockerfile index 4c4341c..755f01b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,20 +1,25 @@ ## STEP 1 BUILD ## -FROM node:17.0.1-alpine AS build +FROM node:16.13-alpine AS build -WORKDIR /dist/src/app +RUN mkdir -p /app + +WORKDIR /app RUN npm cache clean --force -COPY . . +COPY package*.json /app + +RUN npm install --only=prod +RUN npm install @angular/cli@12.2.12 -RUN npm install +COPY . /app -RUN npm run build --prod +RUN npm run build-prod ## STEP 2 DEPLOY ## FROM nginx:1.21.3 AS ngi -COPY --from=build /dist/src/app/dist/EPAClient /usr/share/nginx/html +COPY --from=build /app/dist/EPAClient /usr/share/nginx/html COPY /nginx.conf /etc/nginx/conf.d/default.conf -EXPOSE 80 \ No newline at end of file +EXPOSE 4200 49153 \ No newline at end of file diff --git a/angular.json b/angular.json index 2120426..a2b6012 100644 --- a/angular.json +++ b/angular.json @@ -128,9 +128,9 @@ } }, "schematics": { - "@schematics/angular:component": { - "styleext": "scss" - } + "@schematics/angular:application": { + "strict": true + } }, "defaultProject": "EPAClient" } \ No newline at end of file diff --git a/package.json b/package.json index 09c91ae..d279be9 100644 --- a/package.json +++ b/package.json @@ -3,8 +3,9 @@ "version": "0.0.0", "scripts": { "ng": "ng", - "start": "ng serve", + "start": "ng serve --Host 0.0.0.0 --poll", "build": "ng build", + "build-prod": "ng build --configuration production", "test": "ng test", "lint": "ng lint", "e2e": "ng e2e", @@ -12,7 +13,7 @@ }, "private": true, "dependencies": { - "@angular-material-components/datetime-picker": "^5.0.3", + "@angular-material-components/datetime-picker": "^6.0.3", "@angular/animations": "~12.2.12", "@angular/cdk": "^12.2.12", "@angular/common": "~12.2.12", @@ -25,7 +26,7 @@ "@angular/router": "~12.2.12", "angular-oauth2-oidc": "^10.0.3", "rxjs": "~6.6.3", - "tslib": "^2.1.0", + "tslib": "^2.3.1", "zone.js": "~0.11.4" }, "devDependencies": { @@ -37,7 +38,7 @@ "@types/jasminewd2": "~2.0.8", "@types/node": "^14.14.25", "codelyzer": "^6.0.1", - "jasmine-core": "~3.6.0", + "jasmine-core": "~3.10.1", "jasmine-spec-reporter": "~6.0.0", "karma": "~6.3.7", "karma-chrome-launcher": "~3.1.0", diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts index f9a4b5f..a335a2d 100644 --- a/src/app/app-routing.module.ts +++ b/src/app/app-routing.module.ts @@ -2,15 +2,13 @@ import { NgModule } from '@angular/core'; import { RouterModule } from '@angular/router'; import { Routes } from '@angular/router'; +import { AuthGuard } from './commun/auth/auth.guard'; +import { paths_collaborateurs, paths_demandes_delegation, paths_demandes_formation, paths_ep, paths_saisie_ep, paths_formation, paths_referents, paths_engagements, paths_notes, paths_home } from './commun/utils/paths'; +import { Role } from './commun/utils/roles'; import { HomeComponent } from './home/'; -import { AuthGuard } from './shared/auth/auth.guard'; -import { paths_collaborateurs, paths_demandes_delegation, paths_demandes_formation, - paths_ep, paths_saisie_ep, paths_formation, paths_home, paths_referents, paths_engagements, paths_notes } from './shared/utils/paths'; - -import { Role } from './shared/utils/roles'; /** * L'ensemble des routes du client Angular diff --git a/src/app/app.component.ts b/src/app/app.component.ts index 236d2fd..2144cc9 100644 --- a/src/app/app.component.ts +++ b/src/app/app.component.ts @@ -1,9 +1,9 @@ import { Component, OnInit } from '@angular/core'; -import { CollaborateursService } from '@shared/api-swagger/api/api' -import { AuthService } from '@shared/auth/auth.service'; import { Subscription } from 'rxjs'; +import { AuthService } from './commun/auth/auth.service'; -import { cles } from "@shared/utils/cles" +import { CollaborateursService } from './commun/services/collaborateurs.service'; +import { cles } from './commun/utils/cles'; @Component({ selector: 'app-root', diff --git a/src/app/app.module.ts b/src/app/app.module.ts index 8118234..8177a79 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -1,6 +1,6 @@ import { BrowserModule } from '@angular/platform-browser'; import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; -import { NgModule, DoBootstrap } from '@angular/core'; +import { NgModule } from '@angular/core'; import { HttpClientModule } from '@angular/common/http'; import { registerLocaleData } from '@angular/common'; @@ -11,38 +11,25 @@ registerLocaleData(localeFr, 'fr'); import { AppComponent } from './app.component'; import { AppRoutingModule } from './app-routing.module'; -import { ApiModule } from '@shared/api-swagger' -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 { AffichageDetailsCollaborateurModule } from "@shared/affichage-details-collaboarteur/affichage-details-collaborateur.module"; -import { EpModule } from "./ep" -import { AuthModule } from '@shared/auth/auth.module'; - -import { MatTablesModule } from "@shared/mat-tables/mat-tables.module"; -import { EngagementsModule } from './engagements'; -import { NotesModule } from './notes'; -import { FilterModule } from "@shared/filter/filter.module"; + +import { CommunModule } from './commun/commun-api.module'; +import { CommunUiModule } from './commun/commun-ui.module'; + @NgModule({ declarations: [ AppComponent ], imports: [ - BrowserModule, BrowserAnimationsModule, - AuthModule.forRoot(), AppRoutingModule, - HttpClientModule, ApiModule, - HomeModule, CollaborateursModule, - ReferentsModule, FormationsModule, - DemandesFormationModule, DemandesDelegationModule, - EpSaisieModule, NotesModule, EpModule, - MatTablesModule, FilterModule, - AffichageDetailsCollaborateurModule, EngagementsModule + BrowserModule, + BrowserAnimationsModule, + AppRoutingModule, + HttpClientModule, + CollaborateursModule, + CommunModule, + CommunUiModule ], providers: [], bootstrap: [AppComponent] diff --git a/src/app/app.theme.scss b/src/app/app.theme.scss index a6b1111..471b086 100644 --- a/src/app/app.theme.scss +++ b/src/app/app.theme.scss @@ -2,6 +2,10 @@ @use '~@angular/material' as mat; // @ Custom color maps // ----------------------------------------------------------------------------------------------------- + +$black-87-opacity: rgba(black, 0.87); +$white-87-opacity: rgba(white, 0.87); + $navy-app-theme: ( 50: #ECECEE, 100: #C5C6CB, @@ -18,20 +22,20 @@ $navy-app-theme: ( A400: #5C616F, A700: #2D323E, contrast: ( - 50: $dark-primary-text, - 100: $dark-primary-text, - 200: $dark-primary-text, - 300: $light-primary-text, - 400: $light-primary-text, - 500: $light-primary-text, - 600: $light-primary-text, - 700: $light-primary-text, - 800: $light-primary-text, - 900: $light-primary-text, - A100: $dark-primary-text, - A200: $light-primary-text, - A400: $light-primary-text, - A700: $light-primary-text, + 50: $black-87-opacity, + 100: $black-87-opacity, + 200: $black-87-opacity, + 300: $black-87-opacity, + 400: white, + 500: white, + 600: $white-87-opacity, + 700: $white-87-opacity, + 800: $white-87-opacity, + 900: $white-87-opacity, + A100: $black-87-opacity, + A200: $black-87-opacity, + A400: white, + A700: $white-87-opacity, ) ); @@ -51,20 +55,21 @@ $apside-primary-app-theme: ( A400: #5C616F, A700: #2D323E, contrast: ( - 50: $dark-primary-text, - 100: $dark-primary-text, - 200: $dark-primary-text, - 300: $light-primary-text, - 400: $light-primary-text, - 500: $light-primary-text, - 600: $light-primary-text, - 700: $light-primary-text, - 800: $light-primary-text, - 900: $light-primary-text, - A100: $dark-primary-text, - A200: $light-primary-text, - A400: $light-primary-text, - A700: $light-primary-text, + 0: $black-87-opacity, + 50: $black-87-opacity, + 100: $black-87-opacity, + 200: $black-87-opacity, + 300: $black-87-opacity, + 400: $black-87-opacity, + 500: $black-87-opacity, + 600: $white-87-opacity, + 700: $white-87-opacity, + 800: $white-87-opacity, + 900: $white-87-opacity, + A100: $black-87-opacity, + A200: $black-87-opacity, + A400: $black-87-opacity, + A700: $white-87-opacity, ) ); diff --git a/src/app/collaborateurs/collaborateurs.component.ts b/src/app/collaborateurs/collaborateurs.component.ts index a1ea1ef..e8670fd 100644 --- a/src/app/collaborateurs/collaborateurs.component.ts +++ b/src/app/collaborateurs/collaborateurs.component.ts @@ -1,8 +1,7 @@ import { Component } from '@angular/core'; - -import { collaborateurTypeRecherche } from "@shared/utils/cles"; import { Router } from '@angular/router'; +import { collaborateurTypeRecherche } from 'app/commun/utils/cles'; /** * Composant qui sert à l'affichage de la liste des collaborateurs en fonction de l'agence de son utilitateur. diff --git a/src/app/collaborateurs/collaborateurs.module.ts b/src/app/collaborateurs/collaborateurs.module.ts index c0d69bd..8bd79ab 100644 --- a/src/app/collaborateurs/collaborateurs.module.ts +++ b/src/app/collaborateurs/collaborateurs.module.ts @@ -3,9 +3,6 @@ import { CommonModule } from "@angular/common"; import { FormsModule, ReactiveFormsModule } from '@angular/forms'; import { RouterModule } from '@angular/router'; -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"; @@ -13,15 +10,17 @@ import { EvaluationComponent } from "./formations-collaborateur/details-evaluati import { EditEvaluationComponent } from "./formations-collaborateur/edit-evaluation/edit-evaluation.component"; import { FormationsCollaboateurComponent } from "./formations-collaborateur/formations-collaborateur.component"; -import { MatTablesModule } from "@shared/mat-tables/mat-tables.module"; import { CollaborateursRoutingModule } from "./collaborateurs.routing.module"; -import { AffichageDetailsCollaborateurModule } from "@shared/affichage-details-collaboarteur/affichage-details-collaborateur.module"; +import { CommunUiModule } from "app/commun/commun-ui.module"; @NgModule({ declarations: [ - CollaborateursComponent, DetailsCollaborateurComponent, - DetailsCollaborateurComponent, EvaluationComponent, EditEvaluationComponent, + CollaborateursComponent, + DetailsCollaborateurComponent, + DetailsCollaborateurComponent, + EvaluationComponent, + EditEvaluationComponent, FormationsCollaboateurComponent ], exports: [ @@ -30,12 +29,9 @@ import { AffichageDetailsCollaborateurModule } from "@shared/affichage-details-c imports: [ //FormsModule, CommonModule, + CommunUiModule, FormsModule, ReactiveFormsModule, - MaterialModule, - NavMenuModule, - MatTablesModule, - AffichageDetailsCollaborateurModule, CollaborateursRoutingModule, RouterModule ], diff --git a/src/app/collaborateurs/collaborateurs.routing.module.ts b/src/app/collaborateurs/collaborateurs.routing.module.ts index 48955fe..eaced5e 100644 --- a/src/app/collaborateurs/collaborateurs.routing.module.ts +++ b/src/app/collaborateurs/collaborateurs.routing.module.ts @@ -6,11 +6,9 @@ import { DetailsCollaborateurComponent } from "./details-collaborateur/details-c import { FormationsCollaboateurComponent } from "./formations-collaborateur/formations-collaborateur.component"; import { EvaluationComponent } from './formations-collaborateur/details-evaluation/evaluation.component'; import { EditEvaluationComponent } from './formations-collaborateur/edit-evaluation/edit-evaluation.component'; - -import { paths_collaborateurs } from '../shared/utils/paths'; - -import { AuthGuard } from '../shared/auth/auth.guard'; -import { Role } from '../shared/utils/roles'; +import { AuthGuard } from 'app/commun/auth/auth.guard'; +import { paths_collaborateurs } from 'app/commun/utils/paths'; +import { Role } from 'app/commun/utils/roles'; const routes: Routes = [ diff --git a/src/app/shared/affichage-details-collaboarteur/affichage-details-collaborateur.html b/src/app/commun/affichage-details-collaboarteur/affichage-details-collaborateur.html similarity index 100% rename from src/app/shared/affichage-details-collaboarteur/affichage-details-collaborateur.html rename to src/app/commun/affichage-details-collaboarteur/affichage-details-collaborateur.html diff --git a/src/app/shared/affichage-details-collaboarteur/affichage-details-collaborateur.module.ts b/src/app/commun/affichage-details-collaboarteur/affichage-details-collaborateur.module.ts similarity index 52% rename from src/app/shared/affichage-details-collaboarteur/affichage-details-collaborateur.module.ts rename to src/app/commun/affichage-details-collaboarteur/affichage-details-collaborateur.module.ts index 7a9c867..71c7562 100644 --- a/src/app/shared/affichage-details-collaboarteur/affichage-details-collaborateur.module.ts +++ b/src/app/commun/affichage-details-collaboarteur/affichage-details-collaborateur.module.ts @@ -2,9 +2,7 @@ import { NgModule } from "@angular/core"; import { CommonModule } from '@angular/common'; import { FormsModule } from '@angular/forms'; -import { MaterialModule } from "../angular-material/angular-material.module"; -import { AffichageDetailsCollaborateurComponent } from "@shared/affichage-details-collaboarteur/affichage-details-collaborateur"; -import { MatTablesModule } from '@shared/mat-tables/mat-tables.module'; +import { AffichageDetailsCollaborateurComponent } from "app/commun/affichage-details-collaboarteur/affichage-details-collaborateur"; import { DialogAssignationRapideReferentComponent, DialogAssignationRapideCollaborateursComponent } from "./dialog-assignation-rapide/dialog-assignation-rapide.component"; import { ProchainEpComponent } from "./prochain-ep/prochain-ep.component"; import { RouterModule } from "@angular/router"; @@ -12,16 +10,13 @@ import { RouterModule } from "@angular/router"; @NgModule({ declarations: [ - AffichageDetailsCollaborateurComponent, DialogAssignationRapideReferentComponent, - DialogAssignationRapideCollaborateursComponent, ProchainEpComponent + ], imports: [ - MaterialModule, CommonModule, FormsModule, - MatTablesModule, RouterModule ], - exports: [AffichageDetailsCollaborateurComponent] + exports: [] }) export class AffichageDetailsCollaborateurModule {} diff --git a/src/app/shared/affichage-details-collaboarteur/affichage-details-collaborateur.ts b/src/app/commun/affichage-details-collaboarteur/affichage-details-collaborateur.ts similarity index 89% rename from src/app/shared/affichage-details-collaboarteur/affichage-details-collaborateur.ts rename to src/app/commun/affichage-details-collaboarteur/affichage-details-collaborateur.ts index a370ab0..0662ef5 100644 --- a/src/app/shared/affichage-details-collaboarteur/affichage-details-collaborateur.ts +++ b/src/app/commun/affichage-details-collaboarteur/affichage-details-collaborateur.ts @@ -1,10 +1,13 @@ import { Component, Input, OnInit } from "@angular/core"; -import { CollaborateurDTO, CollaborateursService, ParticipationFormationDTO, ParticipationsFormationsService } from "@shared/api-swagger"; import { Subscription } from "rxjs"; -import { collaborateurTypeRecherche, epTypeRecherche } from "@shared/utils/cles"; import { MatDialog } from "@angular/material/dialog"; import { DialogAssignationRapideReferentComponent, DialogAssignationRapideCollaborateursComponent } from "./dialog-assignation-rapide/dialog-assignation-rapide.component"; import { Router } from "@angular/router"; +import { CollaborateurDTO } from "../model/collaborateurDTO"; +import { ParticipationFormationDTO } from "../model/participationFormationDTO"; +import { CollaborateursService } from "../services/collaborateurs.service"; +import { ParticipationsFormationsService } from "../services/participationsFormations.service"; +import { collaborateurTypeRecherche, epTypeRecherche } from "../utils/cles"; @Component({ diff --git a/src/app/shared/affichage-details-collaboarteur/dialog-assignation-rapide/dialog-assignation-rapide-collaborateurs.html b/src/app/commun/affichage-details-collaboarteur/dialog-assignation-rapide/dialog-assignation-rapide-collaborateurs.html similarity index 100% rename from src/app/shared/affichage-details-collaboarteur/dialog-assignation-rapide/dialog-assignation-rapide-collaborateurs.html rename to src/app/commun/affichage-details-collaboarteur/dialog-assignation-rapide/dialog-assignation-rapide-collaborateurs.html diff --git a/src/app/shared/affichage-details-collaboarteur/dialog-assignation-rapide/dialog-assignation-rapide-referent.html b/src/app/commun/affichage-details-collaboarteur/dialog-assignation-rapide/dialog-assignation-rapide-referent.html similarity index 100% rename from src/app/shared/affichage-details-collaboarteur/dialog-assignation-rapide/dialog-assignation-rapide-referent.html rename to src/app/commun/affichage-details-collaboarteur/dialog-assignation-rapide/dialog-assignation-rapide-referent.html diff --git a/src/app/shared/affichage-details-collaboarteur/dialog-assignation-rapide/dialog-assignation-rapide.component.ts b/src/app/commun/affichage-details-collaboarteur/dialog-assignation-rapide/dialog-assignation-rapide.component.ts similarity index 93% rename from src/app/shared/affichage-details-collaboarteur/dialog-assignation-rapide/dialog-assignation-rapide.component.ts rename to src/app/commun/affichage-details-collaboarteur/dialog-assignation-rapide/dialog-assignation-rapide.component.ts index 3212dba..f3861d7 100644 --- a/src/app/shared/affichage-details-collaboarteur/dialog-assignation-rapide/dialog-assignation-rapide.component.ts +++ b/src/app/commun/affichage-details-collaboarteur/dialog-assignation-rapide/dialog-assignation-rapide.component.ts @@ -1,8 +1,11 @@ import {Component, Inject, OnInit } from "@angular/core"; import {MAT_DIALOG_DATA, MatDialogRef} from '@angular/material/dialog'; import { MatSnackBar } from "@angular/material/snack-bar"; -import { CollaborateurDTO, CollaborateursService, ReferentEPDTO, ReferentsEPService } from "@shared/api-swagger"; -import { collaborateurTypeRecherche, } from "@shared/utils/cles"; +import { CollaborateurDTO } from "app/commun/model/collaborateurDTO"; +import { ReferentEPDTO } from "app/commun/model/referentEPDTO"; +import { CollaborateursService } from "app/commun/services/collaborateurs.service"; +import { ReferentsEPService } from "app/commun/services/referentsEP.service"; +import { collaborateurTypeRecherche } from "app/commun/utils/cles"; import { Subscription } from "rxjs"; @Component({ diff --git a/src/app/shared/affichage-details-collaboarteur/prochain-ep/prochain-ep.component.html b/src/app/commun/affichage-details-collaboarteur/prochain-ep/prochain-ep.component.html similarity index 100% rename from src/app/shared/affichage-details-collaboarteur/prochain-ep/prochain-ep.component.html rename to src/app/commun/affichage-details-collaboarteur/prochain-ep/prochain-ep.component.html diff --git a/src/app/shared/affichage-details-collaboarteur/prochain-ep/prochain-ep.component.ts b/src/app/commun/affichage-details-collaboarteur/prochain-ep/prochain-ep.component.ts similarity index 88% rename from src/app/shared/affichage-details-collaboarteur/prochain-ep/prochain-ep.component.ts rename to src/app/commun/affichage-details-collaboarteur/prochain-ep/prochain-ep.component.ts index f9d586e..2d651ee 100644 --- a/src/app/shared/affichage-details-collaboarteur/prochain-ep/prochain-ep.component.ts +++ b/src/app/commun/affichage-details-collaboarteur/prochain-ep/prochain-ep.component.ts @@ -1,5 +1,6 @@ import { Component, Input, OnInit } from "@angular/core" -import { affichageStatut, EpInformationDTO, EpService, StatutEp } from "@shared/api-swagger"; +import { affichageStatut, EpInformationDTO, StatutEp } from "app/commun/model/models"; +import { EpService } from "app/commun/services/ep.service"; import { Subscription } from "rxjs"; diff --git a/src/app/shared/auth/auth-config.ts b/src/app/commun/auth/auth-config.ts similarity index 100% rename from src/app/shared/auth/auth-config.ts rename to src/app/commun/auth/auth-config.ts diff --git a/src/app/shared/auth/auth-module-config.ts b/src/app/commun/auth/auth-module-config.ts similarity index 100% rename from src/app/shared/auth/auth-module-config.ts rename to src/app/commun/auth/auth-module-config.ts diff --git a/src/app/shared/auth/auth.guard.ts b/src/app/commun/auth/auth.guard.ts similarity index 100% rename from src/app/shared/auth/auth.guard.ts rename to src/app/commun/auth/auth.guard.ts diff --git a/src/app/shared/auth/auth.module.ts b/src/app/commun/auth/auth.module.ts similarity index 100% rename from src/app/shared/auth/auth.module.ts rename to src/app/commun/auth/auth.module.ts diff --git a/src/app/shared/auth/auth.service.spec.ts b/src/app/commun/auth/auth.service.spec.ts similarity index 100% rename from src/app/shared/auth/auth.service.spec.ts rename to src/app/commun/auth/auth.service.spec.ts diff --git a/src/app/shared/auth/auth.service.ts b/src/app/commun/auth/auth.service.ts similarity index 100% rename from src/app/shared/auth/auth.service.ts rename to src/app/commun/auth/auth.service.ts diff --git a/src/app/commun/commun-api.module.ts b/src/app/commun/commun-api.module.ts new file mode 100644 index 0000000..b8b5d97 --- /dev/null +++ b/src/app/commun/commun-api.module.ts @@ -0,0 +1,34 @@ +import { NgModule } from '@angular/core'; +import { CommonModule } from '@angular/common'; +import { DemandesFormationService } from './services/demandesformation.service'; +import { CollaborateursService } from './services/collaborateurs.service'; +import { DemandesDelegationService } from './services/demandesDelegation.service'; +import { DemandesEPIService } from './services/demandesEPI.service'; +import { EngagementsService } from './services/engagements.service'; +import { EpService } from './services/ep.service'; +import { FormationsService } from './services/formations.service'; +import { NotesService } from './services/notes.service'; +import { ParticipationsFormationsService } from './services/participationsFormations.service'; +import { ReferentsEPService } from './services/referentsEP.service'; + + + +@NgModule({ + declarations: [], + imports: [ + CommonModule + ], + providers: [ + CollaborateursService, + DemandesDelegationService, + DemandesEPIService, + DemandesFormationService, + EngagementsService, + EpService, + FormationsService, + NotesService, + ParticipationsFormationsService, + ReferentsEPService + ] +}) +export class CommunModule {} \ No newline at end of file diff --git a/src/app/commun/commun-ui.module.ts b/src/app/commun/commun-ui.module.ts new file mode 100644 index 0000000..28bb5ea --- /dev/null +++ b/src/app/commun/commun-ui.module.ts @@ -0,0 +1,166 @@ +import { NgModule } from '@angular/core'; +import { CommonModule } from '@angular/common'; +import { MatCardModule } from '@angular/material/card'; +import { MatButtonModule } from '@angular/material/button'; +import { MatMenuModule } from '@angular/material/menu'; +import { MatPaginatorModule } from '@angular/material/paginator'; +import { MatIconModule } from '@angular/material/icon'; +import { MatSortModule } from '@angular/material/sort'; +import { MatInputModule } from '@angular/material/input'; +import { MatTableModule } from '@angular/material/table'; +import { MatProgressSpinnerModule } from '@angular/material/progress-spinner'; +import { MatFormFieldModule } from '@angular/material/form-field'; +import { MatTabsModule } from '@angular/material/tabs'; +import { NgxMatDatetimePickerModule, NgxMatNativeDateModule } from '@angular-material-components/datetime-picker'; +import { MatDatepickerModule } from '@angular/material/datepicker'; +import { MatListModule } from '@angular/material/list'; +import { MatNativeDateModule, MatOption, MatOptionModule } from '@angular/material/core'; +import { MatCheckboxModule } from '@angular/material/checkbox'; +import { MatSelectModule } from '@angular/material/select'; +import { MatStepperModule } from '@angular/material/stepper'; +import { MatChipsModule } from '@angular/material/chips'; +import { MatSnackBarModule } from '@angular/material/snack-bar'; +import { MatSlideToggleModule } from '@angular/material/slide-toggle'; +import { MatRadioModule } from '@angular/material/radio'; +import { CollaborateursTableComponent } from './mat-tables/collaborateurs-table/collaborateurs.table'; +import { DemandesFormationTableComponent } from './mat-tables/demandes-formation-table/demandes-formation.table'; +import { EngagementTableComponent } from './mat-tables/engagements-table/engagements-table'; +import { EpTableComponent } from './mat-tables/ep-table/ep-table'; +import { FormationsTableComponent } from './mat-tables/formations-table/formations.table'; +import { ParticipationsFormationTableComponent } from './mat-tables/participations-formation-table/participations-formation.table'; +import { FilterModule } from './filter/filter.module'; +import { AuthModule } from './auth/auth.module'; +import { NavMenuComponent } from './nav-menu/nav-menu.component'; +import { NavMenuAssistanteComponent } from './nav-menu/nav-menu-assistante/nav-menu-assistante.component'; +import { NavMenuCollaborateurComponent } from './nav-menu/nav-menu-collaborateur/nav-menu-collaborateur.component'; +import { NavMenuCommercialComponent } from './nav-menu/nav-menu-commercial/nav-menu-commercial.component'; +import { NavMenuRHComponent } from './nav-menu/nav-menu-rh/nav-menu-rh.component'; +import { RouterModule } from '@angular/router'; +import { FormsModule, ReactiveFormsModule } from '@angular/forms'; +import { CheckboxFilterComponent } from './filter/checkbox-filter/checkbox-filter'; +import { SelectFilterComponent } from './filter/select-filter/select-filter'; +import { AffichageDetailsCollaborateurComponent } from './affichage-details-collaboarteur/affichage-details-collaborateur'; +import { DialogAssignationRapideReferentComponent, DialogAssignationRapideCollaborateursComponent } from './affichage-details-collaboarteur/dialog-assignation-rapide/dialog-assignation-rapide.component'; +import { ProchainEpComponent } from './affichage-details-collaboarteur/prochain-ep/prochain-ep.component'; + + + +@NgModule({ + imports: [ + // Materials + MatCardModule, + MatButtonModule, + MatMenuModule, + MatIconModule, + MatPaginatorModule, + MatSortModule, + MatTableModule, + MatInputModule, + MatProgressSpinnerModule, + MatTabsModule, + MatFormFieldModule, + NgxMatDatetimePickerModule, + MatDatepickerModule, + NgxMatNativeDateModule, + MatNativeDateModule, + MatListModule, + MatCheckboxModule, + MatSelectModule, + MatStepperModule, + MatChipsModule, + MatSnackBarModule, + MatSlideToggleModule, + MatRadioModule, + MatOptionModule, + + // Forms Angular + FormsModule, + ReactiveFormsModule, + + // Common angular + CommonModule, + + // Module commun + FilterModule, + RouterModule, + AuthModule.forRoot() + ], + exports: [ + // Materials + MatCardModule, + MatButtonModule, + MatMenuModule, + MatIconModule, + MatPaginatorModule, + MatSortModule, + MatTableModule, + MatInputModule, + MatProgressSpinnerModule, + MatTabsModule, + MatFormFieldModule, + NgxMatDatetimePickerModule, + MatDatepickerModule, + NgxMatNativeDateModule, + MatNativeDateModule, + MatListModule, + MatCheckboxModule, + MatSelectModule, + MatStepperModule, + MatChipsModule, + MatSnackBarModule, + MatSlideToggleModule, + MatRadioModule, + MatOptionModule, + + // Module commun + FilterModule, + + // Component commun + NavMenuComponent, + ProchainEpComponent, + DialogAssignationRapideReferentComponent, + AffichageDetailsCollaborateurComponent, + + // Table commun + CollaborateursTableComponent, + EngagementTableComponent, + FormationsTableComponent, + EpTableComponent, + ParticipationsFormationTableComponent, + DemandesFormationTableComponent + + ], + declarations: [ + + // Component commun + /// Filter + CheckboxFilterComponent, + SelectFilterComponent, + + /// Nav menu + NavMenuComponent, + NavMenuAssistanteComponent, + NavMenuCollaborateurComponent, + NavMenuCommercialComponent, + NavMenuRHComponent, + + /// Affichage collab + AffichageDetailsCollaborateurComponent, + DialogAssignationRapideReferentComponent, + DialogAssignationRapideCollaborateursComponent, + ProchainEpComponent, + + // Table commun + CollaborateursTableComponent, + EngagementTableComponent, + FormationsTableComponent, + EpTableComponent, + ParticipationsFormationTableComponent, + DemandesFormationTableComponent, + ], + entryComponents: [ + NavMenuComponent, + DialogAssignationRapideReferentComponent + ] +}) +export class CommunUiModule { } diff --git a/src/app/shared/api-swagger/configuration.ts b/src/app/commun/config/configuration.ts similarity index 100% rename from src/app/shared/api-swagger/configuration.ts rename to src/app/commun/config/configuration.ts diff --git a/src/app/shared/api-swagger/encoder.ts b/src/app/commun/config/encoder.ts similarity index 100% rename from src/app/shared/api-swagger/encoder.ts rename to src/app/commun/config/encoder.ts diff --git a/src/app/shared/api-swagger/variables.ts b/src/app/commun/config/variables.ts similarity index 100% rename from src/app/shared/api-swagger/variables.ts rename to src/app/commun/config/variables.ts diff --git a/src/app/shared/filter/checkbox-filter/checkbox-filter.html b/src/app/commun/filter/checkbox-filter/checkbox-filter.html similarity index 100% rename from src/app/shared/filter/checkbox-filter/checkbox-filter.html rename to src/app/commun/filter/checkbox-filter/checkbox-filter.html diff --git a/src/app/shared/filter/checkbox-filter/checkbox-filter.scss b/src/app/commun/filter/checkbox-filter/checkbox-filter.scss similarity index 100% rename from src/app/shared/filter/checkbox-filter/checkbox-filter.scss rename to src/app/commun/filter/checkbox-filter/checkbox-filter.scss diff --git a/src/app/shared/filter/checkbox-filter/checkbox-filter.ts b/src/app/commun/filter/checkbox-filter/checkbox-filter.ts similarity index 98% rename from src/app/shared/filter/checkbox-filter/checkbox-filter.ts rename to src/app/commun/filter/checkbox-filter/checkbox-filter.ts index 11aac3c..202d82f 100644 --- a/src/app/shared/filter/checkbox-filter/checkbox-filter.ts +++ b/src/app/commun/filter/checkbox-filter/checkbox-filter.ts @@ -1,7 +1,5 @@ import { Component, Input, Output, EventEmitter, OnInit, OnChanges } from "@angular/core"; - -import { SelectedElement } from "@shared/filter/selected-element"; - +import { SelectedElement } from "../selected-element"; diff --git a/src/app/commun/filter/filter.module.ts b/src/app/commun/filter/filter.module.ts new file mode 100644 index 0000000..a39b1f0 --- /dev/null +++ b/src/app/commun/filter/filter.module.ts @@ -0,0 +1,24 @@ +import { NgModule } from "@angular/core"; +import { CommonModule } from '@angular/common'; +import { FormsModule, ReactiveFormsModule} from '@angular/forms'; +import { RouterModule } from '@angular/router'; + +import { SelectFilterComponent } from "./select-filter/select-filter"; +import { CheckboxFilterComponent } from "./checkbox-filter/checkbox-filter"; + + +@NgModule({ + declarations: [ + + ], + imports: [ + CommonModule, + FormsModule, + ReactiveFormsModule, + RouterModule + ], + exports: [ + + ] +}) +export class FilterModule {} diff --git a/src/app/shared/filter/select-filter/select-filter.html b/src/app/commun/filter/select-filter/select-filter.html similarity index 100% rename from src/app/shared/filter/select-filter/select-filter.html rename to src/app/commun/filter/select-filter/select-filter.html diff --git a/src/app/shared/filter/select-filter/select-filter.scss b/src/app/commun/filter/select-filter/select-filter.scss similarity index 100% rename from src/app/shared/filter/select-filter/select-filter.scss rename to src/app/commun/filter/select-filter/select-filter.scss diff --git a/src/app/shared/filter/select-filter/select-filter.ts b/src/app/commun/filter/select-filter/select-filter.ts similarity index 98% rename from src/app/shared/filter/select-filter/select-filter.ts rename to src/app/commun/filter/select-filter/select-filter.ts index deb6837..7577e15 100644 --- a/src/app/shared/filter/select-filter/select-filter.ts +++ b/src/app/commun/filter/select-filter/select-filter.ts @@ -1,5 +1,5 @@ import { Component, Input, Output, EventEmitter, OnInit, OnChanges } from "@angular/core"; -import { SelectedElement } from "@shared/filter/selected-element"; +import { SelectedElement } from "../selected-element"; @Component({ selector: "select-filter", diff --git a/src/app/shared/filter/selected-element.ts b/src/app/commun/filter/selected-element.ts similarity index 100% rename from src/app/shared/filter/selected-element.ts rename to src/app/commun/filter/selected-element.ts diff --git a/src/app/shared/mat-tables/collaborateurs-table/collaborateurs.table.html b/src/app/commun/mat-tables/collaborateurs-table/collaborateurs.table.html similarity index 100% rename from src/app/shared/mat-tables/collaborateurs-table/collaborateurs.table.html rename to src/app/commun/mat-tables/collaborateurs-table/collaborateurs.table.html diff --git a/src/app/shared/mat-tables/collaborateurs-table/collaborateurs.table.scss b/src/app/commun/mat-tables/collaborateurs-table/collaborateurs.table.scss similarity index 100% rename from src/app/shared/mat-tables/collaborateurs-table/collaborateurs.table.scss rename to src/app/commun/mat-tables/collaborateurs-table/collaborateurs.table.scss diff --git a/src/app/shared/mat-tables/collaborateurs-table/collaborateurs.table.ts b/src/app/commun/mat-tables/collaborateurs-table/collaborateurs.table.ts similarity index 97% rename from src/app/shared/mat-tables/collaborateurs-table/collaborateurs.table.ts rename to src/app/commun/mat-tables/collaborateurs-table/collaborateurs.table.ts index 54b3ffd..bb76ffe 100644 --- a/src/app/shared/mat-tables/collaborateurs-table/collaborateurs.table.ts +++ b/src/app/commun/mat-tables/collaborateurs-table/collaborateurs.table.ts @@ -4,9 +4,10 @@ import { Subscription } from 'rxjs'; import {MatTableDataSource} from '@angular/material/table'; -import { BusinessUnitDTO, CollaborateurDTO } from '@shared/api-swagger/model/models' -import { CollaborateursService } from "@shared/api-swagger/api/api"; -import { cles, collaborateurTypeRecherche } from "@shared/utils/cles"; +import { BusinessUnitDTO } from "app/commun/model/businessUnitDTO"; +import { CollaborateurDTO } from "app/commun/model/collaborateurDTO"; +import { CollaborateursService } from "app/commun/services/collaborateurs.service"; +import { cles, collaborateurTypeRecherche } from "app/commun/utils/cles"; @Component({ diff --git a/src/app/shared/mat-tables/demandes-formation-table/demandes-formation.table.html b/src/app/commun/mat-tables/demandes-formation-table/demandes-formation.table.html similarity index 100% rename from src/app/shared/mat-tables/demandes-formation-table/demandes-formation.table.html rename to src/app/commun/mat-tables/demandes-formation-table/demandes-formation.table.html diff --git a/src/app/shared/mat-tables/demandes-formation-table/demandes-formation.table.scss b/src/app/commun/mat-tables/demandes-formation-table/demandes-formation.table.scss similarity index 100% rename from src/app/shared/mat-tables/demandes-formation-table/demandes-formation.table.scss rename to src/app/commun/mat-tables/demandes-formation-table/demandes-formation.table.scss diff --git a/src/app/shared/mat-tables/demandes-formation-table/demandes-formation.table.ts b/src/app/commun/mat-tables/demandes-formation-table/demandes-formation.table.ts similarity index 95% rename from src/app/shared/mat-tables/demandes-formation-table/demandes-formation.table.ts rename to src/app/commun/mat-tables/demandes-formation-table/demandes-formation.table.ts index b928741..5cc31cb 100644 --- a/src/app/shared/mat-tables/demandes-formation-table/demandes-formation.table.ts +++ b/src/app/commun/mat-tables/demandes-formation-table/demandes-formation.table.ts @@ -1,7 +1,12 @@ import { Component, EventEmitter, Input, OnInit, Output } from "@angular/core"; import { MatTableDataSource } from "@angular/material/table"; -import { BusinessUnitDTO, CollaborateurDTO, DemandesFormationService, EtatDemande, afficherEtatDemande, DemandeFormationDTO, StatutEp, estEPEnCours } from "@shared/api-swagger"; -import { cles } from "@shared/utils/cles"; +import { BusinessUnitDTO } from "app/commun/model/businessUnitDTO"; +import { CollaborateurDTO } from "app/commun/model/collaborateurDTO"; +import { DemandeFormationDTO } from "app/commun/model/demandeFormationDTO"; +import { EtatDemande, afficherEtatDemande } from "app/commun/model/etatDemande"; +import { StatutEp, estEPEnCours } from "app/commun/model/statutEp"; +import { DemandesFormationService } from "app/commun/services/demandesformation.service"; +import { cles } from "app/commun/utils/cles"; import { DemandesFormationsRoutingModule } from "app/demandes-formation/demandes-formation.routing.module"; import { Subscription } from "rxjs"; diff --git a/src/app/shared/mat-tables/engagements-table/engagements-table.html b/src/app/commun/mat-tables/engagements-table/engagements-table.html similarity index 100% rename from src/app/shared/mat-tables/engagements-table/engagements-table.html rename to src/app/commun/mat-tables/engagements-table/engagements-table.html diff --git a/src/app/shared/mat-tables/engagements-table/engagements-table.scss b/src/app/commun/mat-tables/engagements-table/engagements-table.scss similarity index 100% rename from src/app/shared/mat-tables/engagements-table/engagements-table.scss rename to src/app/commun/mat-tables/engagements-table/engagements-table.scss diff --git a/src/app/shared/mat-tables/engagements-table/engagements-table.ts b/src/app/commun/mat-tables/engagements-table/engagements-table.ts similarity index 93% rename from src/app/shared/mat-tables/engagements-table/engagements-table.ts rename to src/app/commun/mat-tables/engagements-table/engagements-table.ts index 3aeb821..f2b6395 100644 --- a/src/app/shared/mat-tables/engagements-table/engagements-table.ts +++ b/src/app/commun/mat-tables/engagements-table/engagements-table.ts @@ -1,7 +1,11 @@ import { Component, EventEmitter, Input, OnInit, Output } from "@angular/core"; import { MatTableDataSource } from "@angular/material/table"; -import { BusinessUnitDTO, CollaborateurDTO, EngagementDTO, EngagementsService, EtatEngagement, afficherEtatEngagement } from "@shared/api-swagger"; -import { cles, engagementTypeRecherche } from "@shared/utils/cles"; +import { BusinessUnitDTO } from "app/commun/model/businessUnitDTO"; +import { CollaborateurDTO } from "app/commun/model/collaborateurDTO"; +import { EngagementDTO } from "app/commun/model/engagementDTO"; +import { EtatEngagement, afficherEtatEngagement } from "app/commun/model/etatEngagement"; +import { EngagementsService } from "app/commun/services/engagements.service"; +import { cles } from "app/commun/utils/cles"; import { EngagementsRoutingModule } from "app/engagements/engagements.routing.module"; import { Subscription } from "rxjs"; diff --git a/src/app/shared/mat-tables/ep-table/ep-table.html b/src/app/commun/mat-tables/ep-table/ep-table.html similarity index 100% rename from src/app/shared/mat-tables/ep-table/ep-table.html rename to src/app/commun/mat-tables/ep-table/ep-table.html diff --git a/src/app/shared/mat-tables/ep-table/ep-table.scss b/src/app/commun/mat-tables/ep-table/ep-table.scss similarity index 100% rename from src/app/shared/mat-tables/ep-table/ep-table.scss rename to src/app/commun/mat-tables/ep-table/ep-table.scss diff --git a/src/app/shared/mat-tables/ep-table/ep-table.ts b/src/app/commun/mat-tables/ep-table/ep-table.ts similarity index 95% rename from src/app/shared/mat-tables/ep-table/ep-table.ts rename to src/app/commun/mat-tables/ep-table/ep-table.ts index 757cf4b..bb10b36 100644 --- a/src/app/shared/mat-tables/ep-table/ep-table.ts +++ b/src/app/commun/mat-tables/ep-table/ep-table.ts @@ -1,8 +1,12 @@ import { Component, EventEmitter, Input, OnInit, Output } from "@angular/core"; import { MatSlideToggleChange } from "@angular/material/slide-toggle"; import { MatTableDataSource } from "@angular/material/table"; -import { affichageStatut, BusinessUnitDTO, CollaborateurDTO, EpInformationDTO, EpService, estEnAttente, StatutEp, TypeEp } from "@shared/api-swagger"; -import { cles, epTypeRecherche } from "@shared/utils/cles"; +import { BusinessUnitDTO } from "app/commun/model/businessUnitDTO"; +import { CollaborateurDTO } from "app/commun/model/collaborateurDTO"; +import { EpInformationDTO } from "app/commun/model/epInformationDTO"; +import { StatutEp, affichageStatut, estEnAttente } from "app/commun/model/statutEp"; +import { EpService } from "app/commun/services/ep.service"; +import { epTypeRecherche, cles } from "app/commun/utils/cles"; import { Subscription } from "rxjs"; @Component({ diff --git a/src/app/shared/mat-tables/formations-table/formations.table.html b/src/app/commun/mat-tables/formations-table/formations.table.html similarity index 100% rename from src/app/shared/mat-tables/formations-table/formations.table.html rename to src/app/commun/mat-tables/formations-table/formations.table.html diff --git a/src/app/shared/mat-tables/formations-table/formations.table.scss b/src/app/commun/mat-tables/formations-table/formations.table.scss similarity index 100% rename from src/app/shared/mat-tables/formations-table/formations.table.scss rename to src/app/commun/mat-tables/formations-table/formations.table.scss diff --git a/src/app/shared/mat-tables/formations-table/formations.table.ts b/src/app/commun/mat-tables/formations-table/formations.table.ts similarity index 95% rename from src/app/shared/mat-tables/formations-table/formations.table.ts rename to src/app/commun/mat-tables/formations-table/formations.table.ts index 732bb9c..d1ce948 100644 --- a/src/app/shared/mat-tables/formations-table/formations.table.ts +++ b/src/app/commun/mat-tables/formations-table/formations.table.ts @@ -4,9 +4,11 @@ import { Subscription } from 'rxjs'; import {MatTableDataSource} from '@angular/material/table'; -import { CollaborateurDTO, FormationDetailsDTO, StatutFormationDTO } from '@shared/api-swagger/model/models' -import { FormationsService } from "@shared/api-swagger/api/api"; -import { cles } from "@shared/utils/cles"; +import { CollaborateurDTO } from "app/commun/model/collaborateurDTO"; +import { FormationDetailsDTO } from "app/commun/model/formationDetailsDTO"; +import { StatutFormationDTO } from "app/commun/model/statutFormationDTO"; +import { FormationsService } from "app/commun/services/formations.service"; +import { cles } from "app/commun/utils/cles"; @Component({ diff --git a/src/app/shared/mat-tables/participations-formation-table/participations-formation.table.html b/src/app/commun/mat-tables/participations-formation-table/participations-formation.table.html similarity index 100% rename from src/app/shared/mat-tables/participations-formation-table/participations-formation.table.html rename to src/app/commun/mat-tables/participations-formation-table/participations-formation.table.html diff --git a/src/app/shared/mat-tables/participations-formation-table/participations-formation.table.scss b/src/app/commun/mat-tables/participations-formation-table/participations-formation.table.scss similarity index 100% rename from src/app/shared/mat-tables/participations-formation-table/participations-formation.table.scss rename to src/app/commun/mat-tables/participations-formation-table/participations-formation.table.scss diff --git a/src/app/shared/mat-tables/participations-formation-table/participations-formation.table.ts b/src/app/commun/mat-tables/participations-formation-table/participations-formation.table.ts similarity index 95% rename from src/app/shared/mat-tables/participations-formation-table/participations-formation.table.ts rename to src/app/commun/mat-tables/participations-formation-table/participations-formation.table.ts index 9e90f76..1726407 100644 --- a/src/app/shared/mat-tables/participations-formation-table/participations-formation.table.ts +++ b/src/app/commun/mat-tables/participations-formation-table/participations-formation.table.ts @@ -4,8 +4,9 @@ import {MatPaginator} from '@angular/material/paginator'; import {MatSort} from '@angular/material/sort'; import {MatTableDataSource} from '@angular/material/table'; -import { estEnAttente, estEPDisponible, ParticipationFormationDTO, StatutEp } from '@shared/api-swagger/model/models' import { DatePipe } from "@angular/common"; +import { ParticipationFormationDTO } from "app/commun/model/participationFormationDTO"; +import { StatutEp, estEnAttente, estEPDisponible } from "app/commun/model/statutEp"; @Component({ diff --git a/src/app/shared/api-swagger/model/affichageNoteDTO.ts b/src/app/commun/model/affichageNoteDTO.ts similarity index 100% rename from src/app/shared/api-swagger/model/affichageNoteDTO.ts rename to src/app/commun/model/affichageNoteDTO.ts diff --git a/src/app/shared/api-swagger/model/agenceDTO.ts b/src/app/commun/model/agenceDTO.ts similarity index 100% rename from src/app/shared/api-swagger/model/agenceDTO.ts rename to src/app/commun/model/agenceDTO.ts diff --git a/src/app/shared/api-swagger/model/augmentationSalaireDTO.ts b/src/app/commun/model/augmentationSalaireDTO.ts similarity index 100% rename from src/app/shared/api-swagger/model/augmentationSalaireDTO.ts rename to src/app/commun/model/augmentationSalaireDTO.ts diff --git a/src/app/shared/api-swagger/model/businessUnitDTO.ts b/src/app/commun/model/businessUnitDTO.ts similarity index 100% rename from src/app/shared/api-swagger/model/businessUnitDTO.ts rename to src/app/commun/model/businessUnitDTO.ts diff --git a/src/app/shared/api-swagger/model/champDTO.ts b/src/app/commun/model/champDTO.ts similarity index 100% rename from src/app/shared/api-swagger/model/champDTO.ts rename to src/app/commun/model/champDTO.ts diff --git a/src/app/shared/api-swagger/model/collaborateurDTO.ts b/src/app/commun/model/collaborateurDTO.ts similarity index 100% rename from src/app/shared/api-swagger/model/collaborateurDTO.ts rename to src/app/commun/model/collaborateurDTO.ts diff --git a/src/app/shared/api-swagger/model/commentaireAssistantDTO.ts b/src/app/commun/model/commentaireAssistantDTO.ts similarity index 100% rename from src/app/shared/api-swagger/model/commentaireAssistantDTO.ts rename to src/app/commun/model/commentaireAssistantDTO.ts diff --git a/src/app/shared/api-swagger/model/demandeDelegationDTO.ts b/src/app/commun/model/demandeDelegationDTO.ts similarity index 100% rename from src/app/shared/api-swagger/model/demandeDelegationDTO.ts rename to src/app/commun/model/demandeDelegationDTO.ts diff --git a/src/app/shared/api-swagger/model/demandeEPIDTO.ts b/src/app/commun/model/demandeEPIDTO.ts similarity index 100% rename from src/app/shared/api-swagger/model/demandeEPIDTO.ts rename to src/app/commun/model/demandeEPIDTO.ts diff --git a/src/app/shared/api-swagger/model/demandeFormationDTO.ts b/src/app/commun/model/demandeFormationDTO.ts similarity index 100% rename from src/app/shared/api-swagger/model/demandeFormationDTO.ts rename to src/app/commun/model/demandeFormationDTO.ts diff --git a/src/app/shared/api-swagger/model/detailsNoteDTO.ts b/src/app/commun/model/detailsNoteDTO.ts similarity index 100% rename from src/app/shared/api-swagger/model/detailsNoteDTO.ts rename to src/app/commun/model/detailsNoteDTO.ts diff --git a/src/app/shared/api-swagger/model/documentDTO.ts b/src/app/commun/model/documentDTO.ts similarity index 100% rename from src/app/shared/api-swagger/model/documentDTO.ts rename to src/app/commun/model/documentDTO.ts diff --git a/src/app/shared/api-swagger/model/engagementDTO.ts b/src/app/commun/model/engagementDTO.ts similarity index 100% rename from src/app/shared/api-swagger/model/engagementDTO.ts rename to src/app/commun/model/engagementDTO.ts diff --git a/src/app/shared/api-swagger/model/epDTO.ts b/src/app/commun/model/epDTO.ts similarity index 100% rename from src/app/shared/api-swagger/model/epDTO.ts rename to src/app/commun/model/epDTO.ts diff --git a/src/app/shared/api-swagger/model/epInformationDTO.ts b/src/app/commun/model/epInformationDTO.ts similarity index 100% rename from src/app/shared/api-swagger/model/epInformationDTO.ts rename to src/app/commun/model/epInformationDTO.ts diff --git a/src/app/shared/api-swagger/model/epSaisieDTO.ts b/src/app/commun/model/epSaisieDTO.ts similarity index 100% rename from src/app/shared/api-swagger/model/epSaisieDTO.ts rename to src/app/commun/model/epSaisieDTO.ts diff --git a/src/app/shared/api-swagger/model/erreurDTO.ts b/src/app/commun/model/erreurDTO.ts similarity index 100% rename from src/app/shared/api-swagger/model/erreurDTO.ts rename to src/app/commun/model/erreurDTO.ts diff --git a/src/app/shared/api-swagger/model/etatDemande.ts b/src/app/commun/model/etatDemande.ts similarity index 100% rename from src/app/shared/api-swagger/model/etatDemande.ts rename to src/app/commun/model/etatDemande.ts diff --git a/src/app/shared/api-swagger/model/etatEngagement.ts b/src/app/commun/model/etatEngagement.ts similarity index 100% rename from src/app/shared/api-swagger/model/etatEngagement.ts rename to src/app/commun/model/etatEngagement.ts diff --git a/src/app/shared/api-swagger/model/evaluationDTO.ts b/src/app/commun/model/evaluationDTO.ts similarity index 100% rename from src/app/shared/api-swagger/model/evaluationDTO.ts rename to src/app/commun/model/evaluationDTO.ts diff --git a/src/app/shared/api-swagger/model/formationDTO.ts b/src/app/commun/model/formationDTO.ts similarity index 100% rename from src/app/shared/api-swagger/model/formationDTO.ts rename to src/app/commun/model/formationDTO.ts diff --git a/src/app/shared/api-swagger/model/formationDetailsDTO.ts b/src/app/commun/model/formationDetailsDTO.ts similarity index 100% rename from src/app/shared/api-swagger/model/formationDetailsDTO.ts rename to src/app/commun/model/formationDetailsDTO.ts diff --git a/src/app/shared/api-swagger/model/modeFormationDTO.ts b/src/app/commun/model/modeFormationDTO.ts similarity index 100% rename from src/app/shared/api-swagger/model/modeFormationDTO.ts rename to src/app/commun/model/modeFormationDTO.ts diff --git a/src/app/shared/api-swagger/model/models.ts b/src/app/commun/model/models.ts similarity index 100% rename from src/app/shared/api-swagger/model/models.ts rename to src/app/commun/model/models.ts diff --git a/src/app/shared/api-swagger/model/objectifDTO.ts b/src/app/commun/model/objectifDTO.ts similarity index 100% rename from src/app/shared/api-swagger/model/objectifDTO.ts rename to src/app/commun/model/objectifDTO.ts diff --git a/src/app/shared/api-swagger/model/objectifPrecedentDTO.ts b/src/app/commun/model/objectifPrecedentDTO.ts similarity index 100% rename from src/app/shared/api-swagger/model/objectifPrecedentDTO.ts rename to src/app/commun/model/objectifPrecedentDTO.ts diff --git a/src/app/shared/api-swagger/model/origineDemandeFormationDTO.ts b/src/app/commun/model/origineDemandeFormationDTO.ts similarity index 100% rename from src/app/shared/api-swagger/model/origineDemandeFormationDTO.ts rename to src/app/commun/model/origineDemandeFormationDTO.ts diff --git a/src/app/shared/api-swagger/model/origineFormationDTO.ts b/src/app/commun/model/origineFormationDTO.ts similarity index 100% rename from src/app/shared/api-swagger/model/origineFormationDTO.ts rename to src/app/commun/model/origineFormationDTO.ts diff --git a/src/app/shared/api-swagger/model/participationEPDTO.ts b/src/app/commun/model/participationEPDTO.ts similarity index 100% rename from src/app/shared/api-swagger/model/participationEPDTO.ts rename to src/app/commun/model/participationEPDTO.ts diff --git a/src/app/shared/api-swagger/model/participationFormationDTO.ts b/src/app/commun/model/participationFormationDTO.ts similarity index 100% rename from src/app/shared/api-swagger/model/participationFormationDTO.ts rename to src/app/commun/model/participationFormationDTO.ts diff --git a/src/app/shared/api-swagger/model/prochainEPDTO.ts b/src/app/commun/model/prochainEPDTO.ts similarity index 100% rename from src/app/shared/api-swagger/model/prochainEPDTO.ts rename to src/app/commun/model/prochainEPDTO.ts diff --git a/src/app/shared/api-swagger/model/rDVEntretienDTO.ts b/src/app/commun/model/rDVEntretienDTO.ts similarity index 100% rename from src/app/shared/api-swagger/model/rDVEntretienDTO.ts rename to src/app/commun/model/rDVEntretienDTO.ts diff --git a/src/app/shared/api-swagger/model/referentEPDTO.ts b/src/app/commun/model/referentEPDTO.ts similarity index 100% rename from src/app/shared/api-swagger/model/referentEPDTO.ts rename to src/app/commun/model/referentEPDTO.ts diff --git a/src/app/shared/api-swagger/model/saisieDTO.ts b/src/app/commun/model/saisieDTO.ts similarity index 100% rename from src/app/shared/api-swagger/model/saisieDTO.ts rename to src/app/commun/model/saisieDTO.ts diff --git a/src/app/shared/api-swagger/model/statutEp.ts b/src/app/commun/model/statutEp.ts similarity index 100% rename from src/app/shared/api-swagger/model/statutEp.ts rename to src/app/commun/model/statutEp.ts diff --git a/src/app/shared/api-swagger/model/statutFormationDTO.ts b/src/app/commun/model/statutFormationDTO.ts similarity index 100% rename from src/app/shared/api-swagger/model/statutFormationDTO.ts rename to src/app/commun/model/statutFormationDTO.ts diff --git a/src/app/shared/api-swagger/model/statutObjectif.ts b/src/app/commun/model/statutObjectif.ts similarity index 100% rename from src/app/shared/api-swagger/model/statutObjectif.ts rename to src/app/commun/model/statutObjectif.ts diff --git a/src/app/shared/api-swagger/model/typeChamps.ts b/src/app/commun/model/typeChamps.ts similarity index 100% rename from src/app/shared/api-swagger/model/typeChamps.ts rename to src/app/commun/model/typeChamps.ts diff --git a/src/app/shared/api-swagger/model/typeEntretienDTO.ts b/src/app/commun/model/typeEntretienDTO.ts similarity index 100% rename from src/app/shared/api-swagger/model/typeEntretienDTO.ts rename to src/app/commun/model/typeEntretienDTO.ts diff --git a/src/app/shared/api-swagger/model/typeEp.ts b/src/app/commun/model/typeEp.ts similarity index 100% rename from src/app/shared/api-swagger/model/typeEp.ts rename to src/app/commun/model/typeEp.ts diff --git a/src/app/shared/api-swagger/model/typeFormationDTO.ts b/src/app/commun/model/typeFormationDTO.ts similarity index 100% rename from src/app/shared/api-swagger/model/typeFormationDTO.ts rename to src/app/commun/model/typeFormationDTO.ts diff --git a/src/app/shared/api-swagger/model/typeSaisie.ts b/src/app/commun/model/typeSaisie.ts similarity index 100% rename from src/app/shared/api-swagger/model/typeSaisie.ts rename to src/app/commun/model/typeSaisie.ts diff --git a/src/app/shared/nav-menu/index.ts b/src/app/commun/nav-menu/index.ts similarity index 100% rename from src/app/shared/nav-menu/index.ts rename to src/app/commun/nav-menu/index.ts diff --git a/src/app/shared/nav-menu/nav-menu-assistante/nav-menu-assistante.component.html b/src/app/commun/nav-menu/nav-menu-assistante/nav-menu-assistante.component.html similarity index 100% rename from src/app/shared/nav-menu/nav-menu-assistante/nav-menu-assistante.component.html rename to src/app/commun/nav-menu/nav-menu-assistante/nav-menu-assistante.component.html diff --git a/src/app/shared/nav-menu/nav-menu-assistante/nav-menu-assistante.component.ts b/src/app/commun/nav-menu/nav-menu-assistante/nav-menu-assistante.component.ts similarity index 100% rename from src/app/shared/nav-menu/nav-menu-assistante/nav-menu-assistante.component.ts rename to src/app/commun/nav-menu/nav-menu-assistante/nav-menu-assistante.component.ts diff --git a/src/app/shared/nav-menu/nav-menu-collaborateur/nav-menu-collaborateur.component.html b/src/app/commun/nav-menu/nav-menu-collaborateur/nav-menu-collaborateur.component.html similarity index 100% rename from src/app/shared/nav-menu/nav-menu-collaborateur/nav-menu-collaborateur.component.html rename to src/app/commun/nav-menu/nav-menu-collaborateur/nav-menu-collaborateur.component.html diff --git a/src/app/shared/nav-menu/nav-menu-collaborateur/nav-menu-collaborateur.component.ts b/src/app/commun/nav-menu/nav-menu-collaborateur/nav-menu-collaborateur.component.ts similarity index 100% rename from src/app/shared/nav-menu/nav-menu-collaborateur/nav-menu-collaborateur.component.ts rename to src/app/commun/nav-menu/nav-menu-collaborateur/nav-menu-collaborateur.component.ts diff --git a/src/app/shared/nav-menu/nav-menu-commercial/nav-menu-commercial.component.html b/src/app/commun/nav-menu/nav-menu-commercial/nav-menu-commercial.component.html similarity index 100% rename from src/app/shared/nav-menu/nav-menu-commercial/nav-menu-commercial.component.html rename to src/app/commun/nav-menu/nav-menu-commercial/nav-menu-commercial.component.html diff --git a/src/app/shared/nav-menu/nav-menu-commercial/nav-menu-commercial.component.ts b/src/app/commun/nav-menu/nav-menu-commercial/nav-menu-commercial.component.ts similarity index 100% rename from src/app/shared/nav-menu/nav-menu-commercial/nav-menu-commercial.component.ts rename to src/app/commun/nav-menu/nav-menu-commercial/nav-menu-commercial.component.ts diff --git a/src/app/shared/nav-menu/nav-menu-rh/nav-menu-rh.component.html b/src/app/commun/nav-menu/nav-menu-rh/nav-menu-rh.component.html similarity index 100% rename from src/app/shared/nav-menu/nav-menu-rh/nav-menu-rh.component.html rename to src/app/commun/nav-menu/nav-menu-rh/nav-menu-rh.component.html diff --git a/src/app/shared/nav-menu/nav-menu-rh/nav-menu-rh.component.ts b/src/app/commun/nav-menu/nav-menu-rh/nav-menu-rh.component.ts similarity index 100% rename from src/app/shared/nav-menu/nav-menu-rh/nav-menu-rh.component.ts rename to src/app/commun/nav-menu/nav-menu-rh/nav-menu-rh.component.ts diff --git a/src/app/shared/nav-menu/nav-menu.component.html b/src/app/commun/nav-menu/nav-menu.component.html similarity index 100% rename from src/app/shared/nav-menu/nav-menu.component.html rename to src/app/commun/nav-menu/nav-menu.component.html diff --git a/src/app/shared/nav-menu/nav-menu.component.ts b/src/app/commun/nav-menu/nav-menu.component.ts similarity index 90% rename from src/app/shared/nav-menu/nav-menu.component.ts rename to src/app/commun/nav-menu/nav-menu.component.ts index c340eb6..a471478 100644 --- a/src/app/shared/nav-menu/nav-menu.component.ts +++ b/src/app/commun/nav-menu/nav-menu.component.ts @@ -1,11 +1,8 @@ import { Component, Inject } from '@angular/core'; import { DOCUMENT } from '@angular/common'; -import { AuthService } from '@shared/auth/auth.service'; - -import { Role } from '@shared/utils/roles'; - -import { environment } from '@env' -import { cles } from '@shared/utils/cles'; +import { AuthService } from '../auth/auth.service'; +import { cles } from '../utils/cles'; +import { Role } from '../utils/roles'; /** * Le composant du nav menu de base. diff --git a/src/app/shared/api-swagger/api/collaborateurs.service.ts b/src/app/commun/services/collaborateurs.service.ts similarity index 99% rename from src/app/shared/api-swagger/api/collaborateurs.service.ts rename to src/app/commun/services/collaborateurs.service.ts index ebc35aa..7d4a267 100644 --- a/src/app/shared/api-swagger/api/collaborateurs.service.ts +++ b/src/app/commun/services/collaborateurs.service.ts @@ -13,15 +13,15 @@ import { Inject, Injectable, Optional } from '@angular/core'; import { HttpClient, HttpHeaders, HttpParams, HttpResponse, HttpEvent } from '@angular/common/http'; -import { CustomHttpUrlEncodingCodec } from '../encoder'; +import { CustomHttpUrlEncodingCodec } from '../config/encoder'; import { Observable } from 'rxjs'; import { CollaborateurDTO } from '../model/collaborateurDTO'; import { ErreurDTO } from '../model/erreurDTO'; -import { BASE_PATH, COLLECTION_FORMATS } from '../variables'; -import { Configuration } from '../configuration'; +import { BASE_PATH, COLLECTION_FORMATS } from '../config/variables'; +import { Configuration } from '../config/configuration'; @Injectable() diff --git a/src/app/shared/api-swagger/api/demandesDelegation.service.ts b/src/app/commun/services/demandesDelegation.service.ts similarity index 98% rename from src/app/shared/api-swagger/api/demandesDelegation.service.ts rename to src/app/commun/services/demandesDelegation.service.ts index 73355bb..e8f5bf0 100644 --- a/src/app/shared/api-swagger/api/demandesDelegation.service.ts +++ b/src/app/commun/services/demandesDelegation.service.ts @@ -13,15 +13,15 @@ import { Inject, Injectable, Optional } from '@angular/core'; import { HttpClient, HttpHeaders, HttpParams, HttpResponse, HttpEvent } from '@angular/common/http'; -import { CustomHttpUrlEncodingCodec } from '../encoder'; +import { CustomHttpUrlEncodingCodec } from '../config/encoder'; import { Observable } from 'rxjs'; import { DemandeDelegationDTO } from '../model/demandeDelegationDTO'; import { ErreurDTO } from '../model/erreurDTO'; -import { BASE_PATH, COLLECTION_FORMATS } from '../variables'; -import { Configuration } from '../configuration'; +import { BASE_PATH, COLLECTION_FORMATS } from '../config/variables'; +import { Configuration } from '../config/configuration'; @Injectable() diff --git a/src/app/shared/api-swagger/api/demandesEPI.service.ts b/src/app/commun/services/demandesEPI.service.ts similarity index 99% rename from src/app/shared/api-swagger/api/demandesEPI.service.ts rename to src/app/commun/services/demandesEPI.service.ts index 92edb8f..8b93db4 100644 --- a/src/app/shared/api-swagger/api/demandesEPI.service.ts +++ b/src/app/commun/services/demandesEPI.service.ts @@ -13,7 +13,7 @@ import { Inject, Injectable, Optional } from '@angular/core'; import { HttpClient, HttpHeaders, HttpParams, HttpResponse, HttpEvent } from '@angular/common/http'; -import { CustomHttpUrlEncodingCodec } from '../encoder'; +import { CustomHttpUrlEncodingCodec } from '../config/encoder'; import { Observable } from 'rxjs'; @@ -21,8 +21,8 @@ import { DemandeEPIDTO } from '../model/demandeEPIDTO'; import { ErreurDTO } from '../model/erreurDTO'; import { EtatDemande } from '../model/etatDemande'; -import { BASE_PATH, COLLECTION_FORMATS } from '../variables'; -import { Configuration } from '../configuration'; +import { BASE_PATH, COLLECTION_FORMATS } from '../config/variables'; +import { Configuration } from '../config/configuration'; @Injectable() diff --git a/src/app/shared/api-swagger/api/demandesformation.service.ts b/src/app/commun/services/demandesformation.service.ts similarity index 99% rename from src/app/shared/api-swagger/api/demandesformation.service.ts rename to src/app/commun/services/demandesformation.service.ts index ae7d703..cad6518 100644 --- a/src/app/shared/api-swagger/api/demandesformation.service.ts +++ b/src/app/commun/services/demandesformation.service.ts @@ -13,7 +13,7 @@ import { Inject, Injectable, Optional } from '@angular/core'; import { HttpClient, HttpHeaders, HttpParams, HttpResponse, HttpEvent } from '@angular/common/http'; -import { CustomHttpUrlEncodingCodec } from '../encoder'; +import { CustomHttpUrlEncodingCodec } from '../config/encoder'; import { Observable } from 'rxjs'; @@ -22,8 +22,8 @@ import { ErreurDTO } from '../model/erreurDTO'; import { EtatDemande } from '../model/etatDemande'; import { OrigineDemandeFormationDTO } from '../model/origineDemandeFormationDTO'; -import { BASE_PATH, COLLECTION_FORMATS } from '../variables'; -import { Configuration } from '../configuration'; +import { BASE_PATH, COLLECTION_FORMATS } from '../config/variables'; +import { Configuration } from '../config/configuration'; import { StatutEp } from '../model/statutEp'; diff --git a/src/app/shared/api-swagger/api/engagements.service.ts b/src/app/commun/services/engagements.service.ts similarity index 99% rename from src/app/shared/api-swagger/api/engagements.service.ts rename to src/app/commun/services/engagements.service.ts index dc08a51..cac2da7 100644 --- a/src/app/shared/api-swagger/api/engagements.service.ts +++ b/src/app/commun/services/engagements.service.ts @@ -13,7 +13,7 @@ import { Inject, Injectable, Optional } from '@angular/core'; import { HttpClient, HttpHeaders, HttpParams, HttpResponse, HttpEvent } from '@angular/common/http'; -import { CustomHttpUrlEncodingCodec } from '../encoder'; +import { CustomHttpUrlEncodingCodec } from '../config/encoder'; import { Observable } from 'rxjs'; @@ -21,8 +21,8 @@ import { EngagementDTO } from '../model/engagementDTO'; import { ErreurDTO } from '../model/erreurDTO'; import { EtatEngagement } from '../model/etatEngagement'; -import { BASE_PATH, COLLECTION_FORMATS } from '../variables'; -import { Configuration } from '../configuration'; +import { BASE_PATH, COLLECTION_FORMATS } from '../config/variables'; +import { Configuration } from '../config/configuration'; @Injectable() diff --git a/src/app/shared/api-swagger/api/ep.service.ts b/src/app/commun/services/ep.service.ts similarity index 99% rename from src/app/shared/api-swagger/api/ep.service.ts rename to src/app/commun/services/ep.service.ts index 9ea253d..553a592 100644 --- a/src/app/shared/api-swagger/api/ep.service.ts +++ b/src/app/commun/services/ep.service.ts @@ -13,7 +13,7 @@ import { Inject, Injectable, Optional } from '@angular/core'; import { HttpClient, HttpHeaders, HttpParams, HttpResponse, HttpEvent } from '@angular/common/http'; - import { CustomHttpUrlEncodingCodec } from '../encoder'; + import { CustomHttpUrlEncodingCodec } from '../config/encoder'; import { Observable } from 'rxjs'; @@ -23,8 +23,8 @@ import { ErreurDTO } from '../model/erreurDTO'; import { TypeEntretienDTO } from '../model/typeEntretienDTO'; - import { BASE_PATH, COLLECTION_FORMATS } from '../variables'; - import { Configuration } from '../configuration'; + import { BASE_PATH, COLLECTION_FORMATS } from '../config/variables'; + import { Configuration } from '../config/configuration'; @Injectable() diff --git a/src/app/shared/api-swagger/api/formations.service.ts b/src/app/commun/services/formations.service.ts similarity index 99% rename from src/app/shared/api-swagger/api/formations.service.ts rename to src/app/commun/services/formations.service.ts index d25a2f9..912b906 100644 --- a/src/app/shared/api-swagger/api/formations.service.ts +++ b/src/app/commun/services/formations.service.ts @@ -13,7 +13,7 @@ import { Inject, Injectable, Optional } from '@angular/core'; import { HttpClient, HttpHeaders, HttpParams, HttpResponse, HttpEvent } from '@angular/common/http'; -import { CustomHttpUrlEncodingCodec } from '../encoder'; +import { CustomHttpUrlEncodingCodec } from '../config/encoder'; import { Observable } from 'rxjs'; @@ -25,8 +25,8 @@ import { OrigineFormationDTO } from '../model/origineFormationDTO'; import { StatutFormationDTO } from '../model/statutFormationDTO'; import { TypeFormationDTO } from '../model/typeFormationDTO'; -import { BASE_PATH, COLLECTION_FORMATS } from '../variables'; -import { Configuration } from '../configuration'; +import { BASE_PATH, COLLECTION_FORMATS } from '../config/variables'; +import { Configuration } from '../config/configuration'; @Injectable() diff --git a/src/app/shared/api-swagger/api/notes.service.ts b/src/app/commun/services/notes.service.ts similarity index 99% rename from src/app/shared/api-swagger/api/notes.service.ts rename to src/app/commun/services/notes.service.ts index db34a2b..fa248c0 100644 --- a/src/app/shared/api-swagger/api/notes.service.ts +++ b/src/app/commun/services/notes.service.ts @@ -13,7 +13,7 @@ import { Inject, Injectable, Optional } from '@angular/core'; import { HttpClient, HttpHeaders, HttpParams, HttpResponse, HttpEvent } from '@angular/common/http'; -import { CustomHttpUrlEncodingCodec } from '../encoder'; +import { CustomHttpUrlEncodingCodec } from '../config/encoder'; import { Observable } from 'rxjs'; @@ -21,8 +21,8 @@ import { AffichageNoteDTO } from '../model/affichageNoteDTO'; import { DetailsNoteDTO } from '../model/detailsNoteDTO'; import { ErreurDTO } from '../model/erreurDTO'; -import { BASE_PATH, COLLECTION_FORMATS } from '../variables'; -import { Configuration } from '../configuration'; +import { BASE_PATH, COLLECTION_FORMATS } from '../config/variables'; +import { Configuration } from '../config/configuration'; @Injectable() diff --git a/src/app/shared/api-swagger/api/participationsFormations.service.ts b/src/app/commun/services/participationsFormations.service.ts similarity index 99% rename from src/app/shared/api-swagger/api/participationsFormations.service.ts rename to src/app/commun/services/participationsFormations.service.ts index 819ac13..f7e59c7 100644 --- a/src/app/shared/api-swagger/api/participationsFormations.service.ts +++ b/src/app/commun/services/participationsFormations.service.ts @@ -13,7 +13,7 @@ import { Inject, Injectable, Optional } from '@angular/core'; import { HttpClient, HttpHeaders, HttpParams, HttpResponse, HttpEvent } from '@angular/common/http'; -import { CustomHttpUrlEncodingCodec } from '../encoder'; +import { CustomHttpUrlEncodingCodec } from '../config/encoder'; import { Observable } from 'rxjs'; @@ -21,8 +21,8 @@ import { ErreurDTO } from '../model/erreurDTO'; import { EvaluationDTO } from '../model/evaluationDTO'; import { ParticipationFormationDTO } from '../model/participationFormationDTO'; -import { BASE_PATH, COLLECTION_FORMATS } from '../variables'; -import { Configuration } from '../configuration'; +import { BASE_PATH, COLLECTION_FORMATS } from '../config/variables'; +import { Configuration } from '../config/configuration'; @Injectable() diff --git a/src/app/shared/api-swagger/api/referentsEP.service.ts b/src/app/commun/services/referentsEP.service.ts similarity index 99% rename from src/app/shared/api-swagger/api/referentsEP.service.ts rename to src/app/commun/services/referentsEP.service.ts index 29554ed..5411640 100644 --- a/src/app/shared/api-swagger/api/referentsEP.service.ts +++ b/src/app/commun/services/referentsEP.service.ts @@ -13,15 +13,15 @@ import { Inject, Injectable, Optional } from '@angular/core'; import { HttpClient, HttpHeaders, HttpParams, HttpResponse, HttpEvent } from '@angular/common/http'; -import { CustomHttpUrlEncodingCodec } from '../encoder'; +import { CustomHttpUrlEncodingCodec } from '../config/encoder'; import { Observable } from 'rxjs'; import { ErreurDTO } from '../model/erreurDTO'; import { ReferentEPDTO } from '../model/referentEPDTO'; -import { BASE_PATH, COLLECTION_FORMATS } from '../variables'; -import { Configuration } from '../configuration'; +import { BASE_PATH, COLLECTION_FORMATS } from '../config/variables'; +import { Configuration } from '../config/configuration'; @Injectable() diff --git a/src/app/shared/utils/cles.ts b/src/app/commun/utils/cles.ts similarity index 100% rename from src/app/shared/utils/cles.ts rename to src/app/commun/utils/cles.ts diff --git a/src/app/shared/utils/paths.ts b/src/app/commun/utils/paths.ts similarity index 100% rename from src/app/shared/utils/paths.ts rename to src/app/commun/utils/paths.ts diff --git a/src/app/shared/utils/roles.ts b/src/app/commun/utils/roles.ts similarity index 100% rename from src/app/shared/utils/roles.ts rename to src/app/commun/utils/roles.ts diff --git a/src/app/shared/utils/typeenums.ts b/src/app/commun/utils/typeenums.ts similarity index 100% rename from src/app/shared/utils/typeenums.ts rename to src/app/commun/utils/typeenums.ts diff --git a/src/app/demandes-delegation/demandes-delegation.component.ts b/src/app/demandes-delegation/demandes-delegation.component.ts index 6e5fb21..de637c1 100644 --- a/src/app/demandes-delegation/demandes-delegation.component.ts +++ b/src/app/demandes-delegation/demandes-delegation.component.ts @@ -1,7 +1,9 @@ import { Component, Inject, OnInit } from '@angular/core'; import { MatDialog, MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog'; -import { CollaborateurDTO, DemandeDelegationDTO, DemandesDelegationService, EtatDemande } from '@shared/api-swagger'; -import { cles } from '@shared/utils/cles'; +import { DemandeDelegationDTO } from 'app/commun/model/demandeDelegationDTO'; +import { CollaborateurDTO, EtatDemande } from 'app/commun/model/models'; +import { DemandesDelegationService } from 'app/commun/services/demandesDelegation.service'; +import { cles } from 'app/commun/utils/cles'; import { Subscription } from 'rxjs'; /** diff --git a/src/app/demandes-delegation/demandes-delegation.module.ts b/src/app/demandes-delegation/demandes-delegation.module.ts index b3c2d5f..23665de 100644 --- a/src/app/demandes-delegation/demandes-delegation.module.ts +++ b/src/app/demandes-delegation/demandes-delegation.module.ts @@ -3,14 +3,10 @@ import { CommonModule } from "@angular/common"; import { FormsModule } from '@angular/forms'; import { RouterModule } from '@angular/router'; -import { MaterialModule } from "@shared/angular-material/angular-material.module"; - -import {NavMenuModule} from '@shared/nav-menu/nav-menu.module'; - - import { DemandesDelegationComponent, DialogValidationReponse } from './demandes-delegation.component'; import { DemandeDelegationComponent, DialogReponseDemandeDelegation } from './details-demande-delegation/demande-delegation.component'; import { DemandesDelegationRoutingModule } from './demandes-delegation.routing.module'; +import { CommunUiModule } from "app/commun/commun-ui.module"; @NgModule({ @@ -21,12 +17,11 @@ import { DemandesDelegationRoutingModule } from './demandes-delegation.routing.m exports: [ DemandesDelegationComponent ], imports: [ - MaterialModule, - NavMenuModule, DemandesDelegationRoutingModule, RouterModule, FormsModule, - CommonModule + CommonModule, + CommunUiModule ], }) export class DemandesDelegationModule {} diff --git a/src/app/demandes-delegation/demandes-delegation.routing.module.ts b/src/app/demandes-delegation/demandes-delegation.routing.module.ts index 091e3ec..95a51b7 100644 --- a/src/app/demandes-delegation/demandes-delegation.routing.module.ts +++ b/src/app/demandes-delegation/demandes-delegation.routing.module.ts @@ -1,12 +1,10 @@ import { NgModule } from '@angular/core'; import { Routes, RouterModule } from '@angular/router'; +import { AuthGuard } from 'app/commun/auth/auth.guard'; import { DemandesDelegationComponent } from "./demandes-delegation.component"; -import { AuthGuard } from '@shared/auth/auth.guard'; - - /** * Routes du module demandes delegation */ 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 index 4dd74a8..6f3be10 100644 --- a/src/app/demandes-delegation/details-demande-delegation/demande-delegation.component.ts +++ b/src/app/demandes-delegation/details-demande-delegation/demande-delegation.component.ts @@ -1,8 +1,7 @@ -import { i18nMetaToJSDoc } from '@angular/compiler/src/render3/view/i18n/meta'; import { Component, EventEmitter, Inject, Input, OnInit, Output } from '@angular/core'; import { MatDialog, MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog'; -import { DemandeDelegationDTO, DemandeEPIDTO, EtatDemande } from '@shared/api-swagger'; -import { BrowserStack } from 'protractor/built/driverProviders'; +import { DemandeDelegationDTO } from 'app/commun/model/demandeDelegationDTO'; +import { EtatDemande } from 'app/commun/model/etatDemande'; import { Subscription } from 'rxjs'; diff --git a/src/app/demandes-formation/demandes-formation.component.ts b/src/app/demandes-formation/demandes-formation.component.ts index 9dea266..a5d8679 100644 --- a/src/app/demandes-formation/demandes-formation.component.ts +++ b/src/app/demandes-formation/demandes-formation.component.ts @@ -1,6 +1,6 @@ import { Component, OnInit } from '@angular/core'; import { MatDialog, MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog'; -import { DemandeFormationDTO } from '@shared/api-swagger'; +import { DemandeFormationDTO } from 'app/commun/model/models'; import { DialogDemandeFormationComponent } from './mat-dialog/dialog-demande-formation.component'; /** diff --git a/src/app/demandes-formation/demandes-formation.module.ts b/src/app/demandes-formation/demandes-formation.module.ts index 031f2a4..cee97d8 100644 --- a/src/app/demandes-formation/demandes-formation.module.ts +++ b/src/app/demandes-formation/demandes-formation.module.ts @@ -5,16 +5,13 @@ import { FormsModule, ReactiveFormsModule } 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 { DialogDemandeFormationComponent } from './mat-dialog/dialog-demande-formation.component'; import { DemandeFormationComponent } from './details-demande-formation/demande-formation.component' import { NewDemandeFormationComponent } from './new-demande-formation/new-demande-formation.component' import { DemandesFormationsRoutingModule } from './demandes-formation.routing.module'; -import { MatTablesModule } from "@shared/mat-tables/mat-tables.module"; +import { CommunUiModule } from 'app/commun/commun-ui.module'; /** * Module demandes formation @@ -28,10 +25,8 @@ import { MatTablesModule } from "@shared/mat-tables/mat-tables.module"; ], imports: [ CommonModule, - MaterialModule, - NavMenuModule, + CommunUiModule, DemandesFormationsRoutingModule, - MatTablesModule, RouterModule, FormsModule, ReactiveFormsModule diff --git a/src/app/demandes-formation/demandes-formation.routing.module.ts b/src/app/demandes-formation/demandes-formation.routing.module.ts index 0a341f4..9b5752f 100644 --- a/src/app/demandes-formation/demandes-formation.routing.module.ts +++ b/src/app/demandes-formation/demandes-formation.routing.module.ts @@ -1,14 +1,13 @@ import { NgModule } from '@angular/core'; import { Routes, RouterModule } from '@angular/router'; +import { AuthGuard } from 'app/commun/auth/auth.guard'; +import { paths_demandes_formation } from 'app/commun/utils/paths'; import { DemandesFormationComponent } from "./demandes-formation.component"; import { DemandeFormationComponent } from "./details-demande-formation/demande-formation.component"; import { NewDemandeFormationComponent } from "./new-demande-formation/new-demande-formation.component"; -import { AuthGuard } from '../shared/auth/auth.guard'; - -import { paths_demandes_formation } from "../shared/utils/paths"; /** * Routes du module demandes formation diff --git a/src/app/demandes-formation/mat-dialog/dialog-demande-formation.component.ts b/src/app/demandes-formation/mat-dialog/dialog-demande-formation.component.ts index e33e012..51f6be3 100644 --- a/src/app/demandes-formation/mat-dialog/dialog-demande-formation.component.ts +++ b/src/app/demandes-formation/mat-dialog/dialog-demande-formation.component.ts @@ -1,7 +1,8 @@ import { Component, Inject } from "@angular/core"; import { MatDialogRef, MAT_DIALOG_DATA } from "@angular/material/dialog"; import { MatSnackBar } from "@angular/material/snack-bar"; -import { CollaborateurDTO, EpInformationDTO, DemandesFormationService, DemandeFormationDTO, EtatDemande, afficherEtatDemande } from "@shared/api-swagger"; +import { CollaborateurDTO, DemandeFormationDTO, EpInformationDTO, EtatDemande, afficherEtatDemande } from "app/commun/model/models"; +import { DemandesFormationService } from "app/commun/services/demandesformation.service"; import { Subscription } from "rxjs"; 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 index ea133db..f75c6b9 100644 --- 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 @@ -2,10 +2,9 @@ import { Component, OnInit } from '@angular/core'; import { Observable, Subscription } from 'rxjs'; import { Router } from '@angular/router'; import { FormBuilder, FormGroup, FormControl, } from '@angular/forms'; - -import { OrigineDemandeFormationDTO, EtatDemande } from "@shared/api-swagger/model/models"; - -import { DemandesFormationService } from "@shared/api-swagger/api/api"; +import { EtatDemande } from 'app/commun/model/etatDemande'; +import { OrigineDemandeFormationDTO } from 'app/commun/model/origineDemandeFormationDTO'; +import { DemandesFormationService } from 'app/commun/services/demandesformation.service'; /** * Composant qui sert à créer une demande de formation pour un collaborateur. diff --git a/src/app/engagements/engagements.component.ts b/src/app/engagements/engagements.component.ts index ccb2a55..64fa005 100644 --- a/src/app/engagements/engagements.component.ts +++ b/src/app/engagements/engagements.component.ts @@ -1,7 +1,11 @@ import { Component, Inject } from "@angular/core"; import { MatDialog, MatDialogRef, MAT_DIALOG_DATA } from "@angular/material/dialog"; import { MatSnackBar } from "@angular/material/snack-bar"; -import { CollaborateurDTO, EngagementDTO, EngagementsService, EpInformationDTO, EtatEngagement, afficherEtatEngagement } from "@shared/api-swagger"; +import { CollaborateurDTO } from "app/commun/model/collaborateurDTO"; +import { EngagementDTO } from "app/commun/model/engagementDTO"; +import { EpInformationDTO } from "app/commun/model/epInformationDTO"; +import { EtatEngagement, afficherEtatEngagement } from "app/commun/model/etatEngagement"; +import { EngagementsService } from "app/commun/services/engagements.service"; import { Subscription } from "rxjs"; /** diff --git a/src/app/engagements/engagements.module.ts b/src/app/engagements/engagements.module.ts index b06d1fc..c5ac093 100644 --- a/src/app/engagements/engagements.module.ts +++ b/src/app/engagements/engagements.module.ts @@ -2,29 +2,25 @@ import { NgModule } from "@angular/core"; import { CommonModule } from "@angular/common"; import { RouterModule } from '@angular/router'; -import { MaterialModule } from "@shared/angular-material/angular-material.module"; - -import {NavMenuModule} from '@shared/nav-menu/nav-menu.module'; import { DialogEngagementsComponent, EngagementsComponent } from "./engagements.component"; import { EngagementsRoutingModule } from "./engagements.routing.module"; -import { MatTablesModule } from "@shared/mat-tables/mat-tables.module"; import { FormsModule } from "@angular/forms"; +import { CommunUiModule } from "app/commun/commun-ui.module"; @NgModule({ declarations: [ - EngagementsComponent, DialogEngagementsComponent + EngagementsComponent, + DialogEngagementsComponent ], exports: [], imports: [ CommonModule, RouterModule, - NavMenuModule, EngagementsRoutingModule, - MatTablesModule, - MaterialModule, - FormsModule + FormsModule, + CommunUiModule ], }) export class EngagementsModule {} \ No newline at end of file diff --git a/src/app/engagements/engagements.routing.module.ts b/src/app/engagements/engagements.routing.module.ts index 905ca37..9905397 100644 --- a/src/app/engagements/engagements.routing.module.ts +++ b/src/app/engagements/engagements.routing.module.ts @@ -1,12 +1,10 @@ import { NgModule } from '@angular/core'; import { Routes, RouterModule } from '@angular/router'; +import { AuthGuard } from 'app/commun/auth/auth.guard'; import { EngagementsComponent } from "./engagements.component"; -import { AuthGuard } from '@shared/auth/auth.guard'; - - const routes: Routes = [ { path: '', component: EngagementsComponent, pathMatch: 'full', canActivate: [AuthGuard]} diff --git a/src/app/ep-saisie/ep-saisie.module.ts b/src/app/ep-saisie/ep-saisie.module.ts index 9fb65b7..fe160a0 100644 --- a/src/app/ep-saisie/ep-saisie.module.ts +++ b/src/app/ep-saisie/ep-saisie.module.ts @@ -3,16 +3,13 @@ import { CommonModule } from "@angular/common"; import { FormsModule } from '@angular/forms'; import { RouterModule } from '@angular/router' -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'; import { EpSaisieRoutingModule } from './ep-saisie.routing.module'; +import { CommunUiModule } from "app/commun/commun-ui.module"; /** * Module de la saisie de l'EP @@ -26,8 +23,8 @@ import { EpSaisieRoutingModule } from './ep-saisie.routing.module'; imports: [ //BrowserAnimationsModule, //FormsModule, - MaterialModule, - NavMenuModule, + CommonModule, + CommunUiModule, EpSaisieRoutingModule, RouterModule ], diff --git a/src/app/ep-saisie/ep-saisie.routing.module.ts b/src/app/ep-saisie/ep-saisie.routing.module.ts index cb617eb..72b077f 100644 --- a/src/app/ep-saisie/ep-saisie.routing.module.ts +++ b/src/app/ep-saisie/ep-saisie.routing.module.ts @@ -6,10 +6,8 @@ import { EpSaisieComponent } from "./ep-saisie.component"; import { EpsSaisieComponent } from "./eps-saisie/eps-saisie.component"; import { EpaSaisieComponent } from "./epa-saisie/epa-saisie.component"; import { EpaSixAnsSaisieComponent } from "./epa-six-ans-saisie/epa-six-ans-saisie.component"; - -import { AuthGuard } from '../shared/auth/auth.guard'; - -import { paths_saisie_ep } from "../shared/utils/paths"; +import { AuthGuard } from 'app/commun/auth/auth.guard'; +import { paths_saisie_ep } from 'app/commun/utils/paths'; /** * Routes du module saisie ep diff --git a/src/app/ep/details-ep/details-ep.component.ts b/src/app/ep/details-ep/details-ep.component.ts index d4b77aa..1a40999 100644 --- a/src/app/ep/details-ep/details-ep.component.ts +++ b/src/app/ep/details-ep/details-ep.component.ts @@ -1,9 +1,10 @@ import { Component, OnInit } from "@angular/core"; import { ActivatedRoute } from "@angular/router"; -import { affichageStatut, EpDTO, EpService, StatutEp, estEPEnCours, estEPSigne, estEPEnAttenteSignatureCollaborateur, estEPEffectue, CollaborateurDTO } from "@shared/api-swagger"; -import { AuthService } from "@shared/auth/auth.service"; -import { cles } from "@shared/utils/cles"; -import { Role } from "@shared/utils/roles"; +import { AuthService } from "app/commun/auth/auth.service"; +import { affichageStatut, CollaborateurDTO, EpDTO, estEPEffectue, estEPEnAttenteSignatureCollaborateur, estEPEnCours, estEPSigne, StatutEp } from "app/commun/model/models"; +import { EpService } from "app/commun/services/ep.service"; +import { cles } from "app/commun/utils/cles"; +import { Role } from "app/commun/utils/roles"; import { Subscription } from "rxjs"; /** diff --git a/src/app/ep/details-ep/ep-choix-date/ep-choix-date.component.ts b/src/app/ep/details-ep/ep-choix-date/ep-choix-date.component.ts index 503c472..5ca1e77 100644 --- a/src/app/ep/details-ep/ep-choix-date/ep-choix-date.component.ts +++ b/src/app/ep/details-ep/ep-choix-date/ep-choix-date.component.ts @@ -1,5 +1,5 @@ import { Component, Input } from '@angular/core'; -import { RDVEntretienDTO } from '@shared/api-swagger'; +import { RDVEntretienDTO } from 'app/commun/model/rDVEntretienDTO'; /** * Composant qui permet au collaborateur de faire un choix parmi les date proposées diff --git a/src/app/ep/details-ep/ep-commentaires-assistant/ep-commentaires-assistant.component.ts b/src/app/ep/details-ep/ep-commentaires-assistant/ep-commentaires-assistant.component.ts index cfea645..c7540ce 100644 --- a/src/app/ep/details-ep/ep-commentaires-assistant/ep-commentaires-assistant.component.ts +++ b/src/app/ep/details-ep/ep-commentaires-assistant/ep-commentaires-assistant.component.ts @@ -1,8 +1,9 @@ import { analyzeAndValidateNgModules } from '@angular/compiler'; import { Component, Inject, Input } from '@angular/core'; import { MatDialog, MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog'; -import { CollaborateurDTO, CommentaireAssistantDTO, EpDTO } from '@shared/api-swagger'; -import { AuthService } from '@shared/auth/auth.service'; +import { CollaborateurDTO } from 'app/commun/model/collaborateurDTO'; +import { CommentaireAssistantDTO } from 'app/commun/model/commentaireAssistantDTO'; +import { EpDTO } from 'app/commun/model/epDTO'; import { Subscription } from 'rxjs'; /** diff --git a/src/app/ep/details-ep/ep-demande-delegation/ep-demande-delegation.component.ts b/src/app/ep/details-ep/ep-demande-delegation/ep-demande-delegation.component.ts index 39ccd4d..06c5e2b 100644 --- a/src/app/ep/details-ep/ep-demande-delegation/ep-demande-delegation.component.ts +++ b/src/app/ep/details-ep/ep-demande-delegation/ep-demande-delegation.component.ts @@ -1,5 +1,6 @@ import { Component, Input} from '@angular/core'; -import { AfficherEtatDemandeDelegation, DemandeDelegationDTO, EpDTO, EtatDemande } from '@shared/api-swagger'; +import { DemandeDelegationDTO } from 'app/commun/model/demandeDelegationDTO'; +import { EtatDemande, AfficherEtatDemandeDelegation } from 'app/commun/model/etatDemande'; /** * Composant pour faire une demande de délégation et voir la dernière en cours diff --git a/src/app/ep/details-ep/ep-demandes-formation/ep-demandes-formation.component.ts b/src/app/ep/details-ep/ep-demandes-formation/ep-demandes-formation.component.ts index ad8523c..9b38066 100644 --- a/src/app/ep/details-ep/ep-demandes-formation/ep-demandes-formation.component.ts +++ b/src/app/ep/details-ep/ep-demandes-formation/ep-demandes-formation.component.ts @@ -1,5 +1,5 @@ import { Component, Input } from '@angular/core'; -import { DemandeFormationDTO } from '@shared/api-swagger'; +import { DemandeFormationDTO } from 'app/commun/model/models'; /** * Composant pour ajouter et voir les demandes de formation diff --git a/src/app/ep/details-ep/ep-engagements/ep-engagements.component.ts b/src/app/ep/details-ep/ep-engagements/ep-engagements.component.ts index c631de5..fb3b408 100644 --- a/src/app/ep/details-ep/ep-engagements/ep-engagements.component.ts +++ b/src/app/ep/details-ep/ep-engagements/ep-engagements.component.ts @@ -1,5 +1,5 @@ import { Component, Input } from "@angular/core"; -import { EngagementDTO } from "@shared/api-swagger"; +import { EngagementDTO } from "app/commun/model/models"; @Component({ selector: "ep-engagements", diff --git a/src/app/ep/details-ep/ep-objectifs/ep-objectifs.component.ts b/src/app/ep/details-ep/ep-objectifs/ep-objectifs.component.ts index fa5c748..ac4c154 100644 --- a/src/app/ep/details-ep/ep-objectifs/ep-objectifs.component.ts +++ b/src/app/ep/details-ep/ep-objectifs/ep-objectifs.component.ts @@ -1,5 +1,6 @@ import { Component, Input } from "@angular/core"; -import { afficherStatutObjectif, EpDTO, StatutObjectif } from "@shared/api-swagger"; +import { EpDTO } from "app/commun/model/epDTO"; +import { StatutObjectif, afficherStatutObjectif } from "app/commun/model/statutObjectif"; @Component({ diff --git a/src/app/ep/details-ep/ep-participants/ep-participants.component.ts b/src/app/ep/details-ep/ep-participants/ep-participants.component.ts index 04da4b9..b6e162b 100644 --- a/src/app/ep/details-ep/ep-participants/ep-participants.component.ts +++ b/src/app/ep/details-ep/ep-participants/ep-participants.component.ts @@ -1,5 +1,5 @@ import { Component, Input, OnInit } from '@angular/core'; -import { EpDTO } from '@shared/api-swagger'; +import { EpDTO } from 'app/commun/model/models'; /** * Composant pour afficher la liste des participants de l'EP diff --git a/src/app/ep/details-ep/ep-propositions-dates/ep-propositions-dates.component.ts b/src/app/ep/details-ep/ep-propositions-dates/ep-propositions-dates.component.ts index 5efe113..b8f3798 100644 --- a/src/app/ep/details-ep/ep-propositions-dates/ep-propositions-dates.component.ts +++ b/src/app/ep/details-ep/ep-propositions-dates/ep-propositions-dates.component.ts @@ -1,5 +1,5 @@ import { Component, Input } from '@angular/core'; -import { RDVEntretienDTO, TypeEntretienDTO } from '@shared/api-swagger'; +import { RDVEntretienDTO, TypeEntretienDTO } from 'app/commun/model/models'; /** * Composant permettant au référent de proposer ses dates d'EP à partir des préférences de lieu d'entretien du collaborateur diff --git a/src/app/ep/ep-signes/ep-signes.component.ts b/src/app/ep/ep-signes/ep-signes.component.ts index 0e197b4..3bfbfc2 100644 --- a/src/app/ep/ep-signes/ep-signes.component.ts +++ b/src/app/ep/ep-signes/ep-signes.component.ts @@ -1,6 +1,6 @@ import { Component } from '@angular/core'; import { Router } from '@angular/router'; -import { epTypeRecherche } from '@shared/utils/cles'; +import { epTypeRecherche } from 'app/commun/utils/cles'; /** * Composant qui permet la consultation de la liste des EP signés diff --git a/src/app/ep/ep.component.ts b/src/app/ep/ep.component.ts index f0ad9aa..a74d464 100644 --- a/src/app/ep/ep.component.ts +++ b/src/app/ep/ep.component.ts @@ -1,9 +1,9 @@ import { Component, OnInit } from '@angular/core'; import { Router } from '@angular/router'; -import { CollaborateurDTO } from '@shared/api-swagger'; -import { AuthService } from '@shared/auth/auth.service'; -import { cles, epTypeRecherche } from '@shared/utils/cles'; -import { Role } from '@shared/utils/roles'; +import { AuthService } from 'app/commun/auth/auth.service'; +import { CollaborateurDTO } from 'app/commun/model/models'; +import { cles, epTypeRecherche } from 'app/commun/utils/cles'; +import { Role } from 'app/commun/utils/roles'; /** diff --git a/src/app/ep/ep.module.ts b/src/app/ep/ep.module.ts index ce00e85..8123487 100644 --- a/src/app/ep/ep.module.ts +++ b/src/app/ep/ep.module.ts @@ -3,14 +3,9 @@ import { CommonModule } from "@angular/common"; import { FormsModule, ReactiveFormsModule } from '@angular/forms'; import { RouterModule } from '@angular/router'; -import { MaterialModule } from "@shared/angular-material/angular-material.module"; - -import {NavMenuModule} from '@shared/nav-menu/nav-menu.module'; - import { EpComponent } from './ep.component'; import { EpRoutingModule } from './ep.routing.module'; -import { MatTablesModule } from "@shared/mat-tables/mat-tables.module"; import { EpSignesComponent } from "./ep-signes/ep-signes.component"; import { DetailsEPComponent } from "./details-ep/details-ep.component"; import { EpObjectifsComponent } from "./details-ep/ep-objectifs/ep-objectifs.component"; @@ -21,6 +16,7 @@ import { EpEngagementsCompenent } from "./details-ep/ep-engagements/ep-engagemen import { EpPropositionsDatesComponent } from "./details-ep/ep-propositions-dates/ep-propositions-dates.component"; import { EpChoixDateComponent } from "./details-ep/ep-choix-date/ep-choix-date.component"; import { EpDemandesFormationComponent } from "./details-ep/ep-demandes-formation/ep-demandes-formation.component"; +import { CommunUiModule } from "app/commun/commun-ui.module"; @@ -29,20 +25,29 @@ import { EpDemandesFormationComponent } from "./details-ep/ep-demandes-formation */ @NgModule({ declarations: [ - EpComponent, EpSignesComponent, DetailsEPComponent, EpObjectifsComponent, - EpParticipantsComponent, EpDemandeDelegationComponent, EpCommentairesAssistantComponent, - EpEngagementsCompenent, EpPropositionsDatesComponent, EpChoixDateComponent, - EpDemandesFormationComponent, DialogEPAjouterCommentaireAssistant, DialogEPSupprimerCommentaireAssistant + EpComponent, + EpSignesComponent, + DetailsEPComponent, + EpObjectifsComponent, + EpParticipantsComponent, + EpDemandeDelegationComponent, + EpCommentairesAssistantComponent, + EpEngagementsCompenent, + EpPropositionsDatesComponent, + EpChoixDateComponent, + EpDemandesFormationComponent, + DialogEPAjouterCommentaireAssistant, + DialogEPSupprimerCommentaireAssistant ], - exports: [EpComponent, DetailsEPComponent + exports: [ + EpComponent, + DetailsEPComponent ], imports: [ - MaterialModule, - NavMenuModule, EpRoutingModule, RouterModule, - MatTablesModule, CommonModule, + CommunUiModule, FormsModule, ReactiveFormsModule ], diff --git a/src/app/ep/ep.routing.module.ts b/src/app/ep/ep.routing.module.ts index f976bb9..561bbf6 100644 --- a/src/app/ep/ep.routing.module.ts +++ b/src/app/ep/ep.routing.module.ts @@ -4,10 +4,10 @@ import { Routes, RouterModule } from '@angular/router'; import { EpComponent } from "./ep.component"; -import { AuthGuard } from '../shared/auth/auth.guard'; -import { paths_ep } from "../shared/utils/paths"; import { EpSignesComponent } from './ep-signes/ep-signes.component'; import { DetailsEPComponent } from './details-ep/details-ep.component'; +import { AuthGuard } from 'app/commun/auth/auth.guard'; +import { paths_ep } from 'app/commun/utils/paths'; /** * Routes du module ep diff --git a/src/app/formations/details-formation/formation.component.ts b/src/app/formations/details-formation/formation.component.ts index 243a202..e4a79a4 100644 --- a/src/app/formations/details-formation/formation.component.ts +++ b/src/app/formations/details-formation/formation.component.ts @@ -2,9 +2,9 @@ import { Component, OnInit } from '@angular/core'; import { Subscription } from 'rxjs'; import {ActivatedRoute} from '@angular/router'; +import { FormationDTO } from 'app/commun/model/models'; +import { FormationsService } from 'app/commun/services/formations.service'; -import { FormationsService } from '@shared/api-swagger/api/api'; -import { FormationDTO } from "@shared/api-swagger/model/models"; /** * Composant qui permet l'affichage des détails d'une formation ainsi que de sa liste de participants. diff --git a/src/app/formations/edit-formation/edit-formation.component.ts b/src/app/formations/edit-formation/edit-formation.component.ts index 164f241..947f0b8 100644 --- a/src/app/formations/edit-formation/edit-formation.component.ts +++ b/src/app/formations/edit-formation/edit-formation.component.ts @@ -8,11 +8,10 @@ import { FormBuilder, FormGroup, FormControl, Validators } from '@angular/forms' import {MatTableDataSource} from '@angular/material/table'; import {MatPaginator} from '@angular/material/paginator'; import {MatSort} from '@angular/material/sort'; +import { FormationDTO, ModeFormationDTO, OrigineFormationDTO, StatutFormationDTO, TypeFormationDTO } from 'app/commun/model/models'; +import { FormationsService } from 'app/commun/services/formations.service'; -import { FormationDTO, ModeFormationDTO, TypeFormationDTO, StatutFormationDTO, OrigineFormationDTO } from '@shared/api-swagger/model/models'; -import { FormationsService } from '@shared/api-swagger/api/api'; - /** * Composant pour modifier une formation */ diff --git a/src/app/formations/formations.module.ts b/src/app/formations/formations.module.ts index c6ac76e..aa77b7a 100644 --- a/src/app/formations/formations.module.ts +++ b/src/app/formations/formations.module.ts @@ -4,11 +4,6 @@ import { RouterModule } from '@angular/router'; import { FormsModule, ReactiveFormsModule } from '@angular/forms'; -import { MaterialModule } from "@shared/angular-material/angular-material.module"; -import { MatTablesModule } from "@shared/mat-tables/mat-tables.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'; @@ -18,6 +13,7 @@ import { EditFormationComponent } from './edit-formation/edit-formation.componen * Module des formations */ import { FormationsRoutingModule } from './formations.routing.module'; +import { CommunUiModule } from "app/commun/commun-ui.module"; @NgModule({ declarations: [ FormationsComponent, FormationComponent, @@ -28,9 +24,7 @@ import { FormationsRoutingModule } from './formations.routing.module'; ], imports: [ CommonModule, - MaterialModule, - NavMenuModule, - MatTablesModule, + CommunUiModule, RouterModule, FormationsRoutingModule, ReactiveFormsModule diff --git a/src/app/formations/formations.routing.module.ts b/src/app/formations/formations.routing.module.ts index 5550e06..5afa475 100644 --- a/src/app/formations/formations.routing.module.ts +++ b/src/app/formations/formations.routing.module.ts @@ -6,10 +6,9 @@ import { FormationsComponent } from "./formations.component"; import { FormationComponent } from "./details-formation/formation.component"; import { NewFormationComponent } from "./new-formation/new-formation.component"; import { EditFormationComponent } from "./edit-formation/edit-formation.component"; +import { AuthGuard } from 'app/commun/auth/auth.guard'; +import { paths_formation } from 'app/commun/utils/paths'; -import { AuthGuard } from '../shared/auth/auth.guard'; - -import { paths_formation } from "../shared/utils/paths"; /** * Routes du module formation */ diff --git a/src/app/formations/new-formation/new-formation.component.ts b/src/app/formations/new-formation/new-formation.component.ts index a7d188d..a853798 100644 --- a/src/app/formations/new-formation/new-formation.component.ts +++ b/src/app/formations/new-formation/new-formation.component.ts @@ -2,10 +2,9 @@ import { Component, OnInit } from '@angular/core'; import { Observable, Subscription } from 'rxjs'; import { Router } from '@angular/router'; import { FormBuilder, FormGroup, FormControl, Validators } from '@angular/forms'; +import { ModeFormationDTO, OrigineFormationDTO, StatutFormationDTO, TypeFormationDTO } from 'app/commun/model/models'; +import { FormationsService } from 'app/commun/services/formations.service'; -import { FormationDTO, ModeFormationDTO, TypeFormationDTO, StatutFormationDTO, OrigineFormationDTO } from "@shared/api-swagger/model/models"; - -import { FormationsService } from "@shared/api-swagger/api/api"; /** * Composant pour ajotuer une nouvelle formation diff --git a/src/app/home/home-assistante/home-assistante.component.ts b/src/app/home/home-assistante/home-assistante.component.ts index 1d2b8d8..0dffd0e 100644 --- a/src/app/home/home-assistante/home-assistante.component.ts +++ b/src/app/home/home-assistante/home-assistante.component.ts @@ -1,6 +1,6 @@ import { Component } from '@angular/core'; import { Router } from '@angular/router'; -import { epTypeRecherche } from '@shared/utils/cles'; +import { epTypeRecherche } from 'app/commun/utils/cles'; diff --git a/src/app/home/home-collaborateur/home-collaborateur.component.ts b/src/app/home/home-collaborateur/home-collaborateur.component.ts index d3e2a37..64eb012 100644 --- a/src/app/home/home-collaborateur/home-collaborateur.component.ts +++ b/src/app/home/home-collaborateur/home-collaborateur.component.ts @@ -1,7 +1,8 @@ import { Component, OnInit } from '@angular/core'; import { Router } from '@angular/router'; -import { affichageStatut, CollaborateurDTO, EpInformationDTO, EpService, StatutEp } from '@shared/api-swagger'; -import { cles, epTypeRecherche } from '@shared/utils/cles'; +import { affichageStatut, CollaborateurDTO, EpInformationDTO, StatutEp } from 'app/commun/model/models'; +import { EpService } from 'app/commun/services/ep.service'; +import { cles, epTypeRecherche } from 'app/commun/utils/cles'; import { Subscription } from 'rxjs'; diff --git a/src/app/home/home-commercial/home-commercial.component.ts b/src/app/home/home-commercial/home-commercial.component.ts index 9598ee5..d2316aa 100644 --- a/src/app/home/home-commercial/home-commercial.component.ts +++ b/src/app/home/home-commercial/home-commercial.component.ts @@ -1,7 +1,8 @@ import { Component, OnInit } from '@angular/core'; import { Router } from '@angular/router'; -import { CollaborateurDTO, EpService } from '@shared/api-swagger'; -import { cles, epTypeRecherche } from '@shared/utils/cles'; +import { CollaborateurDTO } from 'app/commun/model/models'; +import { EpService } from 'app/commun/services/ep.service'; +import { epTypeRecherche, cles } from 'app/commun/utils/cles'; import { Subscription } from 'rxjs'; diff --git a/src/app/home/home.component.ts b/src/app/home/home.component.ts index 94936ff..06ae0c6 100644 --- a/src/app/home/home.component.ts +++ b/src/app/home/home.component.ts @@ -1,10 +1,9 @@ import { Component, OnInit } from '@angular/core'; -import { AuthService } from '@shared/auth/auth.service'; - -import { Role } from '@shared/utils/roles'; import { environment } from '@env' +import { AuthService } from 'app/commun/auth/auth.service'; +import { Role } from 'app/commun/utils/roles'; /** * 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 index 8be69f1..eecb6c3 100644 --- a/src/app/home/home.module.ts +++ b/src/app/home/home.module.ts @@ -3,9 +3,6 @@ import { CommonModule } from "@angular/common"; import { RouterModule } from '@angular/router'; import { FormsModule } from '@angular/forms'; -import { MaterialModule } from "@shared/angular-material/angular-material.module"; -import { MatTablesModule } from "@shared/mat-tables/mat-tables.module"; - import {HomeAssistanteComponent} from './home-assistante/home-assistante.component'; import {HomeRHComponent} from './home-rh/home-rh.component'; @@ -13,25 +10,26 @@ import {HomeCollaborateurComponent} from './home-collaborateur/home-collaborateu import {HomeCommercialComponent} from './home-commercial/home-commercial.component'; import {HomeComponent} from './home.component'; -import {NavMenuModule} from '@shared/nav-menu/nav-menu.module'; +import { CommunUiModule } from "app/commun/commun-ui.module"; /** * Module des différents homes */ @NgModule({ declarations: [ - HomeComponent, HomeAssistanteComponent, HomeRHComponent, - HomeCollaborateurComponent, HomeCommercialComponent + HomeComponent, + HomeAssistanteComponent, + HomeRHComponent, + HomeCollaborateurComponent, + HomeCommercialComponent ], exports: [ HomeComponent ], imports: [ CommonModule, + CommunUiModule, FormsModule, - MaterialModule, - NavMenuModule, - MatTablesModule, RouterModule ], }) diff --git a/src/app/notes/details-note/details-note.component.ts b/src/app/notes/details-note/details-note.component.ts index 38efc9d..e431fa9 100644 --- a/src/app/notes/details-note/details-note.component.ts +++ b/src/app/notes/details-note/details-note.component.ts @@ -1,7 +1,8 @@ import { Component, Inject, OnInit } from "@angular/core"; import { MatDialog, MatDialogRef, MAT_DIALOG_DATA } from "@angular/material/dialog"; import { ActivatedRoute, Router } from "@angular/router"; -import { DetailsNoteDTO, NotesService } from "@shared/api-swagger"; +import { DetailsNoteDTO } from "app/commun/model/models"; +import { NotesService } from "app/commun/services/notes.service"; import { Subscription } from "rxjs"; /** diff --git a/src/app/notes/modifier-note/modifier-note.component.ts b/src/app/notes/modifier-note/modifier-note.component.ts index a72dfe0..78890e3 100644 --- a/src/app/notes/modifier-note/modifier-note.component.ts +++ b/src/app/notes/modifier-note/modifier-note.component.ts @@ -3,7 +3,8 @@ import { Component, OnInit } from "@angular/core"; import { FormBuilder, FormGroup } from "@angular/forms"; import { MatDialog } from "@angular/material/dialog"; import { ActivatedRoute, Router } from "@angular/router"; -import { CollaborateurDTO, DetailsNoteDTO, NotesService } from "@shared/api-swagger"; +import { CollaborateurDTO, DetailsNoteDTO } from "app/commun/model/models"; +import { NotesService } from "app/commun/services/notes.service"; import { Subscription } from "rxjs"; diff --git a/src/app/notes/notes.component.ts b/src/app/notes/notes.component.ts index adc4d91..9292929 100644 --- a/src/app/notes/notes.component.ts +++ b/src/app/notes/notes.component.ts @@ -1,7 +1,8 @@ import { Component, OnInit } from "@angular/core"; import { MatTableDataSource } from "@angular/material/table"; -import { AffichageNoteDTO, CollaborateurDTO, NotesService } from "@shared/api-swagger"; -import { cles } from "@shared/utils/cles"; +import { AffichageNoteDTO, CollaborateurDTO } from "app/commun/model/models"; +import { NotesService } from "app/commun/services/notes.service"; +import { cles } from "app/commun/utils/cles"; import { Subscription } from "rxjs"; @Component({ diff --git a/src/app/notes/notes.module.ts b/src/app/notes/notes.module.ts index 9067e36..6010699 100644 --- a/src/app/notes/notes.module.ts +++ b/src/app/notes/notes.module.ts @@ -2,32 +2,33 @@ import { NgModule } from "@angular/core"; import { CommonModule } from "@angular/common"; import { RouterModule } from '@angular/router'; import { NotesRoutingModule } from "./notes.routing.module"; -import { MaterialModule } from "@shared/angular-material/angular-material.module"; -import {NavMenuModule} from '@shared/nav-menu/nav-menu.module'; import { NotesComponent } from "./notes.component"; import { FormsModule, ReactiveFormsModule } from "@angular/forms"; import { DialogChoixCollaborateurNoteComponent, NouvelleNoteComponent } from "./nouvelle-note/nouvelle-note.component"; -import { MatTablesModule } from "@shared/mat-tables/mat-tables.module"; import { DetailsNoteComponent, DialogSuppressionNoteComponent } from "./details-note/details-note.component"; import { ModifierNoteComponent } from "./modifier-note/modifier-note.component"; - +import { CommunUiModule } from "app/commun/commun-ui.module"; @NgModule({ declarations: [ - NotesComponent, NouvelleNoteComponent, + NotesComponent, + NouvelleNoteComponent, DialogChoixCollaborateurNoteComponent, - DetailsNoteComponent, ModifierNoteComponent, + DetailsNoteComponent, + ModifierNoteComponent, DialogSuppressionNoteComponent ], imports: [ CommonModule, - MaterialModule, - NavMenuModule, + CommunUiModule, RouterModule, NotesRoutingModule, - FormsModule, ReactiveFormsModule, - MatTablesModule + FormsModule, + ReactiveFormsModule ], + exports: [ + NotesComponent + ] }) export class NotesModule {} \ No newline at end of file diff --git a/src/app/notes/notes.routing.module.ts b/src/app/notes/notes.routing.module.ts index d98fa76..230024e 100644 --- a/src/app/notes/notes.routing.module.ts +++ b/src/app/notes/notes.routing.module.ts @@ -3,13 +3,12 @@ import { Routes, RouterModule } from '@angular/router'; import { NotesComponent } from "./notes.component"; -import { AuthGuard } from "../shared/auth/auth.guard"; - -import { paths_notes } from "../shared/utils/paths"; import { NouvelleNoteComponent } from './nouvelle-note/nouvelle-note.component'; import { DetailsNoteComponent } from './details-note/details-note.component'; import { ModifierNoteComponent } from './modifier-note/modifier-note.component'; +import { paths_notes } from 'app/commun/utils/paths'; +import { AuthGuard } from 'app/commun/auth/auth.guard'; const routes: Routes = [ { path: paths_notes.ajoutNote, component: NouvelleNoteComponent, canActivate: [AuthGuard]}, diff --git a/src/app/notes/nouvelle-note/nouvelle-note.component.ts b/src/app/notes/nouvelle-note/nouvelle-note.component.ts index bea0856..2af1bd2 100644 --- a/src/app/notes/nouvelle-note/nouvelle-note.component.ts +++ b/src/app/notes/nouvelle-note/nouvelle-note.component.ts @@ -2,8 +2,9 @@ import { Component, Inject, OnInit } from "@angular/core"; import { FormBuilder } from "@angular/forms"; import { MatDialog, MatDialogRef, MAT_DIALOG_DATA } from "@angular/material/dialog"; import { Router } from "@angular/router"; -import { CollaborateurDTO, DetailsNoteDTO, NotesService } from "@shared/api-swagger"; -import { cles, collaborateurTypeRecherche } from "@shared/utils/cles"; +import { CollaborateurDTO, DetailsNoteDTO } from "app/commun/model/models"; +import { NotesService } from "app/commun/services/notes.service"; +import { cles, collaborateurTypeRecherche } from "app/commun/utils/cles"; import { Subscription } from "rxjs"; diff --git a/src/app/referents/assignation-referent/assignation-referent.component.ts b/src/app/referents/assignation-referent/assignation-referent.component.ts index 329e64f..53bb8cc 100644 --- a/src/app/referents/assignation-referent/assignation-referent.component.ts +++ b/src/app/referents/assignation-referent/assignation-referent.component.ts @@ -1,6 +1,4 @@ import { Component, Inject } from "@angular/core"; -import { CollaborateurDTO, CollaborateursService, ReferentsEPService, ReferentEPDTO } from "@shared/api-swagger"; -import { collaborateurTypeRecherche } from "@shared/utils/cles"; import {MatDialog, MAT_DIALOG_DATA, MatDialogRef} from '@angular/material/dialog'; import { MatSnackBar } from '@angular/material/snack-bar'; @@ -8,6 +6,10 @@ import { MatSnackBar } from '@angular/material/snack-bar'; import { Subscription } from "rxjs"; import { Router } from "@angular/router"; +import { CollaborateurDTO, ReferentEPDTO } from "app/commun/model/models"; +import { CollaborateursService } from "app/commun/services/collaborateurs.service"; +import { ReferentsEPService } from "app/commun/services/referentsEP.service"; +import { collaborateurTypeRecherche } from "app/commun/utils/cles"; diff --git a/src/app/referents/referents.component.ts b/src/app/referents/referents.component.ts index 723aa66..b96068f 100644 --- a/src/app/referents/referents.component.ts +++ b/src/app/referents/referents.component.ts @@ -1,7 +1,7 @@ import { Component } from '@angular/core'; -import { collaborateurTypeRecherche } from "@shared/utils/cles"; import { Router } from '@angular/router'; +import { collaborateurTypeRecherche } from 'app/commun/utils/cles'; /** */ diff --git a/src/app/referents/referents.module.ts b/src/app/referents/referents.module.ts index e1c2707..0592cda 100644 --- a/src/app/referents/referents.module.ts +++ b/src/app/referents/referents.module.ts @@ -2,34 +2,31 @@ import { NgModule } from "@angular/core"; import { CommonModule } from "@angular/common"; import { RouterModule } from '@angular/router'; import { FormsModule, ReactiveFormsModule } from '@angular/forms'; -import { MaterialModule } from "@shared/angular-material/angular-material.module"; - -import {NavMenuModule} from '@shared/nav-menu/nav-menu.module'; -import { MatTablesModule } from "@shared/mat-tables/mat-tables.module"; import { ReferentsComponent } from './referents.component'; import { DetailsReferentComponent } from './details-referent/details-referent.component'; import { ReferentsRoutingModule } from './referents.routing.module'; import { AssignationReferentComponent, DialogAssignationReferentComponent } from "./assignation-referent/assignation-referent.component"; -import { AffichageDetailsCollaborateurModule } from "@shared/affichage-details-collaboarteur/affichage-details-collaborateur.module"; +import { CommunUiModule } from "app/commun/commun-ui.module"; + @NgModule({ - declarations: [ DetailsReferentComponent, - ReferentsComponent, AssignationReferentComponent, + declarations: [ + DetailsReferentComponent, + ReferentsComponent, + AssignationReferentComponent, DialogAssignationReferentComponent ], - exports: [ ReferentsComponent + exports: [ + ReferentsComponent ], imports: [ CommonModule, - MaterialModule, - NavMenuModule, FormsModule, RouterModule, ReactiveFormsModule, - AffichageDetailsCollaborateurModule, ReferentsRoutingModule, - MatTablesModule + CommunUiModule ], }) export class ReferentsModule {} diff --git a/src/app/referents/referents.routing.module.ts b/src/app/referents/referents.routing.module.ts index f47e826..3cae4e7 100644 --- a/src/app/referents/referents.routing.module.ts +++ b/src/app/referents/referents.routing.module.ts @@ -5,10 +5,9 @@ import { Routes, RouterModule } from '@angular/router'; import { ReferentsComponent } from "./referents.component"; import { DetailsReferentComponent } from "./details-referent/details-referent.component"; -import { paths_referents } from "../shared/utils/paths"; - -import { AuthGuard } from '../shared/auth/auth.guard'; import { AssignationReferentComponent } from './assignation-referent/assignation-referent.component'; +import { AuthGuard } from 'app/commun/auth/auth.guard'; +import { paths_referents } from 'app/commun/utils/paths'; /** * Routes du module référents diff --git a/src/app/shared/angular-material/angular-material.module.ts b/src/app/shared/angular-material/angular-material.module.ts deleted file mode 100644 index 69a3c4c..0000000 --- a/src/app/shared/angular-material/angular-material.module.ts +++ /dev/null @@ -1,59 +0,0 @@ -import { NgModule } from "@angular/core"; -import { CommonModule } from "@angular/common"; - -import {MatCardModule} from '@angular/material/card'; -import { MatButtonModule } from '@angular/material/button'; -import {MatInputModule} from '@angular/material/input'; -import {MatIconModule} from '@angular/material/icon'; -import {MatMenuModule} from '@angular/material/menu'; -import {MatPaginatorModule} from '@angular/material/paginator'; -import {MatTableModule} from '@angular/material/table'; -import {MatSortModule} from '@angular/material/sort'; -import {MatListModule} from '@angular/material/list'; -import {MatProgressSpinnerModule} from '@angular/material/progress-spinner'; -import {MatTabsModule} from '@angular/material/tabs'; -import {MatRadioModule} from '@angular/material/radio'; -import {MatFormFieldModule} from '@angular/material/form-field'; -import {MatDatepickerModule} from '@angular/material/datepicker'; -import {MatNativeDateModule} from '@angular/material/core'; -import {MatCheckboxModule} from '@angular/material/checkbox'; -import {MatSelectModule} from '@angular/material/select'; -import {MatStepperModule} from '@angular/material/stepper'; -import {MatChipsModule} from '@angular/material/chips'; -import {MatSnackBarModule} from '@angular/material/snack-bar'; -import {MatSlideToggleModule} from '@angular/material/slide-toggle'; - - -import { NgxMatDatetimePickerModule, NgxMatTimepickerModule, NgxMatNativeDateModule } from '@angular-material-components/datetime-picker'; - - -/** - * Module qui va faire l'import et l'export de tous les componsants material design qui seront utilisés dans les différents modules. - */ -@NgModule({ - imports : [MatCardModule, - MatButtonModule, MatMenuModule, - MatIconModule, MatPaginatorModule, - MatSortModule, MatTableModule, - MatInputModule, MatProgressSpinnerModule, - MatTabsModule, MatFormFieldModule, - NgxMatDatetimePickerModule, MatDatepickerModule, - NgxMatNativeDateModule, MatNativeDateModule, MatListModule, - MatCheckboxModule, MatSelectModule, MatStepperModule, - MatChipsModule, MatSnackBarModule, MatSlideToggleModule, - MatRadioModule - ], - exports : [MatCardModule, - MatButtonModule, MatMenuModule, - MatIconModule, MatPaginatorModule, - MatSortModule, MatTableModule, - MatInputModule, MatProgressSpinnerModule, - MatTabsModule, MatFormFieldModule, - NgxMatDatetimePickerModule, MatDatepickerModule, - NgxMatNativeDateModule, MatNativeDateModule, MatListModule, - MatCheckboxModule, MatSelectModule, MatStepperModule, - MatChipsModule, MatSnackBarModule, MatSlideToggleModule, - MatRadioModule - ] -}) -export class MaterialModule {} diff --git a/src/app/shared/api-swagger/.npmignore b/src/app/shared/api-swagger/.npmignore deleted file mode 100644 index 7e981c4..0000000 --- a/src/app/shared/api-swagger/.npmignore +++ /dev/null @@ -1,5 +0,0 @@ -wwwroot/*.js -node -node_modules -typings -dist diff --git a/src/app/shared/api-swagger/.swagger-codegen-ignore b/src/app/shared/api-swagger/.swagger-codegen-ignore deleted file mode 100644 index c5fa491..0000000 --- a/src/app/shared/api-swagger/.swagger-codegen-ignore +++ /dev/null @@ -1,23 +0,0 @@ -# Swagger Codegen Ignore -# Generated by swagger-codegen https://github.com/swagger-api/swagger-codegen - -# Use this file to prevent files from being overwritten by the generator. -# The patterns follow closely to .gitignore or .dockerignore. - -# As an example, the C# client generator defines ApiClient.cs. -# You can make changes and tell Swagger Codgen to ignore just this file by uncommenting the following line: -#ApiClient.cs - -# You can match any string of characters against a directory, file or extension with a single asterisk (*): -#foo/*/qux -# The above matches foo/bar/qux and foo/baz/qux, but not foo/bar/baz/qux - -# You can recursively match patterns against a directory, file or extension with a double asterisk (**): -#foo/**/qux -# This matches foo/bar/qux, foo/baz/qux, and foo/bar/baz/qux - -# You can also negate patterns with an exclamation (!). -# For example, you can ignore all files in a docs folder with the file extension .md: -#docs/*.md -# Then explicitly reverse the ignore rule for a single file: -#!docs/README.md diff --git a/src/app/shared/api-swagger/.swagger-codegen/VERSION b/src/app/shared/api-swagger/.swagger-codegen/VERSION deleted file mode 100644 index 402b44e..0000000 --- a/src/app/shared/api-swagger/.swagger-codegen/VERSION +++ /dev/null @@ -1 +0,0 @@ -3.0.21 \ No newline at end of file diff --git a/src/app/shared/api-swagger/api.module.ts b/src/app/shared/api-swagger/api.module.ts deleted file mode 100644 index 8eac21a..0000000 --- a/src/app/shared/api-swagger/api.module.ts +++ /dev/null @@ -1,51 +0,0 @@ -import { NgModule, ModuleWithProviders, SkipSelf, Optional } from '@angular/core'; -import { Configuration } from './configuration'; -import { HttpClient } from '@angular/common/http'; - - -import { CollaborateursService } from './api/collaborateurs.service'; -import { DemandesDelegationService } from './api/demandesDelegation.service'; -import { DemandesEPIService } from './api/demandesEPI.service'; -import { DemandesFormationService } from './api/demandesFormation.service'; -import { EngagementsService } from './api/engagements.service'; -import { EpService } from './api/ep.service'; -import { FormationsService } from './api/formations.service'; -import { NotesService } from './api/notes.service'; -import { ParticipationsFormationsService } from './api/participationsFormations.service'; -import { ReferentsEPService } from './api/referentsEP.service'; - -@NgModule({ - imports: [], - declarations: [], - exports: [], - providers: [ - CollaborateursService, - DemandesDelegationService, - DemandesEPIService, - DemandesFormationService, - EngagementsService, - EpService, - FormationsService, - NotesService, - ParticipationsFormationsService, - ReferentsEPService ] -}) -export class ApiModule { - public static forRoot(configurationFactory: () => Configuration): ModuleWithProviders { - return { - ngModule: ApiModule, - providers: [ { provide: Configuration, useFactory: configurationFactory } ] - }; - } - - constructor( @Optional() @SkipSelf() parentModule: ApiModule, - @Optional() http: HttpClient) { - if (parentModule) { - throw new Error('ApiModule is already loaded. Import in your base AppModule only.'); - } - if (!http) { - throw new Error('You need to import the HttpClientModule in your AppModule! \n' + - 'See also https://github.com/angular/angular/issues/20575'); - } - } -} diff --git a/src/app/shared/api-swagger/api/api.ts b/src/app/shared/api-swagger/api/api.ts deleted file mode 100644 index 1b6a79b..0000000 --- a/src/app/shared/api-swagger/api/api.ts +++ /dev/null @@ -1,21 +0,0 @@ -export * from './collaborateurs.service'; -import { CollaborateursService } from './collaborateurs.service'; -export * from './demandesDelegation.service'; -import { DemandesDelegationService } from './demandesDelegation.service'; -export * from './demandesEPI.service'; -import { DemandesEPIService } from './demandesEPI.service'; -export * from './demandesFormation.service'; -import { DemandesFormationService } from './demandesFormation.service'; -export * from './engagements.service'; -import { EngagementsService } from './engagements.service'; -export * from './ep.service'; -import { EpService } from './ep.service'; -export * from './formations.service'; -import { FormationsService } from './formations.service'; -export * from './notes.service'; -import { NotesService } from './notes.service'; -export * from './participationsFormations.service'; -import { ParticipationsFormationsService } from './participationsFormations.service'; -export * from './referentsEP.service'; -import { ReferentsEPService } from './referentsEP.service'; -export const APIS = [CollaborateursService, DemandesDelegationService, DemandesEPIService, DemandesFormationService, EngagementsService, EpService, FormationsService, NotesService, ParticipationsFormationsService, ReferentsEPService]; diff --git a/src/app/shared/api-swagger/index.ts b/src/app/shared/api-swagger/index.ts deleted file mode 100644 index c312b70..0000000 --- a/src/app/shared/api-swagger/index.ts +++ /dev/null @@ -1,5 +0,0 @@ -export * from './api/api'; -export * from './model/models'; -export * from './variables'; -export * from './configuration'; -export * from './api.module'; \ No newline at end of file diff --git a/src/app/shared/api-swagger/ng-package.json b/src/app/shared/api-swagger/ng-package.json deleted file mode 100644 index 3b17900..0000000 --- a/src/app/shared/api-swagger/ng-package.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "$schema": "./node_modules/ng-packagr/ng-package.schema.json", - "lib": { - "entryFile": "index.ts" - } -} diff --git a/src/app/shared/filter/filter.module.ts b/src/app/shared/filter/filter.module.ts deleted file mode 100644 index 9d30ceb..0000000 --- a/src/app/shared/filter/filter.module.ts +++ /dev/null @@ -1,28 +0,0 @@ -import { NgModule } from "@angular/core"; -import { CommonModule } from '@angular/common'; -import { FormsModule, ReactiveFormsModule} from '@angular/forms'; -import { RouterModule } from '@angular/router'; - -import { MaterialModule } from "../angular-material/angular-material.module"; -import { CheckboxFilterComponent } from "@shared/filter/checkbox-filter/checkbox-filter"; -import { SelectFilterComponent } from "@shared/filter/select-filter/select-filter"; - - -@NgModule({ - declarations: [ - CheckboxFilterComponent, - SelectFilterComponent - ], - imports: [ - MaterialModule, - CommonModule, - FormsModule, - ReactiveFormsModule, - RouterModule - ], - exports: [ - CheckboxFilterComponent, - SelectFilterComponent - ] -}) -export class FilterModule {} diff --git a/src/app/shared/mat-tables/mat-tables.module.ts b/src/app/shared/mat-tables/mat-tables.module.ts deleted file mode 100644 index bed0477..0000000 --- a/src/app/shared/mat-tables/mat-tables.module.ts +++ /dev/null @@ -1,41 +0,0 @@ -import { NgModule } from "@angular/core"; -import { CommonModule } from '@angular/common'; -import { FormsModule } from '@angular/forms'; -import { RouterModule } from '@angular/router'; - -import { MaterialModule } from "../angular-material/angular-material.module"; -import { CollaborateursTableComponent } from "@shared/mat-tables/collaborateurs-table/collaborateurs.table"; -import { EngagementTableComponent } from "@shared/mat-tables/engagements-table/engagements-table" -import { FormationsTableComponent } from "@shared/mat-tables/formations-table/formations.table"; -import { ParticipationsFormationTableComponent } from "@shared/mat-tables/participations-formation-table/participations-formation.table"; -import { FilterModule } from "@shared/filter/filter.module"; -import { EpTableComponent } from "./ep-table/ep-table"; -import { DemandesFormationTableComponent } from "@shared/mat-tables/demandes-formation-table/demandes-formation.table"; - - -@NgModule({ - declarations: [ - CollaborateursTableComponent, - EngagementTableComponent, - FormationsTableComponent , - EpTableComponent, - ParticipationsFormationTableComponent, - DemandesFormationTableComponent - ], - imports: [ - MaterialModule, - FilterModule, - CommonModule, - FormsModule, - RouterModule - ], - exports: [ - CollaborateursTableComponent, - EngagementTableComponent, - FormationsTableComponent, - EpTableComponent, - ParticipationsFormationTableComponent, - DemandesFormationTableComponent - ] -}) -export class MatTablesModule {} diff --git a/src/app/shared/nav-menu/nav-menu.module.ts b/src/app/shared/nav-menu/nav-menu.module.ts deleted file mode 100644 index c5e1cc1..0000000 --- a/src/app/shared/nav-menu/nav-menu.module.ts +++ /dev/null @@ -1,28 +0,0 @@ -import { NgModule } from "@angular/core"; -import { CommonModule } from "@angular/common"; -import { RouterModule } from '@angular/router'; - - -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"; - -/** - * Module des nav utilisés pour chaque role - */ -@NgModule({ - declarations: [ NavMenuComponent, NavMenuAssistanteComponent, NavMenuCollaborateurComponent, - NavMenuCommercialComponent, NavMenuRHComponent - ], - imports: [ - CommonModule, - MaterialModule, - RouterModule - ], - exports: [NavMenuComponent] -}) -export class NavMenuModule {} diff --git a/src/environments/environment.prod.ts b/src/environments/environment.prod.ts index 3612073..c5112cc 100644 --- a/src/environments/environment.prod.ts +++ b/src/environments/environment.prod.ts @@ -1,3 +1,38 @@ +import { AuthConfig } from 'angular-oauth2-oidc'; + +const keycloakConfig: AuthConfig = { + // Url of the Identity Provider + issuer: 'http://localhost:8080/auth/realms/Apside', + + // URL of the SPA to redirect the user to after login + redirectUri: 'http://localhost:4200', + + // The SPA's id. The SPA is registerd with this id at the auth-server + clientId: 'GestionEPA', + + // Just needed if your auth server demands a secret. In general, this + // is a sign that the auth server is not configured with SPAs in mind + // and it might not enforce further best practices vital for security + // such applications. + //dummyClientSecret: 'b261c083-d8ba-4a7c-918e-9d13393f33bd', + dummyClientSecret: '201a3d53-7cd5-4613-bcb6-f2e98c1ba2ec', + + // To configure your solution for code flow + PKCE you have to set the responseType to code + responseType: 'code', + + // set the scope for the permissions the client should request + // The first four are defined by OIDC. + // Important: Request offline_access to get a refresh token + // The api scope is a usecase specific one + scope: 'openid profile email', + useSilentRefresh: true, // Activate silent refresh for code flow + silentRefreshTimeout: 5000, + timeoutFactor: 0.25, + sessionChecksEnabled: true, + nonceStateSeparator : 'semicolon' // Real semicolon gets mangled by Keycloak's URI encoding +}; + export const environment = { - production: true + production: true, + keycloakConfig }; diff --git a/tsconfig.json b/tsconfig.json index 5f3fa63..8041f42 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -3,8 +3,7 @@ "compilerOptions": { "baseUrl": "src", "paths": { - "@env": ["environments/environment"], - "@shared/*": ["app/shared/*"] + "@env": ["environments/environment"] }, "outDir": "./dist/out-tsc", "sourceMap": true, @@ -23,5 +22,5 @@ "angularCompilerOptions": { "fullTemplateTypeCheck": true, "strictInjectionParameters": true - } + } }