From ce1b72263768bd3d233bd87090ee1790f5b35db2 Mon Sep 17 00:00:00 2001 From: Cyril Joseph Date: Sat, 17 Jan 2026 16:59:37 -0400 Subject: [PATCH] feedback updates --- src/app/carnet/goods/goods.component.html | 10 +- src/app/carnet/goods/goods.component.scss | 17 ++++ src/app/carnet/goods/goods.component.ts | 7 +- .../carnet/shipping/fees-dialog.component.ts | 20 ++-- src/app/carnet/shipping/shipping.component.ts | 2 - .../terms-conditions.component.html | 93 +++++++++++++------ .../terms-conditions.component.scss | 22 ++++- src/app/core/services/carnet/goods.service.ts | 37 ++------ src/app/core/services/home.service.ts | 5 +- src/app/home/home.component.html | 46 +++------ src/app/home/home.component.ts | 24 ++++- 11 files changed, 171 insertions(+), 112 deletions(-) diff --git a/src/app/carnet/goods/goods.component.html b/src/app/carnet/goods/goods.component.html index ac395f4..edd35f2 100644 --- a/src/app/carnet/goods/goods.component.html +++ b/src/app/carnet/goods/goods.component.html @@ -86,7 +86,7 @@ Weight - {{ formatDecimalDisplay(item.weight, 4) }} + {{ item.weight | number:'1.2-2' }} @@ -240,6 +240,14 @@
+ +
+
+ Total Goods Value: + {{totalGoodsValue | currency}} +
+
+ @@ -161,31 +170,6 @@ Void -
diff --git a/src/app/home/home.component.ts b/src/app/home/home.component.ts index ffcb090..81781ce 100644 --- a/src/app/home/home.component.ts +++ b/src/app/home/home.component.ts @@ -20,6 +20,7 @@ import { MatDialog } from '@angular/material/dialog'; import { StorageService } from '../core/services/common/storage.service'; import { CarnetService } from '../core/services/carnet/carnet.service'; import { FormsModule } from '@angular/forms'; +import { UserService } from '../core/services/common/user.service'; @Component({ selector: 'app-home', @@ -34,14 +35,18 @@ export class HomeComponent { showTable = false; userPreferences: UserPreferences; carnetStatuses: CarnetStatus[] = []; + currentCarnetStatus: any = {}; // table filter variables selectedColumn: string = ''; 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: 'deliveryType', displayName: 'Delivery Type' }, + { value: 'securityType', displayName: 'Security Type' }, { value: 'usSets', displayName: 'US Sets' }, { value: 'foreignSets', displayName: 'Foreign Sets' }, { value: 'transitSets', displayName: 'Transit Sets' }, @@ -64,7 +69,7 @@ export class HomeComponent { this.dataSource.sort = value; } - displayedColumns: string[] = ['applicationName', 'holderName', 'carnetNumber', 'usSets', 'foreignSets', 'transitSets', 'carnetValue', 'issueDate', 'expiryDate', 'orderType', 'carnetStatus', 'actions']; + displayedColumns: string[] = ['applicationName', 'clientName', 'holderName', 'carnetNumber', 'deliveryType', 'securityType', 'usSets', 'foreignSets', 'transitSets', 'carnetValue', 'issueDate', 'expiryDate', 'orderType', 'carnetStatus', 'actions']; private homeService = inject(HomeService); private carnetService = inject(CarnetService); @@ -73,6 +78,7 @@ export class HomeComponent { private commonService = inject(CommonService); private navigationService = inject(NavigationService); private storageService = inject(StorageService); + private userService = inject(UserService); private dialog = inject(MatDialog); constructor(userPrefenceService: UserPreferencesService) { @@ -101,7 +107,12 @@ export class HomeComponent { next: (data) => { this.carnetData = data; this.isLoading = false; - this.defaultCarnetStatusData(); + + if (!this.currentCarnetStatus?.spid) { + this.defaultCarnetStatusData(); + } else { + this.onCarnetStatusClick(this.currentCarnetStatus); + } }, error: (error) => { console.error('Error loading carnet data:', error); @@ -114,13 +125,15 @@ export class HomeComponent { this.isLoading = true; this.showTable = false; + this.currentCarnetStatus = event; + // Clear any existing filters when loading new data this.clearFilter(); 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; @@ -142,7 +155,7 @@ export class HomeComponent { const inProgressData = this.carnetData?.[0]?.CARNETSTATUS?.includes('T'); if (inProgressData) { - let spid = this.carnetData[0].SPID; + let spid = this.carnetData[0].SPID ?? this.userService.getUserSpid(); var carentData = { spid: spid, carnetStatus: 'T' @@ -175,8 +188,11 @@ 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, + 'Delivery Type': item.deliveryType, + 'Security Type': item.securityType, 'US Sets': item.usSets, 'Foreign Sets': item.foreignSets, 'Transit Sets': item.transitSets,