From 0e0f34f505261e5625ccd4184df1be8d2df0fd2f Mon Sep 17 00:00:00 2001 From: ychung-mot Date: Mon, 23 Sep 2024 14:09:07 -0700 Subject: [PATCH] fix(dss-872) --- ...isting-upload-history-table.component.html | 4 +- .../export-listings.component.html | 4 +- .../listing-details.component.html | 32 +- .../upload-business-license.component.html | 286 +++++++++++++----- 4 files changed, 231 insertions(+), 95 deletions(-) diff --git a/frontend/src/app/common/listing-upload-history-table/listing-upload-history-table.component.html b/frontend/src/app/common/listing-upload-history-table/listing-upload-history-table.component.html index 7d7b2dda..deec9ca7 100644 --- a/frontend/src/app/common/listing-upload-history-table/listing-upload-history-table.component.html +++ b/frontend/src/app/common/listing-upload-history-table/listing-upload-history-table.component.html @@ -114,7 +114,7 @@

Platform Upload History

{{0}} - {{ row.updDtm |date:'YYYY-MM-dd' }} + {{ row.updDtm |date:'yyyy-MM-dd' }} {{ row.uploadedBy }} @@ -142,4 +142,4 @@

Platform Upload History

[currentPageReportTemplate]="'Rows per page: 10   {first}-{last} of {totalRecords}'"> - \ No newline at end of file + diff --git a/frontend/src/app/features/components/export-listings/export-listings.component.html b/frontend/src/app/features/components/export-listings/export-listings.component.html index bd9718b7..539342f6 100644 --- a/frontend/src/app/features/components/export-listings/export-listings.component.html +++ b/frontend/src/app/features/components/export-listings/export-listings.component.html @@ -4,7 +4,7 @@
Data last updated on {{dateLastUpdated - | date: 'YYYY-MM-dd'}} + | date: 'yyyy-MM-dd'}}
@@ -34,4 +34,4 @@

Download listings as .CSV file

-
\ No newline at end of file + diff --git a/frontend/src/app/features/components/listings-table/listing-details/listing-details.component.html b/frontend/src/app/features/components/listings-table/listing-details/listing-details.component.html index e2aaf47e..dfe92636 100644 --- a/frontend/src/app/features/components/listings-table/listing-details/listing-details.component.html +++ b/frontend/src/app/features/components/listings-table/listing-details/listing-details.component.html @@ -213,7 +213,7 @@

Detailed Listing Information for

{{ addressChange.type }} {{ addressChange.platformAddress }} {{ addressChange.bestMatchAddress }} - {{ addressChange.date |date:'YYYY-MM-dd' }} + {{ addressChange.date |date:'yyyy-MM-dd' }} {{ addressChange.user }}
@@ -261,7 +261,7 @@

Detailed Listing Information for

Business Licence Information - BL Records Last Uploaded:{{blInfo.updDtm |date:'YYYY-MM-dd' }} + BL Records Last Uploaded:{{blInfo.updDtm |date:'yyyy-MM-dd' }}
@@ -303,9 +303,9 @@

Detailed Listing Information for

@@ -317,7 +317,7 @@

Detailed Listing Information for

Licence Type: {{blInfo.licenceTypeTxt ||'-'}}
- Expiry Date: {{blInfo.expiryDt |date:'YYYY-MM-dd'}} + Expiry Date: {{blInfo.expiryDt |date:'yyyy-MM-dd'}}
Status: Detailed Listing Information for Phone: {{blInfo.businessOwnerPhoneNo ||'-'}}
-
@@ -362,11 +362,11 @@

Detailed Listing Information for

Phone: {{blInfo.businessOperatorPhoneNo ||'-'}}
-
@@ -399,11 +399,11 @@

Detailed Listing Information for

Infraction Date: {{blInfo.infractionDt|date:'YYYY-MM-dd'}} + class="value">{{blInfo.infractionDt|date:'yyyy-MM-dd'}}
-
diff --git a/frontend/src/app/features/components/upload-business-license/upload-business-license.component.html b/frontend/src/app/features/components/upload-business-license/upload-business-license.component.html index 4287a9ed..2fa037ac 100644 --- a/frontend/src/app/features/components/upload-business-license/upload-business-license.component.html +++ b/frontend/src/app/features/components/upload-business-license/upload-business-license.component.html @@ -1,74 +1,165 @@
Upload Business Licence Data
- +
- + - {{group.label}} + {{ group.label }}
- + - + Jurisdiction - - + + - + Status - - + + - + Total Records - - + + - + Errors - - + + - + Upload Date - - + + - + Uploaded By - - + + @@ -76,58 +167,103 @@ {{ uploadHistory.organizationNm }} - - {{uploadHistory.status}} - {{uploadHistory.status}} + + + {{ + uploadHistory.status + }} + {{ + uploadHistory.status + }} {{ uploadHistory.total }} - - - {{0}} - + (click)=" + onDownloadErrors( + uploadHistory.uploadDeliveryId, + uploadHistory.organizationNm, + uploadHistory.reportPeriodYM + ) + " + > + {{ uploadHistory.errors || '-' }}  + + + {{ 0 }} - {{ uploadHistory.updDtm |date:'YYYY-MM-dd' }} - {{ uploadHistory.givenNm }} {{uploadHistory.familyNm}} + {{ uploadHistory.updDtm | date : 'yyyy-MM-dd' }} + {{ uploadHistory.givenNm }} {{ uploadHistory.familyNm }} - - + No records found - + [showFirstLastIcon]="false" + [showPageLinks]="false" + [showCurrentPageReport]="true" + >
- + -
- Upload Your Business Licence Data (.CSV File Only) -
+
Upload Your Business Licence Data (.CSV File Only)
- -
{{selectedFile?.name || 'No file selected'}}
+ +
{{ selectedFile?.name || 'No file selected' }}
-
\ No newline at end of file +