diff --git a/src/frontend/app/attachments/attachments-page/attachment-page.component.html b/src/frontend/app/attachments/attachments-page/attachment-page.component.html index cc3995a5c01cead7ebce8479d273755340c1681f..4326ef9251e8d710f39406c0ec10b9a342e7fb07 100644 --- a/src/frontend/app/attachments/attachments-page/attachment-page.component.html +++ b/src/frontend/app/attachments/attachments-page/attachment-page.component.html @@ -197,7 +197,7 @@ <app-document-viewer #appAttachmentViewer style="height:100%;width:100%;" [editMode]="editMode" [resId]="data.resId" [resIdMaster]="attachment['resIdMaster'].value" [mode]="'attachment'" [attachType]="attachment['type'].value" [infoPanel]="snavLeft" - (triggerEvent)="setDatasViewer()" + (triggerEvent)="setDatasViewer($event)" [title]="attachment.chrono.value + ' - ' + attachment.title.value"> </app-document-viewer> </mat-tab> diff --git a/src/frontend/app/attachments/attachments-page/attachment-page.component.scss b/src/frontend/app/attachments/attachments-page/attachment-page.component.scss index 77b6ff8dad37226e2d9cee71b75969ccf6988c7d..e75c7c801cd283fd5cab017d7b257f767b0f4d90 100644 --- a/src/frontend/app/attachments/attachments-page/attachment-page.component.scss +++ b/src/frontend/app/attachments/attachments-page/attachment-page.component.scss @@ -89,6 +89,8 @@ display: block; height: 100% !important; text-align: center; + background: $primary; + color: white; } } diff --git a/src/frontend/app/attachments/attachments-page/attachment-page.component.ts b/src/frontend/app/attachments/attachments-page/attachment-page.component.ts index c6f8d447c9e383fc8d5d242d365e0587c0588c5d..cd4736b45b5a4d179c7a92e67cd3ffb66146d8f4 100644 --- a/src/frontend/app/attachments/attachments-page/attachment-page.component.ts +++ b/src/frontend/app/attachments/attachments-page/attachment-page.component.ts @@ -190,7 +190,7 @@ export class AttachmentPageComponent implements OnInit { return attachmentValues; } - setDatasViewer() { + setDatasViewer(ev: any) { let datas: any = {}; Object.keys(this.attachment).forEach(element => { if (['title', 'validationDate', 'effectiveDate'].indexOf(element) > -1) { @@ -200,9 +200,9 @@ export class AttachmentPageComponent implements OnInit { datas['resId'] = this.attachment['resIdMaster'].value; this.attachment.encodedFile.setValue(this.appAttachmentViewer.getFile().content); this.appAttachmentViewer.setDatas(datas); - console.log('event!'); - - this.setNewVersion(); + if (ev !== 'cleanFile') { + this.setNewVersion(); + } } getAttachType(attachType: any) { diff --git a/src/frontend/app/viewer/document-viewer.component.ts b/src/frontend/app/viewer/document-viewer.component.ts index afc7ff1895a392c8604cfd74cfced07df9147ef0..336b7e23bfe4acdf0ade2f41a356e5c6f0724427 100644 --- a/src/frontend/app/viewer/document-viewer.component.ts +++ b/src/frontend/app/viewer/document-viewer.component.ts @@ -371,7 +371,7 @@ export class DocumentViewerComponent implements OnInit { content: null, src: null }; - this.triggerEvent.emit(); + this.triggerEvent.emit('cleanFile'); }), catchError((err: any) => { this.notify.handleErrors(err);