Skip to content
Snippets Groups Projects
Commit 17eb2de7 authored by Alex ORLUC's avatar Alex ORLUC
Browse files

FEAT #10551 TIME 1 begin filter sign / visa / note

parent 1f67f8f3
No related branches found
No related tags found
No related merge requests found
...@@ -134,11 +134,15 @@ ...@@ -134,11 +134,15 @@
"wrongLoginPassword" : "Wrong login or password", "wrongLoginPassword" : "Wrong login or password",
"wrongPassword" : "Wrong password", "wrongPassword" : "Wrong password",
"wsUser" : "Web service user", "wsUser" : "Web service user",
"visaUser" : "Visa user", "visaUser": "Visa user",
"signUser" : "Sign user", "signUser": "Sign user",
"visaProcessInfo" : "Visa to", "visaProcessInfo": "Visa to",
"signProcessInfo" : "Sign to", "signProcessInfo": "Sign to",
"inProgress" : "In progress", "inProgress": "In progress",
"waiting" : "Waiting" "waiting": "Waiting",
"visaLabel": "to approve",
"signLabel": "to sign",
"noteLabel": "to note",
"documents": "document(s)"
} }
} }
...@@ -135,10 +135,14 @@ ...@@ -135,10 +135,14 @@
"wrongPassword" : "Mauvais mot de passe", "wrongPassword" : "Mauvais mot de passe",
"wsUser" : "Utilisateur web service", "wsUser" : "Utilisateur web service",
"visaUser" : "Viseur", "visaUser" : "Viseur",
"signUser" : "Signataire", "signUser": "Signataire",
"visaProcessInfo" : "Visé le", "visaProcessInfo": "Visé le",
"signProcessInfo" : "Signé le", "signProcessInfo": "Signé le",
"inProgress" : "En cours", "inProgress": "En cours",
"waiting" : "En attente" "waiting": "En attente",
"visaLabel": "à viser",
"signLabel": "à signer",
"noteLabel": "à annoter",
"documents": "document(s)"
} }
} }
...@@ -31,7 +31,7 @@ export class SignaturesContentService { ...@@ -31,7 +31,7 @@ export class SignaturesContentService {
workingAreaHeight = 0; workingAreaHeight = 0;
renderingDoc = true; renderingDoc = true;
mobileMode = true; mobileMode = true;
mode = 'SIGN'; mode = '';
scale = 1; scale = 1;
x = 0; x = 0;
y = 0; y = 0;
...@@ -77,7 +77,7 @@ export class SignaturesContentService { ...@@ -77,7 +77,7 @@ export class SignaturesContentService {
} else { } else {
this.mobileMode = false; this.mobileMode = false;
} }
this.mode = 'SIGN'; this.mode = '';
this.scale = 1; this.scale = 1;
this.x = 0; this.x = 0;
this.y = 85; this.y = 85;
......
...@@ -11,10 +11,12 @@ ...@@ -11,10 +11,12 @@
</div> </div>
</header> </header>
<header class="sidebar-header"> <header class="sidebar-header">
1 {{'lang.documents' | translate}}&nbsp;<span class="primary" *ngIf="signaturesService.mode != ''">{{'lang.'+signaturesService.mode+'Label' | translate}}</span>
</header> </header>
<section class="sidebar-btn"> <section class="sidebar-btn">
<button class="btn btn-xs blue filter" [ngClass]="[signaturesService.mode == 'NOTE' ? 'active' : '']" (click)="filter('NOTE')">{{'lang.annotation' | translate}} <span *ngIf="signaturesService.documentsListCount['NOTE']" class="badgeNbDocument">{{signaturesService.documentsListCount["NOTE"]}}</span></button> <button class="btn btn-xs blue filter" [ngClass]="[signaturesService.mode == 'sign' ? 'active' : '']" (click)="filter('sign')"><i class="fas fa-file-signature"></i></button>
<button class="btn btn-xs blue filter" [ngClass]="[signaturesService.mode == 'SIGN' ? 'active' : '']" (click)="filter('SIGN')">{{'lang.signature' | translate}} <span *ngIf="signaturesService.documentsListCount['SIGN']" class="badgeNbDocument">{{signaturesService.documentsListCount["SIGN"]}}</span></button> <button class="btn btn-xs blue filter" [ngClass]="[signaturesService.mode == 'visa' ? 'active' : '']" (click)="filter('visa')"><i class="fas fa-thumbs-up"></i></button>
<button class="btn btn-xs blue filter" [ngClass]="[signaturesService.mode == 'note' ? 'active' : '']" (click)="filter('note')"><i class="far fa-comment-dots"></i></button>
</section> </section>
</div> </div>
<ul #listContent class="nav" detect-scroll (onScroll)="handleScroll($event)" [bottomOffset]="1" [topOffset]="1"> <ul #listContent class="nav" detect-scroll (onScroll)="handleScroll($event)" [bottomOffset]="1" [topOffset]="1">
......
...@@ -153,6 +153,10 @@ ...@@ -153,6 +153,10 @@
right: 10px; right: 10px;
} }
.filter {
width: 35px;
}
.filter.active { .filter.active {
background: $primary; background: $primary;
} }
......
...@@ -83,7 +83,8 @@ export class SidebarComponent implements OnInit { ...@@ -83,7 +83,8 @@ export class SidebarComponent implements OnInit {
} }
filter(mode: string) { filter(mode: string) {
this.signaturesService.mode = mode; this.signaturesService.mode == mode ? this.signaturesService.mode = '' : this.signaturesService.mode = mode;
this.offset = 0; this.offset = 0;
this.http.get('../rest/documents?limit=' + this.limit + '&offset=' + this.offset + '&mode=' + this.signaturesService.mode) this.http.get('../rest/documents?limit=' + this.limit + '&offset=' + this.offset + '&mode=' + this.signaturesService.mode)
.subscribe((data: any) => { .subscribe((data: any) => {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment