From daae6fc05c32aea0229dd530640cdd67f7fc43cd Mon Sep 17 00:00:00 2001
From: Alex ORLUC <alex.orluc@maarch.org>
Date: Wed, 11 Mar 2020 14:36:04 +0100
Subject: [PATCH] FEAT #12091 TIME 1 fix view doc action
---
src/frontend/app/actions/actions.service.ts | 2 +-
.../view-doc-action.component.html | 12 +++++++++---
.../view-doc-action.component.scss | 5 -----
.../view-doc-action/view-doc-action.component.ts | 16 +++++-----------
src/frontend/css/maarch-material-modal.scss | 5 +++++
5 files changed, 20 insertions(+), 20 deletions(-)
diff --git a/src/frontend/app/actions/actions.service.ts b/src/frontend/app/actions/actions.service.ts
index 64af0696bed..d9e1799998a 100644
--- a/src/frontend/app/actions/actions.service.ts
+++ b/src/frontend/app/actions/actions.service.ts
@@ -523,7 +523,7 @@ export class ActionsService {
viewDoc(options: any = null) {
this.dialog.open(ViewDocActionComponent, {
- panelClass: 'maarch-modal no-padding-full-dialog',
+ panelClass: 'maarch-modal',
data: this.setDatasActionToSend()
});
}
diff --git a/src/frontend/app/actions/view-doc-action/view-doc-action.component.html b/src/frontend/app/actions/view-doc-action/view-doc-action.component.html
index 796054619d0..9339157e6d8 100644
--- a/src/frontend/app/actions/view-doc-action/view-doc-action.component.html
+++ b/src/frontend/app/actions/view-doc-action/view-doc-action.component.html
@@ -1,10 +1,16 @@
<div class="mat-dialog-content-container">
- <h1 mat-dialog-title>{{data.resource.chrono}}
+ <h1 mat-dialog-title>
+ <span>
+ {{data.resource.chrono}}
+ </span>
<button title="{{lang.close}}" mat-icon-button [mat-dialog-close]="">
<mat-icon class="fa fa-times-circle fa-2x"></mat-icon>
</button>
</h1>
- <div style="overflow:auto;height: 100%;width: 100%;">
- <pdf-viewer [src]="docUrl" [render-text]="true" [autoresize]="true" [original-size]="false" [show-all]="true"></pdf-viewer>
+ <div mat-dialog-content style="min-height: 200px;">
+ <app-document-viewer #appDocumentViewer style="display:block;height:100%;width:100%;overflow: auto;"
+ [editMode]="false" [resId]="data.resource.resId"
+ [title]="data.resource.chrono + ' - ' + data.resource.subject">
+ </app-document-viewer>
</div>
</div>
\ No newline at end of file
diff --git a/src/frontend/app/actions/view-doc-action/view-doc-action.component.scss b/src/frontend/app/actions/view-doc-action/view-doc-action.component.scss
index f1c85626d8d..e69de29bb2d 100644
--- a/src/frontend/app/actions/view-doc-action/view-doc-action.component.scss
+++ b/src/frontend/app/actions/view-doc-action/view-doc-action.component.scss
@@ -1,5 +0,0 @@
-button {
- z-index: 1;
- float: right;
- top: -5px;
-}
\ No newline at end of file
diff --git a/src/frontend/app/actions/view-doc-action/view-doc-action.component.ts b/src/frontend/app/actions/view-doc-action/view-doc-action.component.ts
index 57d6ec34035..0d715955fa8 100644
--- a/src/frontend/app/actions/view-doc-action/view-doc-action.component.ts
+++ b/src/frontend/app/actions/view-doc-action/view-doc-action.component.ts
@@ -1,7 +1,6 @@
import { Component, OnInit, Inject } from '@angular/core';
import { LANG } from '../../translate.component';
-import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
-import { DomSanitizer, SafeHtml } from '@angular/platform-browser';
+import { MAT_DIALOG_DATA } from '@angular/material/dialog';
@Component({
templateUrl: "view-doc-action.component.html",
@@ -10,15 +9,10 @@ import { DomSanitizer, SafeHtml } from '@angular/platform-browser';
export class ViewDocActionComponent implements OnInit {
lang: any = LANG;
- loading: boolean = false;
- docUrl: string = '';
- innerHtml: SafeHtml;
- constructor(public dialogRef: MatDialogRef<ViewDocActionComponent>, @Inject(MAT_DIALOG_DATA) public data: any, public sanitizer: DomSanitizer) {
- (<any>window).pdfWorkerSrc = '../../node_modules/pdfjs-dist/build/pdf.worker.min.js';
- }
+ constructor(
+ @Inject(MAT_DIALOG_DATA) public data: any
+ ) { }
- ngOnInit(): void {
- this.docUrl = '../../rest/resources/' + this.data.resIds[0] + '/content';
- }
+ ngOnInit(): void { }
}
diff --git a/src/frontend/css/maarch-material-modal.scss b/src/frontend/css/maarch-material-modal.scss
index b3dc2026dad..e602f38c319 100644
--- a/src/frontend/css/maarch-material-modal.scss
+++ b/src/frontend/css/maarch-material-modal.scss
@@ -88,6 +88,11 @@
align-items: center;
justify-content: center;
+ span {
+ flex : 1;
+ text-align: center;
+ }
+
small {
color: #F99830;
}
--
GitLab