diff --git a/lang/fr.json b/lang/fr.json
index 931d5dad7c7ea08d96ed701f95286068832d73bd..2eaec4fefbc186a4d7aa4e838a978cba1d93dc18 100755
--- a/lang/fr.json
+++ b/lang/fr.json
@@ -404,6 +404,7 @@
"certifiedDocument": "Document certifié",
"certifiedDocumentMsg": "Le document a été signé par certificat numérique, vous ne pouvez pas apposer de griffe.",
"errorUserSignType": "Les signataires sans certificat doivent être présent avant les signataires avec certificat.",
- "fortifyReadException": "Erreur lors de la communication avec Fortify"
+ "fortifyReadException": "Erreur lors de la communication avec Fortify",
+ "certifiedDocumentMsg2": "Document certifié ! Les annotations sur le document ne seront pas prise en compte !"
}
}
diff --git a/src/frontend/app/administration/connection/connection.component.html b/src/frontend/app/administration/connection/connection.component.html
index 850c2668ec6961924e06f6875621b6c800f3b289..bd9387f2c9d45b461aa4064ca7e6f75dc6e0a63b 100644
--- a/src/frontend/app/administration/connection/connection.component.html
+++ b/src/frontend/app/administration/connection/connection.component.html
@@ -31,46 +31,4 @@
</ion-col>
</ion-row>
</ion-grid>
-</ion-content>
-
-<!--<mat-sidenav-container autosize>
- <mat-sidenav #snav [disableClose]="!signaturesService.mobileMode"
- [mode]="signaturesService.mobileMode ? 'over': 'side'" fixedInViewport="true"
- [opened]="!signaturesService.mobileMode" [style.width.px]="350">
- <app-admin-sidebar [snavLeftComponent]="this.snav" [snavRightComponent]="this.snavRight"></app-admin-sidebar>
- </mat-sidenav>
- <mat-sidenav-content class="mainView">
- <header class="header">
- <button *ngIf="signaturesService.mobileMode" mat-icon-button (click)="this.snav.toggle();">
- <mat-icon fontSet="fas" fontIcon="fa-bars" style="font-size: 24px;"></mat-icon>
- </button> {{'lang.manage_connections' | translate}}
- </header>
- <div class="container">
- <div *ngIf="loading" class="loader">
- <mat-spinner></mat-spinner>
- </div>
- <div *ngIf="currentConnection" class="connectionType">
- <button mat-stroked-button [matMenuTriggerFor]="menu">{{'lang.connectionMode' | translate}} :
- <b>{{'lang.' + currentConnection.id + 'Connection' | translate}}</b><i class="fa fa-caret-down"></i></button>
- <mat-menu #menu="matMenu" [class]="'listMenu'">
- <ng-container *ngFor="let connection of connectionList">
- <button mat-menu-item *ngIf="connection.id !== currentConnection.id" (click)="changeConnection(connection)"
- [disabled]="!connection.allowed">{{'lang.' + connection.id + 'Connection' | translate}}</button>
- </ng-container>
- </mat-menu>
- </div>
- <div class="admin-item" *ngFor="let privilege of privileges">
- <button mat-stroked-button color="primary" [routerLink]="privilege.route">
- <mat-icon color="primary" [class]="privilege.icon"></mat-icon>
- <span>{{'lang.' + privilege.id | translate}}</span>
- <span class="admin-desc">
- {{'lang.' + privilege.id + 'Desc' | translate}}
- </span>
- </button>
- </div>
- </div>
- </mat-sidenav-content>
- <mat-sidenav #snavRight disableClose [mode]="signaturesService.mobileMode ? 'over': 'side'" [opened]="false"
- fixedInViewport="true" position='end'>
- </mat-sidenav>
-</mat-sidenav-container>-->
\ No newline at end of file
+</ion-content>
\ No newline at end of file
diff --git a/src/frontend/app/administration/connection/ldap/ldap-list.component.html b/src/frontend/app/administration/connection/ldap/ldap-list.component.html
index e9b0311060fc235a979df9b0a3eac45a51620a11..476adbfb7c36aec1fab7ad956e6fa44a8a483038 100644
--- a/src/frontend/app/administration/connection/ldap/ldap-list.component.html
+++ b/src/frontend/app/administration/connection/ldap/ldap-list.component.html
@@ -51,59 +51,4 @@
</ion-item>
</ion-virtual-scroll>
</ion-list>
-</ion-content>
-<!--<mat-sidenav-container autosize>
- <mat-sidenav #snav [disableClose]="!signaturesService.mobileMode" [mode]="signaturesService.mobileMode ? 'over': 'side'" fixedInViewport="true"
- [opened]="!signaturesService.mobileMode" [style.width.px]="350">
- <app-admin-sidebar [snavLeftComponent]="this.snav" [snavRightComponent]="this.snavRight"></app-admin-sidebar>
- </mat-sidenav>
- <mat-sidenav-content class="mainView">
- <header class="header">
- <div class="header-title">
- <button *ngIf="signaturesService.mobileMode" mat-icon-button (click)="this.snav.toggle();">
- <mat-icon fontSet="fas" fontIcon="fa-bars" style="font-size: 24px;"></mat-icon>
- </button>
- <span><b>{{ldapList.length}}</b> {{'lang.manage_ldap_configurationsAlt' | translate}}</span>
- </div>
- <div>
- <mat-paginator #paginator [length]="100" [pageSize]="10"></mat-paginator>
- </div>
- </header>
- <div class="container">
- <div *ngIf="loading" class="loader">
- <mat-spinner></mat-spinner>
- </div>
- <mat-table #table class="dataTable" [dataSource]="dataSource" matSort matSortActive="label"
- matSortDirection="asc" [class.emptyTable]="dataSource.filteredData.length === 0">
- <ng-container matColumnDef="label">
- <mat-header-cell *matHeaderCellDef mat-sort-header>{{'lang.label' | translate}}</mat-header-cell>
- <mat-cell *matCellDef="let element"> {{element.label}} </mat-cell>
- </ng-container>
- <ng-container matColumnDef="actions">
- <mat-header-cell *matHeaderCellDef style="justify-content: end;">
- <mat-form-field>
- <input matInput (keyup)="applyFilter($event.target.value)" placeholder="Filtrer">
- </mat-form-field>
- </mat-header-cell>
- <mat-cell *matCellDef="let element" style="justify-content: flex-end;">
- <button mat-icon-button color="warn" [disabled]="dataSource.data.length === 1 && authService.authMode === 'ldap'" (click)="$event.stopPropagation();delete(element)" title="{{'lang.delete' | translate}}">
- <mat-icon class="fa fa-trash-alt fa-2x"></mat-icon>
- </button>
- </mat-cell>
- </ng-container>
- <mat-header-row *matHeaderRowDef="displayedColumns"></mat-header-row>
- <mat-row *matRowDef="let row; columns: displayedColumns;" routerLink="/administration/connections/ldaps/{{row.id}}"
- style="cursor:pointer;"></mat-row>
- </mat-table>
- <div class="addButton">
- <button mat-stroked-button type="button" class="btn blue" routerLink="/administration/connections/ldaps/new">{{'lang.ldapCreation' | translate}}</button>
- </div>
- <div class="noResult" *ngIf="dataSource.filteredData.length === 0">
- {{'lang.noResult' | translate}}
- </div>
- </div>
- </mat-sidenav-content>
- <mat-sidenav #snavRight disableClose [mode]="signaturesService.mobileMode ? 'over': 'side'" [opened]="false"
- fixedInViewport="true" position='end'>
- </mat-sidenav>
-</mat-sidenav-container>-->
\ No newline at end of file
+</ion-content>
\ No newline at end of file
diff --git a/src/frontend/app/administration/connection/ldap/ldap.component.html b/src/frontend/app/administration/connection/ldap/ldap.component.html
index 5e6b71e6b9be81a6ae1f9500a1e64abb74c2bced..4778a5822b0e8221f9b163d8d5d3eb4e7de7925e 100644
--- a/src/frontend/app/administration/connection/ldap/ldap.component.html
+++ b/src/frontend/app/administration/connection/ldap/ldap.component.html
@@ -53,116 +53,4 @@
</div>
</ion-item>
</ion-content>
-</form>
-<!--mat-sidenav-container autosize>
- <mat-sidenav #snav [disableClose]="!signaturesService.mobileMode"
- [mode]="signaturesService.mobileMode ? 'over': 'side'" fixedInViewport="true"
- [opened]="!signaturesService.mobileMode" [style.width.px]="350">
- <app-admin-sidebar [snavLeftComponent]="this.snav" [snavRightComponent]="this.snavRight"></app-admin-sidebar>
- </mat-sidenav>
- <mat-sidenav-content class="mainView">
- <header class="header">
- <div class="header-title">
- <button *ngIf="signaturesService.mobileMode" mat-icon-button (click)="this.snav.toggle();">
- <mat-icon fontSet="fas" fontIcon="fa-bars" style="font-size: 24px;"></mat-icon>
- </button>
- <span *ngIf="!loading">{{title}}</span>
- </div>
- <div *ngIf="!creationMode" style="width: 70px;text-align: center;">
- <button mat-icon-button (click)="snavRight.toggle()" title="{{'lang.connectionTest' | translate}}">
- <mat-icon class="fa fa-broadcast-tower fa-2x"></mat-icon>
- </button>
- </div>
- </header>
- <div class="container">
- <div *ngIf="loading" class="loader">
- <mat-spinner></mat-spinner>
- </div>
- <form class="admin-form" *ngIf="!loading" (ngSubmit)="onSubmit()" #adminForm="ngForm">
- <mat-form-field class="input-row">
- <input name="label" matInput placeholder="{{'lang.label' | translate}}" type="text" [(ngModel)]="ldap.label"
- required>
- </mat-form-field>
- <mat-form-field class="input-row">
- <input name="uri" matInput placeholder="{{'lang.uri' | translate}}" type="text" [(ngModel)]="ldap.value.uri"
- required>
- </mat-form-field>
- <mat-form-field class="input-row">
- <input name="dn" matInput placeholder="{{'lang.baseDN' | translate}}" [(ngModel)]="ldap.value.baseDN">
- <mat-hint align="end">
- ex: dc=maarch,dc=com
- </mat-hint>
- </mat-form-field>
- <mat-form-field class="input-row">
- <input name="prefix" matInput placeholder="{{'lang.prefix' | translate}}" [(ngModel)]="ldap.value.prefix">
- <mat-hint align="end">
- ex: MAARCH
- </mat-hint>
- </mat-form-field>
- <mat-form-field class="input-row">
- <input name="suffix" matInput placeholder="{{'lang.suffix' | translate}}" [(ngModel)]="ldap.value.suffix">
- <mat-hint align="end">
- ex: @maarch.com
- </mat-hint>
- </mat-form-field>
- <div class="actions-form">
- <button mat-stroked-button type="submit" class="btn blue"
- [disabled]="!adminForm.form.valid || !canValidate()">{{'lang.validate' | translate}}</button>
- <button mat-stroked-button type="button" class="btn" (click)="cancel()">{{'lang.cancel' | translate}}</button>
- <button mat-stroked-button type="button" *ngIf="!creationMode" [disabled]="authService.authMode==='ldap' && ldap.count === 1" class="btn red"
- (click)="delete()">{{'lang.delete' | translate}}</button>
- </div>
- </form>
- </div>
- </mat-sidenav-content>
- <mat-sidenav #snavRight disableClose [mode]="signaturesService.mobileMode ? 'over': 'side'" [opened]="false"
- [style.width]="'650px'" fixedInViewport="true" position='end'>
- <div class="panel-container">
- <div class="panel-header">
- {{'lang.connectionTest' | translate}}
- </div>
- <button *ngIf="signaturesService.mobileMode" class="cancel" mat-icon-button type="button"
- (click)="snavRight.toggle();">
- <mat-icon fontSet="fas" fontIcon="fa-arrow-right fa-2x"></mat-icon>
- </button>
- <div class="panel-content">
- <form class="admin-form" *ngIf="!loading" (ngSubmit)="testLdap()" #adminTestForm="ngForm">
- <mat-form-field class="input-row">
- <input name="login" matInput placeholder="{{'lang.login' | translate}}" type="text"
- [(ngModel)]="ldapTest.login" required>
- </mat-form-field>
- <mat-form-field class="input-row">
- <input name="password" matInput type="password" placeholder="{{'lang.password' | translate}}"
- [(ngModel)]="ldapTest.password" required>
- </mat-form-field>
- <fieldset>
- <legend align="left">{{'lang.ldapInformations' | translate}} :</legend>
- <div class="form-container">
- <mat-list role="list">
- <mat-list-item role="listitem"><b class="primary">{{'lang.uri' | translate}}</b> : {{ldap.value.uri}}</mat-list-item>
- <mat-list-item role="listitem"><b class="primary">{{'lang.login' | translate}}</b> :
- <span *ngIf="ldap.value.prefix">
- {{ldap.value.prefix}}\
- </span>
- {{ldapTest.login}}{{ldap.value.suffix}}
- </mat-list-item>
- </mat-list>
- </div>
- </fieldset>
- <div class="actions-form">
- <button mat-stroked-button type="submit" class="btn blue connTest"
- [disabled]="!adminTestForm.form.valid || loadingTest">{{'lang.connectionTest' | translate}}</button>
- </div>
- </form>
- <div *ngIf="ldapTest.result !== '' || loadingTest" class="bash">
- <ng-container *ngIf="loadingTest">
- {{'lang.connectionInProgress' | translate}}...
- </ng-container>
- <ng-container *ngIf="ldapTest.result !== ''">
- {{ldapTest.result}}
- </ng-container>
- </div>
- </div>
- </div>
- </mat-sidenav>
-</mat-sidenav-container>-->
\ No newline at end of file
+</form>
\ No newline at end of file
diff --git a/src/frontend/app/app.module.ts b/src/frontend/app/app.module.ts
index f60aa1d86c5ff28a61830b06b13b68a66fc576ba..b51dc62dc08ecb3e90c9232205d8e7c175a66419 100755
--- a/src/frontend/app/app.module.ts
+++ b/src/frontend/app/app.module.ts
@@ -34,7 +34,6 @@ import { ForgotPasswordComponent } from './login/forgotPassword/forgotPassword.c
import { SignaturesComponent } from './signatures/signatures.component';
import { SignaturePadPageComponent } from './pad/pad.component';
import { SignaturePadModule } from 'angular2-signaturepad';
-import { DrawerComponent } from './drawer/drawer.component';
import { DocumentComponent } from './document/document.component';
import { DocumentSignListComponent } from './documentSignList/document-sign-list.component';
import { DocumentNoteListComponent } from './documentNoteList/document-note-list.component';
@@ -45,7 +44,6 @@ import { ConfirmModalComponent } from './modal/confirm-modal.component';
import { WarnModalComponent } from './modal/warn-modal.component';
import { SuccessInfoValidBottomSheetComponent } from './modal/success-info-valid.component';
import { RejectInfoBottomSheetComponent } from './modal/reject-info.component';
-import { OverlayComponent } from './overlay/overlay.component';
import { VisaWorkflowComponent } from './document/visa-workflow/visa-workflow.component';
import { DocumentListComponent } from './document/document-list/document-list.component';
import { MainDocumentDetailComponent } from './document/main-document-detail/main-document-detail.component';
@@ -100,7 +98,6 @@ import { SortPipe } from './plugins/sorting.pipe';
UpdatePasswordComponent,
SignaturesComponent,
SignaturePadPageComponent,
- DrawerComponent,
DocumentComponent,
DocumentSignListComponent,
DocumentNoteListComponent,
@@ -111,7 +108,6 @@ import { SortPipe } from './plugins/sorting.pipe';
SuccessInfoValidBottomSheetComponent,
RejectInfoBottomSheetComponent,
ProfileComponent,
- OverlayComponent,
VisaWorkflowComponent,
DocumentListComponent,
MainDocumentDetailComponent,
diff --git a/src/frontend/app/document/document.component.html b/src/frontend/app/document/document.component.html
index 1b27d1e39c4eadea72725ab04c57f66a15cc502c..309662fdd94c9b9b097216fba8f911ef3fc25ec1 100755
--- a/src/frontend/app/document/document.component.html
+++ b/src/frontend/app/document/document.component.html
@@ -3,8 +3,8 @@
<ion-buttons slot="start">
<ion-menu-button></ion-menu-button>
</ion-buttons>
- <ion-segment value="favorite" [value]="signaturesService.sideNavRigtDatas.mode"
- (ionChange)="signaturesService.sideNavRigtDatas.mode=$event.detail.value">
+ <ion-segment value="favorite" [value]="signaturesService.currentToobal"
+ (ionChange)="signaturesService.currentToobal=$event.detail.value">
<ion-segment-button value="mainDocumentDetail" (click)="openMainDocumentDetail();">
<ion-label color="primary">{{'lang.informations' | translate}}</ion-label>
<ion-icon color="primary" name="information-circle"></ion-icon>
@@ -41,7 +41,7 @@
</ion-toolbar>
</ion-header>
<ion-toolbar class="ion-text-center" color="primary"
- *ngIf="authService.user.substitute !== null && !this.signaturesService.annotationMode && docList[currentDoc]">
+ *ngIf="authService.user.substitute !== null && docList[currentDoc]">
<ion-label style="font-size: 13px;">{{'lang.substitutionInfo' | translate}}</ion-label>
</ion-toolbar>
<ion-toolbar class="ion-text-center" color="danger" *ngIf="mainDocument.id !== 0 && mainDocument.status !== 'READY'">
@@ -95,7 +95,7 @@
<app-document-sign-list *ngIf="currentDoc === 0 && !loadingImage && this.signaturesService.signaturesContent[pageNum]" [bounds]="myBounds">
</app-document-sign-list>
<ion-img
- *ngIf="docList[currentDoc] !== undefined && !signaturesService.empty(docList[currentDoc].imgContent[pageNum])"
+ *ngIf="docList[currentDoc] !== undefined && !functionsService.empty(docList[currentDoc].imgContent[pageNum])"
class="img-content" [src]="docList[currentDoc].imgContent[pageNum]"
[style.width.px]="signaturesService.workingAreaWidth"
[style.height.px]="signaturesService.workingAreaHeight" (ionImgDidLoad)="imageLoaded($event)" #img>
@@ -139,16 +139,16 @@
</ion-footer>
<ng-template #rightContent>
- <app-visa-workflow [visaWorkflow]="mainDocument.workflow" [snavRightComponent]="this.snavRight"
- *ngIf="signaturesService.sideNavRigtDatas.mode == 'visaWorkflow'" style="display: contents;">
+ <app-visa-workflow [visaWorkflow]="mainDocument.workflow"
+ *ngIf="signaturesService.currentToobal == 'visaWorkflow'" style="display: contents;">
</app-visa-workflow>
- <app-document-list #appDocumentList [currentDocId]="currentDoc" [snavRightComponent]="this.snavRight"
- [docList]="docList" *ngIf="signaturesService.sideNavRigtDatas.mode == 'documentList'"
+ <app-document-list #appDocumentList [currentDocId]="currentDoc"
+ [docList]="docList" *ngIf="signaturesService.currentToobal == 'documentList'"
(triggerEvent)="loadDoc($event)" style="display: contents;"></app-document-list>
- <app-associated-documents #appAssociatedDocuments [snavRightComponent]="this.snavRight"
- [associatedDocuments]="mainDocument.linkedDocuments" *ngIf="signaturesService.sideNavRigtDatas.mode == 'associatedDocuments'"
+ <app-associated-documents #appAssociatedDocuments
+ [associatedDocuments]="mainDocument.linkedDocuments" *ngIf="signaturesService.currentToobal == 'associatedDocuments'"
style="display: contents;"></app-associated-documents>
- <app-main-document-detail #appMainDocumentDetail [snavRightComponent]="this.snavRight" [mainDocument]="mainDocument"
- *ngIf="signaturesService.sideNavRigtDatas.mode == 'mainDocumentDetail'" style="display: contents;">
+ <app-main-document-detail #appMainDocumentDetail [mainDocument]="mainDocument"
+ *ngIf="signaturesService.currentToobal == 'mainDocumentDetail'" style="display: contents;">
</app-main-document-detail>
</ng-template>
\ No newline at end of file
diff --git a/src/frontend/app/document/document.component.ts b/src/frontend/app/document/document.component.ts
index f964fdd844ef4633f2855227ae5dc12b934f8fc7..47a0673e7d96c6dcdbb1ba373b3209c0aded76ff 100755
--- a/src/frontend/app/document/document.component.ts
+++ b/src/frontend/app/document/document.component.ts
@@ -1,4 +1,4 @@
-import { Component, OnInit, ViewChild, TemplateRef, ViewContainerRef, OnDestroy } from '@angular/core';
+import { Component, OnInit, ViewChild, TemplateRef, ViewContainerRef } from '@angular/core';
import { SignaturesContentService } from '../service/signatures.service';
import { DomSanitizer } from '@angular/platform-browser';
import { MatBottomSheet, MatBottomSheetConfig } from '@angular/material/bottom-sheet';
@@ -11,7 +11,6 @@ import { NotificationService } from '../service/notification.service';
import { CookieService } from 'ngx-cookie-service';
import { DocumentNotePadComponent } from '../documentNotePad/document-note-pad.component';
import { RejectInfoBottomSheetComponent } from '../modal/reject-info.component';
-import { SuccessInfoValidBottomSheetComponent } from '../modal/success-info-valid.component';
import { TranslateService } from '@ngx-translate/core';
import { DocumentListComponent } from './document-list/document-list.component';
import { AuthService } from '../service/auth.service';
@@ -23,6 +22,7 @@ import { of } from 'rxjs';
import { SignatureMethodService } from '../service/signature-method/signature-method.service';
import { FunctionsService } from '../service/functions.service';
import { ActionsService } from '../service/actions.service';
+import { SuccessInfoValidBottomSheetComponent } from '../modal/success-info-valid.component';
@Component({
selector: 'app-document',
@@ -92,7 +92,6 @@ export class DocumentComponent implements OnInit {
@ViewChild('mainContent') mainContent: any;
@ViewChild('img') img: any;
@ViewChild('snav', { static: true }) snav: MatSidenav;
- @ViewChild('snavRight', { static: true }) snavRight: MatSidenav;
@ViewChild('dragElem') dragElem: any;
@ViewChild('appDocumentNotePad') appDocumentNotePad: DocumentNotePadComponent;
@ViewChild('appDocumentList') appDocumentList: DocumentListComponent;
@@ -120,7 +119,7 @@ export class DocumentComponent implements OnInit {
public alertController: AlertController,
public signatureMethodService: SignatureMethodService,
public navCtrl: NavController,
- private functionsService: FunctionsService,
+ public functionsService: FunctionsService,
public actionsService: ActionsService,
) {
this.draggable = false;
@@ -188,7 +187,7 @@ export class DocumentComponent implements OnInit {
});
}
- if (!this.mainDocument.signLock) {
+ if (!this.signaturesService.stampLock) {
buttons.push({
text: this.translate.instant('lang.affixSignature'),
icon: 'ribbon-outline',
@@ -247,7 +246,6 @@ export class DocumentComponent implements OnInit {
cssClass: 'my-custom-class',
componentProps: {
currentWorflow: this.mainDocument.workflow.filter((line: { current: boolean; }) => line.current === true)[0],
- signLock : this.mainDocument.signLock
}
});
await modal.present();
@@ -324,8 +322,6 @@ export class DocumentComponent implements OnInit {
}).then((load: HTMLIonLoadingElement) => {
this.load = load;
this.load.present();
- this.signaturesService.mainLoading = true;
- this.signaturesService.renderingDoc = true;
this.http.get('../rest/documents/' + params['id']).pipe(
tap((data: any) => {
this.mainDocument = data.document;
@@ -365,12 +361,11 @@ export class DocumentComponent implements OnInit {
];
this.detailMode = true;
} else {
- this.mainDocument.signLock = this.mainDocument.isCertified && ((realUserWorkflow[0].signatureMode === 'stamp' && realUserWorkflow[0].mode === 'sign') || (realUserWorkflow[0].mode === 'visa'));
+ this.signaturesService.stampLock = this.mainDocument.isCertified && ((realUserWorkflow[0].signatureMode === 'stamp' && realUserWorkflow[0].mode === 'sign') || (realUserWorkflow[0].mode === 'visa'));
if (realUserWorkflow[0].userId !== this.authService.user.id) {
this.http.get('../rest/users/' + realUserWorkflow[0].userId + '/signatures')
.subscribe((dataSign: any) => {
this.signaturesService.signaturesListSubstituted = dataSign.signatures;
- this.signaturesService.loadingSign = false;
});
} else {
this.signaturesService.signaturesListSubstituted = [];
@@ -461,7 +456,7 @@ export class DocumentComponent implements OnInit {
this.signaturesService.signaturesContent = [];
this.signaturesService.notesContent = [];
this.signaturesService.datesContent = [];
- this.signaturesService.sideNavRigtDatas.mode = 'mainDocumentDetail';
+ this.signaturesService.currentToobal = 'mainDocumentDetail';
const notesContent = this.localStorage.get(this.mainDocument.id.toString());
@@ -510,7 +505,6 @@ export class DocumentComponent implements OnInit {
}
zoomForView() {
- this.signaturesService.mainLoading = true;
// this.resetDragPosition();
this.resetDragPos = true;
this.widthDoc = '100%';
@@ -519,9 +513,6 @@ export class DocumentComponent implements OnInit {
setTimeout(() => {
this.resetDragPos = false;
}, 200);
- setTimeout(() => {
- this.signaturesService.mainLoading = false;
- }, 400);
this.signaturesService.scale = 1;
}
@@ -603,39 +594,6 @@ export class DocumentComponent implements OnInit {
}*/
}
- addAnnotation(e: any) {
- /*e.preventDefault();
-
- e = e.srcEvent;
-
- if (!this.signaturesService.annotationMode && this.currentDoc === 0 && this.mainDocument.status === 'READY') {
-
- this.backToDetails();
-
- this.img = document.querySelector('img.zoom');
-
- const rect = this.img.getBoundingClientRect();
- const offsetX = e.pageX - rect.left - window.pageXOffset;
- const offsetY = e.pageY - rect.top - window.pageYOffset;
-
- const posX = offsetX - this.signaturesService.x;
- const posY = offsetY - this.signaturesService.y;
-
- if (this.signaturesService.mobileMode) {
- this.signaturesService.x = -posX;
- } else {
- this.signaturesService.x = -posX + 350;
- }
-
- this.signaturesService.y = -posY;
- this.zoomForNotes();
- $('.example-box').css({ 'transform': 'translate3d(' + -(posX) + 'px, ' + -(posY) + 'px, 0px)' });
-
- this.signaturesService.annotationMode = true;
- this.appDocumentNotePad.initPad();
- }*/
- }
-
async refuseDocument(): Promise<void> {
let msg = this.translate.instant('lang.rejectDocumentWarning');
@@ -687,8 +645,8 @@ export class DocumentComponent implements OnInit {
if (this.signaturesService.signaturesContent.length === 0 && this.signaturesService.notesContent.length === 0) {
msg = this.translate.instant('lang.validateDocumentWithoutSignOrNote');
}
- if (this.mainDocument.signLock) {
- msg = 'Document certifié ! Les annotations sur le document ne seront pas prise en compte !';
+ if (this.signaturesService.stampLock) {
+ msg = this.translate.instant('lang.certifiedDocumentMsg2');
}
const alert = await this.alertController.create({
cssClass: 'custom-alert-success',
@@ -729,21 +687,6 @@ export class DocumentComponent implements OnInit {
await alert.present();
}
-
- openDrawer(): void {
- if (this.currentDoc > 0) {
- this.currentDoc = 0;
- this.pageNum = 1;
- }
- this.signaturesService.showSign = true;
- this.signaturesService.showPad = false;
- const config: MatBottomSheetConfig = {
- disableClose: false,
- direction: 'ltr'
- };
- this.bottomSheet.open(SignaturesComponent, config);
- }
-
async removeTags() {
this.signaturesService.currentAction = 0;
@@ -767,10 +710,6 @@ export class DocumentComponent implements OnInit {
}
loadDoc(index: any) {
- this.signaturesService.renderingDoc = true;
- if (index > 0) {
- this.signaturesService.isTaggable = false;
- }
this.pageNum = 1;
this.currentDoc = index;
this.totalPages = this.docList[index].pages;
@@ -829,46 +768,26 @@ export class DocumentComponent implements OnInit {
openVisaWorkflow() {
this.menu.open('right-menu');
- this.signaturesService.sideNavRigtDatas = {
- mode: 'visaWorkflow',
- width: '450px',
- locked: false,
- };
+ this.signaturesService.currentToobal = 'visaWorkflow';
}
openDocumentList() {
this.menu.open('right-menu');
- this.signaturesService.sideNavRigtDatas = {
- mode: 'documentList',
- width: '450px',
- locked: false,
- };
+ this.signaturesService.currentToobal = 'documentList';
}
openAssociatedDocuments() {
this.menu.open('right-menu');
- this.signaturesService.sideNavRigtDatas = {
- mode: 'associatedDocuments',
- width: '450px',
- locked: false,
- };
+ this.signaturesService.currentToobal = 'associatedDocuments';
}
openMainDocumentDetail() {
this.menu.open('right-menu');
- this.signaturesService.sideNavRigtDatas = {
- mode: 'mainDocumentDetail',
- width: '450px',
- locked: false,
- };
+ this.signaturesService.currentToobal = 'mainDocumentDetail';
}
backToDetails() {
- this.signaturesService.sideNavRigtDatas = {
- mode: 'mainDocumentDetail',
- width: '450px',
- locked: false,
- };
+ this.signaturesService.currentToobal = 'mainDocumentDetail';
}
deleteSubstution() {
diff --git a/src/frontend/app/document/main-document-detail/main-document-detail.component.html b/src/frontend/app/document/main-document-detail/main-document-detail.component.html
index 48f8bea933d95352c69062af7b2b5183d3aa1068..bf69dd6f576f207ff7e3836ef6a730f3581a2ca8 100644
--- a/src/frontend/app/document/main-document-detail/main-document-detail.component.html
+++ b/src/frontend/app/document/main-document-detail/main-document-detail.component.html
@@ -35,64 +35,4 @@
<ion-input [value]="data.value" readonly></ion-input>
</ion-item>
</ion-list>
-</ion-content>
-<!--<div class="panel-container" *ngIf="!loading">
- <div class="panel-header">
- <button *ngIf="signaturesService.mobileMode" class="closePanel" mat-icon-button type="button" (tap)="snavRightComponent.close();">
- <mat-icon fontSet="fas" fontIcon="fa-arrow-right fa-2x"></mat-icon>
- </button>
- <mat-icon fontSet="fas" fontIcon="fa-info-circle fa-2x"></mat-icon> {{'lang.informations' | translate}}
- </div>
- <div class="panel-content" *ngIf="mainDocument.id">
- <mat-list>
- <mat-list-item>
- <p mat-line style="display: flex;padding:10px;">
- <mat-form-field style="width:100%;">
- <input matInput [value]="mainDocument.sender" title="{{mainDocument.sender}}"
- placeholder="{{'lang.emittedBy' | translate}}" disabled>
- </mat-form-field>
- </p>
- </mat-list-item>
- <mat-list-item *ngIf="mainDocument.description != null">
- <p mat-line style="display: flex;padding:10px;">
- <mat-form-field style="width:100%;">
- <input matInput [value]="mainDocument.description" title="{{mainDocument.description}}"
- placeholder="{{'lang.description' | translate}}" disabled>
- </mat-form-field>
- </p>
- </mat-list-item>
- <mat-list-item *ngIf="mainDocument.deadline != null">
- <p mat-line style="display: flex;padding:10px;">
- <mat-form-field style="width:100%;">
- <input matInput [value]="mainDocument.deadline" title="{{mainDocument.deadline}}"
- placeholder="{{'lang.processingDeadline' | translate}}" disabled>
- </mat-form-field>
- </p>
- </mat-list-item>
- <mat-list-item>
- <p mat-line style="display: flex;padding:10px;">
- <mat-form-field style="width:100%;">
- <input matInput [value]="mainDocument.reference" title="{{mainDocument.reference}}"
- placeholder="{{'lang.reference' | translate}}" disabled>
- </mat-form-field>
- </p>
- </mat-list-item>
- <mat-list-item>
- <p mat-line style="display: flex;padding:10px;">
- <mat-form-field style="width:100%;">
- <input matInput [value]="mainDocument.title" title="{{mainDocument.title}}"
- placeholder="{{'lang.subject' | translate}}" disabled>
- </mat-form-field>
- </p>
- </mat-list-item>
- <mat-list-item *ngFor="let data of mainDocument.metadata;">
- <p mat-line style="display: flex;padding:10px;">
- <mat-form-field style="width:100%;">
- <input matInput [value]="data.value" title="{{data.value | translate}}"
- placeholder="{{data.label | translate}}" disabled>
- </mat-form-field>
- </p>
- </mat-list-item>
- </mat-list>
- </div>
-</div>-->
+</ion-content>
\ No newline at end of file
diff --git a/src/frontend/app/document/main-document-detail/main-document-detail.component.ts b/src/frontend/app/document/main-document-detail/main-document-detail.component.ts
index 0c2260cab76be54b69d928c801c0a3f89ca9a8c7..4c60a0230ad5aecca2032a66d66ababeaa33413f 100644
--- a/src/frontend/app/document/main-document-detail/main-document-detail.component.ts
+++ b/src/frontend/app/document/main-document-detail/main-document-detail.component.ts
@@ -1,5 +1,4 @@
import { Component, Input, OnInit } from '@angular/core';
-import { MatSidenav } from '@angular/material/sidenav';
import { SignaturesContentService } from '../../service/signatures.service';
@Component({
@@ -11,11 +10,7 @@ export class MainDocumentDetailComponent implements OnInit {
loading: boolean = false;
- // tslint:disable-next-line:no-input-rename
- @Input('mainDocument') mainDocument: any;
-
- // tslint:disable-next-line:no-input-rename
- @Input('snavRightComponent') snavRightComponent: MatSidenav;
+ @Input() mainDocument: any;
constructor(public signaturesService: SignaturesContentService) { }
diff --git a/src/frontend/app/documentNoteList/document-note-list.component.html b/src/frontend/app/documentNoteList/document-note-list.component.html
index 1028789c8ce41be11383b1e8d041ae6c8f098beb..82c0a7a77339fd24e240c0022ba9569c27ebaeda 100644
--- a/src/frontend/app/documentNoteList/document-note-list.component.html
+++ b/src/frontend/app/documentNoteList/document-note-list.component.html
@@ -1,9 +1,6 @@
<ng-container *ngFor="let note of this.signaturesService.notesContent[this.signaturesService.currentPage];let i = index;">
<div style="top:0;left:0;position: absolute;" [style.width.px]="signaturesService.workingAreaWidth"
- [style.height.px]="signaturesService.workingAreaHeight" [ngClass]="{
- 'pdf-page-canvas':!signaturesService.renderingDoc,
- 'pdf-page-canvas-loading-doc':signaturesService.renderingDoc
- }">
+ [style.height.px]="signaturesService.workingAreaHeight">
<img [style.width.%]="100" [src]="sanitization.bypassSecurityTrustUrl(note.fullPath)">
</div>
</ng-container>
\ No newline at end of file
diff --git a/src/frontend/app/documentNotePad/document-note-pad.component.html b/src/frontend/app/documentNotePad/document-note-pad.component.html
index 2332d32c1987b2c835a04448b29f323ffeea7372..6d86bfcde6d5620fcb9991e39341060d7f3819b8 100644
--- a/src/frontend/app/documentNotePad/document-note-pad.component.html
+++ b/src/frontend/app/documentNotePad/document-note-pad.component.html
@@ -50,11 +50,4 @@
<ion-label style="font-size: 13px;">{{'lang.save' | translate}}</ion-label>
</ion-button>
</div>
-</ion-footer>
-<!--<div *ngIf="signaturesService.annotationMode" [style.width.px]="this.areaWidth*this.signaturesService.scale" [style.height.px]="this.areaHeight*this.signaturesService.scale"
- style="top:0;position: absolute;border: dashed 1px grey;overflow: hidden;" [ngClass]="{
- 'pdf-page-canvas':!signaturesService.renderingDoc,
- 'pdf-page-canvas-loading-doc':signaturesService.renderingDoc
-}">
- <canvas id="myCanvas" #canvas></canvas>
-</div>-->
\ No newline at end of file
+</ion-footer>
\ No newline at end of file
diff --git a/src/frontend/app/documentNotePad/document-note-pad.component.ts b/src/frontend/app/documentNotePad/document-note-pad.component.ts
index ed25150788c9f3f0545054b32f186bf3b057a757..4ddfc367b3e45ec185c0f55ccf17624bbf3452a0 100644
--- a/src/frontend/app/documentNotePad/document-note-pad.component.ts
+++ b/src/frontend/app/documentNotePad/document-note-pad.component.ts
@@ -60,7 +60,7 @@ export class DocumentNotePadComponent implements OnInit {
}
if (this.editMode) {
setTimeout(() => {
- //const scrollY = (this.areaHeight * this.precentScrollTop) / 100;
+ // const scrollY = (this.areaHeight * this.precentScrollTop) / 100;
const scrollY = (this.precentScrollTop / 100) * ($('#myBounds').height() - $(window).height());
const scrollX = (this.areaWidth * this.precentScrollLeft) / 100;
@@ -98,17 +98,6 @@ export class DocumentNotePadComponent implements OnInit {
$('input[value=\'' + this.authService.user.preferences.writingColor + '\']').trigger('click');
}
- cancelAnnotation() {
- this.signaturesService.mainLoading = true;
- setTimeout(() => {
- this.triggerEvent.emit();
- this.signaturesService.x = 0;
- this.signaturesService.y = 90;
- this.signaturesService.annotationMode = false;
- this.signaturesService.mainLoading = false;
- }, 200);
- }
-
validateAnnotation() {
if (!this.signaturesService.notesContent[this.signaturesService.currentPage]) {
this.signaturesService.notesContent[this.signaturesService.currentPage] = [];
diff --git a/src/frontend/app/documentSignList/document-sign-list.component.ts b/src/frontend/app/documentSignList/document-sign-list.component.ts
index 1ca1e86efc30c33cbf4f6d0aa6e11b9ae2b5a1d1..926b39c28b1d47a10aad1bf1f06dbe676d91861a 100644
--- a/src/frontend/app/documentSignList/document-sign-list.component.ts
+++ b/src/frontend/app/documentSignList/document-sign-list.component.ts
@@ -37,10 +37,6 @@ export class DocumentSignListComponent implements OnInit {
this[ev.detail.value](index);
}
- onDragBegin(event: any) {
- this.signaturesService.documentFreeze = true;
- }
-
moveSign(event: any, i: number) {
const percentx = (event.x * 100) / this.signaturesService.workingAreaWidth;
const percenty = (event.y * 100) / this.signaturesService.workingAreaHeight;
diff --git a/src/frontend/app/drawer/drawer.component.html b/src/frontend/app/drawer/drawer.component.html
deleted file mode 100755
index 1c474a9923967a0fec2673bf68c47721f1f02407..0000000000000000000000000000000000000000
--- a/src/frontend/app/drawer/drawer.component.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<!-- <section class="drawer" [ngClass]="{'open': open}"> -->
-<section class="drawer" [ngClass]="{'open' : signaturesService.showDrawer}">
- <button *ngIf="!signaturesService.showDrawer" class="btn green btn-action" (click)="openDrawer()">
- <i class="fas fa-arrow-up"></i>
- {{'lang.open' | translate}}
- </button>
- <i *ngIf="signaturesService.showDrawer" class="far fa-times-circle fa-3x btn-action" (click)="closeDrawer()"></i>
- <app-signatures></app-signatures>
- <app-pad></app-pad>
-</section>
diff --git a/src/frontend/app/drawer/drawer.component.scss b/src/frontend/app/drawer/drawer.component.scss
deleted file mode 100644
index 6eb1beb6d393dafe8a432b196ef26a23a2a984ca..0000000000000000000000000000000000000000
--- a/src/frontend/app/drawer/drawer.component.scss
+++ /dev/null
@@ -1,21 +0,0 @@
-.drawer {
- width: 100vw;
- height: 0;
- background: #FCFCFC;
- position: fixed;
- bottom: 0;
- left: 0;
- border-radius: 5px;
- box-shadow: 0 2px 5px 0 rgba(0, 0, 0, 0.08);
- transition: 0.25s all ease-in-out;
- z-index: 2;
- &.open {
- height: 470px;
- }
- .btn-action {
- position: absolute;
- right: 20px;
- top: 20px;
- cursor: pointer;
- }
-}
\ No newline at end of file
diff --git a/src/frontend/app/drawer/drawer.component.spec.ts b/src/frontend/app/drawer/drawer.component.spec.ts
deleted file mode 100755
index 565c4092161fc4329104a401e4cd721f05622fb5..0000000000000000000000000000000000000000
--- a/src/frontend/app/drawer/drawer.component.spec.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { DrawerComponent } from './drawer.component';
-
-describe('DrawerComponent', () => {
- let component: DrawerComponent;
- let fixture: ComponentFixture<DrawerComponent>;
-
- beforeEach(async(() => {
- TestBed.configureTestingModule({
- declarations: [ DrawerComponent ]
- })
- .compileComponents();
- }));
-
- beforeEach(() => {
- fixture = TestBed.createComponent(DrawerComponent);
- component = fixture.componentInstance;
- fixture.detectChanges();
- });
-
- it('should create', () => {
- expect(component).toBeTruthy();
- });
-});
diff --git a/src/frontend/app/drawer/drawer.component.ts b/src/frontend/app/drawer/drawer.component.ts
deleted file mode 100755
index 78060e92e6920fed7341412d32fed7e8596c9e3e..0000000000000000000000000000000000000000
--- a/src/frontend/app/drawer/drawer.component.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-import { Component } from '@angular/core';
-import { SignaturesContentService } from '../service/signatures.service';
-import { TranslateService } from '@ngx-translate/core';
-
-@Component({
- selector: 'app-drawer',
- templateUrl: 'drawer.component.html',
- styleUrls: ['drawer.component.scss']
-})
-export class DrawerComponent {
-
- constructor(private translate: TranslateService, public signaturesService: SignaturesContentService) { }
-
- openDrawer() {
- this.signaturesService.showSign = true;
- this.signaturesService.showDrawer = true;
- }
-
- closeDrawer() {
- this.signaturesService.showDrawer = false;
- this.signaturesService.showPad = false;
- this.signaturesService.showSign = false;
- }
-}
diff --git a/src/frontend/app/modal/reject-info.component.ts b/src/frontend/app/modal/reject-info.component.ts
index 4e701be946bde4126149c6ebdddabaa8137d5d57..8a87da2d97f4edb6a8a543c9090e0e7d7d875345 100644
--- a/src/frontend/app/modal/reject-info.component.ts
+++ b/src/frontend/app/modal/reject-info.component.ts
@@ -16,19 +16,11 @@ export class RejectInfoBottomSheetComponent implements OnInit {
ngOnInit(): void {
setTimeout(() => {
if (this.signaturesService.documentsList[this.signaturesService.indexDocumentsList]) {
- this.signaturesService.sideNavRigtDatas = {
- mode : 'mainDocumentDetail',
- width : '450px',
- locked : false,
- };
+ this.signaturesService.currentToobal = 'mainDocumentDetail';
this.filtersService.resfreshDocuments();
this.router.navigate(['/documents/' + this.signaturesService.documentsList[this.signaturesService.indexDocumentsList].id]);
} else {
- this.signaturesService.sideNavRigtDatas = {
- mode : 'mainDocumentDetail',
- width : '450px',
- locked : false,
- };
+ this.signaturesService.currentToobal = 'mainDocumentDetail';
this.router.navigate(['/documents']);
}
this.bottomSheetRef.dismiss();
diff --git a/src/frontend/app/modal/success-info-valid.component.ts b/src/frontend/app/modal/success-info-valid.component.ts
index e862b66f7ca02839b76e665501779c7a75576bd3..42bac9993071003af4eec56972351708d8956ff5 100644
--- a/src/frontend/app/modal/success-info-valid.component.ts
+++ b/src/frontend/app/modal/success-info-valid.component.ts
@@ -16,19 +16,11 @@ export class SuccessInfoValidBottomSheetComponent implements OnInit {
ngOnInit(): void {
setTimeout(() => {
if (this.signaturesService.documentsList[this.signaturesService.indexDocumentsList]) {
- this.signaturesService.sideNavRigtDatas = {
- mode : 'mainDocumentDetail',
- width : '450px',
- locked : false,
- };
+ this.signaturesService.currentToobal = 'mainDocumentDetail';
this.filtersService.resfreshDocuments();
this.router.navigate(['/documents/' + this.signaturesService.documentsList[this.signaturesService.indexDocumentsList].id]);
} else {
- this.signaturesService.sideNavRigtDatas = {
- mode : 'mainDocumentDetail',
- width : '450px',
- locked : false,
- };
+ this.signaturesService.currentToobal = 'mainDocumentDetail';
this.router.navigate(['/documents']);
}
this.bottomSheetRef.dismiss();
diff --git a/src/frontend/app/overlay/overlay.component.html b/src/frontend/app/overlay/overlay.component.html
deleted file mode 100644
index 486fe085d7575b0bb72050fa1df57d8eec6470fc..0000000000000000000000000000000000000000
--- a/src/frontend/app/overlay/overlay.component.html
+++ /dev/null
@@ -1,18 +0,0 @@
-<div>
- <span style="z-index:1;position: absolute;left:20px;bottom: 20px;font-size: 25px;height:50px;">
- <button class="btn-filled blue" (tap)="this.appDocumentNotePad.cancelAnnotation();"><i
- class="fas fa-arrow-left fa-2x"></i>{{'lang.cancelAnnotation' | translate}}</button>
- </span>
- <span style="z-index:1;position: absolute;bottom: 20px;right: 20px;font-size: 25px;">
- <button class="btn-filled green" (tap)="this.appDocumentNotePad.validateAnnotation();"><i
- class="fas fa-check-circle fa-2x"></i>{{'lang.validateAnnotation' | translate}}</button>
- </span>
-</div>
-<div class="tool-content tool-content-right">
- <ng-container *ngFor="let color of this.appDocumentNotePad.penColors" let idx="index">
- <input type="radio" name="colors" [checked]="idx === 0" [value]="color.id" class="radio"
- [ngStyle]="{'border-color': color.id, 'background-color': color.id}">
- </ng-container>
- <hr>
- <i class="fa fa-undo fa-2x undo" (click)="this.appDocumentNotePad.undo()"></i>
-</div>
\ No newline at end of file
diff --git a/src/frontend/app/overlay/overlay.component.scss b/src/frontend/app/overlay/overlay.component.scss
deleted file mode 100644
index 5f6feaab7af1b9f0b72660060edab570144d8d19..0000000000000000000000000000000000000000
--- a/src/frontend/app/overlay/overlay.component.scss
+++ /dev/null
@@ -1,43 +0,0 @@
-.tool-content {
- z-index: 1;
- display: flex;
- position: absolute;
- background: #8080804d;
- border-radius: 20px;
- top: 170px;
- transform: translateY(-50%) rotate(-90deg);
- padding: 10px;
- &-left {
- left: -40px;
- }
- &-right {
- right: -40px;
- }
- }
-
- .undo {
- cursor: pointer;
- transform: rotate(90deg);
- transition: all 0.2s;
- &:active {
- transform: rotate(90deg) scale(1.5);
- }
- }
-
- .radio {
- appearance: none;
- position: relative;
- margin: 5px;
- width: 30px;
- height: 30px;
- border-radius: 30px;
- border-width: none;
- border-style: solid;
- outline: none;
- cursor: pointer;
- transition: all 0.2s;
- &:checked, &:hover {
- transform: scale(1.5);
- }
- }
-
\ No newline at end of file
diff --git a/src/frontend/app/overlay/overlay.component.spec.ts b/src/frontend/app/overlay/overlay.component.spec.ts
deleted file mode 100644
index e333a42ba5c3cd213a3cd3c3a2f079ef8a2d1379..0000000000000000000000000000000000000000
--- a/src/frontend/app/overlay/overlay.component.spec.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { DocumentComponent } from './overlay.component';
-
-describe('DocumentComponent', () => {
- let component: DocumentComponent;
- let fixture: ComponentFixture<DocumentComponent>;
-
- beforeEach(async(() => {
- TestBed.configureTestingModule({
- declarations: [ DocumentComponent ]
- })
- .compileComponents();
- }));
-
- beforeEach(() => {
- fixture = TestBed.createComponent(DocumentComponent);
- component = fixture.componentInstance;
- fixture.detectChanges();
- });
-
- it('should create', () => {
- expect(component).toBeTruthy();
- });
-});
diff --git a/src/frontend/app/overlay/overlay.component.ts b/src/frontend/app/overlay/overlay.component.ts
deleted file mode 100644
index 3c4d767548835617dcc15625e0960a988447fed7..0000000000000000000000000000000000000000
--- a/src/frontend/app/overlay/overlay.component.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-import { Component, OnInit, Input } from '@angular/core';
-import { DocumentNotePadComponent } from '../documentNotePad/document-note-pad.component';
-
-@Component({
- selector: 'app-overlay',
- templateUrl: 'overlay.component.html',
- styleUrls: ['overlay.component.scss'],
-})
-export class OverlayComponent implements OnInit {
-
-
- // tslint:disable-next-line:no-input-rename
- @Input('appDocumentNotePad') appDocumentNotePad: DocumentNotePadComponent;
-
- constructor() { }
-
- ngOnInit(): void { }
-}
diff --git a/src/frontend/app/profile/profile.component.ts b/src/frontend/app/profile/profile.component.ts
index 814e37e626e502a6bfcb6be49883dc52c2c8fd08..6ad3229d83e94084ea64bb7512f779b59bcbea0d 100644
--- a/src/frontend/app/profile/profile.component.ts
+++ b/src/frontend/app/profile/profile.component.ts
@@ -1,7 +1,6 @@
import { Component, OnInit, Input, ViewChild, Renderer2, ElementRef } from '@angular/core';
import { DomSanitizer } from '@angular/platform-browser';
import { MatExpansionPanel } from '@angular/material/expansion';
-import { MatSidenav } from '@angular/material/sidenav';
import { HttpClient, HttpHeaders } from '@angular/common/http';
import { SignaturesContentService } from '../service/signatures.service';
import { NotificationService } from '../service/notification.service';
@@ -23,10 +22,6 @@ import { ModalController } from '@ionic/angular';
export class ProfileComponent implements OnInit {
- @Input('snavRightComponent') snavRightComponent: MatSidenav;
- @Input('snavLeftComponent') snavLeftComponent: MatSidenav;
-
-
@ViewChild('passwordContent') passwordContent: MatExpansionPanel;
@ViewChild('avatarProfile') avatarProfile: ElementRef;
currentTool = 'info';
diff --git a/src/frontend/app/service/signatures.service.ts b/src/frontend/app/service/signatures.service.ts
index 37f581d9832f87cda14f62f687f90e9f9d036f6c..a08fcc1d377ef5e029a5eade22df791fa4b11d1a 100755
--- a/src/frontend/app/service/signatures.service.ts
+++ b/src/frontend/app/service/signatures.service.ts
@@ -5,40 +5,33 @@ import { ApplicationRef, ComponentFactoryResolver, Injectable, Injector, Templat
export class SignaturesContentService {
mainDocumentId = 0;
+
signaturesContent: any[] = [];
datesContent: any[] = [];
notesContent: any[] = [];
+
signaturesList: any[] = [];
signaturesListSubstituted: any[] = [];
+
currentPage = 1;
totalPage = 1;
- isTaggable = true;
- documentFreeze = false;
- annotationMode = false;
- showSign = false;
- showPad = false;
- showDrawer = false;
- sideNavRigtDatas = {
- mode : '',
- width : '650px',
- locked : true,
- };
+
+ stampLock = false;
+
+ currentToobal = 'mainDocumentDetail';
+
currentAction = 0;
- loadingSign = true;
indexDocumentsList = 0;
documentsList: any[] = [];
documentsListCount: any = {};
- newSign: any = {};
workingAreaWidth = 0;
workingAreaHeight = 0;
- renderingDoc = true;
mobileMode = true;
smartphoneMode = true;
mode = '';
scale = 1;
x = 0;
y = 90;
- mainLoading = true;
dragging = false;
appSession: any;
@@ -59,11 +52,6 @@ export class SignaturesContentService {
this.mobileMode = true;
} else {
this.mobileMode = false;
- this.sideNavRigtDatas = {
- mode : 'mainDocumentDetail',
- width : '450px',
- locked : true,
- };
}
}
@@ -76,25 +64,14 @@ export class SignaturesContentService {
this.signaturesListSubstituted = [];
this.currentPage = 1;
this.totalPage = 1;
- this.isTaggable = true;
- this.annotationMode = false;
- this.showSign = false;
- this.showPad = false;
- this.showDrawer = false;
- this.sideNavRigtDatas = {
- mode : '',
- width : '650px',
- locked : true,
- };
+ this.stampLock = false;
this.currentAction = 0;
- this.loadingSign = true;
this.indexDocumentsList = 0;
this.documentsList = [];
this.documentsListCount = {};
- this.newSign = {};
this.workingAreaWidth = 0;
this.workingAreaHeight = 0;
- this.renderingDoc = true;
+ this.currentToobal = 'mainDocumentDetail';
if (window.screen.width <= 360) {
this.smartphoneMode = true;
@@ -105,11 +82,6 @@ export class SignaturesContentService {
this.mobileMode = true;
} else {
this.mobileMode = false;
- this.sideNavRigtDatas = {
- mode : 'mainDocumentDetail',
- width : '450px',
- locked : true,
- };
}
this.mode = '';
this.scale = 1;
@@ -139,23 +111,6 @@ export class SignaturesContentService {
this.portalHost.attach(templatePortal);
}
- empty(value: any) {
- if (value === null || value === undefined) {
- return true;
-
- } else if (Array.isArray(value)) {
- if (value.length > 0) {
- return false;
- } else {
- return true;
- }
- } else if (String(value) !== '') {
- return false;
- } else {
- return true;
- }
- }
-
detachTemplate(id: string = 'adminMenu') {
this.portalHost.detach();
}
diff --git a/src/frontend/app/sidebar/administration/admin-sidebar.component.ts b/src/frontend/app/sidebar/administration/admin-sidebar.component.ts
index e2763d68f92c28f6a9494813e02610b6d5a06aaf..1bccc22a3b8397a143e490c127bc2ea667942c6e 100644
--- a/src/frontend/app/sidebar/administration/admin-sidebar.component.ts
+++ b/src/frontend/app/sidebar/administration/admin-sidebar.component.ts
@@ -1,5 +1,4 @@
-import { Component, Input, OnInit } from '@angular/core';
-import { MatSidenav } from '@angular/material/sidenav';
+import { Component, OnInit } from '@angular/core';
import { Router, ActivatedRoute } from '@angular/router';
import { AuthService } from '../../service/auth.service';
@@ -19,9 +18,6 @@ export class AdminSidebarComponent implements OnInit {
loading: boolean = true;
privileges: Privilege[] = [];
- @Input() snavRightComponent: MatSidenav;
- @Input() snavLeftComponent: MatSidenav;
-
constructor(
private route: ActivatedRoute,
private router: Router,
diff --git a/src/frontend/app/signatures/signatures.component.html b/src/frontend/app/signatures/signatures.component.html
index 7ab2a3a0e1b52132ea1ed648635a2bf09949a27d..6d22a54c8559643a4795e9b3728c06fd4b25242e 100755
--- a/src/frontend/app/signatures/signatures.component.html
+++ b/src/frontend/app/signatures/signatures.component.html
@@ -9,7 +9,7 @@
</ion-toolbar>
</ion-header>
<ion-content (wheel)="scroll($event)">
- <ng-container *ngIf="!signLock; else elseCertified">
+ <ng-container *ngIf="!signaturesService.stampLock; else elseCertified">
<ion-slides *ngIf="!loading" pager="true" [options]="slideOpts" #slides>
<ion-slide *ngFor="let slide of signaturesList;let i=index" style="display: grid;grid-template-columns: repeat(2, 1fr);">
<div style="display: contents;">
diff --git a/src/frontend/app/signatures/signatures.component.ts b/src/frontend/app/signatures/signatures.component.ts
index 45d95145e5a56ca3f948e6f11ce8a6c2fa469b33..62a18402b62b2a52276f0937713696245fba482f 100755
--- a/src/frontend/app/signatures/signatures.component.ts
+++ b/src/frontend/app/signatures/signatures.component.ts
@@ -19,7 +19,6 @@ import { SignaturePadPageComponent } from '../pad/pad.component';
export class SignaturesComponent implements OnInit {
@Input() currentWorflow: any;
- @Input() signLock: any;
loading: boolean = true;
scrolling: boolean = false;
@@ -109,15 +108,6 @@ export class SignaturesComponent implements OnInit {
}
}
- closeSignatures() {
- this.signaturesService.showSign = false;
- }
-
- openPad() {
- this.signaturesService.showPad = true;
- this.closeSignatures();
- }
-
selectSignature(signature: any) {
const percentWidth = 25;