diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts index 1e510d4de01e0fe08c392981239c983472aac3fd..4d33f39f3c7ffce2fe6ddcc370fe465cd1058da3 100644 --- a/src/app/app-routing.module.ts +++ b/src/app/app-routing.module.ts @@ -14,7 +14,6 @@ import { ResetEmailComponent } from './reset-email/reset-email.component'; import { ResetPasswordComponent } from './reset-password/reset-password.component'; import { StructureResolver } from './resolvers/structure.resolver'; import { PasswordFormComponent } from './shared/components'; -import { StructureListPrintComponent } from './shared/components/structure-list-print/structure-list-print.component'; import { StructureDetailsComponent } from './structure-list/components/structure-details/structure-details.component'; import { StructureListSearchPrintComponent } from './structure-list/components/structure-list-search-print/structure-list-search-print.component'; import { StructureListComponent } from './structure-list/structure-list.component'; @@ -39,17 +38,10 @@ const routes: Routes = [ { path: 'print', outlet: 'print', - children: [{ path: 'structure', component: StructureDetailsComponent }, footerOutletRoute], - }, - { - path: 'print', - outlet: 'print', - children: [{ path: 'structures', component: StructureListPrintComponent }, footerOutletRoute], - }, - { - path: 'print', - outlet: 'print', - children: [{ path: 'structures-search', component: StructureListSearchPrintComponent }, footerOutletRoute], + children: [ + { path: 'structure', component: StructureDetailsComponent }, + { path: 'structures-search', component: StructureListSearchPrintComponent }, + ], }, { path: 'acteurs', diff --git a/src/app/app.component.html b/src/app/app.component.html index 500e14908479aecd275ec8a835e7f412af821c67..88b82cf7c5ea54bbada9e995a06ce3a7ef5f887f 100644 --- a/src/app/app.component.html +++ b/src/app/app.component.html @@ -7,8 +7,8 @@ <ng-container *ngIf="!loading"> <router-outlet name="left-pane"></router-outlet> <router-outlet></router-outlet> - <router-outlet name="print"></router-outlet> </ng-container> <router-outlet *ngIf="!loading" name="footer"></router-outlet> </div> </div> +<router-outlet name="print"></router-outlet> diff --git a/src/app/shared/components/index.ts b/src/app/shared/components/index.ts index 04859a36d103ab1d361bd3222aedc225f70ce855..0f5424ca2ce3b0ea06da294569862f8788f3e073 100644 --- a/src/app/shared/components/index.ts +++ b/src/app/shared/components/index.ts @@ -14,7 +14,6 @@ import { ModalJoinConfirmationComponent } from './modal-join-confirmation/modal- import { PasswordFormComponent } from './password-form/password-form.component'; import { RadioFormComponent } from './radio-form/radio-form.component'; import { StructureDetailPrintComponent } from './structure-detail-print/structure-detail-print.component'; -import { StructureListPrintComponent } from './structure-list-print/structure-list-print.component'; import { StructurePmrComponent } from './structure-pmr/structure-pmr.component'; import { StructureTypePickerComponent } from './structure-type-picker/structure-type-picker.component'; import { SvgIconComponent } from './svg-icon/svg-icon.component'; @@ -46,7 +45,6 @@ export { ProgressBarComponent, RadioFormComponent, StructureDetailPrintComponent, - StructureListPrintComponent, StructurePmrComponent, StructurePublicTargetComponent, StructureTypePickerComponent, @@ -78,7 +76,6 @@ export const SharedComponents = [ RadioFormComponent, RadioV3Component, StructureDetailPrintComponent, - StructureListPrintComponent, StructurePmrComponent, StructurePublicTargetComponent, StructureTypePickerComponent, diff --git a/src/app/shared/components/structure-list-print/structure-list-print.component.html b/src/app/shared/components/structure-list-print/structure-list-print.component.html deleted file mode 100644 index abd158620f28461099fde12211e5bdb85f7493af..0000000000000000000000000000000000000000 --- a/src/app/shared/components/structure-list-print/structure-list-print.component.html +++ /dev/null @@ -1,7 +0,0 @@ -<div *ngFor="let structure of structures" class="multi-print"> - <app-structure-detail-print [structure]="structure" /> -</div> -<div class="loader" aria-busy="true"> - <img class="loader-gif" src="/assets/gif/loader_circle_grey.gif" alt /> - <p>Liste en cours d'impression</p> -</div> diff --git a/src/app/shared/components/structure-list-print/structure-list-print.component.scss b/src/app/shared/components/structure-list-print/structure-list-print.component.scss deleted file mode 100644 index 3eb08118daa42ef0a87712ab37c388bfea8b554e..0000000000000000000000000000000000000000 --- a/src/app/shared/components/structure-list-print/structure-list-print.component.scss +++ /dev/null @@ -1,49 +0,0 @@ -@import 'color'; -@import 'layout'; - -.list-to-print { - height: 600px; - overflow-x: hidden; - overflow-y: auto; -} - -.multi-print { - :host { - background-color: $grey-9; - } - ::ng-deep { - .structure-details-container { - margin-top: 2%; - margin-left: 34%; - height: 98%; - } - .print-header { - height: 100%; - } - } - page-break-after: always; - print-color-adjust: exact; - width: 50%; - margin-left: 23%; - margin-right: 23%; - padding-left: 2%; - padding-right: 2%; - height: 100%; - overflow-x: hidden; - background-color: $white; - @media screen { - display: none; - } - @media print { - width: 100%; - margin: 0; - padding: 0; - } -} - -.loader { - height: calc(100vh - #{$header-height} - #{$footer-height}); - @media print { - display: none; - } -} diff --git a/src/app/shared/components/structure-list-print/structure-list-print.component.ts b/src/app/shared/components/structure-list-print/structure-list-print.component.ts deleted file mode 100644 index b03bfe5e67c4fa0c459299d5c4d77370cc7201b8..0000000000000000000000000000000000000000 --- a/src/app/shared/components/structure-list-print/structure-list-print.component.ts +++ /dev/null @@ -1,11 +0,0 @@ -import { Component, Input } from '@angular/core'; -import { Structure } from '../../../models/structure.model'; - -@Component({ - selector: 'app-structure-list-print', - templateUrl: './structure-list-print.component.html', - styleUrls: ['./structure-list-print.component.scss'], -}) -export class StructureListPrintComponent { - @Input() public structures: Structure[]; -} diff --git a/src/styles.scss b/src/styles.scss index bdf5eb8f920a7a17241aaa4f02e798e519587af4..0a23b22c9fabd341866e3a8d52108ed64689e2ef 100644 --- a/src/styles.scss +++ b/src/styles.scss @@ -331,7 +331,7 @@ button { @media print { body, html, - .forPrint { + .root { height: auto; }