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

FEAT #8956 simplify display list

parent d9d36695
No related branches found
No related tags found
No related merge requests found
...@@ -106,9 +106,10 @@ ...@@ -106,9 +106,10 @@
<mat-checkbox color="primary"></mat-checkbox> <mat-checkbox color="primary"></mat-checkbox>
</div> </div>
<div class="resultCol {{data.class}}" *ngFor="let data of displayedMainData"> <div class="resultCol {{data.class}}" *ngFor="let data of displayedMainData">
<span *ngIf="data.id == 'status_label'"> <span *ngIf="data.id == 'alt_identifier'">
<mat-icon [ngStyle]="{'color': row.priority_color}" color="primary" class="{{row.status_icon.charAt(0)}}{{row.status_icon.charAt(1)}} {{row.status_icon}} {{row.status_icon.charAt(0)}}{{row.status_icon.charAt(1)}}-2x" <mat-icon [ngStyle]="{'color': row.priority_color}" color="primary" class="{{row.status_icon.charAt(0)}}{{row.status_icon.charAt(1)}} {{row.status_icon}} {{row.status_icon.charAt(0)}}{{row.status_icon.charAt(1)}}-2x"
title="{{row.status_label}} ({{row.status_id}})"></mat-icon><br /> title="{{row.status_label}} ({{row.status_id}})"></mat-icon><br />
<span style="color: rgba(0,0,0,0.4);font-size: 90%;">{{row[data.id]}}</span>
</span> </span>
<ng-container *ngIf="data.id == 'date'"> <ng-container *ngIf="data.id == 'date'">
<i class="fa fa-calendar" title="{{lang.creationDate}}"></i>&nbsp;{{row.creation_date <i class="fa fa-calendar" title="{{lang.creationDate}}"></i>&nbsp;{{row.creation_date
...@@ -122,15 +123,10 @@ ...@@ -122,15 +123,10 @@
<ng-container *ngIf="data.id == 'category_id'"> <ng-container *ngIf="data.id == 'category_id'">
{{lang[row.category_id]}} {{lang[row.category_id]}}
</ng-container> </ng-container>
<ng-container *ngIf="data.id != 'status_label' && data.id != 'date' && data.id != 'category_id'"> <ng-container *ngIf="data.id != 'status_label' && data.id != 'date' && data.id != 'category_id' && data.id != 'alt_identifier'">
{{row[data.id]}} {{row[data.id]}}
</ng-container> </ng-container>
</div> </div>
</div>
<div class="resultRow">
<div class="resultCol smallFontData softColorData">
<b>Traité par</b> : {{row.user_dest_firstname}} {{row.user_dest_lastname}} ({{row.entity_destination}})
</div>
<mat-button-toggle-group #group="matButtonToggleGroup" class="actions" multiple> <mat-button-toggle-group #group="matButtonToggleGroup" class="actions" multiple>
<button color="primary" mat-icon-button (click)="openBottomSheet(row)"> <button color="primary" mat-icon-button (click)="openBottomSheet(row)">
<mat-icon fontSet="fas" matBadge="??" fontIcon="fa-comments fa-2x"></mat-icon> <mat-icon fontSet="fas" matBadge="??" fontIcon="fa-comments fa-2x"></mat-icon>
......
...@@ -43,14 +43,9 @@ export class BasketListComponent implements OnInit { ...@@ -43,14 +43,9 @@ export class BasketListComponent implements OnInit {
displayedColumnsBasket: string[] = ['res_id']; displayedColumnsBasket: string[] = ['res_id'];
displayedMainData: any = [ displayedMainData: any = [
{
'id' : 'status_label',
'class' : 'centerData',
'icon' : ''
},
{ {
'id' : 'alt_identifier', 'id' : 'alt_identifier',
'class' : 'softColorData', 'class' : 'softColorData centerData',
'icon' : '' 'icon' : ''
}, },
{ {
...@@ -60,38 +55,39 @@ export class BasketListComponent implements OnInit { ...@@ -60,38 +55,39 @@ export class BasketListComponent implements OnInit {
} }
]; ];
displayedSecondaryData: any = [ displayedSecondaryData: any = [];
{ // displayedSecondaryData: any = [
'id' : 'priority_label', // {
'class' : '', // 'id' : 'priority_label',
'icon' : '' // 'class' : '',
}, // 'icon' : ''
{ // },
'id' : 'category_id', // {
'class' : '', // 'id' : 'category_id',
'icon' : '' // 'class' : '',
}, // 'icon' : ''
{ // },
'id' : 'doctype_label', // {
'class' : '', // 'id' : 'doctype_label',
'icon' : 'fa fa-file' // 'class' : '',
}, // 'icon' : 'fa fa-file'
{ // },
'id' : 'contact_society', // {
'class' : '', // 'id' : 'contact_society',
'icon' : '' // 'class' : '',
}, // 'icon' : ''
{ // },
'id' : 'contact_society', // {
'class' : '', // 'id' : 'contact_society',
'icon' : '' // 'class' : '',
}, // 'icon' : ''
{ // },
'id' : 'date', // {
'class' : 'rightData', // 'id' : 'date',
'icon' : '' // 'class' : 'rightData',
}, // 'icon' : ''
]; // },
// ];
exampleDatabase: ExampleHttpDao | null; exampleDatabase: ExampleHttpDao | null;
data: any[] = []; data: any[] = [];
......
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