From 00ba8ca419ab1f189e0f572f0cff3b0a0274930c Mon Sep 17 00:00:00 2001
From: Alex ORLUC <alex.orluc@maarch.org>
Date: Mon, 11 Feb 2019 16:56:12 +0100
Subject: [PATCH] FEAT #9156 fix bad if
---
.../list/list-administration.component.html | 8 ++--
.../list/list-administration.component.ts | 38 +++++++++++++------
src/frontend/lang/lang-en.ts | 4 +-
src/frontend/lang/lang-fr.ts | 6 ++-
src/frontend/lang/lang-nl.ts | 4 +-
5 files changed, 40 insertions(+), 20 deletions(-)
diff --git a/src/frontend/app/administration/basket/list/list-administration.component.html b/src/frontend/app/administration/basket/list/list-administration.component.html
index e581d2f5745..25a63c8ad2c 100644
--- a/src/frontend/app/administration/basket/list/list-administration.component.html
+++ b/src/frontend/app/administration/basket/list/list-administration.component.html
@@ -45,19 +45,19 @@
<span>{{lang.delete}}</span>
</button>
<mat-divider></mat-divider>
- <button [class.isSelectedMenu]="item.cssClasses.indexOf('boldFontData') > 0" mat-menu-item (click)="setStyle(item,'boldFontData')">
+ <button [class.isSelectedMenu]="item.cssClasses.indexOf('boldFontData') > -1" mat-menu-item (click)="setStyle(item,'boldFontData')">
<mat-icon class="secondaryInformations_icon" fontSet="fas" fontIcon="fa-bold fa-2x"></mat-icon>
<span>{{lang.fontBold}}</span>
</button>
- <button [class.isSelectedMenu]="item.cssClasses.indexOf('align_centerData') > 0" mat-menu-item (click)="setStyle(item,'align_centerData')">
+ <button [class.isSelectedMenu]="item.cssClasses.indexOf('align_centerData') > -1" mat-menu-item (click)="setStyle(item,'align_centerData')">
<mat-icon class="secondaryInformations_icon" fontSet="fas" fontIcon="fa-align-center fa-2x"></mat-icon>
<span>{{lang.alignCenter}}</span>
</button>
- <button [class.isSelectedMenu]="item.cssClasses.indexOf('align_rightData') > 0" mat-menu-item (click)="setStyle(item,'align_rightData')">
+ <button [class.isSelectedMenu]="item.cssClasses.indexOf('align_rightData') > -1" mat-menu-item (click)="setStyle(item,'align_rightData')">
<mat-icon class="secondaryInformations_icon" fontSet="fas" fontIcon="fa-align-right fa-2x"></mat-icon>
<span>{{lang.alignRight}}</span>
</button>
- <button [class.isSelectedMenu]="item.cssClasses.indexOf('bigFontData') > 0" mat-menu-item (click)="setStyle(item,'bigFontData')">
+ <button [class.isSelectedMenu]="item.cssClasses.indexOf('bigFontData') > -1" mat-menu-item (click)="setStyle(item,'bigFontData')">
<mat-icon class="secondaryInformations_icon" fontSet="fas" fontIcon="fa-text-height fa-2x"></mat-icon>
<span>{{lang.fontBig}}</span>
</button>
diff --git a/src/frontend/app/administration/basket/list/list-administration.component.ts b/src/frontend/app/administration/basket/list/list-administration.component.ts
index 5cba0de4610..21ef0b64e85 100644
--- a/src/frontend/app/administration/basket/list/list-administration.component.ts
+++ b/src/frontend/app/administration/basket/list/list-administration.component.ts
@@ -20,14 +20,14 @@ export class ListAdministrationComponent implements OnInit {
displayedMainData: any = [
{
- 'value': 'status_chrono',
+ 'value': 'chronoNumberShort',
'label': this.lang.chronoNumberShort,
- 'sample': 'MAARCH/2018A/1',
+ 'sample': 'MAARCH/2019A/1',
'cssClasses': ['align_centerData', 'normalData'],
'icon': ''
},
{
- 'value': 'subject',
+ 'value': 'object',
'label': this.lang.object,
'sample': this.lang.objectSample,
'cssClasses': ['longData'],
@@ -36,63 +36,77 @@ export class ListAdministrationComponent implements OnInit {
availableData: any = [
{
- 'value': 'priority_label',
+ 'value': 'priority',
'label': this.lang.priority,
'sample': this.lang.prioritySample,
'cssClasses': [],
'icon': 'fa-traffic-light '
},
{
- 'value': 'category',
+ 'value': 'category_id',
'label': this.lang.category_id,
'sample': this.lang.incoming,
'cssClasses': [],
'icon': 'fa-exchange-alt'
},
{
- 'value': 'type',
+ 'value': 'mailType',
'label': this.lang.mailType,
'sample': this.lang.mailTypeSample,
'cssClasses': [],
'icon': 'fa-suitcase'
},
{
- 'value': 'attribution',
+ 'value': 'destInformations',
'label': this.lang.destInformations,
'sample': this.lang.destInformationsSample,
'cssClasses': [],
'icon': 'fa-sitemap'
},
{
- 'value': 'senders',
+ 'value': 'sender',
'label': this.lang.sender,
'sample': 'Patricia PETIT',
'cssClasses': [],
'icon': 'fa-user'
},
{
- 'value': 'recipients',
+ 'value': 'recipient',
'label': this.lang.recipient,
'sample': 'Alain DUBOIS (MAARCH)',
'cssClasses': [],
'icon': 'fa-book'
},
{
- 'value': 'creation_limit_date',
+ 'value': 'creationLimitDate',
'label': this.lang.creationLimitDate,
'sample': this.lang.creationLimitDateSample,
'cssClasses': [],
'icon': 'fa-calendar'
},
{
- 'value': 'workflow_visa',
+ 'value': 'visaWorkflow',
'label': this.lang.visaWorkflow,
'sample': '<i color="accent" class="fa fa-check"></i> Barbara BAIN -> <i class="fa fa-hourglass-half"></i> <b>Bruno BOULE</b> -> <i class="fa fa-hourglass-half"></i> Patricia PETIT',
'cssClasses': [],
'icon': 'fa-list-ol'
},
{
- 'value': 'workflow_avis',
+ 'value': 'modificationDate',
+ 'label': this.lang.modificationDate,
+ 'sample': '01-01-2019',
+ 'cssClasses': [],
+ 'icon': 'fa-calendar-check'
+ },
+ {
+ 'value': 'opinionLimitDate',
+ 'label': this.lang.opinionLimitDate,
+ 'sample': '01-01-2019',
+ 'cssClasses': [],
+ 'icon': 'fa-stopwatch'
+ },
+ {
+ 'value': 'nbAvisSent',
'label': this.lang.nbAvisSent,
'sample': this.lang.nbAvisSentSample,
'cssClasses': [],
diff --git a/src/frontend/lang/lang-en.ts b/src/frontend/lang/lang-en.ts
index c2c0d989c84..425457041f7 100755
--- a/src/frontend/lang/lang-en.ts
+++ b/src/frontend/lang/lang-en.ts
@@ -819,8 +819,10 @@ export const LANG_EN = {
"destInformations" : "User destination (entity destination)",
"destInformationsSample" : "Barbara BAIN (Finance division)",
"creationLimitDate" : "Creation date - Process limit date",
- "creationLimitDateSample" : "1st may - <i class=\"fa fa-stopwatch\"></i> <b color=\"warn\">3 day(s)</b>",
+ "creationLimitDateSample" : "1st jan. - <i class=\"fa fa-stopwatch\"></i> <b color=\"warn\">3 day(s)</b>",
"nbAvisSent" : "Number of opinion sent",
"nbAvisSentSample" : "<b>3</b> opinion(s) sent",
"warnMaxDataList" : "Maximum of displayed datas is reached",
+ "opinionLimitDate" : "Opinion limit date",
+ "modificationDate" : "Modification date",
};
diff --git a/src/frontend/lang/lang-fr.ts b/src/frontend/lang/lang-fr.ts
index a3f1ac8d7ed..8a534c533ca 100755
--- a/src/frontend/lang/lang-fr.ts
+++ b/src/frontend/lang/lang-fr.ts
@@ -839,14 +839,16 @@ export const LANG_FR = {
"alignRight" : "Droite",
"fontBig" : "Grand",
"chronoNumberShort" : "N° Chrono",
- "objectSample" : "Plainte concernant des nuisances sonore nocturne (le 20/12/2018)",
+ "objectSample" : "Plainte concernant des nuisances sonore nocturne (le 01/01/2019)",
"prioritySample" : "Urgent",
"mailTypeSample" : "Réclamation",
"destInformations" : "Attributaire (entité traitante)",
"destInformationsSample" : "Barbara BAIN (Pôle Jeunesse et Sport)",
"creationLimitDate" : "Date de création - Date limite",
- "creationLimitDateSample" : "1er mai - <i class=\"fa fa-stopwatch\"></i> <b color=\"warn\">3 jour(s)</b>",
+ "creationLimitDateSample" : "1er janv. - <i class=\"fa fa-stopwatch\"></i> <b color=\"warn\">3 jour(s)</b>",
"nbAvisSent" : "Nombre d'avis donné",
"nbAvisSentSample" : "<b>3</b> avis donné(s)",
"warnMaxDataList" : "Le nombre maximal d'élements affichés a été atteint",
+ "opinionLimitDate" : "Date limite d'envoi des avis",
+ "modificationDate" : "Date de mise à jour",
};
diff --git a/src/frontend/lang/lang-nl.ts b/src/frontend/lang/lang-nl.ts
index b8a0c56fcb4..495a068563f 100755
--- a/src/frontend/lang/lang-nl.ts
+++ b/src/frontend/lang/lang-nl.ts
@@ -848,9 +848,11 @@ export const LANG_NL = {
"destInformations" : "User destination (entity destination)", //_TO_TRANSLATE
"destInformationsSample" : "Barbara BAIN (Finance division)", //_TO_TRANSLATE
"creationLimitDate" : "Creation date - Process limit date", //_TO_TRANSLATE
- "creationLimitDateSample" : "1st may - <i class=\"fa fa-stopwatch\"></i> <b color=\"warn\">3 day(s)</b>", //_TO_TRANSLATE
+ "creationLimitDateSample" : "1st jan. - <i class=\"fa fa-stopwatch\"></i> <b color=\"warn\">3 day(s)</b>", //_TO_TRANSLATE
"nbAvisSent" : "Number of opinion sent", //_TO_TRANSLATE
"nbAvisSentSample" : "<b>3</b> opinion(s) sent", //_TO_TRANSLATE
"warnMaxDataList" : "Maximum of displayed datas is reached", //_TO_TRANSLATE
+ "opinionLimitDate" : "Opinion limit date", //_TO_TRANSLATE
+ "modificationDate" : "Modification date", //_TO_TRANSLATE
};
--
GitLab