Skip to content
Snippets Groups Projects
Verified Commit 0b486af6 authored by Alex ORLUC's avatar Alex ORLUC
Browse files

fix var lang title category + fix visa circuit display list

parent 2de5d365
No related branches found
No related tags found
No related merge requests found
......@@ -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}}"
......
......@@ -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('...');
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment