diff --git a/src/frontend/app/document/document.component.ts b/src/frontend/app/document/document.component.ts
index 703450f554d2d7e691700a076ff9f3d7868141ba..380eeb83cef76c9fac80b45ea0649359649b66fc 100755
--- a/src/frontend/app/document/document.component.ts
+++ b/src/frontend/app/document/document.component.ts
@@ -97,6 +97,8 @@ export class DocumentComponent implements OnInit {
private cookieService: CookieService,
private sanitization: DomSanitizer, public dialog: MatDialog, private bottomSheet: MatBottomSheet) {
this.draggable = false;
+ (<any>window).pdfWorkerSrc = './../node_modules/pdfjs-dist/build/pdf.worker.js';
+
if (!this.cookieService.check('maarchParapheurAuth')) {
this.router.navigate(['/login']);
}
@@ -141,6 +143,7 @@ export class DocumentComponent implements OnInit {
} else {
this.snav.open();
this.freezeSidenavClose = true;
+ this.loadingDoc = false;
}
});
}
diff --git a/src/frontend/app/modal/confirm-modal.component.html b/src/frontend/app/modal/confirm-modal.component.html
index 2bad5bc70e0f7e531ae02374ce2597797edf0411..24cb0ae6bb19c67bf2f3640cb5cc8c0aca5f0953 100755
--- a/src/frontend/app/modal/confirm-modal.component.html
+++ b/src/frontend/app/modal/confirm-modal.component.html
@@ -4,6 +4,6 @@
<p *ngIf="signaturesService.signaturesContent.length == 0 && signaturesService.notesContent.length == 0">Vous êtes sur le point de valider ce document sans signature ou annotation!</p>
</div>
<div mat-dialog-actions>
- <button class="btn green" mat-button (click)="confirmDoc();" [disabled]="disableState"><i class="fas fa-check-circle fa-2x"></i> Valider</button>
+ <button class="btn green" mat-button (click)="confirmDoc();" [disabled]="disableState"><i class="fas fa-check-circle fa-2x"></i> {{ msgButton }}</button>
<button class="btn red" mat-button cdkFocusInitial (click)="this.dialogRef.close();" [disabled]="disableState"><i class="fas fa-times-circle fa-2x"></i> Annuler</button>
</div>
diff --git a/src/frontend/app/modal/confirm-modal.component.ts b/src/frontend/app/modal/confirm-modal.component.ts
index 1eea17c5afd5d61b755f25b9999a8c6d680330ae..c77f42f7248ec386b53035565b92493402dec7dc 100644
--- a/src/frontend/app/modal/confirm-modal.component.ts
+++ b/src/frontend/app/modal/confirm-modal.component.ts
@@ -10,6 +10,7 @@ import { HttpClient } from '@angular/common/http';
})
export class ConfirmModalComponent {
disableState = false;
+ msgButton = 'Valider';
constructor(@Inject(MAT_DIALOG_DATA) public data: any, public http: HttpClient, public dialogRef: MatDialogRef<ConfirmModalComponent>, public signaturesService: SignaturesContentService, public notificationService: NotificationService) { }
@@ -47,9 +48,11 @@ export class ConfirmModalComponent {
}
}
this.disableState = true;
+ this.msgButton = 'Envoi ...';
this.http.put('../rest/documents/' + this.signaturesService.mainDocumentId + '/actions/' + this.signaturesService.currentAction, {'signatures': signatures})
.subscribe(() => {
this.disableState = false;
+ this.msgButton = 'Valider';
this.dialogRef.close('sucess');
this.signaturesService.documentsList.splice(this.signaturesService.indexDocumentsList, 1);
if (this.signaturesService.documentsListCount > 0) {
@@ -58,6 +61,7 @@ export class ConfirmModalComponent {
}, (err: any) => {
this.notificationService.handleErrors(err);
this.disableState = false;
+ this.msgButton = 'Valider';
});
} else {
this.dialogRef.close('sucess');
diff --git a/src/frontend/app/modal/warn-modal.component.html b/src/frontend/app/modal/warn-modal.component.html
index 7c159f336aec712b033727968a543fbb3bf18b6f..ad7763ee6f5a2adb5926344d0df05ea02d4c62dd 100755
--- a/src/frontend/app/modal/warn-modal.component.html
+++ b/src/frontend/app/modal/warn-modal.component.html
@@ -5,5 +5,5 @@
</div>
<div mat-dialog-actions>
<button class="btn" [disabled]="disableState" mat-button (click)="this.dialogRef.close('annotation');" *ngIf="signaturesService.notesContent.length == 0"><i class="fas fa-pen-alt fa-2x"></i> Annoter ce document</button>
- <button class="btn red" mat-button cdkFocusInitial (click)="confirmDoc();" [disabled]="disableState"><i class="fas fa-times-circle fa-2x"></i> Refuser ce document</button>
+ <button class="btn red" mat-button cdkFocusInitial (click)="confirmDoc();" [disabled]="disableState"><i class="fas fa-times-circle fa-2x"></i> {{ msgButton }}</button>
</div>
\ No newline at end of file
diff --git a/src/frontend/app/modal/warn-modal.component.ts b/src/frontend/app/modal/warn-modal.component.ts
index dcd95fe21be6b60b6519c3f53ce68a90d737e832..9e2dba6cd2cd568d244f8363338d531789726588 100644
--- a/src/frontend/app/modal/warn-modal.component.ts
+++ b/src/frontend/app/modal/warn-modal.component.ts
@@ -11,6 +11,7 @@ import { HttpClient } from '@angular/common/http';
})
export class WarnModalComponent {
disableState = false;
+ msgButton = 'Refuser ce document';
constructor(@Inject(MAT_DIALOG_DATA) public data: any, public http: HttpClient, public dialogRef: MatDialogRef<WarnModalComponent>, public signaturesService: SignaturesContentService, public notificationService: NotificationService) { }
@@ -48,6 +49,7 @@ export class WarnModalComponent {
}
}
this.disableState = true;
+ this.msgButton = 'Envoi ...';
this.http.put('../rest/documents/' + this.signaturesService.mainDocumentId + '/actions/' + this.signaturesService.currentAction, {'signatures': signatures})
.subscribe(() => {
this.signaturesService.documentsList.splice(this.signaturesService.indexDocumentsList, 1);
@@ -55,10 +57,12 @@ export class WarnModalComponent {
this.signaturesService.documentsListCount--;
}
this.disableState = false;
+ this.msgButton = 'Refuser ce document';
this.dialogRef.close('sucess');
}, (err: any) => {
this.notificationService.handleErrors(err);
this.disableState = false;
+ this.msgButton = 'Refuser ce document';
});
} else {
this.dialogRef.close('sucess');
diff --git a/src/frontend/app/profile/profile.component.html b/src/frontend/app/profile/profile.component.html
index fd13cce216cd575383d5a9fedfc90fdd1f89e6d7..03d55555c9d79f1a02e469d493f9741c7b66721c 100644
--- a/src/frontend/app/profile/profile.component.html
+++ b/src/frontend/app/profile/profile.component.html
@@ -54,7 +54,7 @@
</mat-expansion-panel>
</mat-accordion>
<span class="actions">
- <button class="validate" mat-button color="primary" type="submit" [disabled]="allowValidate() || !profileForm.form.valid">Valider</button>
+ <button class="validate" mat-button color="primary" type="submit" [disabled]="allowValidate() || !profileForm.form.valid">{{ msgButton }}</button>
<button class="cancel" mat-icon-button type="button" (click)="closeProfile();"><mat-icon fontSet="fas" fontIcon="fa-arrow-left fa-2x"></mat-icon></button>
</span>
</form>
diff --git a/src/frontend/app/profile/profile.component.ts b/src/frontend/app/profile/profile.component.ts
index 0966646794e88f412dd9a1f05c42a679b3d031db..96d74775a59eb81c757aaed2e2c575dc34b72bd4 100644
--- a/src/frontend/app/profile/profile.component.ts
+++ b/src/frontend/app/profile/profile.component.ts
@@ -47,6 +47,7 @@ export class ProfileComponent implements OnInit {
showPassword = false;
disableState = false;
+ msgButton = 'Valider';
constructor(public http: HttpClient, iconReg: MatIconRegistry, public sanitizer: DomSanitizer, public notificationService: NotificationService, public signaturesService: SignaturesContentService, private cookieService: CookieService) {
iconReg.addSvgIcon('maarchLogo', sanitizer.bypassSecurityTrustResourceUrl('../src/frontend/assets/logo_white.svg'));
@@ -164,16 +165,17 @@ export class ProfileComponent implements OnInit {
submitProfile() {
this.disableState = true;
- var profileToSend = {
- "firstname" : this.profileInfo.firstname,
- "lastname" : this.profileInfo.lastname,
- "picture" : this.profileInfo.picture
+ this.msgButton = 'Envoi ...';
+ const profileToSend = {
+ 'firstname' : this.profileInfo.firstname,
+ 'lastname' : this.profileInfo.lastname,
+ 'picture' : this.profileInfo.picture
};
if (this.profileInfo.picture === this.signaturesService.userLogged.picture) {
profileToSend.picture = '';
} else {
- let orientation = $('.avatarProfile').css('content');
- profileToSend["pictureOrientation"] = orientation.replace(/\"/g, '');
+ const orientation = $('.avatarProfile').css('content');
+ profileToSend['pictureOrientation'] = orientation.replace(/\"/g, '');
}
this.http.put('../rest/users/' + this.signaturesService.userLogged.id, this.profileInfo)
@@ -193,6 +195,7 @@ export class ProfileComponent implements OnInit {
this.password.currentPassword = '';
this.notificationService.success('Profil modifié');
this.disableState = false;
+ this.msgButton = 'Valider';
this.closeProfile();
}, (err) => {
if (err.status === 401) {
@@ -206,6 +209,7 @@ export class ProfileComponent implements OnInit {
if (!this.showPassword) {
this.notificationService.success('Profil modifié');
this.disableState = false;
+ this.msgButton = 'Valider';
this.closeProfile();
}
}, (err) => {