From 14ded2f4f1ea2e15a481746a261c66d0f6b1e390 Mon Sep 17 00:00:00 2001
From: Alex ORLUC <alex.orluc@maarch.org>
Date: Mon, 6 Jul 2020 18:56:58 +0200
Subject: [PATCH] FEAT #14199 #14149 TIME 1:20 lock refactoring + edit main doc
in signatureBook
---
src/frontend/app/actions/actions.service.ts | 121 ++++----
src/frontend/app/process/process.component.ts | 42 +--
.../app/signature-book.component.html | 229 +++++++++-----
src/frontend/app/signature-book.component.ts | 293 ++++++++----------
.../app/viewer/document-viewer.component.html | 4 +-
.../app/viewer/document-viewer.component.ts | 77 ++---
src/frontend/service/app.guard.ts | 6 +-
7 files changed, 412 insertions(+), 360 deletions(-)
diff --git a/src/frontend/app/actions/actions.service.ts b/src/frontend/app/actions/actions.service.ts
index 27397c40183..6d569c55fee 100644
--- a/src/frontend/app/actions/actions.service.ts
+++ b/src/frontend/app/actions/actions.service.ts
@@ -130,8 +130,7 @@ export class ActionsService {
this.loading = true;
try {
this[action.component]();
- }
- catch (error) {
+ } catch (error) {
console.log(error);
console.log(action.component);
alert(this.lang.actionNotExist);
@@ -139,41 +138,32 @@ export class ActionsService {
}
}
- launchAction(action: any, userId: number, groupId: number, basketId: number, resIds: number[], datas: any, lockRes: boolean = true) {
+ async launchAction(action: any, userId: number, groupId: number, basketId: number, resIds: number[], datas: any, lockRes: boolean = true) {
if (this.setActionInformations(action, userId, groupId, basketId, resIds)) {
this.loading = true;
this.lockMode = lockRes;
this.setResourceInformations(datas);
+
if (this.lockMode) {
- if (action.component == 'viewDoc' || action.component == 'documentDetails') {
- this[action.component](action.data);
- } else {
- this.http.put(`../../rest/resourcesList/users/${userId}/groups/${groupId}/baskets/${basketId}/lock`, { resources: resIds }).pipe(
- tap((data: any) => {
- if (this.canExecuteAction(data.countLockedResources, data.lockers, resIds)) {
- try {
- this.currentResIds = data.resourcesToProcess;
- this.lockResource();
- this[action.component](action.data);
- }
- catch (error) {
- console.log(error);
- console.log(action);
- alert(this.lang.actionNotExist);
- }
- }
- }),
- catchError((err: any) => {
- this.notify.handleErrors(err);
- return of(false);
- })
- ).subscribe();
+ const res: any = await this.canExecuteAction(resIds);
+ if (res === true) {
+ if (['viewDoc', 'documentDetails', 'signatureBookAction', 'processDocument'].indexOf(action.component) > -1) {
+ this[action.component](action.data);
+ } else {
+ try {
+ this.lockResource();
+ this[action.component](action.data);
+ } catch (error) {
+ console.log(error);
+ console.log(action);
+ alert(this.lang.actionNotExist);
+ }
+ }
}
} else {
try {
this[action.component]();
- }
- catch (error) {
+ } catch (error) {
console.log(error);
console.log(action);
alert(this.lang.actionNotExist);
@@ -182,29 +172,56 @@ export class ActionsService {
}
}
- canExecuteAction(numberOflockedResIds: number, usersWholocked: any[], resIds: number[]) {
- let msgWarn = this.lang.warnLockRes + ' : ' + usersWholocked.join(', ');
+ canExecuteAction(resIds: number[], userId: number = this.currentUserId, groupId: number = this.currentGroupId, basketId: number = this.currentBasketId) {
+ return new Promise((resolve) => {
+ this.http.put(`../../rest/resourcesList/users/${userId}/groups/${groupId}/baskets/${basketId}/locked`, { resources: resIds }).pipe(
+ tap((data: any) => {
+ let msgWarn = this.lang.warnLockRes + ' : ' + data.lockers.join(', ');
- if (numberOflockedResIds != resIds.length) {
- msgWarn += this.lang.warnLockRes2 + '.';
- }
+ if (data.countLockedResources != resIds.length) {
+ msgWarn += this.lang.warnLockRes2 + '.';
+ }
- if (numberOflockedResIds > 0) {
- alert(numberOflockedResIds + ' ' + msgWarn);
- }
+ if (data.countLockedResources > 0) {
+ alert(data.countLockedResources + ' ' + msgWarn);
+ }
- if (numberOflockedResIds != resIds.length) {
- return true;
- } else {
- return false;
- }
+ if (data.countLockedResources != resIds.length) {
+ this.currentResIds = data.resourcesToProcess;
+ resolve(true);
+ } else {
+ resolve(false);
+ }
+ }),
+ // tap((data: any) => resolve(data)),
+ catchError((err: any) => {
+ this.notify.handleErrors(err);
+ return of(false);
+ })
+ ).subscribe();
+ });
+ }
+
+ hasLockResources() {
+ return !this.functions.empty(this.currentResourceLock);
}
- lockResource() {
+ lockResource(userId: number = this.currentUserId, groupId: number = this.currentGroupId, basketId: number = this.currentBasketId, resIds: number[] = this.currentResIds) {
+ console.log(`Verouillage des documents ${resIds}`);
+
+ this.http.put(`../../rest/resourcesList/users/${userId}/groups/${groupId}/baskets/${basketId}/lock`, { resources: resIds }).pipe(
+ tap(() => console.debug(`Cycle lock : `, this.currentResourceLock)),
+ catchError((err: any) => {
+ this.notify.handleErrors(err);
+ return of(false);
+ })
+ ).subscribe();
+
this.currentResourceLock = setInterval(() => {
- this.http.put(`../../rest/resourcesList/users/${this.currentUserId}/groups/${this.currentGroupId}/baskets/${this.currentBasketId}/lock`, { resources: this.currentResIds }).pipe(
+ this.http.put(`../../rest/resourcesList/users/${userId}/groups/${groupId}/baskets/${basketId}/lock`, { resources: resIds }).pipe(
+ tap(() => console.debug(`Cycle lock : `, this.currentResourceLock)),
catchError((err: any) => {
- if (err.status == 403) {
+ if (err.status === 403) {
clearInterval(this.currentResourceLock);
}
this.notify.handleErrors(err);
@@ -214,9 +231,10 @@ export class ActionsService {
}, 50000);
}
- unlockResource() {
- if (this.currentResIds.length > 0) {
- this.http.put(`../../rest/resourcesList/users/${this.currentUserId}/groups/${this.currentGroupId}/baskets/${this.currentBasketId}/unlock`, { resources: this.currentResIds }).pipe(
+ unlockResource(userId: number = this.currentUserId, groupId: number = this.currentGroupId, basketId: number = this.currentBasketId, resIds: number[] = this.currentResIds) {
+ if (resIds.length > 0) {
+ console.debug(`Unlock ressource : ${resIds}`);
+ this.http.put(`../../rest/resourcesList/users/${userId}/groups/${groupId}/baskets/${basketId}/unlock`, { resources: resIds }).pipe(
catchError((err: any) => {
this.notify.handleErrors(err);
return of(false);
@@ -227,6 +245,7 @@ export class ActionsService {
stopRefreshResourceLock() {
if (this.currentResourceLock !== null) {
+ console.debug('Cycle lock cancel');
clearInterval(this.currentResourceLock);
}
}
@@ -241,12 +260,12 @@ export class ActionsService {
basketId: this.currentBasketId,
indexActionRoute: this.indexActionRoute,
processActionRoute: this.processActionRoute
- }
+ };
}
unlockResourceAfterActionModal(resIds: any) {
- this.stopRefreshResourceLock();
if (this.functions.empty(resIds) && this.lockMode) {
+ this.stopRefreshResourceLock();
this.unlockResource();
}
}
@@ -660,7 +679,7 @@ export class ActionsService {
noConfirmAction(options: any = null) {
- let dataActionToSend = this.setDatasActionToSend();
+ const dataActionToSend = this.setDatasActionToSend();
if (dataActionToSend.resIds.length === 0) {
this.http.post('../../rest/resources', dataActionToSend.resource).pipe(
tap((data: any) => {
@@ -693,8 +712,6 @@ export class ActionsService {
}
processDocument(options: any = null) {
- this.stopRefreshResourceLock();
- this.unlockResource();
this.router.navigate([`/process/users/${this.currentUserId}/groups/${this.currentGroupId}/baskets/${this.currentBasketId}/resId/${this.currentResIds}`]);
}
diff --git a/src/frontend/app/process/process.component.ts b/src/frontend/app/process/process.component.ts
index 805d53970cc..137e0070ea1 100755
--- a/src/frontend/app/process/process.component.ts
+++ b/src/frontend/app/process/process.component.ts
@@ -46,8 +46,6 @@ export class ProcessComponent implements OnInit, OnDestroy {
detailMode: boolean = false;
isMailing: boolean = false;
- currentResourceLock: any = null;
-
actionsList: any[] = [];
currentUserId: number = null;
currentBasketId: number = null;
@@ -201,7 +199,6 @@ export class ProcessComponent implements OnInit, OnDestroy {
// Event after process action
this.subscription = this.actionService.catchAction().subscribe(message => {
this.actionEnded = true;
- clearInterval(this.currentResourceLock);
this.router.navigate([`/basketList/users/${this.currentUserId}/groups/${this.currentGroupId}/baskets/${this.currentBasketId}`]);
});
}
@@ -254,7 +251,8 @@ export class ProcessComponent implements OnInit, OnDestroy {
await this.checkAccesDocument(this.currentResourceInformations.resId);
- this.lockResource();
+ this.actionService.lockResource(this.currentUserId, this.currentGroupId, this.currentBasketId, [this.currentResourceInformations.resId]);
+
this.loadBadges();
this.loadResource();
@@ -525,38 +523,6 @@ export class ProcessComponent implements OnInit, OnDestroy {
}
}
- lockResource() {
- this.http.put(`../../rest/resourcesList/users/${this.currentUserId}/groups/${this.currentGroupId}/baskets/${this.currentBasketId}/lock`, { resources: [this.currentResourceInformations.resId] }).pipe(
- catchError((err: any) => {
- this.notify.handleErrors(err);
- return of(false);
- })
- ).subscribe();
-
- this.currentResourceLock = setInterval(() => {
- this.http.put(`../../rest/resourcesList/users/${this.currentUserId}/groups/${this.currentGroupId}/baskets/${this.currentBasketId}/lock`, { resources: [this.currentResourceInformations.resId] }).pipe(
- catchError((err: any) => {
- if (err.status === 403) {
- clearInterval(this.currentResourceLock);
- }
- this.notify.handleErrors(err);
- return of(false);
- })
- ).subscribe();
- }, 50000);
- }
-
- unlockResource() {
- clearInterval(this.currentResourceLock);
-
- this.http.put(`../../rest/resourcesList/users/${this.currentUserId}/groups/${this.currentGroupId}/baskets/${this.currentBasketId}/unlock`, { resources: [this.currentResourceInformations.resId] }).pipe(
- catchError((err: any) => {
- this.notify.handleErrors(err);
- return of(false);
- })
- ).subscribe();
- }
-
onSubmit() {
if (this.currentTool === 'info' || this.isModalOpen('info')) {
this.processAction();
@@ -689,6 +655,10 @@ export class ProcessComponent implements OnInit, OnDestroy {
}
ngOnDestroy() {
+ if (!this.detailMode) {
+ this.actionService.stopRefreshResourceLock();
+ this.actionService.unlockResource(this.currentUserId, this.currentGroupId, this.currentBasketId, [this.currentResourceInformations.resId]);
+ }
// unsubscribe to ensure no memory leaks
this.subscription.unsubscribe();
}
diff --git a/src/frontend/app/signature-book.component.html b/src/frontend/app/signature-book.component.html
index ab48838e064..baf764c2512 100755
--- a/src/frontend/app/signature-book.component.html
+++ b/src/frontend/app/signature-book.component.html
@@ -4,39 +4,53 @@
<div *ngIf="!loading" class='visaContent'>
<div class="titleSignatureBook">
<div id="tabSignatureBook">
- <div *ngIf="signatureBook.documents[0] && !signatureBook.documents[0].inSignatureBook" title="{{lang.mail}}" class="item" [ngClass]="{'activeTabSignatureBook': headerTab == 'document'}" (click)="changeSignatureBookLeftContent('document')">
+ <div *ngIf="signatureBook.documents[0] && !signatureBook.documents[0].inSignatureBook" title="{{lang.mail}}"
+ class="item" [ngClass]="{'activeTabSignatureBook': headerTab == 'document'}"
+ (click)="changeSignatureBookLeftContent('document')">
<i class="fa fa-file-alt fa-2x"></i>
</div>
- <div *ngFor="let module of processTool" title="{{module.label}}" class="item" [ngClass]="{'activeTabSignatureBook': headerTab == module.id}" (click)="changeSignatureBookLeftContent(module.id)">
+ <div *ngFor="let module of processTool" title="{{module.label}}" class="item"
+ [ngClass]="{'activeTabSignatureBook': headerTab == module.id}"
+ (click)="changeSignatureBookLeftContent(module.id)">
<i [class]="module.icon"></i>
<i *ngIf="module.count > 0" class="fas fa-circle haveContent"></i>
</div>
</div>
- <div id="labelSignatureBook" title="{{signatureBook.documents[0].title}}" ><div>{{signatureBook.documents[0].alt_id}} : {{signatureBook.documents[0].title}}</div></div>
+ <div id="labelSignatureBook" title="{{signatureBook.documents[0].title}}">
+ <div>{{signatureBook.documents[0].alt_id}} : {{signatureBook.documents[0].title}}</div>
+ </div>
<div id="closeSignatureBook">
<i style="cursor: pointer" (click)="backToBasket()" class="fa fa-times-circle fa-2x"></i>
</div>
<div class="actions">
- <i style="cursor: pointer;vertical-align: middle;" title="{{lang.linkDetails}}" class="fa fa-info-circle fa-2x" (click)="backToDetails()"></i>
+ <i style="cursor: pointer;vertical-align: middle;" title="{{lang.linkDetails}}"
+ class="fa fa-info-circle fa-2x" (click)="backToDetails()"></i>
<select id="signatureBookActions">
<option *ngFor="let option of signatureBook.actions" value="{{option.id}}">{{option.label}}</option>
</select>
- <input name="send" id="send" value="{{lang.validate}}" class="button button-form-primary-filled" type="button" (click)="validForm()">
+ <input name="send" id="send" value="{{lang.validate}}" class="button button-form-primary-filled"
+ type="button" (click)="validForm()">
</div>
<div class="others" *ngIf="!functions.empty(signatureBook.consigne)">
<span id="consigne">
- <input type="text" value="{{signatureBook.consigne}}" title="{{signatureBook.consigne}}" readonly="readonly" class="inputConsigne">
+ <input type="text" value="{{signatureBook.consigne}}" title="{{signatureBook.consigne}}"
+ readonly="readonly" class="inputConsigne">
</span>
</div>
</div>
<div class="contentSignatureBook">
- <div class="resListContent" [ngStyle]="{'display': showResLeftPanel ? 'inline-block' : 'none'}" id="resListContent">
+ <div class="resListContent" [ngStyle]="{'display': showResLeftPanel ? 'inline-block' : 'none'}"
+ id="resListContent">
<div class="resListContentPos">
- <div class="resListContentFrame" *ngFor="let res of signatureBook.resList" (click)="changeLocation(res.res_id, 'view')" [ngClass]="{'resListContentFrameSelected': resId == res.res_id}">
+ <div class="resListContentFrame" *ngFor="let res of signatureBook.resList"
+ (click)="changeLocation(res.res_id, 'view')"
+ [ngClass]="{'resListContentFrameSelected': resId == res.res_id}">
<div class="resListContentInfo">
<i class="fa fa-compass" title="{{lang.chronoNumber}}"></i> {{res.alt_identifier}}
<i *ngIf="res.allSigned" class="fa fa-certificate"></i>
- <i class="fa fa-circle" title="{{res.priorityLabel}}" aria-hidden="true" [ngStyle]="{'color': res.priorityColor}" style="position: absolute;right: 0px;top: -10px;font-size: 25px;"></i>
+ <i class="fa fa-circle" title="{{res.priorityLabel}}" aria-hidden="true"
+ [ngStyle]="{'color': res.priorityColor}"
+ style="position: absolute;right: 0px;top: -10px;font-size: 25px;"></i>
</div>
<div class="resListContentInfo">
<i class="fa fa-info" title="{{lang.object}}"></i> {{res.subject}}
@@ -45,10 +59,12 @@
<i class="fa fa-book" title="{{lang.contactInfo}}"></i> {{res.sender}}
</div>
<div class="resListContentInfo">
- <i class="fa fa-calendar-alt" title="{{lang.arrivalDate}}"></i> {{res.creation_date | date:'dd/MM/y'}}
+ <i class="fa fa-calendar-alt" title="{{lang.arrivalDate}}"></i>
+ {{res.creation_date | date:'dd/MM/y'}}
</div>
<div class="resListContentInfo" style="margin-top:-10px;">
- <i class="fa fa-bell" title="{{lang.processLimitDate}}"></i> {{res.process_limit_date | date:'dd/MM/y'}}
+ <i class="fa fa-bell" title="{{lang.processLimitDate}}"></i>
+ {{res.process_limit_date | date:'dd/MM/y'}}
</div>
</div>
</div>
@@ -64,41 +80,54 @@
<div *ngIf="headerTab == 'document'" class="contentShow">
<div *ngIf="showTopLeftPanel" class="pjDoc">
<div style="height:100%;">
- <img title="{{document.title}}" id="thumnails_img" *ngFor="let document of signatureBook.documents; let i = index" (click)="changeLeftViewer(i)" [src]="coreUrl + document.thumbnailLink"
- class="leftPanelThumbnails" [ngClass]="{'panelSelectedThumbnail': i == leftSelectedThumbnail}"/>
+ <img title="{{document.title}}" id="thumnails_img"
+ *ngFor="let document of signatureBook.documents; let i = index"
+ (click)="changeLeftViewer(i)" [src]="coreUrl + document.thumbnailLink"
+ class="leftPanelThumbnails"
+ [ngClass]="{'panelSelectedThumbnail': i == leftSelectedThumbnail}" />
</div>
</div>
- <div *ngIf="signatureBook.documents.length - 1 > 0" class="pjDetailsMore" (click)="displayPanel('TOPLEFT')" title="{{signatureBook.documents.length - 1}} {{lang.mailAttachments}}" style="left:25px;">
+ <div *ngIf="signatureBook.documents.length - 1 > 0" class="pjDetailsMore"
+ (click)="displayPanel('TOPLEFT')"
+ title="{{signatureBook.documents.length - 1}} {{lang.mailAttachments}}" style="left:25px;">
<i *ngIf="!showTopLeftPanel" class="fa fa-envelope-square fa-2x" aria-hidden="true"></i>
- <sup *ngIf="!showTopLeftPanel" class="nbRes" style="position: absolute;right: 6px;top: 5px;">{{signatureBook.documents.length - 1}}</sup>
+ <sup *ngIf="!showTopLeftPanel" class="nbRes"
+ style="position: absolute;right: 6px;top: 5px;">{{signatureBook.documents.length - 1}}</sup>
<i *ngIf="showTopLeftPanel" class="fa fa-chevron-up" aria-hidden="true"></i>
</div>
- <pdf-viewer *ngIf="leftViewerLink != '' && (leftSelectedThumbnail == 0 || signatureBook.documents[leftSelectedThumbnail].format == 'pdf' || signatureBook.documents[leftSelectedThumbnail].isConverted)" id="leftPanelShowDocumentIframe" #leftPanelShowDocumentIframe [src]="leftViewerLink"
- [render-text]="true" [fit-to-page]="false" [original-size]="true"
- [ngStyle]="{'height': showTopLeftPanel ? '84%' : '99%'}" [show-all]="true"
- (error)="pdfViewerError(leftViewerLink)"
- ></pdf-viewer>
- <!-- <iframe *ngIf="leftViewerLink != '' && (leftSelectedThumbnail == 0 || signatureBook.documents[leftSelectedThumbnail].format == 'pdf' || signatureBook.documents[leftSelectedThumbnail].isConverted)" id="leftPanelShowDocumentIframe" [src]="leftViewerLink | safeUrl" [ngStyle]="{'height': showTopLeftPanel ? '84%' : '99%'}"></iframe> -->
- <div *ngIf="leftSelectedThumbnail > 0 && signatureBook.documents[leftSelectedThumbnail].format != 'pdf' && !signatureBook.documents[leftSelectedThumbnail].isConverted" [ngStyle]="{'height': showTopLeftPanel ? '79%' : '96%'}" class="visaNoPdfWarning">
- <div style="padding-top: 25%;">{{lang.noOverviewAvailable}}<br/><sub>{{lang.pdfVersionFile}} "{{signatureBook.documents[leftSelectedThumbnail].title}}.{{signatureBook.documents[leftSelectedThumbnail].format}}" {{lang.isNotAvailable}}.</sub></div>
+ <pdf-viewer
+ *ngIf="leftViewerLink != '' && (leftSelectedThumbnail == 0 || signatureBook.documents[leftSelectedThumbnail].format == 'pdf' || signatureBook.documents[leftSelectedThumbnail].isConverted)"
+ id="leftPanelShowDocumentIframe" #leftPanelShowDocumentIframe [src]="leftViewerLink"
+ [render-text]="true" [fit-to-page]="false" [original-size]="true"
+ [ngStyle]="{'height': showTopLeftPanel ? '84%' : '99%'}" [show-all]="true"
+ (error)="pdfViewerError(leftViewerLink)"></pdf-viewer>
+ <div *ngIf="leftSelectedThumbnail > 0 && signatureBook.documents[leftSelectedThumbnail].format != 'pdf' && !signatureBook.documents[leftSelectedThumbnail].isConverted"
+ [ngStyle]="{'height': showTopLeftPanel ? '79%' : '96%'}" class="visaNoPdfWarning">
+ <div style="padding-top: 25%;">{{lang.noOverviewAvailable}}<br /><sub>{{lang.pdfVersionFile}}
+ "{{signatureBook.documents[leftSelectedThumbnail].title}}.{{signatureBook.documents[leftSelectedThumbnail].format}}"
+ {{lang.isNotAvailable}}.</sub></div>
<div class="visaPjView">
- <a title="{{lang.dlAttachment}}" href="../../rest/attachments/{{signatureBook.documents[leftSelectedThumbnail].res_id}}/originalContent" target="_blank">
+ <a title="{{lang.dlAttachment}}"
+ href="../../rest/attachments/{{signatureBook.documents[leftSelectedThumbnail].res_id}}/originalContent"
+ target="_blank">
<i class="fa fa-download fa-2x"></i>
</a>
</div>
</div>
</div>
<div *ngIf="headerTab == 'notes'" class="contentShow" style="width:98%;">
- <app-notes-list #appNotesList [editMode]="true"
- [resId]="resId" (reloadBadgeNotes)="refreshBadge($event,'notes')">
+ <app-notes-list #appNotesList [editMode]="true" [resId]="resId"
+ (reloadBadgeNotes)="refreshBadge($event,'notes')">
</app-notes-list>
</div>
<div *ngIf="headerTab == 'visaCircuit'" class="contentShow" style="width:98%;overflow-x: hidden;">
<app-visa-workflow #appVisaWorkflow [resId]="resId"
- [adminMode]="privilegeService.hasCurrentUserPrivilege('config_visa_workflow')" [target]="'signatureBook'"></app-visa-workflow>
+ [adminMode]="privilegeService.hasCurrentUserPrivilege('config_visa_workflow')"
+ [target]="'signatureBook'"></app-visa-workflow>
<div style="position: sticky;bottom: 0px;text-align:right;">
- <button mat-fab [title]="lang.saveModifications" *ngIf="appVisaWorkflow !== undefined && appVisaWorkflow.isModified()" (click)="saveVisaWorkflow()"
- color="accent">
+ <button mat-fab [title]="lang.saveModifications"
+ *ngIf="appVisaWorkflow !== undefined && appVisaWorkflow.isModified()"
+ (click)="saveVisaWorkflow()" color="accent">
<mat-icon style="height:auto;font-size:20px;" class="fas fa-check"></mat-icon>
</button>
</div>
@@ -111,22 +140,28 @@
(reloadBadgeLinkedResources)="refreshBadge($event,'linkedResources')">
</app-linked-resource-list>
</div>
- <div class="hideRightContent" (click)="displayPanel('MIDDLE')" [ngStyle]="{'right': showRightPanel ? '-10px' : '0px'}">
+ <div class="hideRightContent" (click)="displayPanel('MIDDLE')"
+ [ngStyle]="{'right': showRightPanel ? '-10px' : '0px'}">
<i class="fa fa-chevron-right" aria-hidden="true" *ngIf="showRightPanel"></i>
<i class="fa fa-chevron-left" aria-hidden="true" *ngIf="!showRightPanel"></i>
</div>
</div>
<div *ngIf="showRightPanel" class="contentRight" id="contentRight" [ngStyle]="{'width': rightContentWidth}">
- <div class="hideLeftContent" (click)="displayPanel('LEFT')" id="hideLeftContent" [ngStyle]="{'margin-left': showLeftPanel ? '-13px' : '-2px'}">
+ <div class="hideLeftContent" (click)="displayPanel('LEFT')" id="hideLeftContent"
+ [ngStyle]="{'margin-left': showLeftPanel ? '-13px' : '-2px'}">
<i class="fa fa-chevron-left" aria-hidden="true" *ngIf="showLeftPanel"></i>
<i class="fa fa-chevron-right" aria-hidden="true" *ngIf="!showLeftPanel"></i>
</div>
<div class="contentShow" style="overflow: auto">
- <div *ngIf="signatureBook.attachments[rightSelectedThumbnail] && !showAttachmentPanel" style="height:100%;overflow: auto;">
+ <div *ngIf="signatureBook.attachments[rightSelectedThumbnail] && !showAttachmentPanel"
+ style="height:100%;overflow: auto;">
<div [ngStyle]="{'display': showTopRightPanel ? 'block' : 'none'}" class="pjDetails">
- <div class="infoPj" title="{{signatureBook.attachments[rightSelectedThumbnail].attachment_type}}">
+ <div class="infoPj"
+ title="{{signatureBook.attachments[rightSelectedThumbnail].attachment_type}}">
<label>Type : </label>
- <span>{{signatureBook.attachments[rightSelectedThumbnail].attachment_type}} <sup *ngIf="signatureBook.attachments[rightSelectedThumbnail].status == 'SIGN'" style="color:#135F7F;">{{lang.signed}}</sup></span>
+ <span>{{signatureBook.attachments[rightSelectedThumbnail].attachment_type}} <sup
+ *ngIf="signatureBook.attachments[rightSelectedThumbnail].status == 'SIGN'"
+ style="color:#135F7F;">{{lang.signed}}</sup></span>
</div>
<div class="infoPj" title="{{signatureBook.attachments[rightSelectedThumbnail].title}}">
<label>{{lang.object}} : </label>
@@ -137,11 +172,14 @@
<span>{{signatureBook.attachments[rightSelectedThumbnail].destUser}}</span>
</div>
<div>
- <div *ngIf="!signatureBook.attachments[rightSelectedThumbnail].updated_by" title="{{signatureBook.attachments[rightSelectedThumbnail].typist}}" class="infoPj">
+ <div *ngIf="!signatureBook.attachments[rightSelectedThumbnail].updated_by"
+ title="{{signatureBook.attachments[rightSelectedThumbnail].typist}}" class="infoPj">
<label>{{lang.createdBy}} : </label>
<span>{{signatureBook.attachments[rightSelectedThumbnail].typist}}</span>
</div>
- <div *ngIf="signatureBook.attachments[rightSelectedThumbnail].updated_by" title="{{lang.modifiedBy}} : {{signatureBook.attachments[rightSelectedThumbnail].updated_by}} le {{signatureBook.attachments[rightSelectedThumbnail].doc_date | date:'dd/MM/y'}}" class="infoPj">
+ <div *ngIf="signatureBook.attachments[rightSelectedThumbnail].updated_by"
+ title="{{lang.modifiedBy}} : {{signatureBook.attachments[rightSelectedThumbnail].updated_by}} le {{signatureBook.attachments[rightSelectedThumbnail].doc_date | date:'dd/MM/y'}}"
+ class="infoPj">
<label><i>*</i> {{lang.createdBy}} : </label>
<span>{{signatureBook.attachments[rightSelectedThumbnail].typist}}</span>
</div>
@@ -149,18 +187,22 @@
<label>{{lang.createdOn}} : </label>
<span>{{signatureBook.attachments[rightSelectedThumbnail].creation_date | date:'dd/MM/y à HH:mm'}}</span>
</div>
- <div class="infoPj" title="{{signatureBook.attachments[rightSelectedThumbnail].validation_date | date:'dd/MM/y'}}">
+ <div class="infoPj"
+ title="{{signatureBook.attachments[rightSelectedThumbnail].validation_date | date:'dd/MM/y'}}">
<label>{{lang.back}} : </label>
<span>{{signatureBook.attachments[rightSelectedThumbnail].validation_date | date:'dd/MM/y'}}</span>
</div>
- <div class="infoPj" title="{{signatureBook.attachments[rightSelectedThumbnail].identifier}}">
+ <div class="infoPj"
+ title="{{signatureBook.attachments[rightSelectedThumbnail].identifier}}">
<label>{{lang.chrono}} : </label>
<span>{{signatureBook.attachments[rightSelectedThumbnail].identifier}}</span>
</div>
<div class="infoPj">
<label>Version : </label>
<span>{{signatureBook.attachments[rightSelectedThumbnail].relation}}</span>
- <i [ngStyle]="{'display': signatureBook.attachments[rightSelectedThumbnail].relation > 1 ? '' : 'none'}" style="color:#135F7F" class="fa fa-chevron-circle-up" id="obsVersion" data-tooltip-content="#obsVersionTooltip" aria-hidden="true"></i>
+ <i [ngStyle]="{'display': signatureBook.attachments[rightSelectedThumbnail].relation > 1 ? '' : 'none'}"
+ style="color:#135F7F" class="fa fa-chevron-circle-up" id="obsVersion"
+ data-tooltip-content="#obsVersionTooltip" aria-hidden="true"></i>
</div>
<div class="infoPj">
<label>Format : </label>
@@ -172,80 +214,117 @@
<i *ngIf="!showTopRightPanel" class="fa fa-list-alt fa-2x" aria-hidden="true"></i>
<i *ngIf="showTopRightPanel" class="fa fa-chevron-up" aria-hidden="true"></i>
</div>
- <pdf-viewer #rightPanelShowDocumentIframe id="rightPanelShowDocumentIframe" [src]="rightViewerLink"
- [render-text]="true" [autoresize]="true" [original-size]="false"
- [ngStyle]="{'height': showTopRightPanel ? '84%' : '99%'}" [show-all]="true"
- *ngIf="signatureBook.attachments[rightSelectedThumbnail].isConverted"
- (error)="pdfViewerError(rightViewerLink)"
- ></pdf-viewer>
- <!-- <iframe id="rightPanelShowDocumentIframe" [src]="rightViewerLink | safeUrl" [ngStyle]="{'height': showTopRightPanel ? '84%' : '99%'}"></iframe> -->
- <div *ngIf="signatureBook.attachments[rightSelectedThumbnail].format != 'pdf' && signatureBook.attachments[rightSelectedThumbnail].status != 'TMP' && !signatureBook.attachments[rightSelectedThumbnail].isConverted" [ngStyle]="{'height': showTopRightPanel ? '79%' : '96%'}" class="visaNoPdfWarning">
- <div style="padding-top: 25%;">{{lang.noOverviewAvailable}}<br/><sub>{{lang.pdfVersionFile}} "{{signatureBook.attachments[rightSelectedThumbnail].title}}.{{signatureBook.attachments[rightSelectedThumbnail].format}}" {{lang.isNotAvailable}}.</sub></div>
+ <!--<pdf-viewer #rightPanelShowDocumentIframe id="rightPanelShowDocumentIframe" [src]="rightViewerLink"
+ [render-text]="true" [autoresize]="true" [original-size]="false"
+ [ngStyle]="{'height': showTopRightPanel ? '84%' : '99%'}" [show-all]="true"
+ *ngIf="signatureBook.attachments[rightSelectedThumbnail].isConverted"
+ (error)="pdfViewerError(rightViewerLink)"></pdf-viewer>-->
+ <app-document-viewer #appDocumentViewer id="rightPanelShowDocumentIframe"
+ *ngIf="signatureBook.attachments[rightSelectedThumbnail].isConverted"
+ style="height:100%;width:100%;" [editMode]="true"
+ [hideTools]="true"
+ [mode]="signatureBook.attachments[rightSelectedThumbnail].isResource ? 'mainDocument' : 'attachment'"
+ [resId]="signatureBook.attachments[rightSelectedThumbnail].res_id"
+ [title]="signatureBook.attachments[rightSelectedThumbnail].identifier">
+ </app-document-viewer>
+ <div *ngIf="signatureBook.attachments[rightSelectedThumbnail].format != 'pdf' && signatureBook.attachments[rightSelectedThumbnail].status != 'TMP' && !signatureBook.attachments[rightSelectedThumbnail].isConverted"
+ [ngStyle]="{'height': showTopRightPanel ? '79%' : '96%'}" class="visaNoPdfWarning">
+ <div style="padding-top: 25%;">{{lang.noOverviewAvailable}}<br /><sub>{{lang.pdfVersionFile}}
+ "{{signatureBook.attachments[rightSelectedThumbnail].title}}.{{signatureBook.attachments[rightSelectedThumbnail].format}}"
+ {{lang.isNotAvailable}}.</sub></div>
<div class="visaPjView">
- <a title="{{lang.dlAttachment}}" href="../../rest/attachments/{{signatureBook.attachments[rightSelectedThumbnail].res_id}}/originalContent" target="_blank">
+ <a title="{{lang.dlAttachment}}"
+ href="../../rest/attachments/{{signatureBook.attachments[rightSelectedThumbnail].res_id}}/originalContent"
+ target="_blank">
<i class="fa fa-download fa-2x"></i>
</a>
</div>
</div>
- <div *ngIf="signatureBook.attachments[rightSelectedThumbnail].status == 'TMP' && !signatureBook.attachments[rightSelectedThumbnail].isConverted" [ngStyle]="{'height': showTopRightPanel ? '79%' : '96%'}" class="visaNoPdfWarning">
+ <div *ngIf="signatureBook.attachments[rightSelectedThumbnail].status == 'TMP' && !signatureBook.attachments[rightSelectedThumbnail].isConverted"
+ [ngStyle]="{'height': showTopRightPanel ? '79%' : '96%'}" class="visaNoPdfWarning">
<div style="padding-top: 25%;" [innerHTML]="lang.editingAttachmentInterrupted"></div>
<div>
- <a title="{{lang.editAttachment}}" (click)="showAttachment(signatureBook.attachments[rightSelectedThumbnail])">
+ <a title="{{lang.editAttachment}}"
+ (click)="showAttachment(signatureBook.attachments[rightSelectedThumbnail])">
<i class="fa fa-edit fa-2x" style="cursor:pointer;"></i>
</a>
</div>
</div>
<div *ngIf="signatureBook.signatures[0] && signatureBook.canSign && signatureBook.attachments[rightSelectedThumbnail].status != 'TMP' && signatureBook.attachments[rightSelectedThumbnail].sign"
- (mouseenter)="showSignaturesPanel = true" (mouseleave)="showSignaturesPanel = false" class="pjSign" [ngClass]="[signatureBook.attachments[rightSelectedThumbnail].status == 'SIGN' ? 'signed' : '']" [ngStyle]="{'box-shadow': signatureBook.listinstance.requested_signature ? 'inset 0px 0px 5px 0px red' : 'inset 0px 0px 5px 0px #656565;'}">
- <span *ngIf="signatureBook.attachments[rightSelectedThumbnail].status != 'SIGN' && signatureBook.signatures[0]" style="cursor: pointer">
+ (mouseenter)="showSignaturesPanel = true" (mouseleave)="showSignaturesPanel = false"
+ class="pjSign"
+ [ngClass]="[signatureBook.attachments[rightSelectedThumbnail].status == 'SIGN' ? 'signed' : '']"
+ [ngStyle]="{'box-shadow': signatureBook.listinstance.requested_signature ? 'inset 0px 0px 5px 0px red' : 'inset 0px 0px 5px 0px #656565;'}">
+ <span
+ *ngIf="signatureBook.attachments[rightSelectedThumbnail].status != 'SIGN' && signatureBook.signatures[0]"
+ style="cursor: pointer">
<span *ngIf="!loadingSign">
- <img *ngFor="let signature of signatureBook.signatures; let i = index" src="../../rest/users/{{signature.user_serial_id}}/signatures/{{signature.id}}/content" (click)="signFile(signatureBook.attachments[rightSelectedThumbnail], signature)" [ngStyle]="{'display': !showSignaturesPanel && i > 0 ? 'none' : ''}" title="{{signature.signature_label}}">
+ <img *ngFor="let signature of signatureBook.signatures; let i = index"
+ src="../../rest/users/{{signature.user_serial_id}}/signatures/{{signature.id}}/content"
+ (click)="signFile(signatureBook.attachments[rightSelectedThumbnail], signature)"
+ [ngStyle]="{'display': !showSignaturesPanel && i > 0 ? 'none' : ''}"
+ title="{{signature.signature_label}}">
</span>
<i *ngIf="loadingSign" class="fa fa-spinner fa-pulse fa-2x fa-fw"></i>
</span>
- <span *ngIf="signatureBook.attachments[rightSelectedThumbnail].status == 'SIGN'" (click)="unsignFile(signatureBook.attachments[rightSelectedThumbnail])" style="cursor: pointer;color: green;">
+ <span *ngIf="signatureBook.attachments[rightSelectedThumbnail].status == 'SIGN'"
+ (click)="unsignFile(signatureBook.attachments[rightSelectedThumbnail])"
+ style="cursor: pointer;color: green;">
<i title="{{lang.unsign}}" class="fa fa-check fa-2x" aria-hidden="true"></i>
</span>
</div>
</div>
- <app-attachments-list *ngIf="showAttachmentPanel" #appAttachmentsList
- [resId]="resId" [target]="'process'"
- (reloadBadgeAttachments)="refreshAttachments()" (afterActionAttachment)="refreshAttachments()">
+ <app-attachments-list *ngIf="showAttachmentPanel" #appAttachmentsList [resId]="resId"
+ [target]="'process'" (reloadBadgeAttachments)="refreshAttachments()"
+ (afterActionAttachment)="refreshAttachments()">
</app-attachments-list>
</div>
<div class="visaNoWorkflowWarning">
- <div style="margin-top:200px;" [innerHTML]="noVisaWorkflowNoSignature"></div>
+ <div style="margin-top:200px;" [innerHTML]="lang.noVisaWorkflowNoSignature"></div>
</div>
<div *ngIf="!signatureBook.attachments[rightSelectedThumbnail]" class="visaNoPjWarning">
- <div style="margin-top:200px;" [innerHTML]="noAttachmentClickToAddOne"></div>
+ <div style="margin-top:200px;" [innerHTML]="lang.noAttachmentClickToAddOne"></div>
</div>
</div>
<div class="panelRight">
<div *ngIf="signatureBook.attachments" id="rightPanelContent" class="panelRightContent">
- <div title="[{{attachment.attachment_type}}] {{attachment.title}}" style="position: relative;" class="item" *ngFor="let attachment of signatureBook.attachments; let i = index" (click)="changeRightViewer(i)" [ngClass]="{'panelSelectedThumbnail': i == rightSelectedThumbnail && !showAttachmentPanel}">
+ <div title="[{{attachment.attachment_type}}] {{attachment.title}}" style="position: relative;"
+ class="item" *ngFor="let attachment of signatureBook.attachments; let i = index"
+ (click)="changeRightViewer(i)"
+ [ngClass]="{'panelSelectedThumbnail': i == rightSelectedThumbnail && !showAttachmentPanel}">
<span class="fa-stack fa-lg">
- <i class="far fa-file fa-stack-2x"></i><i style="font-weight:bold;letter-spacing: -1px;">{{attachment.icon}}</i>
+ <i class="far fa-file fa-stack-2x"></i><i
+ style="font-weight:bold;letter-spacing: -1px;">{{attachment.icon}}</i>
</span>
- <i *ngIf="attachment.sign && attachment.status == 'SIGN'" title="Le document a été signé" style="position: absolute;top: 12px;right: 6px;" class="fa fa-circle"></i>
- <i *ngIf="attachment.sign && attachment.status != 'SIGN' && attachment.status != 'TMP'" title="Le document n'a pas encore été signé" style="position: absolute;top: 12px;right: 6px;" class="far fa-circle"></i>
- <i *ngIf="attachment.sign && attachment.status == 'TMP'" style="color:green;-ms-transform: rotate(-35deg);-webkit-transform: rotate(-35deg);transform: rotate(-35deg);position: absolute;top: 39px;right: 1px;" >{{lang.draft}}</i>
- <br/><i style="position: absolute;margin-left: -9px;" >.{{attachment.format}}</i>
+ <i *ngIf="attachment.sign && attachment.status == 'SIGN'" title="Le document a été signé"
+ style="position: absolute;top: 12px;right: 6px;" class="fa fa-circle"></i>
+ <i *ngIf="attachment.sign && attachment.status != 'SIGN' && attachment.status != 'TMP'"
+ title="Le document n'a pas encore été signé" style="position: absolute;top: 12px;right: 6px;"
+ class="far fa-circle"></i>
+ <i *ngIf="attachment.sign && attachment.status == 'TMP'"
+ style="color:green;-ms-transform: rotate(-35deg);-webkit-transform: rotate(-35deg);transform: rotate(-35deg);position: absolute;top: 39px;right: 1px;">{{lang.draft}}</i>
+ <br /><i style="position: absolute;margin-left: -9px;">.{{attachment.format}}</i>
</div>
</div>
<div style="bottom: 0px;position: absolute;width:100%;">
- <div class="panelRightListPj" (click)="displayAttachmentPanel()" title="{{lang.displayAtt}}" [ngClass]="{'panelSelectedThumbnail': showAttachmentPanel}">
- <i class="fa fa-bars fa-2x" ></i>
+ <div class="panelRightListPj" (click)="displayAttachmentPanel()" title="{{lang.displayAtt}}"
+ [ngClass]="{'panelSelectedThumbnail': showAttachmentPanel}">
+ <i class="fa fa-bars fa-2x"></i>
</div>
- <hr style="background-color:#666;margin-top:0px;"/>
+ <hr style="background-color:#666;margin-top:0px;" />
<div class="panelRightAddPj" (click)="createAttachment()" title="{{lang.createAtt}}">
- <i class="fa fa-paperclip fa-2x" ></i>
+ <i class="fa fa-paperclip fa-2x"></i>
<i class="fa fa-plus" style="position:absolute;"></i>
</div>
<div *ngIf="signatureBook.attachments[rightSelectedThumbnail]">
- <div [ngClass]="{'visaDisabledButton': !signatureBook.attachments[rightSelectedThumbnail].canModify || signatureBook.attachments[rightSelectedThumbnail].status == 'SIGN'}" title="{{lang.updateAtt}}" class="visaPjUp" (click)="showAttachment(signatureBook.attachments[rightSelectedThumbnail])">
+ <div [ngClass]="{'visaDisabledButton': !signatureBook.attachments[rightSelectedThumbnail].canModify || signatureBook.attachments[rightSelectedThumbnail].status == 'SIGN'}"
+ title="{{lang.updateAtt}}" class="visaPjUp"
+ (click)="showAttachment(signatureBook.attachments[rightSelectedThumbnail])">
<i class="fa fa-edit fa-2x"></i>
</div>
- <div [ngClass]="{'visaDisabledButton': !signatureBook.attachments[rightSelectedThumbnail].canDelete}" title="{{lang.deleteAtt}}" class="visaPjDel" (click)="delAttachment(signatureBook.attachments[rightSelectedThumbnail])">
+ <div [ngClass]="{'visaDisabledButton': !signatureBook.attachments[rightSelectedThumbnail].canDelete}"
+ title="{{lang.deleteAtt}}" class="visaPjDel"
+ (click)="delAttachment(signatureBook.attachments[rightSelectedThumbnail])">
<i class="fa fa-trash-alt fa-2x"></i>
</div>
</div>
@@ -256,13 +335,15 @@
<div class="tooltip_templates" style="display: none">
<span id="obsVersionTooltip">
- <div *ngIf="signatureBook.attachments[rightSelectedThumbnail] && signatureBook.attachments[rightSelectedThumbnail].relation > 1">
+ <div
+ *ngIf="signatureBook.attachments[rightSelectedThumbnail] && signatureBook.attachments[rightSelectedThumbnail].relation > 1">
<div *ngFor="let version of signatureBook.attachments[rightSelectedThumbnail].obsAttachments">
<span>{{lang.version}} : </span>
<span>{{version.relation}}</span>
<span>{{lang.object}} : </span>
<span>{{version.title}}</span>
- <a style="color:#135F7F" title="{{lang.dlAttachment}}" href="../../rest/attachments/{{version.resId}}/originalContent" target="_blank">
+ <a style="color:#135F7F" title="{{lang.dlAttachment}}"
+ href="../../rest/attachments/{{version.resId}}/originalContent" target="_blank">
<i class="fa fa-download fa-2x"></i>
</a>
</div>
diff --git a/src/frontend/app/signature-book.component.ts b/src/frontend/app/signature-book.component.ts
index d19ac4bab90..180318639e0 100755
--- a/src/frontend/app/signature-book.component.ts
+++ b/src/frontend/app/signature-book.component.ts
@@ -1,4 +1,4 @@
-import { Pipe, PipeTransform, Component, OnInit, NgZone, ViewChild } from '@angular/core';
+import { Pipe, PipeTransform, Component, OnInit, NgZone, ViewChild, OnDestroy } from '@angular/core';
import { HttpClient } from '@angular/common/http';
import { DomSanitizer } from '@angular/platform-browser';
import { Router, ActivatedRoute } from '@angular/router';
@@ -15,6 +15,7 @@ import { VisaWorkflowComponent } from './visa/visa-workflow.component';
import { ActionsService } from './actions/actions.service';
import { HeaderService } from '../service/header.service';
import { AppService } from '../service/app.service';
+import { DocumentViewerComponent } from './viewer/document-viewer.component';
declare function $j(selector: string): any;
@@ -30,11 +31,11 @@ export class SafeUrlPipe implements PipeTransform {
}
@Component({
- templateUrl: "signature-book.component.html",
+ templateUrl: 'signature-book.component.html',
styleUrls: ['signature-book.component.scss'],
providers: [NotificationService]
})
-export class SignatureBookComponent implements OnInit {
+export class SignatureBookComponent implements OnInit, OnDestroy {
coreUrl: string;
resId: number;
@@ -44,7 +45,7 @@ export class SignatureBookComponent implements OnInit {
lang: any = LANG;
signatureBook: any = {
- consigne: "",
+ consigne: '',
documents: [],
attachments: [],
resList: [],
@@ -54,9 +55,9 @@ export class SignatureBookComponent implements OnInit {
rightSelectedThumbnail: number = 0;
leftSelectedThumbnail: number = 0;
- rightViewerLink: string = "";
- leftViewerLink: string = "";
- headerTab: string = "document";
+ rightViewerLink: string = '';
+ leftViewerLink: string = '';
+ headerTab: string = 'document';
showTopRightPanel: boolean = false;
showTopLeftPanel: boolean = false;
showResLeftPanel: boolean = true;
@@ -70,8 +71,8 @@ export class SignatureBookComponent implements OnInit {
subscription: Subscription;
currentResourceLock: any = null;
- leftContentWidth: string = "44%";
- rightContentWidth: string = "44%";
+ leftContentWidth: string = '44%';
+ rightContentWidth: string = '44%';
dialogRef: MatDialogRef<any>;
processTool: any[] = [
@@ -102,6 +103,7 @@ export class SignatureBookComponent implements OnInit {
];
@ViewChild('appVisaWorkflow', { static: false }) appVisaWorkflow: VisaWorkflowComponent;
+ @ViewChild('appDocumentViewer', { static: false }) appDocumentViewer: DocumentViewerComponent;
constructor(
public http: HttpClient,
@@ -118,9 +120,8 @@ export class SignatureBookComponent implements OnInit {
) {
(<any>window).pdfWorkerSrc = '../../node_modules/pdfjs-dist/build/pdf.worker.min.js';
- // Event after process action
+ // Event after process action
this.subscription = this.actionService.catchAction().subscribe(message => {
- clearInterval(this.currentResourceLock);
this.processAfterAction();
});
}
@@ -137,21 +138,23 @@ export class SignatureBookComponent implements OnInit {
this.userId = params['userId'];
this.signatureBook.resList = []; // This line is added because of manage action behaviour (processAfterAction is called twice)
- this.lockResource();
- this.http.get("../../rest/signatureBook/users/" + this.userId + "/groups/" + this.groupId + "/baskets/" + this.basketId + "/resources/" + this.resId)
+
+ this.actionService.lockResource(this.userId, this.groupId, this.basketId, [this.resId]);
+
+ this.http.get('../../rest/signatureBook/users/' + this.userId + '/groups/' + this.groupId + '/baskets/' + this.basketId + '/resources/' + this.resId)
.subscribe((data: any) => {
if (data.error) {
- location.hash = "";
- location.search = "";
+ location.hash = '';
+ location.search = '';
return;
}
this.signatureBook = data;
- this.headerTab = "document";
+ this.headerTab = 'document';
this.leftSelectedThumbnail = 0;
this.rightSelectedThumbnail = 0;
- this.leftViewerLink = "";
- this.rightViewerLink = "";
+ this.leftViewerLink = '';
+ this.rightViewerLink = '';
this.showLeftPanel = true;
this.showRightPanel = true;
this.showResLeftPanel = true;
@@ -159,27 +162,28 @@ export class SignatureBookComponent implements OnInit {
this.showTopRightPanel = false;
this.showAttachmentPanel = false;
- this.leftContentWidth = "44%";
- this.rightContentWidth = "44%";
+ this.leftContentWidth = '44%';
+ this.rightContentWidth = '44%';
if (this.signatureBook.documents[0]) {
this.leftViewerLink = this.signatureBook.documents[0].viewerLink;
if (this.signatureBook.documents[0].inSignatureBook) {
- this.headerTab = "visaCircuit";
+ this.headerTab = 'visaCircuit';
}
}
if (this.signatureBook.attachments[0]) {
this.rightViewerLink = this.signatureBook.attachments[0].viewerLink;
}
- this.signatureBook.resListIndex = this.signatureBook.resList.map((e: any) => { return e.res_id; }).indexOf(this.resId);
+ this.signatureBook.resListIndex = this.signatureBook.resList.map((e: any) => e.res_id).indexOf(this.resId);
- this.displayPanel("RESLEFT");
+ this.displayPanel('RESLEFT');
this.loading = false;
setTimeout(() => {
- $j("#rightPanelContent").niceScroll({ touchbehavior: false, cursorcolor: "#666", cursoropacitymax: 0.6, cursorwidth: 4 });
- if ($j(".tooltipstered").length == 0) {
- $j("#obsVersion").tooltipster({
+ $j('#rightPanelContent').niceScroll({ touchbehavior: false, cursorcolor: '#666', cursoropacitymax: 0.6, cursorwidth: '4' });
+
+ if ($j('.tooltipstered').length === 0) {
+ $j('#obsVersion').tooltipster({
interactive: true
});
}
@@ -196,40 +200,8 @@ export class SignatureBookComponent implements OnInit {
});
}
- lockResource() {
- this.http.put(`../../rest/resourcesList/users/${this.userId}/groups/${this.groupId}/baskets/${this.basketId}/lock`, { resources: [this.resId] }).pipe(
- catchError((err: any) => {
- this.notify.handleErrors(err);
- return of(false);
- })
- ).subscribe();
-
- this.currentResourceLock = setInterval(() => {
- this.http.put(`../../rest/resourcesList/users/${this.userId}/groups/${this.groupId}/baskets/${this.basketId}/lock`, { resources: [this.resId] }).pipe(
- catchError((err: any) => {
- if (err.status == 403) {
- clearInterval(this.currentResourceLock);
- }
- this.notify.handleErrors(err);
- return of(false);
- })
- ).subscribe();
- }, 50000);
- }
-
- unlockResource() {
- clearInterval(this.currentResourceLock);
-
- this.http.put(`../../rest/resourcesList/users/${this.userId}/groups/${this.groupId}/baskets/${this.basketId}/unlock`, { resources: [this.resId] }).pipe(
- catchError((err: any) => {
- this.notify.handleErrors(err);
- return of(false);
- })
- ).subscribe();
- }
-
loadActions() {
- this.http.get("../../rest/resourcesList/users/" + this.userId + "/groups/" + this.groupId + "/baskets/" + this.basketId + "/actions?resId=" + this.resId)
+ this.http.get('../../rest/resourcesList/users/' + this.userId + '/groups/' + this.groupId + '/baskets/' + this.basketId + '/actions?resId=' + this.resId)
.subscribe((data: any) => {
this.signatureBook.actions = data.actions;
}, (err) => {
@@ -238,11 +210,11 @@ export class SignatureBookComponent implements OnInit {
}
processAfterAction() {
- var idToGo = -1;
- var c = this.signatureBook.resList.length;
+ let idToGo = -1;
+ const c = this.signatureBook.resList.length;
for (let i = 0; i < c; i++) {
- if (this.signatureBook.resList[i].res_id == this.resId) {
+ if (this.signatureBook.resList[i].res_id === this.resId) {
if (this.signatureBook.resList[i + 1]) {
idToGo = this.signatureBook.resList[i + 1].res_id;
} else if (i > 0) {
@@ -253,10 +225,10 @@ export class SignatureBookComponent implements OnInit {
if (c > 0) { // This (if)line is added because of manage action behaviour (processAfterAction is called twice)
if (idToGo >= 0) {
- $j("#send").removeAttr("disabled");
- $j("#send").css("opacity", "1");
-
- this.changeLocation(idToGo, "action");
+ $j('#send').removeAttr('disabled');
+ $j('#send').css('opacity', '1');
+
+ this.changeLocation(idToGo, 'action');
} else {
this.backToBasket();
}
@@ -273,9 +245,10 @@ export class SignatureBookComponent implements OnInit {
if (this.signatureBook.attachments[index]) {
this.rightViewerLink = this.signatureBook.attachments[index].viewerLink;
} else {
- this.rightViewerLink = "";
+ this.rightViewerLink = '';
}
this.rightSelectedThumbnail = index;
+ this.appDocumentViewer.loadRessource(this.signatureBook.attachments[this.rightSelectedThumbnail].res_id, this.signatureBook.attachments[this.rightSelectedThumbnail].isResource ? 'mainDocument' : 'attachment');
}
changeLeftViewer(index: number) {
@@ -284,31 +257,31 @@ export class SignatureBookComponent implements OnInit {
}
displayPanel(panel: string) {
- if (panel == "TOPRIGHT") {
+ if (panel === 'TOPRIGHT') {
this.showTopRightPanel = !this.showTopRightPanel;
- } else if (panel == "TOPLEFT") {
+ } else if (panel === 'TOPLEFT') {
this.showTopLeftPanel = !this.showTopLeftPanel;
- } else if (panel == "LEFT") {
+ } else if (panel === 'LEFT') {
this.showLeftPanel = !this.showLeftPanel;
this.showResLeftPanel = false;
if (!this.showLeftPanel) {
- this.rightContentWidth = "96%";
- $j("#hideLeftContent").css('background', 'none');
+ this.rightContentWidth = '96%';
+ $j('#hideLeftContent').css('background', 'none');
} else {
- this.rightContentWidth = "48%";
- this.leftContentWidth = "48%";
- $j("#hideLeftContent").css('background', '#fbfbfb');
+ this.rightContentWidth = '48%';
+ this.leftContentWidth = '48%';
+ $j('#hideLeftContent').css('background', '#fbfbfb');
}
- } else if (panel == "RESLEFT") {
+ } else if (panel === 'RESLEFT') {
this.showResLeftPanel = !this.showResLeftPanel;
if (!this.showResLeftPanel) {
- this.rightContentWidth = "48%";
- this.leftContentWidth = "48%";
+ this.rightContentWidth = '48%';
+ this.leftContentWidth = '48%';
} else {
- this.rightContentWidth = "44%";
- this.leftContentWidth = "44%";
- if (this.signatureBook.resList.length == 0 || typeof this.signatureBook.resList[0].creation_date === 'undefined') {
- this.http.get("../../rest/signatureBook/users/" + this.userId + "/groups/" + this.groupId + "/baskets/" + this.basketId + "/resources")
+ this.rightContentWidth = '44%';
+ this.leftContentWidth = '44%';
+ if (this.signatureBook.resList.length === 0 || typeof this.signatureBook.resList[0].creation_date === 'undefined') {
+ this.http.get('../../rest/signatureBook/users/' + this.userId + '/groups/' + this.groupId + '/baskets/' + this.basketId + '/resources')
.subscribe((data: any) => {
this.signatureBook.resList = data.resources;
this.signatureBook.resList.forEach((value: any, index: number) => {
@@ -317,23 +290,23 @@ export class SignatureBookComponent implements OnInit {
}
});
setTimeout(() => {
- $j("#resListContent").niceScroll({ touchbehavior: false, cursorcolor: "#666", cursoropacitymax: 0.6, cursorwidth: 4 });
- $j("#resListContent").scrollTop(0);
- $j("#resListContent").scrollTop($j(".resListContentFrameSelected").offset().top - 42);
+ $j('#resListContent').niceScroll({ touchbehavior: false, cursorcolor: '#666', cursoropacitymax: 0.6, cursorwidth: '4' });
+ $j('#resListContent').scrollTop(0);
+ $j('#resListContent').scrollTop($j('.resListContentFrameSelected').offset().top - 42);
}, 0);
});
}
}
- } else if (panel == "MIDDLE") {
+ } else if (panel === 'MIDDLE') {
this.showRightPanel = !this.showRightPanel;
this.showResLeftPanel = false;
if (!this.showRightPanel) {
- this.leftContentWidth = "96%";
- $j("#contentLeft").css('border-right', 'none');
+ this.leftContentWidth = '96%';
+ $j('#contentLeft').css('border-right', 'none');
} else {
- this.rightContentWidth = "48%";
- this.leftContentWidth = "48%";
- $j("#contentLeft").css('border-right', 'solid 1px');
+ this.rightContentWidth = '48%';
+ this.leftContentWidth = '48%';
+ $j('#contentLeft').css('border-right', 'solid 1px');
}
}
}
@@ -346,27 +319,26 @@ export class SignatureBookComponent implements OnInit {
}
}
- refreshAttachments(mode: string) {
- if (mode == "rightContent") {
- this.http.get(this.coreUrl + 'rest/signatureBook/' + this.resId + '/incomingMailAttachments')
+ refreshAttachments(mode: string = 'rightContent') {
+ if (mode === 'rightContent') {
+ this.http.get('../../rest/signatureBook/' + this.resId + '/incomingMailAttachments')
.subscribe((data: any) => {
this.signatureBook.documents = data;
});
-
} else {
- this.http.get(this.coreUrl + 'rest/signatureBook/' + this.resId + '/attachments')
+ this.http.get('../../rest/signatureBook/' + this.resId + '/attachments')
.subscribe((data: any) => {
- var i = 0;
- if (mode == "add") {
- var found = false;
+ let i = 0;
+ if (mode === 'add') {
+ let found = false;
data.forEach((elem: any, index: number) => {
if (!found && (!this.signatureBook.attachments[index] || elem.res_id != this.signatureBook.attachments[index].res_id)) {
i = index;
found = true;
}
});
- } else if (mode == "edit") {
- var id = this.signatureBook.attachments[this.rightSelectedThumbnail].res_id;
+ } else if (mode === 'edit') {
+ const id = this.signatureBook.attachments[this.rightSelectedThumbnail].res_id;
data.forEach((elem: any, index: number) => {
if (elem.res_id == id) {
i = index;
@@ -376,9 +348,9 @@ export class SignatureBookComponent implements OnInit {
this.signatureBook.attachments = data;
- if (mode == "add" || mode == "edit") {
+ if (mode === 'add' || mode === 'edit') {
this.changeRightViewer(i);
- } else if (mode == "del") {
+ } else if (mode === 'del') {
this.changeRightViewer(0);
}
});
@@ -387,10 +359,11 @@ export class SignatureBookComponent implements OnInit {
delAttachment(attachment: any) {
if (attachment.canDelete) {
+ let r = false;
if (this.signatureBook.attachments.length <= 1) {
- var r = confirm('Attention, ceci est votre dernière pièce jointe pour ce courrier, voulez-vous vraiment la supprimer ?');
+ r = confirm('Attention, ceci est votre dernière pièce jointe pour ce courrier, voulez-vous vraiment la supprimer ?');
} else {
- var r = confirm('Voulez-vous vraiment supprimer la pièce jointe ?');
+ r = confirm('Voulez-vous vraiment supprimer la pièce jointe ?');
}
if (r) {
this.http.delete('../../rest/attachments/' + attachment.res_id).pipe(
@@ -409,21 +382,23 @@ export class SignatureBookComponent implements OnInit {
signFile(attachment: any, signature: any) {
if (!this.loadingSign && this.signatureBook.canSign) {
this.loadingSign = true;
- var route = attachment.isResource ? '../../rest/resources/' + attachment.res_id + '/sign' : '../../rest/attachments/' + attachment.res_id + '/sign';
+ const route = attachment.isResource ? '../../rest/resources/' + attachment.res_id + '/sign' : '../../rest/attachments/' + attachment.res_id + '/sign';
this.http.put(route, { 'signatureId': signature.id })
.subscribe((data: any) => {
if (!attachment.isResource) {
- this.rightViewerLink = "../../rest/attachments/" + data.id + "/content";
+ this.appDocumentViewer.loadRessource(data.id, 'attachment');
+ this.rightViewerLink = '../../rest/attachments/' + data.id + '/content';
this.signatureBook.attachments[this.rightSelectedThumbnail].status = 'SIGN';
this.signatureBook.attachments[this.rightSelectedThumbnail].idToDl = data.new_id;
} else {
- this.rightViewerLink += "?tsp=" + Math.floor(Math.random() * 100);
+ this.appDocumentViewer.loadRessource(attachment.res_id, 'mainDocument');
+ this.rightViewerLink += '?tsp=' + Math.floor(Math.random() * 100);
this.signatureBook.attachments[this.rightSelectedThumbnail].status = 'SIGN';
}
this.signatureBook.attachments[this.rightSelectedThumbnail].viewerLink = this.rightViewerLink;
- var allSigned = true;
+ let allSigned = true;
this.signatureBook.attachments.forEach((value: any) => {
- if (value.sign && value.status != 'SIGN') {
+ if (value.sign && value.status !== 'SIGN') {
allSigned = false;
}
});
@@ -444,33 +419,35 @@ export class SignatureBookComponent implements OnInit {
if (attachment.isResource) {
this.http.put('../../rest/resources/' + attachment.res_id + '/unsign', {})
.subscribe(() => {
- this.rightViewerLink += "?tsp=" + Math.floor(Math.random() * 100);
+ this.appDocumentViewer.loadRessource(attachment.res_id, 'maintDocument');
+ this.rightViewerLink += '?tsp=' + Math.floor(Math.random() * 100);
this.signatureBook.attachments[this.rightSelectedThumbnail].status = 'A_TRA';
if (this.signatureBook.resList.length > 0) {
this.signatureBook.resList[this.signatureBook.resListIndex].allSigned = false;
}
- if (this.headerTab == "visaCircuit") {
- this.changeSignatureBookLeftContent("document");
+ if (this.headerTab === 'visaCircuit') {
+ this.changeSignatureBookLeftContent('document');
setTimeout(() => {
- this.changeSignatureBookLeftContent("visaCircuit");
+ this.changeSignatureBookLeftContent('visaCircuit');
}, 0);
}
});
} else {
this.http.put('../../rest/attachments/' + attachment.res_id + '/unsign', {})
.subscribe(() => {
- this.rightViewerLink = "../../rest/attachments/" + attachment.res_id + "/content";
+ this.appDocumentViewer.loadRessource(attachment.res_id, 'attachment');
+ this.rightViewerLink = '../../rest/attachments/' + attachment.res_id + '/content';
this.signatureBook.attachments[this.rightSelectedThumbnail].viewerLink = this.rightViewerLink;
this.signatureBook.attachments[this.rightSelectedThumbnail].status = 'A_TRA';
this.signatureBook.attachments[this.rightSelectedThumbnail].idToDl = attachment.res_id;
if (this.signatureBook.resList.length > 0) {
this.signatureBook.resList[this.signatureBook.resListIndex].allSigned = false;
}
- if (this.headerTab == "visaCircuit") {
- this.changeSignatureBookLeftContent("document");
+ if (this.headerTab === 'visaCircuit') {
+ this.changeSignatureBookLeftContent('document');
setTimeout(() => {
- this.changeSignatureBookLeftContent("visaCircuit");
+ this.changeSignatureBookLeftContent('visaCircuit');
}, 0);
}
@@ -480,13 +457,8 @@ export class SignatureBookComponent implements OnInit {
}
backToBasket() {
- let path = '/basketList/users/' + this.userId + '/groups/' + this.groupId + '/baskets/' + this.basketId;
- this.http.put('../../rest/resourcesList/users/' + this.userId + '/groups/' + this.groupId + '/baskets/' + this.basketId + '/unlock', { resources: [this.resId] })
- .subscribe((data: any) => {
- this.router.navigate([path]);
- }, (err: any) => {
- this.router.navigate([path]);
- });
+ const path = '/basketList/users/' + this.userId + '/groups/' + this.groupId + '/baskets/' + this.basketId;
+ this.router.navigate([path]);
}
backToDetails() {
@@ -494,36 +466,34 @@ export class SignatureBookComponent implements OnInit {
.subscribe((data: any) => {
this.router.navigate([`/resources/${this.resId}`]);
}, (err: any) => { });
-
}
- changeLocation(resId: number, origin: string) {
- this.http.put('../../rest/resourcesList/users/' + this.userId + '/groups/' + this.groupId + '/baskets/' + this.basketId + '/lock', { resources: [resId] })
- .subscribe((data: any) => {
- if (data.countLockedResources > 0) {
- alert(data.countLockedResources + ' ' + this.lang.warnLockRes + '.');
- } else {
- let path = "signatureBook/users/" + this.userId + "/groups/" + this.groupId + "/baskets/" + this.basketId + "/resources/" + resId;
- this.router.navigate([path]);
- }
- }, (err: any) => {
- this.notify.handleErrors(err);
- });
+ async changeLocation(resId: number, origin: string) {
+ const data: any = await this.actionService.canExecuteAction([resId], this.userId, this.groupId, this.basketId);
+
+ if (data === true) {
+ this.actionService.stopRefreshResourceLock();
+ this.actionService.unlockResource(this.userId, this.groupId, this.basketId, [this.resId]);
+ const path = 'signatureBook/users/' + this.userId + '/groups/' + this.groupId + '/baskets/' + this.basketId + '/resources/' + resId;
+ this.router.navigate([path]);
+ } else {
+ this.backToBasket();
+ }
}
validForm() {
- if ($j("#signatureBookActions option:selected")[0].value != "") {
+ if ($j('#signatureBookActions option:selected').val() !== '') {
this.processAction();
} else {
- alert("Aucune action choisie");
+ alert('Aucune action choisie');
}
}
processAction() {
this.http.get(`../../rest/resources/${this.resId}?light=true`).pipe(
tap((data: any) => {
- let actionId = $j("#signatureBookActions option:selected")[0].value;
- let selectedAction = this.signatureBook.actions.filter((action: any) => action.id == actionId)[0];
+ const actionId = $j('#signatureBookActions option:selected').val();
+ const selectedAction = this.signatureBook.actions.filter((action: any) => action.id == actionId)[0];
this.actionService.launchAction(selectedAction, this.userId, this.groupId, this.basketId, [this.resId], data, false);
}),
catchError((err: any) => {
@@ -567,19 +537,23 @@ export class SignatureBookComponent implements OnInit {
}
showAttachment(attachment: any) {
- if (attachment.canModify && attachment.status != "SIGN") {
- this.dialogRef = this.dialog.open(AttachmentPageComponent, { height: '99vh', width: this.appService.getViewMode() ? '99vw' : '90vw', maxWidth: this.appService.getViewMode() ? '99vw' : '90vw', panelClass: 'attachment-modal-container', disableClose: true, data: { resId: attachment.res_id } });
-
- this.dialogRef.afterClosed().pipe(
- filter((data: string) => data === 'success'),
- tap(() => {
- this.refreshAttachments('edit');
- }),
- catchError((err: any) => {
- this.notify.handleErrors(err);
- return of(false);
- })
- ).subscribe();
+ if (attachment.canModify && attachment.status !== 'SIGN') {
+ if (attachment.isResource) {
+ this.appDocumentViewer.editResource();
+ } else {
+ this.dialogRef = this.dialog.open(AttachmentPageComponent, { height: '99vh', width: this.appService.getViewMode() ? '99vw' : '90vw', maxWidth: this.appService.getViewMode() ? '99vw' : '90vw', panelClass: 'attachment-modal-container', disableClose: true, data: { resId: attachment.res_id } });
+
+ this.dialogRef.afterClosed().pipe(
+ filter((data: string) => data === 'success'),
+ tap(() => {
+ this.refreshAttachments('edit');
+ }),
+ catchError((err: any) => {
+ this.notify.handleErrors(err);
+ return of(false);
+ })
+ ).subscribe();
+ }
}
}
@@ -588,6 +562,9 @@ export class SignatureBookComponent implements OnInit {
}
ngOnDestroy() {
+ this.actionService.stopRefreshResourceLock();
+ this.actionService.unlockResource(this.userId, this.groupId, this.basketId, [this.resId]);
+
// unsubscribe to ensure no memory leaks
this.subscription.unsubscribe();
}
@@ -596,9 +573,11 @@ export class SignatureBookComponent implements OnInit {
this.http.get(viewerLink)
.pipe(
catchError((err: any) => {
- this.notify.handleSoftErrors(err);
+ if (err.status !== 200) {
+ this.notify.handleSoftErrors(err);
+ }
return of(false);
})
- ).subscribe()
+ ).subscribe();
}
}
diff --git a/src/frontend/app/viewer/document-viewer.component.html b/src/frontend/app/viewer/document-viewer.component.html
index 83225ce677c..cec43ecdc4a 100644
--- a/src/frontend/app/viewer/document-viewer.component.html
+++ b/src/frontend/app/viewer/document-viewer.component.html
@@ -42,7 +42,7 @@
<input type="file" #docToUpload [ngModel]="docToUploadValue" name="files[]" (change)="uploadTrigger($event)" style="display:none;">
<div style="display: block;width:100%;" appUploadFileDragDrop (onFileDropped)="dndUploadFile($event)"
[disabled]="!editMode">
- <div *ngIf="!loading && file.content !== null" class="viewer-tools">
+ <div *ngIf="!loading && file.content !== null && !hideTools" class="viewer-tools">
<button mat-icon-button (click)="downloadOriginalFile()" [matTooltip]="lang.downloadOriginalFile">
<mat-icon class="fa fa-download"></mat-icon>
</button>
@@ -124,7 +124,7 @@
<mat-icon style="height:auto;font-size:20px;" class="fas fa-check"></mat-icon>
</button>
<button mat-raised-button
- *ngIf="!isDocModified && mode === 'mainDocument' && resId !== null && !functions.empty(file.subinfos) && file.subinfos.signedDocVersions && (privilegeService.hasCurrentUserPrivilege('sign_document') || this.headerService.user.id == file.creatorId)"
+ *ngIf="(!isDocModified && mode === 'mainDocument' && resId !== null && !functions.empty(file.subinfos) && file.subinfos.signedDocVersions && (privilegeService.hasCurrentUserPrivilege('sign_document') || this.headerService.user.id == file.creatorId)) && !hideTools"
color="warn"
[title]="lang.unsign" style="position: fixed;z-index: 1;bottom: 100px;right: 150px;"
(click)="unsignMainDocument()">
diff --git a/src/frontend/app/viewer/document-viewer.component.ts b/src/frontend/app/viewer/document-viewer.component.ts
index 115cf7447e4..e75c27ba779 100755
--- a/src/frontend/app/viewer/document-viewer.component.ts
+++ b/src/frontend/app/viewer/document-viewer.component.ts
@@ -5,7 +5,6 @@ import { NotificationService } from '../notification.service';
import { HeaderService } from '../../service/header.service';
import { AppService } from '../../service/app.service';
import { tap, catchError, filter, map, exhaustMap } from 'rxjs/operators';
-import { of, Subject } from 'rxjs';
import { ConfirmComponent } from '../../plugins/modal/confirm.component';
import { MatDialogRef, MatDialog } from '@angular/material';
import { AlertComponent } from '../../plugins/modal/alert.component';
@@ -16,12 +15,12 @@ import { EcplOnlyofficeViewerComponent } from '../../plugins/onlyoffice-api-js/o
import { FunctionsService } from '../../service/functions.service';
import { DocumentViewerModalComponent } from './modal/document-viewer-modal.component';
import { PrivilegeService } from '../../service/privileges.service';
-import { VisaWorkflowModalComponent } from "../visa/modal/visa-workflow-modal.component";
-
+import { VisaWorkflowModalComponent } from '../visa/modal/visa-workflow-modal.component';
+import { of, Subject } from 'rxjs';
@Component({
selector: 'app-document-viewer',
- templateUrl: "document-viewer.component.html",
+ templateUrl: 'document-viewer.component.html',
styleUrls: [
'document-viewer.component.scss',
'../indexation/indexing-form/indexing-form.component.scss',
@@ -34,50 +33,55 @@ export class DocumentViewerComponent implements OnInit {
/**
* document name stored in server (in tmp folder)
*/
- @Input('tmpFilename') tmpFilename: string;
+ @Input() tmpFilename: string;
/**
* base64 of document (@format is required!)
*/
- @Input('base64') base64: any = null;
- @Input('format') format: string = null;
+ @Input() base64: any = null;
+ @Input() format: string = null;
/**
* Target of resource (document or attachment)
*/
- @Input('mode') mode: 'mainDocument' | 'attachment' = 'mainDocument';
+ @Input() mode: 'mainDocument' | 'attachment' = 'mainDocument';
/**
* Resource of document or attachment (based on @mode)
*/
- @Input('resId') resId: number = null;
+ @Input() resId: number = null;
/**
* Resource of document link to attachment (@mode = 'attachment' required!)
*/
- @Input('resIdMaster') resIdMaster: number = null;
+ @Input() resIdMaster: number = null;
/**
* Can manage document ? (create, delete, update)
*/
- @Input('editMode') editMode: boolean = false;
+ @Input() editMode: boolean = false;
+
+ /**
+ * Hide tool document viewer
+ */
+ @Input() hideTools: boolean = false;
/**
* Title of new tab when open document in external tab
*/
- @Input('title') title: string = '';
+ @Input() title: string = '';
/**
* To load specific attachment type in template list (to create document)
*/
- @Input('attachType') attachType: string = null;
+ @Input() attachType: string = null;
/**
* Event emitter
*/
- @Output('triggerEvent') triggerEvent = new EventEmitter<string>();
+ @Output() triggerEvent = new EventEmitter<string>();
lang: any = LANG;
@@ -157,7 +161,7 @@ export class DocumentViewerComponent implements OnInit {
extension: '.' + ext.extension.toLowerCase(),
mimeType: ext.mimeType,
canConvert: ext.canConvert
- }
+ };
});
this.allowedExtensions = this.sortPipe.transform(this.allowedExtensions, 'extension');
@@ -186,7 +190,7 @@ export class DocumentViewerComponent implements OnInit {
if (!this.functions.empty(this.base64)) {
this.loadFileFromBase64();
- } else if (this.tmpFilename != '' && this.tmpFilename !== undefined) {
+ } else if (this.tmpFilename !== '' && this.tmpFilename !== undefined) {
this.http.get('../../rest/convertedFile/' + this.tmpFilename).pipe(
tap((data: any) => {
this.file = {
@@ -260,7 +264,7 @@ export class DocumentViewerComponent implements OnInit {
if (fileInput.target.files && fileInput.target.files[0] && this.isExtensionAllowed(fileInput.target.files[0])) {
this.initUpload();
- var reader = new FileReader();
+ const reader = new FileReader();
this.file.name = fileInput.target.files[0].name;
this.file.type = fileInput.target.files[0].type;
this.file.format = this.file.name.split('.').pop();
@@ -297,7 +301,7 @@ export class DocumentViewerComponent implements OnInit {
}
getBase64Document(buffer: ArrayBuffer) {
- let TYPED_ARRAY = new Uint8Array(buffer);
+ const TYPED_ARRAY = new Uint8Array(buffer);
const STRING_CHAR = TYPED_ARRAY.reduce((data, byte) => {
return data + String.fromCharCode(byte);
}, '');
@@ -306,10 +310,10 @@ export class DocumentViewerComponent implements OnInit {
}
base64ToArrayBuffer(base64: string) {
- var binary_string = window.atob(base64);
- var len = binary_string.length;
- var bytes = new Uint8Array(len);
- for (var i = 0; i < len; i++) {
+ const binary_string = window.atob(base64);
+ const len = binary_string.length;
+ const bytes = new Uint8Array(len);
+ for (let i = 0; i < len; i++) {
bytes[i] = binary_string.charCodeAt(i);
}
return bytes.buffer;
@@ -355,13 +359,13 @@ export class DocumentViewerComponent implements OnInit {
);
} else {
this.noConvertedFound = true;
- this.loading = false
+ this.loading = false;
}
}
upload(data: any) {
- let uploadURL = `../../rest/convertedFile`;
+ const uploadURL = `../../rest/convertedFile`;
return this.http.post<any>(uploadURL, data, {
reportProgress: true,
@@ -444,7 +448,7 @@ export class DocumentViewerComponent implements OnInit {
content: null,
src: null
};
- this.docToUploadValue = "";
+ this.docToUploadValue = '';
this.triggerEvent.emit('cleanFile');
}),
catchError((err: any) => {
@@ -521,7 +525,7 @@ export class DocumentViewerComponent implements OnInit {
}
downloadOriginalFile() {
- let downloadLink = document.createElement('a');
+ const downloadLink = document.createElement('a');
if (this.file.contentMode === 'base64') {
downloadLink.href = `data:${this.file.type};base64,${this.file.content}`;
} else {
@@ -544,7 +548,9 @@ export class DocumentViewerComponent implements OnInit {
newWindow.document.title = this.title;
}
- async loadRessource(resId: any, target: string = 'mainDocument') {
+ async loadRessource(resId: any, target: any = 'mainDocument') {
+ this.resId = resId;
+ this.mode = target;
this.loading = true;
if (target === 'attachment') {
this.requestWithLoader(`../../rest/attachments/${resId}/content?mode=base64`).subscribe(
@@ -653,7 +659,7 @@ export class DocumentViewerComponent implements OnInit {
editTemplate(templateId: number) {
let confirmMsg = '';
- if (this.mode == 'attachment') {
+ if (this.mode === 'attachment') {
confirmMsg = this.lang.editionAttachmentConfirmFirst + '<br><br>' + this.lang.editionAttachmentConfirmThird;
} else {
confirmMsg = this.lang.editionAttachmentConfirmFirst + '<br><br>' + this.lang.editionAttachmentConfirmSecond;
@@ -670,7 +676,7 @@ export class DocumentViewerComponent implements OnInit {
tap(() => {
this.triggerEvent.emit();
- const template = this.listTemplates.filter(template => template.id === templateId)[0];
+ const template = this.listTemplates.filter(templateItem => templateItem.id === templateId)[0];
this.file.format = template.extension;
@@ -753,7 +759,6 @@ export class DocumentViewerComponent implements OnInit {
}
editMainDocument() {
-
if (this.editor.mode === 'onlyoffice') {
this.editor.async = false;
this.editor.options = {
@@ -812,7 +817,7 @@ export class DocumentViewerComponent implements OnInit {
}
loadTemplatesByResId(resId: number, attachType: string) {
- let arrValues: any[] = [];
+ const arrValues: any[] = [];
let arrTypes: any = [];
this.listTemplates = [];
this.http.get('../../rest/attachmentsTypes').pipe(
@@ -865,8 +870,8 @@ export class DocumentViewerComponent implements OnInit {
loadTemplates() {
if (this.listTemplates.length === 0) {
- let arrValues: any[] = [];
- if (this.mode == 'mainDocument') {
+ const arrValues: any[] = [];
+ if (this.mode === 'mainDocument') {
this.http.get('../../rest/currentUser/templates?target=indexingFile').pipe(
tap((data: any) => {
this.listTemplates = data.templates;
@@ -960,13 +965,13 @@ export class DocumentViewerComponent implements OnInit {
}
saveMainDocument() {
- return new Promise((resolve, reject) => {
+ return new Promise((resolve) => {
this.getFile().pipe(
map((data: any) => {
const formatdatas = {
encodedFile: data.content,
- format: data.format,
- resId: this.resId
+ format: data.format,
+ resId: this.resId
};
return formatdatas;
}),
diff --git a/src/frontend/service/app.guard.ts b/src/frontend/service/app.guard.ts
index c0158e2788e..3f32746cce9 100644
--- a/src/frontend/service/app.guard.ts
+++ b/src/frontend/service/app.guard.ts
@@ -66,9 +66,9 @@ export class AfterProcessGuard implements CanDeactivate<ProcessComponent> {
constructor() { }
async canDeactivate(component: ProcessComponent): Promise<boolean> {
- if (!component.isActionEnded() && !component.detailMode) {
+ /* if (!component.isActionEnded() && !component.detailMode) {
component.unlockResource();
- }
+ }*/
if ((component.isToolModified() && !component.isModalOpen()) || (component.appDocumentViewer !== undefined && component.appDocumentViewer.isEditingTemplate())) {
if (confirm(component.lang.saveModifiedData)) {
@@ -84,4 +84,4 @@ export class AfterProcessGuard implements CanDeactivate<ProcessComponent> {
}*/
return true;
}
-}
\ No newline at end of file
+}
--
GitLab