From 0b486af660a6f992606518aedcb36449ae1e1af3 Mon Sep 17 00:00:00 2001
From: Alex ORLUC <alex.orluc@maarch.org>
Date: Mon, 25 Feb 2019 11:20:49 +0100
Subject: [PATCH] fix var lang title category + fix visa circuit display list
---
src/frontend/app/list/basket-list.component.html | 2 +-
src/frontend/app/list/basket-list.component.ts | 14 ++++++++++----
2 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/src/frontend/app/list/basket-list.component.html b/src/frontend/app/list/basket-list.component.html
index 4f296076139..ecbd5f5aecb 100644
--- a/src/frontend/app/list/basket-list.component.html
+++ b/src/frontend/app/list/basket-list.component.html
@@ -60,7 +60,7 @@
</ng-container>
<ng-container *ngIf="data.value == 'getCategory'">
<span *ngIf="!lang[data.displayValue]" style="opacity: 0.5" title="id: {{data.displayValue}}">_UNDEFINED</span>
- <span *ngIf="lang[data.displayValue]" title="{{data.displayTitle}}">{{lang[data.displayValue]}}</span>
+ <span *ngIf="lang[data.displayValue]" title="{{lang[data.displayValue]}}">{{lang[data.displayValue]}}</span>
</ng-container>
<ng-container *ngIf="data.value != 'getCategory' && data.value != 'getCreationAndProcessLimitDates'">
<span *ngIf="!data.value.includes('Date')" title="{{data.displayTitle}}"
diff --git a/src/frontend/app/list/basket-list.component.ts b/src/frontend/app/list/basket-list.component.ts
index 6fe9f356a32..9ccf7e52c90 100755
--- a/src/frontend/app/list/basket-list.component.ts
+++ b/src/frontend/app/list/basket-list.component.ts
@@ -271,7 +271,7 @@ export class BasketListComponent implements OnInit {
content = '<span color="accent" style=""><i class="fa fa-check"></i> <span title="' + this.lang[visa.mode + 'User'] + '">' + user + '</span></span>';
}
- if (visa.current && key > 0) {
+ if (visa.current && key >= 0) {
content = '<b color="primary">' + content + '</b>';
}
@@ -284,7 +284,14 @@ export class BasketListComponent implements OnInit {
if (index > 0) {
formatWorkflow = formatWorkflow.slice(index - 1);
formatWorkflow = formatWorkflow.reverse();
- formatWorkflow = formatWorkflow.slice((formatWorkflow.length - index) - 1);
+ const indexReverse = key.displayValue.map((e: any) => { return e.current; }).reverse().indexOf(true);
+ if (indexReverse > 1) {
+ formatWorkflow = formatWorkflow.slice(indexReverse - 1);
+ }
+ formatWorkflow = formatWorkflow.reverse();
+ } else if (index === 0) {
+ formatWorkflow = formatWorkflow.reverse();
+ formatWorkflow = formatWorkflow.slice(index - 2);
formatWorkflow = formatWorkflow.reverse();
} else if (index === -1) {
formatWorkflow = formatWorkflow.slice(formatWorkflow.length - 2);
@@ -292,8 +299,7 @@ export class BasketListComponent implements OnInit {
if (index >= 2 || (index == -1 && key.displayValue.length >= 3)) {
formatWorkflow.unshift('...');
}
- //console.log();
- if (index != -1 && index - 2 <= key.displayValue.length && key.displayValue.length >= 3) {
+ if (index != -1 && index - 2 <= key.displayValue.length && index + 2 < key.displayValue.length && key.displayValue.length >= 3) {
formatWorkflow.push('...');
}
--
GitLab