From 8493dc94ad9c9e0f3771af83d2a0cba88beacdea Mon Sep 17 00:00:00 2001
From: Alex ORLUC <alex.orluc@maarch.org>
Date: Tue, 2 Apr 2019 16:47:19 +0200
Subject: [PATCH] add target quick search info + fix typist null in attach list
---
src/frontend/app/attachments/attachments-list.component.html | 2 +-
src/frontend/app/header/header-right.component.html | 3 +--
src/frontend/app/search/search-home.component.html | 2 +-
src/frontend/lang/lang-en.ts | 2 ++
src/frontend/lang/lang-fr.ts | 2 ++
src/frontend/lang/lang-nl.ts | 2 ++
6 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/src/frontend/app/attachments/attachments-list.component.html b/src/frontend/app/attachments/attachments-list.component.html
index 3ff2c3f2aab..cebd0242b7a 100644
--- a/src/frontend/app/attachments/attachments-list.component.html
+++ b/src/frontend/app/attachments/attachments-list.component.html
@@ -62,7 +62,7 @@
<div class="col-md-6">
<mat-form-field>
<input matInput title="{{attachment.firstname_typist}} {{attachment.lastname_typist}}"
- [value]="attachment.firstname_typist+' '+attachment.lastname_typist"
+ [value]="attachment.lastname_typist != null ? attachment.firstname_typist+' '+attachment.lastname_typist : lang.undefined"
placeholder="{{lang.by}}" disabled>
</mat-form-field>
</div>
diff --git a/src/frontend/app/header/header-right.component.html b/src/frontend/app/header/header-right.component.html
index 3f80cc1f2c9..d4d0533162a 100644
--- a/src/frontend/app/header/header-right.component.html
+++ b/src/frontend/app/header/header-right.component.html
@@ -13,11 +13,10 @@
<input #searchHome type="submit" name="submit" value="" style="display:none">
</form>
- <button (click)="showSearchInput()" mat-icon-button *ngIf="!mobileMode && hideSearch" style="opacity:0.5;">
+ <button title="{{lang.quickSearchInfo + ' : '+ lang.quickSearchTarget}}" (click)="showSearchInput()" mat-icon-button *ngIf="!mobileMode && hideSearch" style="opacity:0.5;">
<mat-icon class="fa fa-search" style="font-size:22px;"></mat-icon>
</button>
-
<button mat-icon-button [matMenuTriggerFor]="applications" *ngIf="!mobileMode" matTooltip="{{lang.menu}}">
<mat-icon class="fa fa-th" style="font-size:22px;"></mat-icon>
</button>
diff --git a/src/frontend/app/search/search-home.component.html b/src/frontend/app/search/search-home.component.html
index 6042d43568d..f7609b7cbeb 100755
--- a/src/frontend/app/search/search-home.component.html
+++ b/src/frontend/app/search/search-home.component.html
@@ -4,7 +4,7 @@
<input type="hidden" name="baskets_clause" value="true">
<mat-form-field id="searchInput" floatLabel="never" style="width:100%">
<input matInput type="text" name="welcome" placeholder="{{lang.searchMails}}" style="width:100%">
- <button mat-button matSuffix mat-icon-button type="submit" aria-label="Clear" style="opacity:0.5;">
+ <button title="{{lang.quickSearchInfo + ' : '+ lang.quickSearchTarget}}" mat-button matSuffix mat-icon-button type="submit" aria-label="Clear" style="opacity:0.5;">
<mat-icon class="fa fa-search"></mat-icon>
</button>
</mat-form-field>
diff --git a/src/frontend/lang/lang-en.ts b/src/frontend/lang/lang-en.ts
index 5cfd380c8e5..15caba318f5 100755
--- a/src/frontend/lang/lang-en.ts
+++ b/src/frontend/lang/lang-en.ts
@@ -937,4 +937,6 @@ export const LANG_EN = {
"addPerson" : "Add a person",
"actionDone" : "Action done",
"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)",
};
diff --git a/src/frontend/lang/lang-fr.ts b/src/frontend/lang/lang-fr.ts
index 7a5ae067a29..875bd032cf4 100755
--- a/src/frontend/lang/lang-fr.ts
+++ b/src/frontend/lang/lang-fr.ts
@@ -964,4 +964,6 @@ export const LANG_FR = {
"addPerson" : "Ajouter une personne",
"actionDone" : "Action effectuée",
"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)",
};
diff --git a/src/frontend/lang/lang-nl.ts b/src/frontend/lang/lang-nl.ts
index 15633abd60e..e8980da8689 100755
--- a/src/frontend/lang/lang-nl.ts
+++ b/src/frontend/lang/lang-nl.ts
@@ -965,4 +965,6 @@ export const LANG_NL = {
"addPerson" : "Add a person", //_TO_TRANSLATE
"actionDone" : "Action effectuée", //_TO_TRANSLATE
"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
};
--
GitLab