From 66d24dbcd5be92ad022a92475e707f6cf65d03bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adina=20=C8=9Aeudan?= Date: Mon, 30 Aug 2021 17:05:07 +0300 Subject: [PATCH] Dossier attributes listing --- ...r-attributes-listing-screen.component.html | 108 ++++++++---------- ...r-attributes-listing-screen.component.scss | 30 ----- ...ier-attributes-listing-screen.component.ts | 45 +++++--- 3 files changed, 80 insertions(+), 103 deletions(-) diff --git a/apps/red-ui/src/app/modules/admin/screens/dossier-attributes-listing/dossier-attributes-listing-screen.component.html b/apps/red-ui/src/app/modules/admin/screens/dossier-attributes-listing/dossier-attributes-listing-screen.component.html index a3f02e84f..39d8362c4 100644 --- a/apps/red-ui/src/app/modules/admin/screens/dossier-attributes-listing/dossier-attributes-listing-screen.component.html +++ b/apps/red-ui/src/app/modules/admin/screens/dossier-attributes-listing/dossier-attributes-listing-screen.component.html @@ -20,68 +20,20 @@
- - - - - - - -
-
- -
- -
- {{ attribute.label }} -
- -
- {{ attribute.placeholder }} -
- -
- {{ translations[attribute.type] | translate }} -
-
-
- - - -
-
-
-
-
+ [showNoDataButton]="currentUser.isAdmin" + emptyColumnWidth="1fr" + noDataIcon="red:attribute" + > +
@@ -110,3 +62,39 @@ > + + +
+ + + +
+
+ + +
+ {{ attribute.label }} +
+
+ + +
+ {{ attribute.placeholder }} +
+
+ + +
+ {{ translations[attribute.type] | translate }} +
+
diff --git a/apps/red-ui/src/app/modules/admin/screens/dossier-attributes-listing/dossier-attributes-listing-screen.component.scss b/apps/red-ui/src/app/modules/admin/screens/dossier-attributes-listing/dossier-attributes-listing-screen.component.scss index 187b51b58..c19ef5477 100644 --- a/apps/red-ui/src/app/modules/admin/screens/dossier-attributes-listing/dossier-attributes-listing-screen.component.scss +++ b/apps/red-ui/src/app/modules/admin/screens/dossier-attributes-listing/dossier-attributes-listing-screen.component.scss @@ -2,33 +2,3 @@ display: flex; justify-content: flex-end; } - -iqser-table-header::ng-deep .attributes-actions-container { - display: flex; - flex: 1; - justify-content: flex-end; - - > *:not(:last-child) { - margin-right: 10px; - } -} - -cdk-virtual-scroll-viewport { - ::ng-deep.cdk-virtual-scroll-content-wrapper { - grid-template-columns: auto 2fr 2fr 1fr 1fr 11px; - - .table-item > div { - height: 50px; - - &:not(.scrollbar-placeholder) { - padding-left: 10px; - } - } - } - - &.has-scrollbar:hover { - ::ng-deep.cdk-virtual-scroll-content-wrapper { - grid-template-columns: auto 2fr 2fr 1fr 1fr; - } - } -} diff --git a/apps/red-ui/src/app/modules/admin/screens/dossier-attributes-listing/dossier-attributes-listing-screen.component.ts b/apps/red-ui/src/app/modules/admin/screens/dossier-attributes-listing/dossier-attributes-listing-screen.component.ts index a42bb4a9c..8ed266871 100644 --- a/apps/red-ui/src/app/modules/admin/screens/dossier-attributes-listing/dossier-attributes-listing-screen.component.ts +++ b/apps/red-ui/src/app/modules/admin/screens/dossier-attributes-listing/dossier-attributes-listing-screen.component.ts @@ -1,4 +1,4 @@ -import { Component, Injector, OnInit } from '@angular/core'; +import { Component, forwardRef, Injector, OnInit, TemplateRef, ViewChild } from '@angular/core'; import { CircleButtonTypes, DefaultListingServices, @@ -19,7 +19,10 @@ import { UserService } from '@services/user.service'; @Component({ templateUrl: './dossier-attributes-listing-screen.component.html', styleUrls: ['./dossier-attributes-listing-screen.component.scss'], - providers: [...DefaultListingServices] + providers: [ + ...DefaultListingServices, + { provide: ListingComponent, useExisting: forwardRef(() => DossierAttributesListingScreenComponent) } + ] }) export class DossierAttributesListingScreenComponent extends ListingComponent implements OnInit { readonly iconButtonTypes = IconButtonTypes; @@ -27,17 +30,10 @@ export class DossierAttributesListingScreenComponent extends ListingComponent[] = [ - { - label: _('dossier-attributes-listing.table-col-names.label'), - sortByKey: 'label' - }, - { label: _('dossier-attributes-listing.table-col-names.placeholder') }, - { - label: _('dossier-attributes-listing.table-col-names.type'), - sortByKey: 'type' - } - ]; + tableColumnConfigs: TableColumnConfig[]; + @ViewChild('labelTemplate', { static: true }) labelTemplate: TemplateRef; + @ViewChild('placeholderTemplate', { static: true }) placeholderTemplate: TemplateRef; + @ViewChild('typeTemplate', { static: true }) typeTemplate: TemplateRef; protected readonly _primaryKey = 'label'; constructor( @@ -54,6 +50,7 @@ export class DossierAttributesListingScreenComponent extends ListingComponent item.id); await this._dossierAttributesService.deleteConfigs(ids); + this.entitiesService.setSelected([]); await this._loadData(); }); } @@ -77,6 +75,27 @@ export class DossierAttributesListingScreenComponent extends ListingComponent