From c5df0683a0c52771a6c34315c5a3d10717155803 Mon Sep 17 00:00:00 2001 From: Cyril Joseph Date: Sat, 17 Jan 2026 17:07:28 -0400 Subject: [PATCH] feedback updates --- src/app/core/services/home.service.ts | 5 ++++- src/app/home/home.component.html | 10 ++++++++++ src/app/home/home.component.ts | 8 ++++++-- 3 files changed, 20 insertions(+), 3 deletions(-) diff --git a/src/app/core/services/home.service.ts b/src/app/core/services/home.service.ts index 8ecee78..418db31 100644 --- a/src/app/core/services/home.service.ts +++ b/src/app/core/services/home.service.ts @@ -37,7 +37,10 @@ export class HomeService { issueDate: item.ISSUEDATE || null, expiryDate: item.EXPDATE || null, orderType: item.ORDERTYPE, - carnetStatus: item.CARNETSTATUS + carnetStatus: item.CARNETSTATUS, + securityType: item.SECURITYTYPE, + deliveryType: item.DELIVERYTYPE, + clientName: item.CLIENTNAMNE })); } } diff --git a/src/app/home/home.component.html b/src/app/home/home.component.html index 21f36be..d9f89ac 100644 --- a/src/app/home/home.component.html +++ b/src/app/home/home.component.html @@ -60,6 +60,11 @@ {{ item.applicationName }} + + Client Name + {{ item.clientName }} + + Holder Name {{ item.holderName }} @@ -70,6 +75,11 @@ {{ item.carnetNumber }} + + Security Type + {{ item.securityType }} + + US Sets {{ item.usSets }} diff --git a/src/app/home/home.component.ts b/src/app/home/home.component.ts index 5db10c3..763e70c 100644 --- a/src/app/home/home.component.ts +++ b/src/app/home/home.component.ts @@ -36,8 +36,10 @@ export class HomeComponent { filterValue: string = ''; filterableColumns: any[] = [ { value: 'applicationName', displayName: 'Application Name' }, + { value: 'clientName', displayName: 'Client Name' }, { value: 'holderName', displayName: 'Holder Name' }, { value: 'carnetNumber', displayName: 'Carnet Number' }, + { value: 'securityType', displayName: 'Security Type' }, { value: 'usSets', displayName: 'US Sets' }, { value: 'foreignSets', displayName: 'Foreign Sets' }, { value: 'transitSets', displayName: 'Transit Sets' }, @@ -60,7 +62,7 @@ export class HomeComponent { this.dataSource.sort = value; } - displayedColumns: string[] = ['applicationName', 'holderName', 'carnetNumber', 'usSets', 'foreignSets', 'transitSets', 'carnetValue', 'issueDate', 'expiryDate', 'orderType', 'carnetStatus']; + displayedColumns: string[] = ['applicationName', 'clientName', 'holderName', 'carnetNumber', 'securityType', 'usSets', 'foreignSets', 'transitSets', 'carnetValue', 'issueDate', 'expiryDate', 'orderType', 'carnetStatus']; private homeService = inject(HomeService); private errorHandler = inject(ApiErrorHandlerService); @@ -111,7 +113,7 @@ export class HomeComponent { this.homeService.getCarnetDataByStatus(event.spid, event.carnetStatus).subscribe({ next: (carnetDetails) => { this.isLoading = false; - this.showTable = true; + this.showTable = carnetDetails.length > 0; this.dataSource.data = carnetDetails; this.dataSource.paginator = this.paginator; this.dataSource.sort = this.sort; @@ -152,8 +154,10 @@ export class HomeComponent { prepareDownloadData(): any[] { return this.dataSource.data.map(item => ({ 'Application Name': item.applicationName, + 'Client Name': item.clientName, 'Holder Name': item.holderName, 'Carnet Number': item.carnetNumber, + 'Security Type': item.securityType, 'US Sets': item.usSets, 'Foreign Sets': item.foreignSets, 'Transit Sets': item.transitSets,