Skip to content
Snippets Groups Projects
Commit 558ba3d5 authored by Rémi PAILHAREY's avatar Rémi PAILHAREY :fork_knife_plate:
Browse files

fix: print for orientation recap and structure list

parent 29ea75f1
No related branches found
No related tags found
2 merge requests!642retours recette V2.5.0,!640retours recette V2.5.0 du 22/11/2023
...@@ -14,7 +14,6 @@ import { ResetEmailComponent } from './reset-email/reset-email.component'; ...@@ -14,7 +14,6 @@ import { ResetEmailComponent } from './reset-email/reset-email.component';
import { ResetPasswordComponent } from './reset-password/reset-password.component'; import { ResetPasswordComponent } from './reset-password/reset-password.component';
import { StructureResolver } from './resolvers/structure.resolver'; import { StructureResolver } from './resolvers/structure.resolver';
import { PasswordFormComponent } from './shared/components'; 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 { 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 { StructureListSearchPrintComponent } from './structure-list/components/structure-list-search-print/structure-list-search-print.component';
import { StructureListComponent } from './structure-list/structure-list.component'; import { StructureListComponent } from './structure-list/structure-list.component';
...@@ -39,17 +38,10 @@ const routes: Routes = [ ...@@ -39,17 +38,10 @@ const routes: Routes = [
{ {
path: 'print', path: 'print',
outlet: 'print', outlet: 'print',
children: [{ path: 'structure', component: StructureDetailsComponent }, footerOutletRoute], children: [
}, { path: 'structure', component: StructureDetailsComponent },
{ { path: 'structures-search', component: StructureListSearchPrintComponent },
path: 'print', ],
outlet: 'print',
children: [{ path: 'structures', component: StructureListPrintComponent }, footerOutletRoute],
},
{
path: 'print',
outlet: 'print',
children: [{ path: 'structures-search', component: StructureListSearchPrintComponent }, footerOutletRoute],
}, },
{ {
path: 'acteurs', path: 'acteurs',
......
...@@ -7,8 +7,8 @@ ...@@ -7,8 +7,8 @@
<ng-container *ngIf="!loading"> <ng-container *ngIf="!loading">
<router-outlet name="left-pane"></router-outlet> <router-outlet name="left-pane"></router-outlet>
<router-outlet></router-outlet> <router-outlet></router-outlet>
<router-outlet name="print"></router-outlet>
</ng-container> </ng-container>
<router-outlet *ngIf="!loading" name="footer"></router-outlet> <router-outlet *ngIf="!loading" name="footer"></router-outlet>
</div> </div>
</div> </div>
<router-outlet name="print"></router-outlet>
...@@ -14,7 +14,6 @@ import { ModalJoinConfirmationComponent } from './modal-join-confirmation/modal- ...@@ -14,7 +14,6 @@ import { ModalJoinConfirmationComponent } from './modal-join-confirmation/modal-
import { PasswordFormComponent } from './password-form/password-form.component'; import { PasswordFormComponent } from './password-form/password-form.component';
import { RadioFormComponent } from './radio-form/radio-form.component'; import { RadioFormComponent } from './radio-form/radio-form.component';
import { StructureDetailPrintComponent } from './structure-detail-print/structure-detail-print.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 { StructurePmrComponent } from './structure-pmr/structure-pmr.component';
import { StructureTypePickerComponent } from './structure-type-picker/structure-type-picker.component'; import { StructureTypePickerComponent } from './structure-type-picker/structure-type-picker.component';
import { SvgIconComponent } from './svg-icon/svg-icon.component'; import { SvgIconComponent } from './svg-icon/svg-icon.component';
...@@ -46,7 +45,6 @@ export { ...@@ -46,7 +45,6 @@ export {
ProgressBarComponent, ProgressBarComponent,
RadioFormComponent, RadioFormComponent,
StructureDetailPrintComponent, StructureDetailPrintComponent,
StructureListPrintComponent,
StructurePmrComponent, StructurePmrComponent,
StructurePublicTargetComponent, StructurePublicTargetComponent,
StructureTypePickerComponent, StructureTypePickerComponent,
...@@ -78,7 +76,6 @@ export const SharedComponents = [ ...@@ -78,7 +76,6 @@ export const SharedComponents = [
RadioFormComponent, RadioFormComponent,
RadioV3Component, RadioV3Component,
StructureDetailPrintComponent, StructureDetailPrintComponent,
StructureListPrintComponent,
StructurePmrComponent, StructurePmrComponent,
StructurePublicTargetComponent, StructurePublicTargetComponent,
StructureTypePickerComponent, StructureTypePickerComponent,
......
<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>
@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;
}
}
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[];
}
...@@ -331,7 +331,7 @@ button { ...@@ -331,7 +331,7 @@ button {
@media print { @media print {
body, body,
html, html,
.forPrint { .root {
height: auto; height: auto;
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment