From 01397d6e60f03c2e6e42827a709a68c130d2d41a Mon Sep 17 00:00:00 2001
From: Alex ORLUC <alex.orluc@maarch.org>
Date: Thu, 26 Dec 2019 15:00:10 +0100
Subject: [PATCH] FEAT #12635 TIME 0:20 add filling rate in contact list
---
.../list/contacts-list-administration.component.html | 7 +++++++
.../contact/list/contacts-list-administration.component.ts | 2 +-
2 files changed, 8 insertions(+), 1 deletion(-)
diff --git a/src/frontend/app/administration/contact/list/contacts-list-administration.component.html b/src/frontend/app/administration/contact/list/contacts-list-administration.component.html
index 701996326bc..f53d4788309 100644
--- a/src/frontend/app/administration/contact/list/contacts-list-administration.component.html
+++ b/src/frontend/app/administration/contact/list/contacts-list-administration.component.html
@@ -57,6 +57,13 @@
<div style="height:90%;overflow:auto;position:absolute;width:100%;">
<mat-table id="contact-list" #tableContactListSort="matSort" [dataSource]="data" matSort
matSortActive="lastname" matSortDirection="asc" style="width:100%;">
+ <ng-container matColumnDef="filling">
+ <mat-header-cell *matHeaderCellDef style="flex: initial;width: 50px;" mat-sort-header
+ [class.hide-for-mobile]="appService.getViewMode()"></mat-header-cell>
+ <mat-cell mat-cell *matCellDef="let element" style="flex: initial;width: 50px;" [class.hide-for-mobile]="appService.getViewMode()">
+ <i class="fas fa-circle" [title]="lang.contactFilledTo + ' ' + element.filling.rate + '%'" [style.color]="element.filling.color"></i>
+ </mat-cell>
+ </ng-container>
<ng-container matColumnDef="firstname">
<mat-header-cell *matHeaderCellDef mat-sort-header
[class.hide-for-mobile]="appService.getViewMode()">{{lang.firstname}}</mat-header-cell>
diff --git a/src/frontend/app/administration/contact/list/contacts-list-administration.component.ts b/src/frontend/app/administration/contact/list/contacts-list-administration.component.ts
index d82669ff8a0..0d37b105fdb 100644
--- a/src/frontend/app/administration/contact/list/contacts-list-administration.component.ts
+++ b/src/frontend/app/administration/contact/list/contacts-list-administration.component.ts
@@ -29,7 +29,7 @@ export class ContactsListAdministrationComponent implements OnInit {
data: any;
- displayedColumnsContact: string[] = ['firstname', 'lastname', 'company', 'formatedAddress', 'actions'];
+ displayedColumnsContact: string[] = ['filling', 'firstname', 'lastname', 'company', 'formatedAddress', 'actions'];
isLoadingResults = true;
routeUrl: string = '../../rest/contacts';
--
GitLab