diff --git a/src/frontend/app/list/basket-list.component.html b/src/frontend/app/list/basket-list.component.html index cb92b2a9ed8389509e6ba6b623a6fd8f360b2865..f24f6dee2f45c358a93204c6b9a3bb162ce799dd 100644 --- a/src/frontend/app/list/basket-list.component.html +++ b/src/frontend/app/list/basket-list.component.html @@ -117,9 +117,11 @@ </mat-checkbox> </span> <span *ngIf="!mobileMode" style="cursor:pointer;" class="main-info-status" (click)="launch(defaultAction,row);"> - <mat-icon title="{{row.statusLabel}}" [ngStyle]="{'color': row.priorityColor}" color="primary" + <mat-icon *ngIf="row.isLocked !== true" title="{{row.statusLabel}}" [ngStyle]="{'color': row.priorityColor}" color="primary" class="{{row.statusImage.charAt(0)}}{{row.statusImage.charAt(1)}} {{row.statusImage}} {{row.statusImage.charAt(0)}}{{row.statusImage.charAt(1)}}-2x"> </mat-icon> + <mat-icon *ngIf="row.isLocked === true" title="{{lang.warnLockResInProgress}}" style="color: red;" class="fa fa-lock fa-2x"> + </mat-icon> </span> <span *ngIf="!mobileMode" class="main-info-data" style="width:200px;text-align:center;cursor:pointer;" (click)="launch(defaultAction,row);"> <ng-container @@ -164,7 +166,7 @@ </td> </ng-container> <tr mat-row *matRowDef="let row; columns: displayedColumnsBasket;" - (contextmenu)="open($event,row);"></tr> + (contextmenu)="open($event,row);" [class.locked]="row.isLocked == true"></tr> </table> </div> <div class="table-head"> diff --git a/src/frontend/app/list/basket-list.component.scss b/src/frontend/app/list/basket-list.component.scss index 68bb7eb84f47ff1c1fde6aa4f75135d44373f7f8..7c75e41b24aa3f62e4f950b555c8afa6fe59b1a8 100644 --- a/src/frontend/app/list/basket-list.component.scss +++ b/src/frontend/app/list/basket-list.component.scss @@ -32,4 +32,8 @@ .longData { flex: 3; +} + +.locked { + opacity: 0.5; } \ No newline at end of file diff --git a/src/frontend/lang/lang-en.ts b/src/frontend/lang/lang-en.ts index 15caba318f5996bb2668572bc0cdea1cd0781403..6963adf907950845131a79c5c469cf358b3d06cf 100755 --- a/src/frontend/lang/lang-en.ts +++ b/src/frontend/lang/lang-en.ts @@ -939,4 +939,5 @@ export const LANG_EN = { "actionMassForbidden" : "This action is forbidden in mass", "quickSearchInfo" : "Target search ", "quickSearchTarget" : "subject (mail / attachment), chrono number (courrier / attachment), reference mail, notes content, barcode, attachment contact (society / lastanme / firstname)", + "warnLockResInProgress" : "This mail is in progress by an other user", }; diff --git a/src/frontend/lang/lang-fr.ts b/src/frontend/lang/lang-fr.ts index 875bd032cf41cace550b662101da3d9b6efac8cb..6062f0df5947ef1301796fb117a94669d9e44da3 100755 --- a/src/frontend/lang/lang-fr.ts +++ b/src/frontend/lang/lang-fr.ts @@ -966,4 +966,5 @@ export const LANG_FR = { "actionMassForbidden" : "Cette action n\'est pas utilisable en masse", "quickSearchInfo" : "Cible de la recherche", "quickSearchTarget" : "sujet (courrier / pièce jointe), numéro chrono (courrier / pièce jointe), référence courrier expéditeur, contenu d\'annotations, code à barre, contact pièce jointe (société / nom / prénom)", + "warnLockResInProgress" : "Ce courrier est cours de traitement par un autre utilisateur", }; diff --git a/src/frontend/lang/lang-nl.ts b/src/frontend/lang/lang-nl.ts index e8980da8689747cde5b6d717a68e97bcaef6e8d5..e7784634869f0e4ea9aa9f301f714bbd31144f06 100755 --- a/src/frontend/lang/lang-nl.ts +++ b/src/frontend/lang/lang-nl.ts @@ -967,4 +967,5 @@ export const LANG_NL = { "actionMassForbidden" : "This action is forbidden in mass", //_TO_TRANSLATE "quickSearchInfo" : "Target search ", //_TO_TRANSLATE "quickSearchTarget" : "subject (mail / attachment), chrono number (courrier / attachment), reference mail, notes content, barcode, attachment contact (society / lastanme / firstname)", //_TO_TRANSLATE + "warnLockResInProgress" : "This mail is in progress by an other user", //_TO_TRANSLATE };