From db801019d30b08bb736448e6ffd9e3879baa228c Mon Sep 17 00:00:00 2001
From: Alex ORLUC <alex.orluc@maarch.org>
Date: Tue, 18 Dec 2018 16:30:01 +0100
Subject: [PATCH] FEAT #8956 add var lang list v2
---
.../app/basket/basket-home.component.html | 8 ++---
.../app/list/basket-list.component.html | 32 +++++++++----------
.../app/list/basket-list.component.ts | 13 ++++++++
src/frontend/lang/lang-en.ts | 18 ++++++++++-
src/frontend/lang/lang-fr.ts | 19 ++++++++++-
src/frontend/lang/lang-nl.ts | 21 ++++++++++--
6 files changed, 87 insertions(+), 24 deletions(-)
diff --git a/src/frontend/app/basket/basket-home.component.html b/src/frontend/app/basket/basket-home.component.html
index 96cd3d65645..99ef9d22098 100644
--- a/src/frontend/app/basket/basket-home.component.html
+++ b/src/frontend/app/basket/basket-home.component.html
@@ -14,7 +14,7 @@
<mat-divider *ngIf="regroupedBasket.baskets[0]"></mat-divider>
<mat-nav-list>
<ng-container *ngFor="let basket of regroupedBasket.baskets | filterList:listFilter.value">
- <a mat-list-item *ngIf="basket.redirected" disableRipple="true" style="cursor:not-allowed;">
+ <!-- <a mat-list-item *ngIf="basket.redirected" disableRipple="true" style="cursor:not-allowed;">
<mat-icon [ngStyle]="{'color': basket.color}" *ngIf="basket.redirected && !mobileMode" mat-list-icon class="fa fa-share"></mat-icon>
<span *ngIf="basket.resourceNumber==0" class="badge" style="min-width:auto;">{{basket.resourceNumber}}</span>
<span *ngIf="basket.resourceNumber!=0" bgcolor="warn" class="badge" style="min-width:auto;">{{basket.resourceNumber}}</span>
@@ -29,16 +29,16 @@
<p mat-line title="{{basket.basket_name}}" [ngStyle]="{'color': basket.color}">
{{basket.basket_name}}
</p>
- </a>
+ </a> -->
<!-- TODO NEW BASKET LIST-->
- <!-- <a mat-list-item *ngIf="!basket.redirected" (click)="closePanelLeft();" routerLink="/basketList/{{regroupedBasket.groupSerialId}}/baskets/{{basket.basket_id}}" style="cursor:pointer;" [ngStyle]="{'opacity': basket.resourceNumber==0 ? '0.5' : '1'}">
+ <a mat-list-item *ngIf="!basket.redirected" (click)="closePanelLeft();" routerLink="/basketList/{{regroupedBasket.groupSerialId}}/baskets/{{basket.basket_id}}" style="cursor:pointer;" [ngStyle]="{'opacity': basket.resourceNumber==0 ? '0.5' : '1'}">
<mat-icon [ngStyle]="{'color': basket.color}" *ngIf="!mobileMode" mat-list-icon class="fa fa-inbox"></mat-icon>
<span *ngIf="basket.resourceNumber==0" class="badge" style="min-width:auto;">{{basket.resourceNumber}}</span>
<span *ngIf="basket.resourceNumber!=0" bgcolor="warn" class="badge" style="min-width:auto;">{{basket.resourceNumber}}</span>
<p mat-line title="{{basket.basket_name}}" [ngStyle]="{'color': basket.color}">
{{basket.basket_name}}
</p>
- </a> -->
+ </a>
</ng-container>
</mat-nav-list>
</ng-container>
diff --git a/src/frontend/app/list/basket-list.component.html b/src/frontend/app/list/basket-list.component.html
index bebe9d3d369..d8ffd77e373 100644
--- a/src/frontend/app/list/basket-list.component.html
+++ b/src/frontend/app/list/basket-list.component.html
@@ -20,51 +20,51 @@
<mat-button-toggle-group #group="matButtonToggleGroup" class="envFilter" (change)="updateFilters($event)" multiple>
<mat-checkbox color="primary" style="margin: 10px;" title="Sélectionner tous les courriers de la bannette"></mat-checkbox>
<button mat-stroked-button (click)="openFilter()">Filtres</button>
- <mat-button-toggle [checked]="this.listProperties.onlyProcesLimit" value="onlyProcesLimit" title="Afficher les courriers en retard">
+ <mat-button-toggle [checked]="this.listProperties.onlyProcesLimit" value="onlyProcesLimit" title="{{lang.displayProcessLimitRes}}">
<mat-icon fontSet="fas" fontIcon="fa-stopwatch fa-2x"></mat-icon>
</mat-button-toggle>
- <mat-button-toggle [checked]="this.listProperties.onlyNewRes"value="onlyNewRes" title="Afficher les courriers non lu">
+ <mat-button-toggle [checked]="this.listProperties.onlyNewRes"value="onlyNewRes" title="{{lang.displayNewRes}}">
<mat-icon fontSet="fas" fontIcon="fa-eye-slash fa-2x"></mat-icon>
</mat-button-toggle>
- <mat-button-toggle [checked]="this.listProperties.withPj" value="withPj" title="Afficher les courriers avec réponses">
+ <mat-button-toggle [checked]="this.listProperties.withPj" value="withPj" title="{{lang.displayWithAttach}}">
<mat-icon fontSet="fas" fontIcon="fa-reply fa-2x"></mat-icon>
</mat-button-toggle>
- <mat-button-toggle [checked]="this.listProperties.withNote" value="withNote" title="Afficher les courriers avec annotations">
+ <mat-button-toggle [checked]="this.listProperties.withNote" value="withNote" title="{{lang.displayWithNotes}}">
<mat-icon fontSet="fas" fontIcon="fa-comments fa-2x"></mat-icon>
</mat-button-toggle>
<mat-form-field appearance="outline" [style.fontSize.px]="10" style="width:200px !important;">
- <mat-label>Trier par</mat-label>
+ <mat-label>{{lang.orderBy}}</mat-label>
<mat-select multiple>
- <mat-option value="test">
- Numéro chrono
- </mat-option>
- <mat-option value="test">
- Date de création
+ <mat-option [value]="column.id" *ngFor="let column of displayColsOrder">
+ {{lang[column.id]}}
</mat-option>
</mat-select>
</mat-form-field>
+ <button mat-icon-button title="{{lang.descOrder}}" style="color: rgba(0,0,0,0.38);">
+ <mat-icon fontSet="fas" fontIcon="fa-sort-amount-up fa-2x"></mat-icon>
+ </button>
<button mat-icon-button [matMenuTriggerFor]="menuParamList">
<mat-icon color="primary" fontSet="fas" fontIcon="fa-cog fa-2x"></mat-icon>
</button>
<mat-menu #menuParamList="matMenu">
<button mat-menu-item>
<mat-icon fontSet="fas" fontIcon="fa-print fa-2x"></mat-icon>
- <span>Imprimer la liste</span>
+ <span>{{lang.printResultList}}</span>
</button>
<button mat-menu-item>
<mat-icon fontSet="fas" fontIcon="fa-file-export fa-2x"></mat-icon>
- <span>Exporter les données</span>
+ <span>{{lang.exportDatas}}</span>
</button>
<button mat-menu-item>
<mat-icon fontSet="far" fontIcon="fa-list-alt fa-2x"></mat-icon>
- <span>Paramétrer l'affichage</span>
+ <span>{{lang.settingsList}}</span>
</button>
</mat-menu>
</mat-button-toggle-group>
<div class="filterBadges">
- <span class="label label-info" title="Fitre(s) actif(s)" *ngFor="let category of this.listProperties.categories" (click)="openFilter()">{{category.label}}</span>
- <span class="label label-info" title="Fitre(s) actif(s)" *ngFor="let priority of this.listProperties.priorities" (click)="openFilter()">{{priority.label}}</span>
- <span class="label label-info" title="Fitre(s) actif(s)" *ngFor="let entity of this.listProperties.entities" (click)="openFilter()">{{entity.label}}</span>
+ <span class="label label-info" title="{{lang.currentFilters}}" *ngFor="let category of this.listProperties.categories" (click)="openFilter()">{{category.label}}</span>
+ <span class="label label-info" title="{{lang.currentFilters}}" *ngFor="let priority of this.listProperties.priorities" (click)="openFilter()">{{priority.label}}</span>
+ <span class="label label-info" title="{{lang.currentFilters}}" *ngFor="let entity of this.listProperties.entities" (click)="openFilter()">{{entity.label}}</span>
</div>
</div>
<div class="col-md-3 col-xs-3">
diff --git a/src/frontend/app/list/basket-list.component.ts b/src/frontend/app/list/basket-list.component.ts
index 946b29235c6..7c4ac9210e9 100644
--- a/src/frontend/app/list/basket-list.component.ts
+++ b/src/frontend/app/list/basket-list.component.ts
@@ -13,6 +13,7 @@ import { HeaderService } from '../../service/header.service';
import { FiltersListService } from '../../service/filtersList.service';
+
declare function $j(selector: any): any;
declare var angularGlobals: any;
@@ -89,6 +90,18 @@ export class BasketListComponent implements OnInit {
// },
// ];
+ displayColsOrder = [
+ {'id' : 'dest_user'},
+ {'id' : 'creation_date'},
+ {'id' : 'process_limit_date'},
+ {'id' : 'destination'},
+ {'id' : 'subject'},
+ {'id' : 'alt_identifier'},
+ {'id' : 'priority'},
+ {'id' : 'status'},
+ {'id' : 'type_id'}
+ ]
+
exampleDatabase: ExampleHttpDao | null;
data: any[] = [];
resultsLength = 0;
diff --git a/src/frontend/lang/lang-en.ts b/src/frontend/lang/lang-en.ts
index f6ec31924fa..32b187cb6d3 100755
--- a/src/frontend/lang/lang-en.ts
+++ b/src/frontend/lang/lang-en.ts
@@ -697,5 +697,21 @@ export const LANG_EN = {
"organization" : "ORGANIZATION",
"production" : "PRODUCTION",
"classement" : "RANKING",
- "supervision" : "SUPERVISION"
+ "supervision" : "SUPERVISION",
+ "subject" : "Subject",
+ "alt_identifier" : "Chrono number",
+ "process_limit_date" : "Process limit date",
+ "dest_user" : "Operator",
+ "destination" : "Entity",
+ "type_id" : "Document type",
+ "printResultList" : "Print list",
+ "exportDatas" : "Export datas",
+ "settingsList" : "Display settings",
+ "displayProcessLimitRes" : "Display Process limit document",
+ "displayNewRes" : "Display new document",
+ "displayWithAttach" : "Display documents with attachment(s)",
+ "displayWithNotes" : "Display documents with note(s)",
+ "ascOrder" : "Asc order",
+ "descOrder" : "Desc order",
+ "currentFilters" : "Current filters",
};
diff --git a/src/frontend/lang/lang-fr.ts b/src/frontend/lang/lang-fr.ts
index 168ba63b7c6..cdffc01271b 100755
--- a/src/frontend/lang/lang-fr.ts
+++ b/src/frontend/lang/lang-fr.ts
@@ -722,5 +722,22 @@ export const LANG_FR = {
"organization" : "ORGANISATION",
"production" : "PRODUCTION",
"classement" : "CLASSEMENT",
- "supervision" : "SUPERVISION"
+ "supervision" : "SUPERVISION",
+ "subject" : "Objet",
+ "alt_identifier" : "Numéro chrono",
+ "creation_date" : "Date de création",
+ "process_limit_date" : "Date limite de traitement",
+ "dest_user" : "Attributaire",
+ "destination" : "Entité",
+ "type_id" : "Type de document",
+ "printResultList" : "Imprimer la liste",
+ "exportDatas" : "Exporter les données",
+ "settingsList" : "Paramétrer l'affichage",
+ "displayProcessLimitRes" : "Afficher les courriers en retard",
+ "displayNewRes" : "Afficher les courriers non lu",
+ "displayWithAttach" : "Afficher les courriers avec pièce(s) jointe(s)",
+ "displayWithNotes" : "Afficher les courriers avec annotation(s)",
+ "ascOrder" : "Ordre ascendant",
+ "descOrder" : "Ordre descendant",
+ "currentFilters" : "Filtre(s) actif(s)",
};
diff --git a/src/frontend/lang/lang-nl.ts b/src/frontend/lang/lang-nl.ts
index c381d6e5461..39f3c5e475c 100755
--- a/src/frontend/lang/lang-nl.ts
+++ b/src/frontend/lang/lang-nl.ts
@@ -724,6 +724,23 @@ export const LANG_NL = {
"organization" : "ORGANISATIE",
"production" : "PRODUCTIE",
"classement" : "STANDEN",
- "supervision" : "TOEZICHT"
-
+ "supervision" : "TOEZICHT",
+ "subject" : "_TO_TRANSLATE",
+ "alt_identifier" : "_TO_TRANSLATE",
+ "creation_date" : "_TO_TRANSLATE",
+ "process_limit_date" : "_TO_TRANSLATE",
+ "dest_user" : "_TO_TRANSLATE",
+ "destination" : "_TO_TRANSLATE",
+ "type_id" : "_TO_TRANSLATE",
+ "OrderBy" : "_TO_TRANSLATE",
+ "printResultList" : "_TO_TRANSLATE",
+ "exportDatas" : "_TO_TRANSLATE",
+ "settingsList" : "_TO_TRANSLATE",
+ "displayProcessLimitRes" : "_TO_TRANSLATE",
+ "displayNewRes" : "_TO_TRANSLATE",
+ "displayWithAttach" : "_TO_TRANSLATE",
+ "displayWithNotes" : "_TO_TRANSLATE",
+ "ascOrder" : "_TO_TRANSLATE",
+ "descOrder" : "_TO_TRANSLATE",
+ "currentFilters" : "_TO_TRANSLATE",
};
--
GitLab