From 064560c06fcb07c17196b3ee0edce31c972f3b68 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois-Xavier=20Montigny?= Date: Wed, 2 Aug 2023 10:45:41 +0200 Subject: [PATCH] update modules export organisation --- front/src/app/app.module.ts | 5 +- front/src/app/components/components.module.ts | 30 +++--------- .../date-select/date-select.module.ts | 29 ++++++++++++ .../etp-preview/etp-preview.module.ts | 24 ++++++++++ .../help-button/help-button.module.ts | 24 ++++++++++ .../input-button/input-button.module.ts | 29 ++++++++++++ .../panel-activities.module.ts | 25 ++++++++++ .../progression-bar.component.html | 0 .../progression-bar.component.scss | 2 +- .../progression-bar.component.ts | 0 .../select-check-all.component.scss | 4 +- .../select-check-all.component.ts | 0 .../app/components/select/select.module.ts | 31 ++++++++++++ .../speedometer/speedometer.module.ts | 24 ++++++++++ .../text-editor/text-editor.module.ts | 30 ++++++++++++ .../{ => wrapper}/news/news.component.html | 0 .../{ => wrapper}/news/news.component.scss | 2 +- .../{ => wrapper}/news/news.component.ts | 0 .../app/components/wrapper/wrapper.module.ts | 33 +++++++++++++ .../routes/activities/activities.module.ts | 30 ++++++++---- front/src/app/routes/app-routing.module.ts | 1 - .../routes/average-etp/average-etp.module.ts | 30 ++++++++---- .../routes/calculator/calculator.module.ts | 36 ++++++++++---- .../app/routes/dashboard/dashboard.module.ts | 2 + .../human-resource/human-resource.module.ts | 12 +++++ front/src/app/routes/login/login.module.ts | 22 +++++---- .../app/routes/panorama/panorama.module.ts | 2 + .../reaffectator/reaffectator.module.ts | 47 ++++++++++++++----- .../app/routes/simulator/simulator.module.ts | 4 ++ .../app/routes/workforce/workforce.module.ts | 12 +++++ 30 files changed, 410 insertions(+), 80 deletions(-) create mode 100644 front/src/app/components/date-select/date-select.module.ts create mode 100644 front/src/app/components/etp-preview/etp-preview.module.ts create mode 100644 front/src/app/components/help-button/help-button.module.ts create mode 100644 front/src/app/components/input-button/input-button.module.ts create mode 100644 front/src/app/components/panel-activities/panel-activities.module.ts rename front/src/app/components/{ => panel-activities}/progression-bar/progression-bar.component.html (100%) rename front/src/app/components/{ => panel-activities}/progression-bar/progression-bar.component.scss (96%) rename front/src/app/components/{ => panel-activities}/progression-bar/progression-bar.component.ts (100%) rename front/src/app/components/{ => select}/select-check-all/select-check-all.component.scss (76%) rename front/src/app/components/{ => select}/select-check-all/select-check-all.component.ts (100%) create mode 100644 front/src/app/components/select/select.module.ts create mode 100644 front/src/app/components/speedometer/speedometer.module.ts create mode 100644 front/src/app/components/text-editor/text-editor.module.ts rename front/src/app/components/{ => wrapper}/news/news.component.html (100%) rename front/src/app/components/{ => wrapper}/news/news.component.scss (94%) rename front/src/app/components/{ => wrapper}/news/news.component.ts (100%) create mode 100644 front/src/app/components/wrapper/wrapper.module.ts diff --git a/front/src/app/app.module.ts b/front/src/app/app.module.ts index 29ef7edec..b452f9d25 100644 --- a/front/src/app/app.module.ts +++ b/front/src/app/app.module.ts @@ -1,6 +1,5 @@ import { NgModule } from '@angular/core' import { BrowserModule } from '@angular/platform-browser' - import { AppRoutingModule } from './routes/app-routing.module' import { AppComponent } from './app.component' import { HttpClientModule } from '@angular/common/http' @@ -8,11 +7,12 @@ import { BrowserAnimationsModule } from '@angular/platform-browser/animations' import { AlertComponent } from './components/alert/alert.component' import { PopupModule } from './components/popup/popup.module' import { PipesModule } from './pipes/pipes.module' +import { MaterialModule } from './libs/material.module' +import { ReaffectatorModule } from './routes/reaffectator/reaffectator.module' /** * Module principal du projet */ - @NgModule({ declarations: [AppComponent, AlertComponent], imports: [ @@ -22,6 +22,7 @@ import { PipesModule } from './pipes/pipes.module' BrowserAnimationsModule, PipesModule, PopupModule, + ReaffectatorModule, ], providers: [], bootstrap: [AppComponent], diff --git a/front/src/app/components/components.module.ts b/front/src/app/components/components.module.ts index 5232f82d9..7a43991e7 100644 --- a/front/src/app/components/components.module.ts +++ b/front/src/app/components/components.module.ts @@ -1,19 +1,10 @@ import { NgModule } from '@angular/core' import { CommonModule } from '@angular/common' import { RouterModule } from '@angular/router' -import { WrapperComponent } from './wrapper/wrapper.component' -import { SpeedometerComponent } from './speedometer/speedometer.component' import { ListSelectionComponent } from './list-selection/list-selection.component' import { FormsModule, ReactiveFormsModule } from '@angular/forms' import { MaterialModule } from '../libs/material.module' import { OptionsBackupPanelComponent } from './options-backup-panel/options-backup-panel.component' -import { SelectCheckAllComponent } from './select-check-all/select-check-all.component' -import { SelectComponent } from './select/select.component' -import { DateSelectComponent } from './date-select/date-select.component' -import { InputButtonComponent } from './input-button/input-button.component' -import { EtpPreviewComponent } from './etp-preview/etp-preview.component' -import { ProgressionBarComponent } from './progression-bar/progression-bar.component' -import { PanelActivitiesComponent } from './panel-activities/panel-activities.component' import { DateSelectBlueComponent } from './date-select-blue/date-select-blue.component' import { TooltipsComponent } from './tooltips/tooltips.component' import { PipesModule } from '../pipes/pipes.module' @@ -29,30 +20,21 @@ import { RadioButtonComponent } from './radio-button/radio-button.component' import { LegendLabelComponent } from './legend-label/legend-label.component' import { InOutChartComponent } from './in-out-chart/in-out-chart.component' import { EtpChartComponent } from './etp-chart/etp-chart.component' -import { NewsComponent } from './news/news.component' -import { HelpButtonComponent } from './help-button/help-button.component' import { ExtractorActivityComponent } from './extractor-activity/extractor-activity.component'; import { ExtractorVentilationComponent } from './extractor-ventilation/extractor-ventilation.component' -import { TextEditorComponent } from './text-editor/text-editor.component'; import { EditableSituationComponent } from './editable-situation/editable-situation.component' import { CalculatriceComponent } from './calculatrice/calculatrice.component'; import { PopupModule } from './popup/popup.module' +import { PanelActivitiesModule } from './panel-activities/panel-activities.module' +import { SelectModule } from './select/select.module' +import { DateSelectModule } from './date-select/date-select.module' /** * Liste des composants à importer */ const list = [ - WrapperComponent, - SpeedometerComponent, ListSelectionComponent, OptionsBackupPanelComponent, - SelectCheckAllComponent, - SelectComponent, - DateSelectComponent, - InputButtonComponent, - EtpPreviewComponent, - ProgressionBarComponent, - PanelActivitiesComponent, DateSelectBlueComponent, TooltipsComponent, TimeSelectorComponent, @@ -66,11 +48,8 @@ const list = [ LegendLabelComponent, InOutChartComponent, EtpChartComponent, - NewsComponent, - HelpButtonComponent, ExtractorActivityComponent, ExtractorVentilationComponent, - TextEditorComponent, EditableSituationComponent, CalculatriceComponent, ] @@ -89,6 +68,9 @@ const list = [ PipesModule, NgSelectModule, PopupModule, + PanelActivitiesModule, + SelectModule, + DateSelectModule ], exports: list, }) diff --git a/front/src/app/components/date-select/date-select.module.ts b/front/src/app/components/date-select/date-select.module.ts new file mode 100644 index 000000000..8d58bf906 --- /dev/null +++ b/front/src/app/components/date-select/date-select.module.ts @@ -0,0 +1,29 @@ +import { NgModule } from '@angular/core' +import { CommonModule } from '@angular/common' +import { RouterModule } from '@angular/router' +import { DateSelectComponent } from './date-select.component' +import { MaterialModule } from 'src/app/libs/material.module' +import { FormsModule, ReactiveFormsModule } from '@angular/forms' + +/** + * Liste des composants à importer + */ +const list = [ + DateSelectComponent, +] + +/** + * Module d'import de composant + */ +@NgModule({ + declarations: [...list], + imports: [ + CommonModule, + RouterModule, + MaterialModule, + ReactiveFormsModule, + FormsModule + ], + exports: list, +}) +export class DateSelectModule {} diff --git a/front/src/app/components/etp-preview/etp-preview.module.ts b/front/src/app/components/etp-preview/etp-preview.module.ts new file mode 100644 index 000000000..24bedcf2c --- /dev/null +++ b/front/src/app/components/etp-preview/etp-preview.module.ts @@ -0,0 +1,24 @@ +import { NgModule } from '@angular/core' +import { CommonModule } from '@angular/common' +import { RouterModule } from '@angular/router' +import { EtpPreviewComponent } from './etp-preview.component' + +/** + * Liste des composants à importer + */ +const list = [ + EtpPreviewComponent, +] + +/** + * Module d'import de composant + */ +@NgModule({ + declarations: [...list], + imports: [ + CommonModule, + RouterModule, + ], + exports: list, +}) +export class EtpPreviewModule {} diff --git a/front/src/app/components/help-button/help-button.module.ts b/front/src/app/components/help-button/help-button.module.ts new file mode 100644 index 000000000..3d4379421 --- /dev/null +++ b/front/src/app/components/help-button/help-button.module.ts @@ -0,0 +1,24 @@ +import { NgModule } from '@angular/core' +import { CommonModule } from '@angular/common' +import { RouterModule } from '@angular/router' +import { HelpButtonComponent } from './help-button.component' + +/** + * Liste des composants à importer + */ +const list = [ + HelpButtonComponent, +] + +/** + * Module d'import de composant + */ +@NgModule({ + declarations: [...list], + imports: [ + CommonModule, + RouterModule, + ], + exports: list, +}) +export class HelpButtonModule {} diff --git a/front/src/app/components/input-button/input-button.module.ts b/front/src/app/components/input-button/input-button.module.ts new file mode 100644 index 000000000..ab3946c99 --- /dev/null +++ b/front/src/app/components/input-button/input-button.module.ts @@ -0,0 +1,29 @@ +import { NgModule } from '@angular/core' +import { CommonModule } from '@angular/common' +import { RouterModule } from '@angular/router' +import { InputButtonComponent } from './input-button.component' +import { FormsModule, ReactiveFormsModule } from '@angular/forms' +import { MaterialModule } from 'src/app/libs/material.module' + +/** + * Liste des composants à importer + */ +const list = [ + InputButtonComponent, +] + +/** + * Module d'import de composant + */ +@NgModule({ + declarations: [...list], + imports: [ + CommonModule, + RouterModule, + FormsModule, + ReactiveFormsModule, + MaterialModule + ], + exports: list, +}) +export class InputButtonModule {} diff --git a/front/src/app/components/panel-activities/panel-activities.module.ts b/front/src/app/components/panel-activities/panel-activities.module.ts new file mode 100644 index 000000000..2af345c83 --- /dev/null +++ b/front/src/app/components/panel-activities/panel-activities.module.ts @@ -0,0 +1,25 @@ +import { NgModule } from '@angular/core' +import { CommonModule } from '@angular/common' +import { RouterModule } from '@angular/router' +import { PanelActivitiesComponent } from './panel-activities.component' +import { ProgressionBarComponent } from './progression-bar/progression-bar.component' + +/** + * Liste des composants à importer + */ +const list = [ + PanelActivitiesComponent, +] + +/** + * Module d'import de composant + */ +@NgModule({ + declarations: [...list, ProgressionBarComponent], + imports: [ + CommonModule, + RouterModule, + ], + exports: list, +}) +export class PanelActivitiesModule {} diff --git a/front/src/app/components/progression-bar/progression-bar.component.html b/front/src/app/components/panel-activities/progression-bar/progression-bar.component.html similarity index 100% rename from front/src/app/components/progression-bar/progression-bar.component.html rename to front/src/app/components/panel-activities/progression-bar/progression-bar.component.html diff --git a/front/src/app/components/progression-bar/progression-bar.component.scss b/front/src/app/components/panel-activities/progression-bar/progression-bar.component.scss similarity index 96% rename from front/src/app/components/progression-bar/progression-bar.component.scss rename to front/src/app/components/panel-activities/progression-bar/progression-bar.component.scss index be97ebe7d..858e8be09 100644 --- a/front/src/app/components/progression-bar/progression-bar.component.scss +++ b/front/src/app/components/panel-activities/progression-bar/progression-bar.component.scss @@ -1,4 +1,4 @@ -@import "../../styles/utils.scss"; +@import "../../../styles/utils.scss"; :host { display: block; diff --git a/front/src/app/components/progression-bar/progression-bar.component.ts b/front/src/app/components/panel-activities/progression-bar/progression-bar.component.ts similarity index 100% rename from front/src/app/components/progression-bar/progression-bar.component.ts rename to front/src/app/components/panel-activities/progression-bar/progression-bar.component.ts diff --git a/front/src/app/components/select-check-all/select-check-all.component.scss b/front/src/app/components/select/select-check-all/select-check-all.component.scss similarity index 76% rename from front/src/app/components/select-check-all/select-check-all.component.scss rename to front/src/app/components/select/select-check-all/select-check-all.component.scss index 78da56c19..d0449aa53 100644 --- a/front/src/app/components/select-check-all/select-check-all.component.scss +++ b/front/src/app/components/select/select-check-all/select-check-all.component.scss @@ -1,4 +1,4 @@ -@import '../../styles/utils.scss'; +@import '../../../styles/utils.scss'; ::ng-deep .mdc-form-field { font-size: 16px; @@ -10,6 +10,4 @@ .mat-option { margin-left: 5px; - - } \ No newline at end of file diff --git a/front/src/app/components/select-check-all/select-check-all.component.ts b/front/src/app/components/select/select-check-all/select-check-all.component.ts similarity index 100% rename from front/src/app/components/select-check-all/select-check-all.component.ts rename to front/src/app/components/select/select-check-all/select-check-all.component.ts diff --git a/front/src/app/components/select/select.module.ts b/front/src/app/components/select/select.module.ts new file mode 100644 index 000000000..44857b146 --- /dev/null +++ b/front/src/app/components/select/select.module.ts @@ -0,0 +1,31 @@ +import { NgModule } from '@angular/core' +import { CommonModule } from '@angular/common' +import { RouterModule } from '@angular/router' +import { SelectComponent } from './select.component' +import { MaterialModule } from 'src/app/libs/material.module' +import { SelectCheckAllComponent } from './select-check-all/select-check-all.component' +import { FormsModule } from '@angular/forms' +import { PipesModule } from 'src/app/pipes/pipes.module' + +/** + * Liste des composants à importer + */ +const list = [ + SelectComponent, +] + +/** + * Module d'import de composant + */ +@NgModule({ + declarations: [...list, SelectCheckAllComponent], + imports: [ + CommonModule, + RouterModule, + MaterialModule, + FormsModule, + PipesModule + ], + exports: list, +}) +export class SelectModule {} diff --git a/front/src/app/components/speedometer/speedometer.module.ts b/front/src/app/components/speedometer/speedometer.module.ts new file mode 100644 index 000000000..e71b8d606 --- /dev/null +++ b/front/src/app/components/speedometer/speedometer.module.ts @@ -0,0 +1,24 @@ +import { NgModule } from '@angular/core' +import { CommonModule } from '@angular/common' +import { RouterModule } from '@angular/router' +import { SpeedometerComponent } from './speedometer.component' + +/** + * Liste des composants à importer + */ +const list = [ + SpeedometerComponent, +] + +/** + * Module d'import de composant + */ +@NgModule({ + declarations: [...list], + imports: [ + CommonModule, + RouterModule, + ], + exports: list, +}) +export class SpeedometerModule {} diff --git a/front/src/app/components/text-editor/text-editor.module.ts b/front/src/app/components/text-editor/text-editor.module.ts new file mode 100644 index 000000000..8e412dbcc --- /dev/null +++ b/front/src/app/components/text-editor/text-editor.module.ts @@ -0,0 +1,30 @@ +import { NgModule } from '@angular/core' +import { CommonModule } from '@angular/common' +import { RouterModule } from '@angular/router' +import { MaterialModule } from 'src/app/libs/material.module' +import { FormsModule } from '@angular/forms' +import { PipesModule } from 'src/app/pipes/pipes.module' +import { TextEditorComponent } from './text-editor.component' + +/** + * Liste des composants à importer + */ +const list = [ + TextEditorComponent, +] + +/** + * Module d'import de composant + */ +@NgModule({ + declarations: [...list], + imports: [ + CommonModule, + RouterModule, + MaterialModule, + FormsModule, + PipesModule + ], + exports: list, +}) +export class TextEditorModule {} diff --git a/front/src/app/components/news/news.component.html b/front/src/app/components/wrapper/news/news.component.html similarity index 100% rename from front/src/app/components/news/news.component.html rename to front/src/app/components/wrapper/news/news.component.html diff --git a/front/src/app/components/news/news.component.scss b/front/src/app/components/wrapper/news/news.component.scss similarity index 94% rename from front/src/app/components/news/news.component.scss rename to front/src/app/components/wrapper/news/news.component.scss index 7f7ad783f..149f1397c 100644 --- a/front/src/app/components/news/news.component.scss +++ b/front/src/app/components/wrapper/news/news.component.scss @@ -1,4 +1,4 @@ -@import '../../styles/utils.scss'; +@import '../../../styles/utils.scss'; :host { position: relative; diff --git a/front/src/app/components/news/news.component.ts b/front/src/app/components/wrapper/news/news.component.ts similarity index 100% rename from front/src/app/components/news/news.component.ts rename to front/src/app/components/wrapper/news/news.component.ts diff --git a/front/src/app/components/wrapper/wrapper.module.ts b/front/src/app/components/wrapper/wrapper.module.ts new file mode 100644 index 000000000..5f8d61ca3 --- /dev/null +++ b/front/src/app/components/wrapper/wrapper.module.ts @@ -0,0 +1,33 @@ +import { NgModule } from '@angular/core' +import { CommonModule } from '@angular/common' +import { RouterModule } from '@angular/router' +import { WrapperComponent } from './wrapper.component' +import { NewsComponent } from './news/news.component' +import { MaterialModule } from 'src/app/libs/material.module' +import { PopupModule } from '../popup/popup.module' +import { PipesModule } from 'src/app/pipes/pipes.module' +import { TextEditorModule } from '../text-editor/text-editor.module' +import { HelpButtonModule } from '../help-button/help-button.module' + +/** + * Liste des composants à importer + */ +const list = [WrapperComponent] + +/** + * Module d'import de composant + */ +@NgModule({ + declarations: [...list, NewsComponent], + imports: [ + CommonModule, + RouterModule, + MaterialModule, + PopupModule, + PipesModule, + TextEditorModule, + HelpButtonModule, + ], + exports: list, +}) +export class WrapperModule {} diff --git a/front/src/app/routes/activities/activities.module.ts b/front/src/app/routes/activities/activities.module.ts index ca8cfb8fd..0394456f7 100644 --- a/front/src/app/routes/activities/activities.module.ts +++ b/front/src/app/routes/activities/activities.module.ts @@ -1,14 +1,26 @@ -import { NgModule } from '@angular/core'; -import { RouterModule } from '@angular/router'; -import { ActivitiesPage } from './activities.page'; -import { ActivitiesPageModule } from './activities.routing'; -import { ComponentsModule } from 'src/app/components/components.module'; -import { MaterialModule } from 'src/app/libs/material.module'; -import { CommonModule } from '@angular/common'; -import { FormsModule, ReactiveFormsModule } from '@angular/forms'; +import { NgModule } from '@angular/core' +import { RouterModule } from '@angular/router' +import { ActivitiesPage } from './activities.page' +import { ActivitiesPageModule } from './activities.routing' +import { ComponentsModule } from 'src/app/components/components.module' +import { MaterialModule } from 'src/app/libs/material.module' +import { CommonModule } from '@angular/common' +import { FormsModule, ReactiveFormsModule } from '@angular/forms' +import { WrapperModule } from 'src/app/components/wrapper/wrapper.module' +import { DateSelectModule } from 'src/app/components/date-select/date-select.module' @NgModule({ declarations: [ActivitiesPage], - imports: [ActivitiesPageModule, RouterModule, ComponentsModule, MaterialModule, CommonModule, ReactiveFormsModule, FormsModule], + imports: [ + ActivitiesPageModule, + RouterModule, + ComponentsModule, + MaterialModule, + CommonModule, + ReactiveFormsModule, + FormsModule, + WrapperModule, + DateSelectModule, + ], }) export class ActivitiesModule {} diff --git a/front/src/app/routes/app-routing.module.ts b/front/src/app/routes/app-routing.module.ts index dbf031d0d..6691aee5c 100644 --- a/front/src/app/routes/app-routing.module.ts +++ b/front/src/app/routes/app-routing.module.ts @@ -2,7 +2,6 @@ import { NgModule } from '@angular/core' import { RouterModule, Routes } from '@angular/router' import { AuthGuard } from './auth-guard.service' import { CanDeactivateGuardService } from './canDeactivate-guard-service' -import { ReaffectatorModule } from './reaffectator/reaffectator.module' import { ReaffectatorPage } from './reaffectator/reaffectator.page' const routes: Routes = [ diff --git a/front/src/app/routes/average-etp/average-etp.module.ts b/front/src/app/routes/average-etp/average-etp.module.ts index c0ed1c784..0ec0c7f5d 100644 --- a/front/src/app/routes/average-etp/average-etp.module.ts +++ b/front/src/app/routes/average-etp/average-etp.module.ts @@ -1,14 +1,26 @@ -import { NgModule } from '@angular/core'; -import { RouterModule } from '@angular/router'; -import { AverageEtpPage } from './average-etp.page'; -import { AverageEtpPageModule } from './average-etp.routing'; -import { ComponentsModule } from 'src/app/components/components.module'; -import { CommonModule } from '@angular/common'; -import { MaterialModule } from 'src/app/libs/material.module'; -import { FormsModule, ReactiveFormsModule } from '@angular/forms'; +import { NgModule } from '@angular/core' +import { RouterModule } from '@angular/router' +import { AverageEtpPage } from './average-etp.page' +import { AverageEtpPageModule } from './average-etp.routing' +import { ComponentsModule } from 'src/app/components/components.module' +import { CommonModule } from '@angular/common' +import { MaterialModule } from 'src/app/libs/material.module' +import { FormsModule, ReactiveFormsModule } from '@angular/forms' +import { SelectModule } from 'src/app/components/select/select.module' +import { WrapperModule } from 'src/app/components/wrapper/wrapper.module' @NgModule({ declarations: [AverageEtpPage], - imports: [AverageEtpPageModule, CommonModule, RouterModule, ComponentsModule, ReactiveFormsModule, FormsModule, MaterialModule], + imports: [ + AverageEtpPageModule, + CommonModule, + RouterModule, + ComponentsModule, + ReactiveFormsModule, + FormsModule, + MaterialModule, + SelectModule, + WrapperModule + ], }) export class AverageEtpModule {} diff --git a/front/src/app/routes/calculator/calculator.module.ts b/front/src/app/routes/calculator/calculator.module.ts index 886737169..867e05d37 100644 --- a/front/src/app/routes/calculator/calculator.module.ts +++ b/front/src/app/routes/calculator/calculator.module.ts @@ -1,15 +1,31 @@ -import { NgModule } from '@angular/core'; -import { RouterModule } from '@angular/router'; -import { CalculatorPage } from './calculator.page'; -import { CalculatorPageModule } from './calculator.routing'; -import { ComponentsModule } from 'src/app/components/components.module'; -import { CommonModule } from '@angular/common'; -import { FormsModule, ReactiveFormsModule } from '@angular/forms'; -import { MaterialModule } from 'src/app/libs/material.module'; -import { ReferentielCalculatorComponent } from './referentiel-calculator/referentiel-calculator.component'; +import { NgModule } from '@angular/core' +import { RouterModule } from '@angular/router' +import { CalculatorPage } from './calculator.page' +import { CalculatorPageModule } from './calculator.routing' +import { ComponentsModule } from 'src/app/components/components.module' +import { CommonModule } from '@angular/common' +import { FormsModule, ReactiveFormsModule } from '@angular/forms' +import { MaterialModule } from 'src/app/libs/material.module' +import { ReferentielCalculatorComponent } from './referentiel-calculator/referentiel-calculator.component' +import { SpeedometerModule } from 'src/app/components/speedometer/speedometer.module' +import { SelectModule } from 'src/app/components/select/select.module' +import { DateSelectModule } from 'src/app/components/date-select/date-select.module' +import { WrapperModule } from 'src/app/components/wrapper/wrapper.module' @NgModule({ declarations: [CalculatorPage, ReferentielCalculatorComponent], - imports: [CalculatorPageModule, RouterModule, ComponentsModule, CommonModule, ReactiveFormsModule, FormsModule, MaterialModule], + imports: [ + CalculatorPageModule, + RouterModule, + ComponentsModule, + CommonModule, + ReactiveFormsModule, + FormsModule, + MaterialModule, + SpeedometerModule, + SelectModule, + DateSelectModule, + WrapperModule + ], }) export class CalculatorModule {} diff --git a/front/src/app/routes/dashboard/dashboard.module.ts b/front/src/app/routes/dashboard/dashboard.module.ts index dfb64c858..9061b3fc5 100644 --- a/front/src/app/routes/dashboard/dashboard.module.ts +++ b/front/src/app/routes/dashboard/dashboard.module.ts @@ -5,6 +5,7 @@ import { DashboardPageModule } from './dashboard.routing' import { ComponentsModule } from 'src/app/components/components.module' import { MaterialModule } from 'src/app/libs/material.module' import { CommonModule } from '@angular/common' +import { WrapperModule } from 'src/app/components/wrapper/wrapper.module' @NgModule({ declarations: [DashboardPage], @@ -14,6 +15,7 @@ import { CommonModule } from '@angular/common' ComponentsModule, MaterialModule, CommonModule, + WrapperModule ], }) export class DashboardModule {} diff --git a/front/src/app/routes/human-resource/human-resource.module.ts b/front/src/app/routes/human-resource/human-resource.module.ts index 6a539e884..0766185ff 100644 --- a/front/src/app/routes/human-resource/human-resource.module.ts +++ b/front/src/app/routes/human-resource/human-resource.module.ts @@ -14,6 +14,12 @@ import { BigEtpPreviewComponent } from './big-etp-preview/big-etp-preview.compon import { IndispoProfilComponent } from './indispo-profil/indispo-profil.component' import { CommentProfilComponent } from './comment-profil/comment-profil.component' import { PopupModule } from 'src/app/components/popup/popup.module' +import { EtpPreviewModule } from 'src/app/components/etp-preview/etp-preview.module' +import { PanelActivitiesModule } from 'src/app/components/panel-activities/panel-activities.module' +import { WrapperModule } from 'src/app/components/wrapper/wrapper.module' +import { TextEditorModule } from 'src/app/components/text-editor/text-editor.module' +import { DateSelectModule } from 'src/app/components/date-select/date-select.module' +import { HelpButtonModule } from 'src/app/components/help-button/help-button.module' @NgModule({ declarations: [ @@ -35,6 +41,12 @@ import { PopupModule } from 'src/app/components/popup/popup.module' CommonModule, MaterialModule, PopupModule, + EtpPreviewModule, + PanelActivitiesModule, + WrapperModule, + TextEditorModule, + DateSelectModule, + HelpButtonModule ], }) export class HumanResourceModule {} diff --git a/front/src/app/routes/login/login.module.ts b/front/src/app/routes/login/login.module.ts index 789a8b51b..183c825ea 100644 --- a/front/src/app/routes/login/login.module.ts +++ b/front/src/app/routes/login/login.module.ts @@ -1,12 +1,18 @@ -import { NgModule } from '@angular/core'; -import { FormsModule, ReactiveFormsModule } from '@angular/forms'; -import { RouterModule } from '@angular/router'; -import { LoginPage } from './login.page'; -import { LoginPageModule } from './login.routing'; -import { WrapperNoConnectedModule } from 'src/app/components/wrapper-no-connected/wrapper-no-connected.module'; +import { NgModule } from '@angular/core' +import { FormsModule, ReactiveFormsModule } from '@angular/forms' +import { RouterModule } from '@angular/router' +import { LoginPage } from './login.page' +import { LoginPageModule } from './login.routing' +import { WrapperNoConnectedModule } from 'src/app/components/wrapper-no-connected/wrapper-no-connected.module' @NgModule({ - declarations: [ LoginPage ], - imports: [ LoginPageModule, FormsModule, ReactiveFormsModule, RouterModule, WrapperNoConnectedModule ] + declarations: [LoginPage], + imports: [ + LoginPageModule, + FormsModule, + ReactiveFormsModule, + RouterModule, + WrapperNoConnectedModule, + ], }) export class LoginModule {} diff --git a/front/src/app/routes/panorama/panorama.module.ts b/front/src/app/routes/panorama/panorama.module.ts index a0852dc72..3fd8aeae9 100644 --- a/front/src/app/routes/panorama/panorama.module.ts +++ b/front/src/app/routes/panorama/panorama.module.ts @@ -13,6 +13,7 @@ import { WorkforceCompositionComponent } from './workforce-composition/workforce import { WorkforceChangeComponent } from './workforce-change/workforce-change.component' import { RecordsUpdateComponent } from './records-updates/records-update.component' import {NgxPaginationModule} from 'ngx-pagination'; +import { WrapperModule } from 'src/app/components/wrapper/wrapper.module' @NgModule({ declarations: [ @@ -32,6 +33,7 @@ import {NgxPaginationModule} from 'ngx-pagination'; CommonModule, MaterialModule, NgxPaginationModule, + WrapperModule, ], }) export class PanoramaModule {} diff --git a/front/src/app/routes/reaffectator/reaffectator.module.ts b/front/src/app/routes/reaffectator/reaffectator.module.ts index d97a7e797..10b0aafde 100644 --- a/front/src/app/routes/reaffectator/reaffectator.module.ts +++ b/front/src/app/routes/reaffectator/reaffectator.module.ts @@ -1,16 +1,39 @@ -import { NgModule } from '@angular/core'; -import { RouterModule } from '@angular/router'; -import { ReaffectatorPage } from './reaffectator.page'; -import { ReaffectatorPageModule } from './reaffectator.routing'; -import { ComponentsModule } from 'src/app/components/components.module'; -import { CommonModule } from '@angular/common'; -import { FormsModule, ReactiveFormsModule } from '@angular/forms'; -import { MaterialModule } from 'src/app/libs/material.module'; -import { PipesModule } from 'src/app/pipes/pipes.module'; -import { PopupModule } from 'src/app/components/popup/popup.module'; +import { NgModule } from '@angular/core' +import { RouterModule } from '@angular/router' +import { ReaffectatorPage } from './reaffectator.page' +import { ReaffectatorPageModule } from './reaffectator.routing' +import { CommonModule } from '@angular/common' +import { MaterialModule } from 'src/app/libs/material.module' +import { PipesModule } from 'src/app/pipes/pipes.module' +import { PopupModule } from 'src/app/components/popup/popup.module' +import { PanelActivitiesModule } from 'src/app/components/panel-activities/panel-activities.module' +import { EtpPreviewModule } from 'src/app/components/etp-preview/etp-preview.module' +import { WrapperModule } from 'src/app/components/wrapper/wrapper.module' +import { FormsModule, ReactiveFormsModule } from '@angular/forms' +import { SpeedometerModule } from 'src/app/components/speedometer/speedometer.module' +import { SelectModule } from 'src/app/components/select/select.module' +import { DateSelectModule } from 'src/app/components/date-select/date-select.module' +import { InputButtonModule } from 'src/app/components/input-button/input-button.module' +import { MatIconModule } from '@angular/material/icon' @NgModule({ - declarations: [ ReaffectatorPage ], - imports: [ ReaffectatorPageModule, RouterModule, ComponentsModule, CommonModule, FormsModule, ReactiveFormsModule, MaterialModule, PipesModule, PopupModule ] + declarations: [ReaffectatorPage], + imports: [ + ReaffectatorPageModule, + RouterModule, + ReactiveFormsModule, + FormsModule, + CommonModule, + PipesModule, + PopupModule, + PanelActivitiesModule, + EtpPreviewModule, + WrapperModule, + SpeedometerModule, + SelectModule, + DateSelectModule, + InputButtonModule, + MatIconModule + ], }) export class ReaffectatorModule {} diff --git a/front/src/app/routes/simulator/simulator.module.ts b/front/src/app/routes/simulator/simulator.module.ts index fa7d8b459..2658b3c30 100644 --- a/front/src/app/routes/simulator/simulator.module.ts +++ b/front/src/app/routes/simulator/simulator.module.ts @@ -7,6 +7,8 @@ import { MaterialModule } from 'src/app/libs/material.module' import { CommonModule } from '@angular/common' import { MatTooltipModule } from '@angular/material/tooltip' import { PopupModule } from 'src/app/components/popup/popup.module' +import { WrapperModule } from 'src/app/components/wrapper/wrapper.module' +import { SelectModule } from 'src/app/components/select/select.module' @NgModule({ declarations: [SimulatorPage], @@ -18,6 +20,8 @@ import { PopupModule } from 'src/app/components/popup/popup.module' CommonModule, MatTooltipModule, PopupModule, + WrapperModule, + SelectModule, ], }) export class SimulatorModule {} diff --git a/front/src/app/routes/workforce/workforce.module.ts b/front/src/app/routes/workforce/workforce.module.ts index 86ea6e14a..2da9f8735 100644 --- a/front/src/app/routes/workforce/workforce.module.ts +++ b/front/src/app/routes/workforce/workforce.module.ts @@ -10,6 +10,12 @@ import { FilterPanelComponent } from './filter-panel/filter-panel.component' import { NgSelectModule } from '@ng-select/ng-select' import { PipesModule } from 'src/app/pipes/pipes.module' import { PersonPreviewComponent } from './person-preview/person-preview.component' +import { EtpPreviewModule } from 'src/app/components/etp-preview/etp-preview.module' +import { PanelActivitiesModule } from 'src/app/components/panel-activities/panel-activities.module' +import { WrapperModule } from 'src/app/components/wrapper/wrapper.module' +import { SelectModule } from 'src/app/components/select/select.module' +import { DateSelectModule } from 'src/app/components/date-select/date-select.module' +import { InputButtonModule } from 'src/app/components/input-button/input-button.module' @NgModule({ declarations: [WorkforcePage, FilterPanelComponent, PersonPreviewComponent], @@ -23,6 +29,12 @@ import { PersonPreviewComponent } from './person-preview/person-preview.componen ReactiveFormsModule, MaterialModule, PipesModule, + EtpPreviewModule, + PanelActivitiesModule, + WrapperModule, + SelectModule, + DateSelectModule, + InputButtonModule ], }) export class WorkforceModule {}