From 9130b2db6bd2f7a0909d0207d154957346dd44c0 Mon Sep 17 00:00:00 2001 From: Mazdak Gibran <141390141+mazdakgibran@users.noreply.github.com> Date: Thu, 15 Jan 2026 12:48:54 +0500 Subject: [PATCH 1/2] fixed small bugs and adjusted styling fixed small bugs and adjusted styling --- .../transaction-logs.component.html | 13 +++++++--- .../transaction-logs.component.ts | 7 +++-- .../setup-user/setup-user.component.html | 2 +- .../setup-user/setup-user.component.scss | 6 +++++ .../third-party-registration.component.html | 26 ++++++++++++------- .../third-party-registration.component.ts | 7 +++++ src/assets/i18n/Arabic.json | 1 + src/assets/i18n/English.json | 1 + 8 files changed, 46 insertions(+), 17 deletions(-) diff --git a/src/app/transaction-logs/transaction-logs.component.html b/src/app/transaction-logs/transaction-logs.component.html index 7cabc6a..adf4e53 100644 --- a/src/app/transaction-logs/transaction-logs.component.html +++ b/src/app/transaction-logs/transaction-logs.component.html @@ -32,8 +32,8 @@ - - + + @@ -44,7 +44,7 @@ -
+

{{'loadingTransactionLogs' | translate}}

@@ -125,4 +125,9 @@
- \ No newline at end of file + + +
+

{{'noTransactionLogsFound' | translate}}

+
+ \ No newline at end of file diff --git a/src/app/transaction-logs/transaction-logs.component.ts b/src/app/transaction-logs/transaction-logs.component.ts index 5a61b5d..5f2a1dc 100644 --- a/src/app/transaction-logs/transaction-logs.component.ts +++ b/src/app/transaction-logs/transaction-logs.component.ts @@ -31,7 +31,8 @@ throw new Error('Method not implemented.'); pagedItems: any[] = []; errorMessage: string = ''; searchText: string = ''; - allItems: any; + allItems: TransactionLog[] = []; + transactionDataExpanded: boolean = true constructor( private excelExportService: ExcelExportService, @@ -65,7 +66,9 @@ throw new Error('Method not implemented.'); }); } - + toggleTableCard(): void { + this.transactionDataExpanded = !this.transactionDataExpanded; +} itemsPerPageChanged(): void { this.currentPage = 1; this.updatePagedItems(); diff --git a/src/app/user-management/setup-user/setup-user.component.html b/src/app/user-management/setup-user/setup-user.component.html index 53df2b3..5d4aa2e 100644 --- a/src/app/user-management/setup-user/setup-user.component.html +++ b/src/app/user-management/setup-user/setup-user.component.html @@ -127,7 +127,7 @@ {{ 'SelectRole' | translate }}*
- diff --git a/src/app/user-management/setup-user/setup-user.component.scss b/src/app/user-management/setup-user/setup-user.component.scss index e69de29..007cb28 100644 --- a/src/app/user-management/setup-user/setup-user.component.scss +++ b/src/app/user-management/setup-user/setup-user.component.scss @@ -0,0 +1,6 @@ +.form-select-narrow{ + width: 98.3% !important; +} +.form-select-narrow .ng-clear-zone { + display: none; +} \ No newline at end of file diff --git a/src/app/user-management/third-party-registration/third-party-registration.component.html b/src/app/user-management/third-party-registration/third-party-registration.component.html index f64df10..8232c31 100644 --- a/src/app/user-management/third-party-registration/third-party-registration.component.html +++ b/src/app/user-management/third-party-registration/third-party-registration.component.html @@ -31,7 +31,7 @@ class="mandatory">*
- @@ -52,7 +52,7 @@ class="mandatory">*
- @@ -68,7 +68,7 @@
-
- @@ -120,7 +120,7 @@ class="mandatory">*
- @@ -145,7 +145,7 @@ class="mandatory">*
- @@ -224,8 +224,8 @@ placeholder="{{ 'search' | translate }}">
- - + + @@ -234,7 +234,8 @@
-
+ +
@@ -314,4 +315,9 @@ - \ No newline at end of file + + +
+

{{'noThirdPartyRegFound' | translate}}

+
+ \ No newline at end of file diff --git a/src/app/user-management/third-party-registration/third-party-registration.component.ts b/src/app/user-management/third-party-registration/third-party-registration.component.ts index f98ae7f..ca7d325 100644 --- a/src/app/user-management/third-party-registration/third-party-registration.component.ts +++ b/src/app/user-management/third-party-registration/third-party-registration.component.ts @@ -24,6 +24,9 @@ export class ThirdPartyRegistrationComponent implements OnInit { pageSizeOptions = pageSizeOptions; itemsPerPage: number = 5; buttonPermissions: any; + thirdPartyRegExpanded: boolean = true; + allItems: [] = []; + isLoading: boolean = false; @ViewChild(PasswordHideShowComponent) passwordHideShow?: PasswordHideShowComponent; constructor( @@ -81,4 +84,8 @@ export class ThirdPartyRegistrationComponent implements OnInit { getButtonPermissions() { this.buttonPermissions = this.buttonManagementService.buttonPermissions["thirdPartyRegistration"]; } + + toggleTableCard(): void { + this.thirdPartyRegExpanded = !this.thirdPartyRegExpanded; +} } diff --git a/src/assets/i18n/Arabic.json b/src/assets/i18n/Arabic.json index a145ad4..3954493 100644 --- a/src/assets/i18n/Arabic.json +++ b/src/assets/i18n/Arabic.json @@ -191,6 +191,7 @@ "transactionLogs": "سجلات المعاملات", "loadingTransactionLogs": "جاري تحميل سجلات المعاملات...", "noTransactionLogsFound": "لم يتم العثور على سجلات معاملات.", + "noThirdPartyRegFound":"لم يتم العثور على تفاصيل تسجيل الطرف الثالث", "logID": "معرف السجل", "organization": "المنظمة", "transactionID": "معرف المعاملة", diff --git a/src/assets/i18n/English.json b/src/assets/i18n/English.json index bd969fb..422273b 100644 --- a/src/assets/i18n/English.json +++ b/src/assets/i18n/English.json @@ -250,6 +250,7 @@ "toDateInvalidError": "To Date must be greater than or equal to From Date", "noLoggingDetailsFound": "No Logging Details found", "noUserDetailsFound":"No User Details found", + "noThirdPartyRegFound":"No Third Party Registration Details Found", "ERR_SEC_0001": "Email already exists", "ERR_SEC_0002": "Username already exists", "ERR_SEC_0003": "Old Password is not correct", From 6252fed4f411a52e6e44e96ee230ee82b1211752 Mon Sep 17 00:00:00 2001 From: Mazdak Gibran <141390141+mazdakgibran@users.noreply.github.com> Date: Thu, 15 Jan 2026 14:06:57 +0500 Subject: [PATCH 2/2] delete pipes --- .../shared/pipes/transactionLogFilter.pipe.ts | 28 ------------------- src/app/shared/pipes/userFilterPipe.ts | 22 --------------- 2 files changed, 50 deletions(-) delete mode 100644 src/app/shared/pipes/transactionLogFilter.pipe.ts delete mode 100644 src/app/shared/pipes/userFilterPipe.ts diff --git a/src/app/shared/pipes/transactionLogFilter.pipe.ts b/src/app/shared/pipes/transactionLogFilter.pipe.ts deleted file mode 100644 index 4296ba3..0000000 --- a/src/app/shared/pipes/transactionLogFilter.pipe.ts +++ /dev/null @@ -1,28 +0,0 @@ -import { Pipe, PipeTransform } from '@angular/core'; -import { TransactionLog } from '../../models/user'; - -@Pipe({ - name: 'transactionLogFilter', - standalone: true -}) -export class TransactionLogFilterPipe implements PipeTransform { - transform(logs: TransactionLog[], searchText: string): TransactionLog[] { - if (!logs || !searchText) { - return logs; - } - - const search = searchText.toLowerCase(); - - return logs.filter(log => - log.logId?.toString().toLowerCase().includes(search) || - log.porOrgacode?.toLowerCase().includes(search) || - log.transactionID?.toLowerCase().includes(search) || - log.drMbmbkmsnumber?.toLowerCase().includes(search) || - log.crMbmbkmsnumber?.toLowerCase().includes(search) || - log.ppmPymdcode?.toLowerCase().includes(search) || - log.sgtGntrdate?.toLowerCase().includes(search) || - log.channelCode?.toLowerCase().includes(search) || - log.createdAt?.toLowerCase().includes(search) - ); - } -} \ No newline at end of file diff --git a/src/app/shared/pipes/userFilterPipe.ts b/src/app/shared/pipes/userFilterPipe.ts deleted file mode 100644 index 7bb23cd..0000000 --- a/src/app/shared/pipes/userFilterPipe.ts +++ /dev/null @@ -1,22 +0,0 @@ -import { Pipe, PipeTransform } from '@angular/core'; -import { SetupUser } from '../../models/user'; - -@Pipe({ - name: 'userFilter', - standalone: true -}) -export class UserFilterPipe implements PipeTransform { - transform(users: SetupUser[], searchText: string): SetupUser[] { - if (!users || !searchText.trim()) { - return users; - } - - const search = searchText.toLowerCase(); - - return users.filter(user => - user.userId.toLowerCase().includes(search) || - user.userFullname.toLowerCase().includes(search) || - user.email.toLowerCase().includes(search) - ); - } -} \ No newline at end of file