From 1a0d456e3c302286606b919e4d891307131d46d3 Mon Sep 17 00:00:00 2001
From: Alex ORLUC <alex.orluc@maarch.org>
Date: Wed, 3 Apr 2019 10:28:48 +0200
Subject: [PATCH] FEAT #9756 add lock info in result list
---
src/frontend/app/list/basket-list.component.html | 6 ++++--
src/frontend/app/list/basket-list.component.scss | 4 ++++
src/frontend/lang/lang-en.ts | 1 +
src/frontend/lang/lang-fr.ts | 1 +
src/frontend/lang/lang-nl.ts | 1 +
5 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/src/frontend/app/list/basket-list.component.html b/src/frontend/app/list/basket-list.component.html
index cb92b2a9ed8..f24f6dee2f4 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 68bb7eb84f4..7c75e41b24a 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 15caba318f5..6963adf9079 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 875bd032cf4..6062f0df594 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 e8980da8689..e7784634869 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
};
--
GitLab