From a52435d4430c1c4e0a03461796faca18808c0f53 Mon Sep 17 00:00:00 2001 From: ewandor Date: Thu, 9 Mar 2023 17:44:30 +0100 Subject: [PATCH] Improving common list displays --- .../app/src/app/views/contracts/contracts.component.ts | 2 +- front/app/src/app/views/contracts/drafts.component.ts | 2 +- .../views/templates/contract-templates.component.ts | 8 ++++---- .../views/templates/provision-templates.component.ts | 8 ++++---- front/app/src/common/crud/list/list.component.ts | 10 ++++++++-- 5 files changed, 18 insertions(+), 12 deletions(-) diff --git a/front/app/src/app/views/contracts/contracts.component.ts b/front/app/src/app/views/contracts/contracts.component.ts index 0b1c9ce9..bc2b4e0a 100644 --- a/front/app/src/app/views/contracts/contracts.component.ts +++ b/front/app/src/app/views/contracts/contracts.component.ts @@ -13,7 +13,7 @@ export class BaseContractsComponent { templateUrl: '../base-view/templates/list.template.html' }) export class ContractsListComponent extends BaseContractsComponent { - columns = []; + columns = ['status', 'name', 'title', 'parties.items.entity.label', 'lawyer.label', 'date']; } @Component({ diff --git a/front/app/src/app/views/contracts/drafts.component.ts b/front/app/src/app/views/contracts/drafts.component.ts index 955a5964..0d7ea58b 100644 --- a/front/app/src/app/views/contracts/drafts.component.ts +++ b/front/app/src/app/views/contracts/drafts.component.ts @@ -17,7 +17,7 @@ export class BaseDraftsComponent { templateUrl: '../base-view/templates/list.template.html' }) export class DraftsListComponent extends BaseDraftsComponent { - columns = []; + columns = ['status', 'name', 'title', 'parties.items.part']; } @Component({ diff --git a/front/app/src/app/views/templates/contract-templates.component.ts b/front/app/src/app/views/templates/contract-templates.component.ts index d77c0a48..77b1c365 100644 --- a/front/app/src/app/views/templates/contract-templates.component.ts +++ b/front/app/src/app/views/templates/contract-templates.component.ts @@ -7,20 +7,20 @@ export class BaseContractTemplateComponent { } @Component({ - templateUrl: '../base-view/templates/list.template.html' + templateUrl: '../base-view/templates/list.template.html' }) export class ContractTemplateListComponent extends BaseContractTemplateComponent { - columns = []; + columns = ['name', 'title', 'parties.items.part']; } @Component({ - templateUrl: '../base-view/templates/new.template.html' + templateUrl: '../base-view/templates/new.template.html' }) export class ContractTemplateNewComponent extends BaseContractTemplateComponent { } @Component({ - templateUrl: '../base-view/templates/card.template.html' + templateUrl: '../base-view/templates/card.template.html' }) export class ContractTemplateCardComponent extends BaseContractTemplateComponent { } diff --git a/front/app/src/app/views/templates/provision-templates.component.ts b/front/app/src/app/views/templates/provision-templates.component.ts index 62216f13..d0ba438c 100644 --- a/front/app/src/app/views/templates/provision-templates.component.ts +++ b/front/app/src/app/views/templates/provision-templates.component.ts @@ -7,20 +7,20 @@ export class BaseProvisionTemplateComponent { } @Component({ - templateUrl: '../base-view/templates/list.template.html' + templateUrl: '../base-view/templates/list.template.html' }) export class ProvisionTemplateListComponent extends BaseProvisionTemplateComponent{ - columns = []; + columns = ['name', 'title', 'body']; } @Component({ - templateUrl: '../base-view/templates/new.template.html' + templateUrl: '../base-view/templates/new.template.html' }) export class ProvisionTemplateNewComponent extends BaseProvisionTemplateComponent { } @Component({ - templateUrl: '../base-view/templates/card.template.html' + templateUrl: '../base-view/templates/card.template.html' }) export class ProvisionTemplateCardComponent extends BaseProvisionTemplateComponent { } diff --git a/front/app/src/common/crud/list/list.component.ts b/front/app/src/common/crud/list/list.component.ts index a383758f..3989c594 100644 --- a/front/app/src/common/crud/list/list.component.ts +++ b/front/app/src/common/crud/list/list.component.ts @@ -75,10 +75,16 @@ export class ListComponent implements OnInit { } } - getColumnValue(row: any, col: string) { + getColumnValue(row: any, col: string): string { let parent = row; for (const key of col.split('.')) { - parent = parent[key]; + if (key == 'items' && Array.isArray(parent)) { + let path_parts = col.split(/items\.(.*)/s); + let subkey = path_parts[1] + return parent.map((v: any) => this.getColumnValue(v, subkey)).join(', '); + } else { + parent = parent[key]; + } } return parent; }