@sachin9822/reports-lib 0.0.211 → 0.0.213

package/src/lib/shared/search-filter/search-filter.component.ts

@@ -0,0 +1,2387 @@
+import { Component, EventEmitter, Input, OnInit, OnDestroy, Output, ChangeDetectorRef } from '@angular/core';
+import { FormBuilder, FormGroup, Validators } from '@angular/forms';
+import { ComponentLoadingState, Client, Branch, Currency, Product, TransactionStatus, User } from '../../models/transaction-enquiry-report/transaction-enquiry.model';
+import { Subject } from 'rxjs';
+import { forkJoin, of } from 'rxjs';
+import { catchError, finalize, map, switchMap } from 'rxjs/operators';
+import { takeUntil } from 'rxjs/operators';
+import { ReportService } from '../../services/report.service';
+import { ConfigService } from '../../services/config.service';
+import { NgbDateStruct } from '@ng-bootstrap/ng-bootstrap';
+import * as angularCommon from '@angular/common';
+
+@Component({
+  selector: 'lib-search-filter',
+  templateUrl: './search-filter.component.html',
+  styleUrls: ['./search-filter.component.scss']
+})
+
+export class SearchFilterComponent implements OnInit, OnDestroy {
+  @Input() ReportName!: string;
+  @Output() searchClicked = new EventEmitter<any>();
+  @Output() formValid = new EventEmitter<boolean>();
+  searchForm!: FormGroup;
+  @Input() initialFilters: any;
+  formValidationError: boolean = false;
+  private destroy$ = new Subject<void>();
+
+  loadingState: ComponentLoadingState = ComponentLoadingState.Complete;
+  ComponentLoadingState = ComponentLoadingState;
+  hasSearched: boolean = false;
+  private _errorMessage: string = '';
+
+  currentUser: string = '';
+  usernameMissing: boolean = false;
+  token = sessionStorage.getItem('access_token');
+  applicationType = 'ezremit';
+  companyCode = 'BH';
+  serviceUrl: string;
+  public isOpen = false;
+
+  clients1: Client[] = [];
+  branches: Branch[] = [];
+  users: User[] = [];
+  currencies: Currency[] = [];
+  products: Product[] = [];
+  transactionStatuses: TransactionStatus[] = [];
+  summaryReportTypes: any[] = [];
+  selectedStatuses: string[] = [];
+  showStatusDropdown: boolean = false;
+  visibleFieldKeys: string[] = [];
+  params: any;
+  countries: any[] = [];
+  transactionProducts: any[] = [];
+  dateType: any = 1;
+  date: any;
+  sendBusinessPartnerAgents: any[] = [];
+  recvBusinessPartnerAgents: any[] = [];
+  clientName: string;
+  clientType: string;
+  disabledDate: NgbDateStruct;
+  isSelectAllChecked = true;
+  erroMessage: string = 'Error in Loading Data';
+
+  // for Trial Balance - Accounts Report
+  businessUnits: any[] = [];
+  accountStatuses: any[] = [];
+  currency: any[] = [];
+  financialYears: any[] = [];
+  fromMonths: any[] = [];
+  toMonths: any[] = [];
+  dateTypes: any[] = [];
+  fromDays: any[] = [];
+  toDays: any[] = [];
+  paramDateDefault: any[] = [];
+
+  // Field visibility map, 'fromDate', 'toDate','product','userId','currency','transactionStatus','transactionNo'
+  visibleFieldsMap: { [report: string]: string[] } = {
+    'Transaction Enquiry': ['client', 'fromDate', 'toDate', 'branch', 'product', 'currency', 'transactionStatus', 'transactionNo'],
+    'FC Ledger': ['client', 'fromDate', 'toDate', 'currency', 'product'],
+    'Branch Activity Send': ['client', 'fromDate', 'toDate', 'branch', 'transactionProduct', 'receiveCurrency', 'transactionStatus', 'sendCountry', 'receiveCountry'],
+    'ACC GL Details Enquiry': ['dateType', 'date'],
+    'Branch Activity Receive': ['client', 'fromDate', 'toDate', 'branch', 'transactionProduct', 'receiveCurrency', 'transactionStatus', 'sendCountry', 'receiveCountry'],
+    'Cancellation Transaction': ['client', 'fromDate', 'toDate', 'branch', 'sendCountry', 'receiveCountry', 'product', 'receiveCurrency'],
+    'Revenue Per Transaction': ['sendBusinessPartner', 'fromDate', 'toDate', 'recvBusinessPartner', 'sendCountry', 'receiveCountry', 'transactionStatus'],
+    'Statement of Accounts': ['client', 'fromDate', 'toDate'],
+    'Accounting': ['client', 'fromDate', 'toDate', 'branch', 'transactionProduct', 'sendCurrency', 'transactionStatus', 'sendCountry', 'receiveCountry'],
+    'Credit Limit Status Enquiry': ['client', 'fromDate', 'toDate', 'transactionStatusSingleSelect'],
+    'Funding': ['fromDate', 'toDate'],
+    'Trial Balance - Accounts': ['businessUnit', 'accountStatus', 'currency', 'financialYear', 'fromMonth', 'toMonth', 'dateTypeForTrialBalanceAccounts', 'fromDay', 'toDay'],
+    'Branch Activity Send Summary': ['client', 'fromDate', 'toDate', 'branch', 'transactionProduct', 'receiveCurrency', 'transactionStatus', 'sendCountry', 'receiveCountry', 'summaryReport'],
+
+    'Transaction Monitoring': ['client', 'fromDate', 'toDate', 'branch', 'transactionProduct', 'receiveCurrency', 'transactionStatus', 'sendCountry', 'receiveCountry'],
+    // Add more report types here
+  };
+
+  get visibleFields(): string[] {
+    return this.visibleFieldsMap[this.ReportName] || [];
+  }
+
+  isFieldVisible(field: string): boolean {
+    return this.visibleFields.includes(field);
+  }
+
+  constructor(
+    private reportService: ReportService,
+    private fb: FormBuilder,
+    private config: ConfigService,
+    private cd: ChangeDetectorRef
+  ) {
+    this.serviceUrl = this.config.get.serviceUrl;
+    let fossilUser = sessionStorage.getItem('fossilusername');
+    let ezremitUser = sessionStorage.getItem('ezremitusername');
+
+    if (fossilUser) this.currentUser = fossilUser;
+    else if (ezremitUser) this.currentUser = ezremitUser;
+    else {
+      this.usernameMissing = true;
+    }
+    this.currentUser = this.currentUser.replace(/^["'](.*)["']$/, '$1');
+  }
+
+  ngOnInit(): void {
+    const today = new Date();
+    this.disabledDate = {
+      year: today.getFullYear(),
+      month: today.getMonth() + 1,
+      day: today.getDate()
+    };
+    this.checkReport();
+  }
+
+  ngOnDestroy(): void {
+    this.destroy$.next();
+    this.destroy$.complete();
+  }
+
+  private checkReport() {
+    if (this.ReportName == "Transaction Enquiry") {
+      this.initializeForm();
+      this.subscribeToDateChanges();
+      this.loadInitialData();
+      this.transactionStatusSubscribe();
+    }
+    if (this.ReportName == "Branch Activity Send") {
+      this.initializeForm();
+      this.loadInitialData();
+      this.subscribeToDateChanges();
+      this.transactionStatusSubscribe();
+    }
+    if (this.ReportName == "ACC GL Details Enquiry") {
+      this.initializeForm();
+    }
+    if (this.ReportName == "Cancellation Transaction") {
+      this.initializeForm();
+      this.loadInitialData();
+      this.subscribeToDateChanges();
+    }
+    if (this.ReportName === "Branch Activity Receive") {
+      this.initializeForm();
+      this.loadInitialData();
+      this.subscribeToDateChanges();
+      this.transactionStatusSubscribe();
+    }
+    if (this.ReportName === "Revenue Per Transaction") {
+      this.initializeForm()
+      this.loadInitialData();
+      this.subscribeToDateChanges();
+      this.transactionStatusSubscribe();
+    }
+    if (this.ReportName == "Statement of Accounts") {
+      this.initializeForm();
+      this.loadInitialData();
+      this.subscribeToDateChanges();
+    }
+    if (this.ReportName == "Accounting") {
+      this.initializeForm();
+      this.loadInitialData();
+      this.subscribeToDateChanges();
+      this.transactionStatusSubscribe();
+    }
+    if (this.ReportName === "Credit Limit Status Enquiry") {
+      this.initializeForm();
+      this.loadInitialData();
+      this.subscribeToDateChanges();
+    }
+    if (this.ReportName == "Funding") {
+      this.initializeForm();
+      this.subscribeToDateChanges();
+    }
+    if (this.ReportName == "Trial Balance - Accounts") {
+      this.initializeForm();
+      this.loadInitialData();
+    }
+      if (this.ReportName == "Branch Activity Send Summary") {
+      this.initializeForm();
+      this.loadInitialData();
+      this.subscribeToDateChanges();
+      this.transactionStatusSubscribe();
+    }
+     if (this.ReportName == "Transaction Monitoring") {
+      this.initializeForm();
+      this.loadInitialData();
+      this.subscribeToDateChanges();
+      this.transactionStatusSubscribe();
+    }
+  }
+
+  loadInitialData() {
+    if (this.ReportName == 'Transaction Enquiry') {
+      this.loadInitialDatafortxnEnquiry();
+    }
+
+    if (this.ReportName == "Branch Activity Send") {
+      this.loadInitialDataforBranchActivitySend();
+    }
+
+    if (this.ReportName === "Branch Activity Receive") {
+      this.loadInitialDataforBranchActivityReceive();
+    }
+    if (this.ReportName == "Cancellation Transaction") {
+      this.loadInitialDataForCancellationReport();
+    }
+    if (this.ReportName === "Revenue Per Transaction") {
+      this.loadDataForRevenuePerTransactionReport();
+    }
+    if (this.ReportName == "Statement of Accounts") {
+      this.loadInitialDataForStatementOfAccounts();
+    }
+    if (this.ReportName == "Accounting") {
+      this.loadInitialDataforAccounting();
+    }
+    if (this.ReportName == "Trial Balance - Accounts") {
+      this.loadInitialDataForTrialBalanceAccounts();
+    }
+
+    if (this.ReportName === "Credit Limit Status Enquiry") {
+      this.loadInitialDataForCreditLimitStatusEnquiry();
+    }
+     if (this.ReportName == "Branch Activity Send Summary") {
+      this.loadInitialDataforBranchActivitySendSummary();
+    }
+  if (this.ReportName == "Transaction Monitoring") {
+      this.loadInitialDataforTransactionMonitoring();
+    }
+  }
+
+ loadInitialDataforBranchActivitySendSummary() {
+    this.loadingState = ComponentLoadingState.Loading;
+    forkJoin({
+      params: this.reportService.getParamsForSendSummaryReport().pipe(
+        catchError(err => {
+          console.error('Error loading params', err);
+          return of(null);
+        })
+      ),
+      clients: this.reportService.getPayInAgentforSendSummaryReport().pipe(
+        map((clients: any[]): Client[] =>
+          clients.map((client, index) => ({
+            businessPartnerName: client.agent,
+            businessPartnerCode: client.code,
+            displayOrder: index,
+            clientType: ""
+          }))
+        ),
+        catchError(err => {
+          console.error('Error loading clients', err);
+          return of([]);
+        })
+      )
+    }).subscribe(
+      {
+        next: ({ params, clients }) => {
+          this.params = params;
+          this.clients1 = clients;
+          this.countries = [...params?.countries]
+          this.currencies = [...params?.currencies];
+          this.transactionStatuses = [...params?.transactionStatusTypes];
+          this.transactionProducts = [...params?.transactionProductTypes];
+          this.summaryReportTypes = [
+            { label: 'Date-Wise Summary', value: 'Date-Wise Summary' },
+            { label: 'Total Summary', value: 'Total Summary' }
+          ];
+
+          this.searchForm.patchValue({ client: this.clients1[0].businessPartnerCode });
+          this.onClientChange();
+        },
+        error: err => {
+          console.error('Unexpected forkJoin error', err);
+          this.loadingState = ComponentLoadingState.Complete;
+        },
+        complete: () => {
+          this.loadingState = ComponentLoadingState.Complete;
+        }
+      }
+    );
+  }
+    
+  loadInitialDataforTransactionMonitoring() {
+   this.loadingState = ComponentLoadingState.Loading;
+    forkJoin({
+      params: this.reportService.getParamsForTransactionMonitoringReport().pipe(
+        catchError(err => {
+          console.error('Error loading params', err);
+          return of(null);
+        })
+      ),
+      clients: this.reportService.getPayInAgentforTransactionMonitoringReport().pipe(
+        map((clients: any[]): Client[] =>
+          clients.map((client, index) => ({
+            businessPartnerName: client.agent,
+            businessPartnerCode: client.code,
+            displayOrder: index,
+            clientType: ""
+          }))
+        ),
+        catchError(err => {
+          console.error('Error loading clients', err);
+          return of([]);
+        })
+      )
+    }).subscribe(
+      {
+        next: ({ params, clients }) => {
+          this.params = params;
+          this.clients1 = clients;
+          this.countries = [...params?.countries]
+          this.currencies = [...params?.currencies];
+          this.transactionStatuses = [...params?.transactionStatusTypes];
+          this.transactionProducts = [...params?.transactionProductTypes];
+
+         this.searchForm.patchValue({ client: this.clients1[0].businessPartnerCode });
+          if (this.initialFilters) {
+            //patch data
+            this.applyInitialFilters();
+          }
+
+
+          this.onClientChange();
+          //  AUTO LOAD ONLY for routed case
+          if (this.initialFilters) {
+            this.onSearch();
+          }
+        },
+        error: err => {
+          console.error('Unexpected forkJoin error', err);
+          this.loadingState = ComponentLoadingState.Complete;
+        },
+        complete: () => {
+          this.loadingState = ComponentLoadingState.Complete;
+        }
+      }
+    );
+  }
+
+  private applyInitialFilters() {
+    if (!this.initialFilters) return;
+    const patch: any = {};
+    // Transaction Status (STRING → ARRAY)
+    if (this.initialFilters.transactionStatus) {
+      patch.transactionStatus = [this.initialFilters.transactionStatus];
+    }
+
+    // Receive Country
+    if (this.initialFilters.receiveCountry) {
+      patch.receiveCountry = this.initialFilters.receiveCountry;
+    }
+
+    // Realtime handling
+    if (this.initialFilters.isRealtime) {
+
+      patch.fromDate = '';
+      patch.toDate = '';
+      //clear
+      this.searchForm.get('fromDate')?.clearValidators();
+      this.searchForm.get('toDate')?.clearValidators();
+
+    } else {
+
+      // Only override if values exist (VERY IMPORTANT)
+      if (this.initialFilters.toDate) {
+        patch.toDate = this.initialFilters.toDate;
+      }
+      if (this.initialFilters.fromDate) {
+        patch.fromDate = this.initialFilters.fromDate;
+      }
+
+      this.searchForm.get('fromDate')?.setValidators(Validators.required);
+      this.searchForm.get('toDate')?.setValidators(Validators.required);
+
+    }
+
+    // Single patch call (avoids multiple triggers)
+    this.searchForm.patchValue(patch, { emitEvent: false });
+    this.searchForm.get('fromDate')?.updateValueAndValidity({ emitEvent: false });
+    this.searchForm.get('toDate')?.updateValueAndValidity({ emitEvent: false });
+
+  }
+
+  private initializeForm(): void {
+    if (this.ReportName == "Transaction Enquiry") {
+      this.searchForm = this.fb.group(
+        {
+          client: [null, Validators.required],
+          fromDate: [new Date().toISOString().split("T")[0], Validators.required],
+          toDate: [new Date().toISOString().split("T")[0], Validators.required],
+          branch: [null, Validators.required],
+          product: [null, Validators.required],
+          currency: ['All'],
+          transactionStatus: [['All'], Validators.required],
+          transactionNo: ['']
+        },
+      );
+    }
+
+    if (this.ReportName == "ACC GL Details Enquiry") {
+      this.searchForm = this.fb.group(
+        {
+          date: [new Date().toISOString().split("T")[0], Validators.required],
+          dateType: [1, Validators.required]
+        });
+    }
+
+    if (this.ReportName == "Branch Activity Send") {
+      this.searchForm = this.fb.group(
+        {
+          client: [null, Validators.required],
+          fromDate: [new Date().toISOString().split("T")[0], Validators.required],
+          toDate: [new Date().toISOString().split("T")[0], Validators.required],
+          branch: [null, Validators.required],
+          receiveCurrency: ['All'],
+          product: ['All', Validators.required],
+          transactionStatus: [['All'], Validators.required],
+          sendCountry: ['All'],
+          receiveCountry: ['All']
+        }
+      );
+    }
+
+    if (this.ReportName == "Branch Activity Receive") {
+      this.searchForm = this.fb.group(
+        {
+          client: [null, Validators.required],
+          fromDate: [new Date().toISOString().split("T")[0], Validators.required],
+          toDate: [new Date().toISOString().split("T")[0], Validators.required],
+          branch: [null, Validators.required],
+          receiveCurrency: ['All'],
+          product: ['All', Validators.required],
+          transactionStatus: [['All'], Validators.required],
+          sendCountry: ['All'],
+          receiveCountry: ['All']
+        }
+      );
+    }
+
+    if (this.ReportName == "Cancellation Transaction") {
+      this.searchForm = this.fb.group(
+        {
+          client: [null, Validators.required],
+          fromDate: [new Date().toISOString().split("T")[0], Validators.required],
+          toDate: [new Date().toISOString().split("T")[0], Validators.required],
+          branch: [null, Validators.required],
+          sendCountry: [null],
+          receiveCountry: [null],
+          product: [null, Validators.required],
+          receiveCurrency: [null, Validators.required],
+        }
+      );
+    }
+
+    if (this.ReportName === "Revenue Per Transaction") {
+      this.searchForm = this.fb.group({
+        sendBusinessPartner: [null, Validators.required],
+        fromDate: [new Date().toISOString().split("T")[0], Validators.required],
+        toDate: [new Date().toISOString().split("T")[0], Validators.required],
+        recvBusinessPartner: [null, Validators.required],
+        transactionStatus: [['All'], Validators.required],
+        sendCountry: ['All'],
+        receiveCountry: ['All']
+      })
+    }
+
+    if (this.ReportName == "Statement of Accounts") {
+      this.searchForm = this.fb.group(
+        {
+          client: [null, Validators.required],
+          fromDate: [new Date().toISOString().split("T")[0], Validators.required],
+          toDate: [new Date().toISOString().split("T")[0], Validators.required]
+        }
+      );
+    }
+
+    if (this.ReportName == "Accounting") {
+      this.searchForm = this.fb.group(
+        {
+          client: [null, Validators.required],
+          fromDate: [new Date().toISOString().split("T")[0], Validators.required],
+          toDate: [new Date().toISOString().split("T")[0], Validators.required],
+          branch: [null, Validators.required],
+          currency: ['All'],
+          product: ['All', Validators.required],
+          transactionStatus: [['All'], Validators.required],
+          sendCountry: ['All'],
+          receiveCountry: ['All']
+        }
+      );
+    }
+
+    if (this.ReportName === "Credit Limit Status Enquiry") {
+      this.searchForm = this.fb.group(
+        {
+          client: [null, Validators.required],
+          fromDate: [new Date().toISOString().split("T")[0], Validators.required],
+          toDate: [new Date().toISOString().split("T")[0], Validators.required],
+          transactionStatus: ['All', Validators.required],
+        }
+      );
+    }
+    if (this.ReportName == "Funding") {
+      this.searchForm = this.fb.group(
+        {
+          fromDate: [new Date().toISOString().split("T")[0], Validators.required],
+          toDate: [new Date().toISOString().split("T")[0], Validators.required]
+        }
+      );
+    }
+    if (this.ReportName == "Trial Balance - Accounts") {
+      this.searchForm = this.fb.group(
+        {
+          // Added fields
+          businessUnit: ['All'],
+          accountStatus: [['Active']],
+          financialYear: [new Date().getFullYear().toString()],   // default to current year
+          fromMonth: [''],
+          toMonth: [''],
+          dateType: ['VD'],              // example default
+          fromDay: [null, Validators.required],
+          toDay: [{ value: null, disabled: true }, Validators.required],
+          currency: ['All'],
+
+        }
+      );
+
+      this.reportService.GetParamDateDefaultForTrialBalanceAccountsReport().subscribe({
+        next: (response) => {
+          let financialMonth: string = response[0].financialMonth;
+          console.log(`financialMonth in init form of Trial Balance - Accounts: ${financialMonth}`);
+          this.searchForm.patchValue({
+            fromMonth: financialMonth,
+            toMonth: financialMonth
+          });
+        }, error: (err) => { console.error('Error fetching data:', err); }
+      });
+    }
+      if (this.ReportName == "Branch Activity Send Summary") {
+      this.searchForm = this.fb.group(
+        {
+          client: [null, Validators.required],
+          fromDate: [new Date().toISOString().split("T")[0], Validators.required],
+          toDate: [new Date().toISOString().split("T")[0], Validators.required],
+          branch: [null, Validators.required],
+          receiveCurrency: ['All'],
+          product: ['All', Validators.required],
+          transactionStatus: [['All'], Validators.required],
+          sendCountry: ['All'],
+          receiveCountry: ['All'],
+          summaryReport: ['Date-Wise Summary']
+        });
+    }
+     if (this.ReportName == "Transaction Monitoring") {
+      this.searchForm = this.fb.group(
+        {
+          client: [null, Validators.required],
+          fromDate: [new Date().toISOString().split("T")[0], Validators.required],
+          toDate: [new Date().toISOString().split("T")[0], Validators.required],
+          branch: [null, Validators.required],
+          receiveCurrency: ['All'],
+          product: ['All', Validators.required],
+          transactionStatus: [['All'], Validators.required],
+          sendCountry: ['All'],
+          receiveCountry: ['All']
+        }
+      );
+    }
+  }
+
+  loadInitialDataforBranchActivitySend() {
+    this.loadingState = ComponentLoadingState.Loading;
+    forkJoin({
+      params: this.reportService.getParams().pipe(
+        catchError(err => {
+          console.error('Error loading params', err);
+          return of(null);
+        })
+      ),
+      clients: this.reportService.getPayInAgents().pipe(
+        map((clients: any[]): Client[] =>
+          clients.map((client, index) => ({
+            businessPartnerName: client.agent,
+            businessPartnerCode: client.code,
+            displayOrder: index,
+            clientType: ""
+          }))
+        ),
+        catchError(err => {
+          console.error('Error loading clients', err);
+          return of([]);
+        })
+      )
+    }).subscribe(
+      {
+        next: ({ params, clients }) => {
+          this.params = params;
+          this.clients1 = clients;
+          this.countries = [...params?.countries]
+          this.currencies = [...params?.currencies];
+          this.transactionStatuses = [...params?.transactionStatusTypes];
+          this.transactionProducts = [...params?.transactionProductTypes];
+
+          this.searchForm.patchValue({ client: this.clients1[0].businessPartnerCode});
+          this.onClientChange();
+
+        },
+        error: err => {
+          console.error('Unexpected forkJoin error', err);
+          this.loadingState = ComponentLoadingState.Complete;
+        },
+        complete: () => {
+          this.loadingState = ComponentLoadingState.Complete;
+        }
+      }
+    );
+  }
+
+  private async loadInitialDatafortxnEnquiry(): Promise<void> {
+    this.loadingState = ComponentLoadingState.Loading;
+    this.errorMessage = '';
+    try {
+      const data = await this.reportService
+        .getPageLoadData()
+        .pipe(takeUntil(this.destroy$))
+        .toPromise();
+
+      if (data) {
+        this.clients1 = data.clients || [];
+        this.currencies = data.currencies || [];
+        this.products = data.products || [];
+        this.transactionStatuses = (data.transactionStatuses || []).filter(
+          ts => ts.transactionStatus !== ''
+        );
+        if (
+          !this.transactionStatuses.some(
+            s => s.transactionStatus === 'All'
+          )
+        ) {
+          this.transactionStatuses.unshift({
+            transactionStatus: 'All',
+          } as TransactionStatus);
+        }
+        this.searchForm.patchValue({ product: 'All' });
+
+        this.searchForm.patchValue({ client: this.clients1[0].businessPartnerCode});
+        await this.onClientChange();
+      }
+
+      this.loadingState = ComponentLoadingState.Complete;
+    } catch (error) {
+      this.errorMessage = 'Failed to load initial data';
+      this.loadingState = ComponentLoadingState.Error;
+    }
+  }
+
+  loadInitialDataforBranchActivityReceive() {
+    this.loadingState = ComponentLoadingState.Loading;
+    forkJoin({
+      params: this.reportService.getBranchActivityReceiveParams()
+        .pipe(catchError(err => {
+          console.error('Error loading params', err);
+          return of(null);
+        })
+        ),
+      payoutAgents: this.reportService.getAllPayOutAgents()
+        .pipe(map((clients: any[]): Client[] =>
+          clients.map((client, index) => ({
+            businessPartnerName: client.agent,
+            businessPartnerCode: client.code,
+            displayOrder: client.number,
+            clientType: ""
+          }))
+        ), catchError(err => {
+          return of([]);
+        }))
+    }).subscribe({
+      next: ({ params, payoutAgents }) => {
+        this.params = params;
+        this.clients1 = payoutAgents;
+        this.countries = [...params?.countries]
+        this.currencies = [...params?.currencies];
+        this.transactionStatuses = [...params?.transactionStatusTypes];
+        this.transactionProducts = [...params?.transactionProductTypes];
+
+        this.searchForm.patchValue({ client: this.clients1[0].businessPartnerCode});
+        this.onClientChange();
+      },
+      error: err => {
+        console.error('Unexpected forkJoin error', err);
+        this.loadingState = ComponentLoadingState.Complete;
+      },
+      complete: () => {
+        this.loadingState = ComponentLoadingState.Complete;
+      }
+    })
+  }
+  private async loadInitialDataForCancellationReport(): Promise<void> {
+    this.loadingState = ComponentLoadingState.Loading;
+    this.errorMessage = '';
+
+    try {
+      const data = await this.reportService
+        .loadDataforCancallation()
+        .pipe(takeUntil(this.destroy$))
+        .toPromise();
+
+      if (data) {
+        this.countries = data.countries ?? [];
+        this.clients1 = (data.payInAgents ?? []).map((agent) => ({
+          businessPartnerName: agent.agent,
+          businessPartnerCode: agent.code
+        }));
+        this.products = (data.productTypes ?? []).map((pt) => ({
+          productCode: pt.productCode,
+          productName: pt.name
+        }));
+        this.currencies = data.currencies ?? [];
+
+        this.searchForm.patchValue({
+          product: this.products[0]?.productCode,
+          receiveCountry: this.countries[0]?.country,
+          sendCountry: this.countries[0]?.country,
+          receiveCurrency: this.currencies[0]?.currencyCode
+        });
+
+        this.searchForm.patchValue({ client: this.clients1[0].businessPartnerCode});
+        await this.onClientChange();
+        
+      } else {
+        // No data case
+        this.countries = [];
+        this.clients1 = [];
+        this.products = [];
+        this.currencies = [];
+      }
+
+      this.loadingState = ComponentLoadingState.Complete;
+
+    } catch (error) {
+      console.error('Error loading cancellation report data', error);
+      this.errorMessage = 'Failed to load cancellation report data';
+      this.loadingState = ComponentLoadingState.Error;
+    }
+  }
+
+  loadDataForRevenuePerTransactionReport() {
+    const $agents = this.reportService.getAgentsForRevenuePerTransaction();
+    const $params = this.reportService.getRevenuePerTransactionReportParams();
+    this.loadingState = ComponentLoadingState.Loading;
+    forkJoin([$agents, $params]).subscribe({
+      next: ([agents, params]) => {
+        this.sendBusinessPartnerAgents = agents.filter(agent => agent.transactionLeg === "PayIn");
+        this.recvBusinessPartnerAgents = agents.filter(agent => agent.transactionLeg === "PayOut");
+        this.transactionStatuses = params.transactionStatusTypes
+        this.countries = params.countries;
+
+        this.searchForm.patchValue({
+        sendBusinessPartner: this.sendBusinessPartnerAgents[0].id,
+        recvBusinessPartner: this.recvBusinessPartnerAgents[0].id
+      });
+
+      },
+      error: (err) => {
+        this.loadingState = ComponentLoadingState.Complete;
+      },
+      complete: () => {
+        this.loadingState = ComponentLoadingState.Complete;
+      }
+    })
+  }
+
+
+  loadInitialDataforAccounting() {
+    this.loadingState = ComponentLoadingState.Loading;
+
+    forkJoin({
+      clients: this.reportService.getClientsForAccountingReport(this.currentUser).pipe(
+        map((clients: any[]): Client[] =>
+          clients.map((client, index) => ({
+            businessPartnerName: client.agent,
+            businessPartnerCode: client.correlationId,
+            displayOrder: index,
+            clientType: ""
+          }))
+        ),
+        catchError(err => {
+          console.error('Error loading clients', err);
+          return of([]);
+        })
+      ),
+      products: this.reportService.getTransactionTypesForAccountingReport().pipe(
+        catchError(err => {
+          console.error('Error loading transaction types', err);
+          return of([]);
+        })
+      ),
+      currencies: this.reportService.getAllCurrenciesForAccountingReport().pipe(
+        catchError(err => {
+          console.error('Error loading currencies', err);
+          return of([]);
+        })
+      ),
+      statuses: this.reportService.getAllTransactionStatusForAccountingReport().pipe(
+        catchError(err => {
+          console.error('Error loading statuses', err);
+          return of([]);
+        })
+      ),
+      countries: this.reportService.getAllCountriesForAccountingReport().pipe(
+        catchError(err => {
+          console.error('Error loading countries', err);
+          return of([]);
+        })
+      )
+    }).subscribe({
+      next: ({ clients, products, currencies, statuses, countries }) => {
+        this.clients1 = clients;
+        this.transactionProducts = products;
+        this.currencies = currencies;
+        this.transactionStatuses = statuses;
+        this.countries = countries;
+
+        this.searchForm.patchValue({ client: this.clients1[0].businessPartnerCode});
+        this.onClientChange();
+      },
+      error: err => {
+        console.error('Unexpected forkJoin error in Accounting init', err);
+        this.loadingState = ComponentLoadingState.Error;
+      },
+      complete: () => {
+        this.loadingState = ComponentLoadingState.Complete;
+      }
+    });
+
+  }
+
+  loadInitialDataForCreditLimitStatusEnquiry() {
+    const $agents = this.reportService.getClientsForCreditLimitStatusEnquiryReport();
+    const $status = this.reportService.getTransactionTypesForCreditLimitStatusEnquiryReport();
+    this.loadingState = ComponentLoadingState.Loading;
+    forkJoin({
+      agents: $agents.pipe(
+        map((clients: any[]): Client[] =>
+          clients.map((client, index) => ({
+            businessPartnerName: client.name,
+            businessPartnerCode: client.code,
+            displayOrder: index,
+            clientType: ""
+          }))
+        )
+      ),
+      status: $status
+    }).subscribe({
+      next: ({ agents, status }) => {
+        this.clients1 = agents;
+        this.searchForm.patchValue({ client: this.clients1[0].businessPartnerCode });
+        this.transactionStatuses = status;
+      },
+      error: (err) => {
+        this.loadingState = ComponentLoadingState.Complete;
+        console.error('Unexpected forkJoin error', err);
+      },
+      complete: () => {
+        this.loadingState = ComponentLoadingState.Complete;
+      }
+
+    })
+  }
+  loadInitialDataForTrialBalanceAccounts() {
+    this.loadingState = ComponentLoadingState.Loading;
+
+    forkJoin({
+      businessUnits: this.reportService.GetBusinessUnitForTrialBalanceAccountsReport()
+        .pipe(catchError(err => of([]))),
+      accountStatuses: this.reportService.GetAccountStatusForTrialBalanceAccountsReport()
+        .pipe(catchError(err => of([]))),
+      dateTypes: this.reportService.GetDateTypeForTrialBalanceAccountsReport()
+        .pipe(catchError(err => of([]))),
+      financialYears: this.reportService.GetYearForTrialBalanceAccountsReport()
+        .pipe(catchError(err => of([]))),
+      fromMonths: this.reportService.GetFromMonthsForTrialBalanceAccountsReport()
+        .pipe(catchError(err => of([]))),
+      currency: this.reportService.GetCurrenciesForTrialBalanceAccountsReport()
+        .pipe(catchError(err => of([]))),
+      paramDateDefault: this.reportService.GetParamDateDefaultForTrialBalanceAccountsReport()
+        .pipe(catchError(err => of([])))
+    })
+      .pipe(
+        switchMap(results => {
+          // assign base results
+          this.businessUnits = results.businessUnits;
+          this.accountStatuses = results.accountStatuses;
+          this.dateTypes = results.dateTypes;
+          this.financialYears = results.financialYears
+            .sort((a, b) => Number(a.financialYear) - Number(b.financialYear));
+          this.fromMonths = results.fromMonths;
+          this.currencies = results.currency;
+          this.paramDateDefault = results.paramDateDefault;
+
+          // resolve year/month for fromDays & toMonths
+          const year = +(new Date().getFullYear());
+          const month = this.paramDateDefault[0].financialMonth;
+
+          const selectedPMonth = this.searchForm.get('fromMonth')?.value;
+          const fromMonthObj = this.fromMonths.find(m => m.pOrder === selectedPMonth);
+          const fromMonthLabel = fromMonthObj?.period;
+
+          // first call fromDays with year/month
+          return this.reportService.GetFromDatesForTrialBalanceAccountsReport(
+            year, fromMonthLabel
+          ).pipe(
+            catchError(err => of([])),
+            switchMap(fromDays => {
+              this.fromDays = fromDays;
+              this.searchForm.patchValue({
+                fromDay: this.paramDateDefault[0]?.tDate,
+              });
+
+              const financialYear = this.searchForm.get('financialYear')?.value;
+              const fromMonth = this.searchForm.get('fromMonth')?.value;
+              const toMonth = this.searchForm.get('toMonth')?.value;
+              const fromDay = this.searchForm.get('fromDay')?.value;
+
+              const requestPayload = {
+                Year: financialYear,
+                FromMonth: fromMonth,
+                ToMonth: toMonth,
+                FromDate: fromDay // assuming fromDay is already a Date or ISO string
+              };
+
+              // now chain to: toDays + toMonths
+              return forkJoin({
+                toDays: this.reportService.GetToDatesForTrialBalanceAccountsReport(requestPayload)
+                  .pipe(catchError(err => of([]))),
+                toMonths: this.reportService.GetToMonthsForTrialBalanceAccountsReport(year, month)
+                  .pipe(catchError(err => of([])))
+              }).pipe(
+                map(extra => ({ ...results, fromDays, ...extra }))
+              );
+            })
+          );
+        })
+      )
+      .subscribe({
+        next: (allResults) => {
+          this.toDays = allResults.toDays;
+          this.toMonths = allResults.toMonths;
+
+          // patch form defaults
+          this.searchForm.patchValue({
+            businessUnit: this.businessUnits[0]?.companyCode ?? null,
+            accountStatus: this.accountStatuses.length ? [this.accountStatuses[0].statusCode] : [],
+            financialYear: this.paramDateDefault[0]?.financialYear ?? new Date().getFullYear().toString(),
+            fromMonth: this.paramDateDefault[0]?.financialMonth,
+            toMonth: this.paramDateDefault[0]?.financialMonth,
+            dateType: this.dateTypes[0]?.dateTypeCode ?? 'VD',
+            fromDay: this.fromDays[0]?.tDate,
+            toDay: this.toDays.find(d => d.isToday)?.value ?? new Date().getDate(),
+            currency: this.currency[0]?.currencyCode ?? 'All'
+          });
+        },
+        error: (err) => {
+          console.error('Failed to load Trial Balance dropdown data', err);
+          this.loadingState = ComponentLoadingState.Error;
+        },
+        complete: () => {
+          this.loadingState = ComponentLoadingState.Complete;
+        }
+      });
+  }
+
+  private subscribeToDateChanges(): void {
+    this.searchForm.get('fromDate')?.valueChanges.subscribe(fromDateStr => {
+      const toDateControl = this.searchForm.get('toDate');
+      const toDateStr = toDateControl?.value;
+      if (!fromDateStr || !toDateStr) return;
+      const fromDate = new Date(fromDateStr);
+      const toDate = new Date(toDateStr);
+      const maxToDate = new Date(fromDate);
+      maxToDate?.setDate(fromDate.getDate() + 30);
+      if (toDate.setHours(0, 0, 0, 0) > maxToDate.setHours(0, 0, 0, 0) || toDate.setHours(0, 0, 0, 0) < fromDate.setHours(0, 0, 0, 0)) {
+        maxToDate.setHours(12, 0, 0, 0);
+        toDateControl?.patchValue(maxToDate.toISOString().split("T")[0]);
+        // setTimeout(() => toDateControl?.patchValue(maxToDate.toISOString().split("T")[0]));
+        this.cd.detectChanges();
+      }
+      this.disabledDate = this.toNgbDateStruct(fromDate);
+      // setTimeout(() => this.disabledDate = this.toNgbDateStruct(fromDate));
+
+    });
+
+    this.searchForm.get('toDate')?.valueChanges.subscribe(toDateStr => {
+      const fromDateControl = this.searchForm.get('fromDate');
+      const fromDateStr = fromDateControl?.value;
+      if (!toDateStr || !fromDateStr) return;
+      const toDate = new Date(toDateStr);
+      const fromDate = new Date(fromDateStr);
+      this.disabledDate = this.toNgbDateStruct(fromDate);
+      const minFromDate = new Date(toDate);
+      minFromDate?.setDate(toDate.getDate() - 30);
+      if (fromDate.setHours(0, 0, 0, 0) < minFromDate.setHours(0, 0, 0, 0)) {
+        minFromDate.setHours(12, 0, 0, 0);
+        fromDateControl?.patchValue(minFromDate.toISOString().split("T")[0]);
+        this.cd.detectChanges();
+      }
+
+      if (fromDate.setHours(0, 0, 0, 0) > toDate.setHours(0, 0, 0, 0)) {
+        fromDateControl?.patchValue(minFromDate.toISOString().split("T")[0]);
+        this.cd.detectChanges();
+      }
+    });
+  }
+
+  private async loadInitialDataForStatementOfAccounts(): Promise<void> {
+    this.loadingState = ComponentLoadingState.Loading;
+    this.errorMessage = '';
+
+    try {
+      const clients = await this.reportService
+        .loadClientsForStatementOfAccounts()
+        .pipe(takeUntil(this.destroy$))
+        .toPromise();
+
+      if (clients && clients.length > 0) {
+        this.clients1 = clients.map((c, index) => ({
+          businessPartnerCode: c.agentID,
+          businessPartnerName: c.agentName,
+          displayOrder: index,
+          clientType: c.clientType
+        }));
+      } else {
+        this.clients1 = [];
+      }
+      if (this.clients1.length === 1) {
+        this.searchForm.patchValue({
+          client: this.clients1[0].businessPartnerCode
+        });
+        await this.onClientChange();
+      }
+
+      this.loadingState = ComponentLoadingState.Complete;
+
+    } catch (error) {
+      console.error('Error loading Statement of Accounts clients', error);
+      this.errorMessage = 'Failed to load clients for Statement of Accounts';
+      this.loadingState = ComponentLoadingState.Error;
+    }
+  }
+
+  async onClientChange(): Promise<void> {
+
+    if (this.ReportName == "Transaction Enquiry") {
+      this.loadingState = ComponentLoadingState.Loading;
+      const selectedClient = this.searchForm.get('client')?.value;
+      if (!selectedClient) return;
+      this.branches = [];
+      if (selectedClient === 'All') {
+        this.branches = [{
+          businessPartnerBranch: 'All',
+          businessPartnerBranch_CorrelationId: 'All',
+          branchCode: 'All',
+          bank: 'All',
+          number: 1
+        }];
+        this.searchForm.patchValue({ branch: this.branches[0].branchCode });
+        this.loadingState = ComponentLoadingState.Complete;
+        return;
+      }
+      else {
+        try {
+          await Promise.all([
+            this.loadBranchesByAgent(selectedClient)
+          ]);
+          this.loadingState = ComponentLoadingState.Complete;
+        } catch (err) {
+          this.errorMessage = 'Failed to load branch';
+          this.loadingState = ComponentLoadingState.Complete;
+        }
+      }
+    }
+
+    if (this.ReportName == "Branch Activity Send") {
+      const selectedClient = this.searchForm.get('client')?.value;
+      if (!selectedClient) return;
+      this.loadingState = ComponentLoadingState.Loading;
+      this.branches = [];
+      if (selectedClient === 'All') {
+        this.branches = [{
+          businessPartnerBranch: 'All',
+          businessPartnerBranch_CorrelationId: 'All',
+          branchCode: 'All',
+          bank: 'All',
+          number: 1
+        }];
+        this.searchForm.patchValue({ branch: this.branches[0].branchCode });
+        this.loadingState = ComponentLoadingState.Complete;
+        return;
+      }
+      else {
+        this.reportService.getBranchByAgent(selectedClient).subscribe({
+          next: (data) => {
+            this.branches = data;
+            this.searchForm.patchValue({ branch: this.branches[0].branchCode });
+          },
+          error: (err) => {
+            this.loadingState = ComponentLoadingState.Complete;
+          },
+          complete: () => {
+            this.loadingState = ComponentLoadingState.Complete;
+          }
+        });
+      }
+    }
+
+    if (this.ReportName === "Branch Activity Receive") {
+      const selectedClient = this.searchForm.get('client')?.value;
+      if (!selectedClient) return;
+      this.loadingState = ComponentLoadingState.Loading;
+      this.branches = [];
+      if (selectedClient === 'All') {
+        this.branches = [{
+          businessPartnerBranch: 'All',
+          businessPartnerBranch_CorrelationId: 'All',
+          branchCode: 'All',
+          bank: 'All',
+          number: 1
+        }];
+        this.searchForm.patchValue({ branch: this.branches[0].branchCode });
+        this.loadingState = ComponentLoadingState.Complete;
+        return;
+      }
+      else {
+        this.reportService.getBranchActivityReceivePayoutAgentBranch(selectedClient).subscribe({
+          next: (data) => {
+            this.branches = data;
+            this.searchForm.patchValue({ branch: this.branches[0].branchCode });
+          },
+          error: (err) => {
+            this.loadingState = ComponentLoadingState.Complete;
+          },
+          complete: () => {
+            this.loadingState = ComponentLoadingState.Complete;
+          }
+        });
+      }
+    }
+
+    if (this.ReportName == "Cancellation Transaction") {
+      this.loadingState = ComponentLoadingState.Loading;
+      this.errorMessage = '';
+      const selectedClient = this.searchForm.get('client')?.value;
+      this.branches = [];
+      if (selectedClient === 'All') {
+        this.branches = [{
+          businessPartnerBranch: 'All',
+          businessPartnerBranch_CorrelationId: 'All',
+          branchCode: 'All',
+          bank: 'All',
+          number: 1
+        }];
+        this.searchForm.patchValue({ branch: this.branches[0].branchCode });
+        this.loadingState = ComponentLoadingState.Complete;
+        return;
+      }
+      else {
+        try {
+          const data = await this.reportService
+            .getBranches(selectedClient)
+            .pipe(takeUntil(this.destroy$))
+            .toPromise();
+
+          if (data) {
+            this.branches = data;
+            this.searchForm.patchValue({ branch: this.branches[0].branchCode });
+          }
+          this.loadingState = ComponentLoadingState.Complete;
+
+        } catch (error) {
+          console.error('Failed to load branches', error);
+          this.errorMessage = 'Failed to load branch data';
+          this.loadingState = ComponentLoadingState.Error;
+        }
+      }
+    }
+
+    if (this.ReportName == "Statement of Accounts") {
+      this.loadingState = ComponentLoadingState.Loading;
+      this.errorMessage = '';
+      const ClientId = this.searchForm.get('client')?.value;
+      const selectedClient = this.clients1.find(c => c.businessPartnerCode === ClientId);
+      this.clientName = selectedClient?.businessPartnerName || '';
+      this.clientType = selectedClient?.clientType || '';
+      this.loadingState = ComponentLoadingState.Complete;
+    }
+
+    // accounting report
+    if (this.ReportName == "Accounting") {
+      const selectedClient = this.searchForm.get('client')?.value;
+      if (!selectedClient) return;
+      this.loadingState = ComponentLoadingState.Loading;
+
+      this.branches = [];
+      if (selectedClient === 'All') {
+        this.branches = [{
+          businessPartnerBranch: 'All',
+          businessPartnerBranch_CorrelationId: 'All',
+          branchCode: 'All',
+          bank: 'All',
+          number: 1
+        }];
+        this.searchForm.patchValue({ branch: this.branches[0].branchCode });
+        this.loadingState = ComponentLoadingState.Complete;
+        return;
+      }
+      else {
+        this.reportService.getBranchByAgentForAccountingReport(this.currentUser, selectedClient).subscribe({
+          next: (data) => {
+            this.branches = data;
+            this.searchForm.patchValue({ branch: this.branches[0].branchCode });
+          },
+          error: (err) => {
+            this.loadingState = ComponentLoadingState.Complete;
+          },
+          complete: () => {
+            this.loadingState = ComponentLoadingState.Complete;
+          }
+        });
+      }
+    }
+
+    if (this.ReportName == "Branch Activity Send") {
+      this.loadingState = ComponentLoadingState.Loading;
+      const selectedClient = this.searchForm.get('client')?.value;
+      this.branches = [];
+      if (selectedClient === 'All') {
+        this.branches = [{
+          businessPartnerBranch: 'All',
+          businessPartnerBranch_CorrelationId: 'All',
+          branchCode: 'All',
+          bank: 'All',
+          number: 1
+        }];
+        this.searchForm.patchValue({ branch: this.branches[0].branchCode });
+        this.loadingState = ComponentLoadingState.Complete;
+        return;
+      }
+      else {
+        this.reportService.getBranchByAgent(selectedClient).subscribe({
+          next: (data) => {
+            this.branches = data;
+            this.searchForm.patchValue({ branch: this.branches[0].branchCode });
+          },
+          error: (err) => {
+            throw err;
+          },
+          complete: () => {
+            this.loadingState = ComponentLoadingState.Complete;
+          }
+        });
+      }
+    }
+    if (this.ReportName == "Transaction Monitoring") {
+          const selectedClient = this.searchForm.get('client')?.value;
+          if (!selectedClient) return;
+          this.loadingState = ComponentLoadingState.Loading;
+          this.branches = [];
+          if (selectedClient === 'All') {
+            this.branches = [{
+              businessPartnerBranch: 'All',
+              businessPartnerBranch_CorrelationId: 'All',
+              branchCode: 'All',
+              bank: 'All',
+              number: 1
+            }];
+            this.searchForm.patchValue({ branch: this.branches[0].branchCode });
+            this.loadingState = ComponentLoadingState.Complete;
+            return;
+          }
+          else {
+            this.reportService.getBranchByAgentForTransactionMonitoringReport(selectedClient).subscribe({
+              next: (data) => {
+                this.branches = data;
+                this.searchForm.patchValue({ branch: this.branches[0].branchCode });
+              },
+              error: (err) => {
+                this.loadingState = ComponentLoadingState.Complete;
+              },
+              complete: () => {
+                this.loadingState = ComponentLoadingState.Complete;
+              }
+            });
+          }
+    }
+    if (this.ReportName == "Branch Activity Send Summary") {
+      this.loadingState = ComponentLoadingState.Loading;
+      const selectedClient = this.searchForm.get('client')?.value;
+      this.branches = [];
+      if (selectedClient === 'All') {
+        this.branches = [{
+          businessPartnerBranch: 'All',
+          businessPartnerBranch_CorrelationId: 'All',
+          branchCode: 'All',
+          bank: 'All',
+          number: 1
+        }];
+        this.searchForm.patchValue({ branch: this.branches[0].branchCode });
+        this.loadingState = ComponentLoadingState.Complete;
+        return;
+      }
+      else {
+        this.reportService.getBranchByAgentForSendSummaryReport(selectedClient).subscribe({
+          next: (data) => {
+            this.branches = data;
+            this.searchForm.patchValue({ branch: this.branches[0].branchCode });
+          },
+          error: (err) => {
+            throw err;
+          },
+          complete: () => {
+            this.loadingState = ComponentLoadingState.Complete;
+          }
+        });
+      }
+    }
+  }
+  
+
+  private async loadBranchesByAgent(agentCode: string): Promise<void> {
+    const branches = await this.reportService
+      .getBranchesByAgent(agentCode)
+      .pipe(takeUntil(this.destroy$))
+      .toPromise();
+    this.branches = branches || [];
+
+    if (this.branches.length === 1) {
+      this.searchForm.patchValue({ branch: this.branches[0].branchCode });
+      // await this.loadUsersByBranch(agentCode, this.branches[0].branchCode);
+    } else if (this.branches.some(b => b.branchCode === 'All')) {
+      this.searchForm.patchValue({ branch: 'All' });
+      // await this.loadUsersByBranch(agentCode, 'All');
+    } else {
+      this.searchForm.patchValue({ branch: '' });
+      this.users = [];
+    }
+  }
+
+  async onBranchChange(): Promise<void> {
+
+  }
+
+  onSearch(): void {
+    if (this.ReportName == "Transaction Enquiry") {
+      this.hasSearched = true;
+      if (this.searchForm.invalid) {
+        this.formValidationError = true;
+        this.formValid.emit(false);
+        return;
+      }
+      this.formValidationError = false;
+      this.formValid.emit(true);
+      this.searchClicked.emit(this.buildSearchCriteria());
+    }
+
+    if (this.ReportName == "Branch Activity Send") {
+      this.hasSearched = true;
+      if (this.searchForm.invalid) {
+        this.formValidationError = true;
+        this.formValid.emit(false);
+        return;
+      }
+      this.formValidationError = false;
+      this.formValid.emit(true);
+      this.searchClicked.emit(this.buildSearchCriteria());
+    }
+
+    if (this.ReportName == "ACC GL Details Enquiry") {
+      this.hasSearched = true;
+      if (this.searchForm.invalid) {
+        this.formValidationError = true;
+        this.formValid.emit(false);
+        return;
+      }
+      this.formValidationError = false;
+      const modal = {
+        selectedDateType: this.searchForm.controls["dateType"]?.value,
+        selectedDate: this.searchForm.controls["date"]?.value
+      }
+      this.formValid.emit(true);
+      this.searchClicked.emit(modal);
+    }
+
+    if (this.ReportName === "Branch Activity Receive") {
+      this.hasSearched = true;
+      if (this.searchForm.invalid) {
+        this.formValidationError = true;
+        this.formValid.emit(false);
+        return;
+      }
+      this.formValidationError = false;
+      this.formValid.emit(true);
+      this.searchClicked.emit(this.buildSearchCriteria());
+    }
+
+    if (this.ReportName == "Cancellation Transaction") {
+      this.hasSearched = true;
+      if (this.searchForm.invalid) {
+        this.formValidationError = true;
+        this.formValid.emit(false);
+        return;
+      }
+      this.formValidationError = false;
+      this.formValid.emit(true);
+      this.searchClicked.emit(this.buildSearchCriteria());
+    }
+
+    if (this.ReportName === "Revenue Per Transaction") {
+      this.hasSearched = true;
+      if (this.searchForm.invalid) {
+        this.formValidationError = true;
+        this.formValid.emit(false);
+        return;
+      }
+      this.formValidationError = false;
+      this.formValid.emit(true);
+      this.searchClicked.emit(this.buildSearchCriteria());
+    }
+
+    if (this.ReportName == "Statement of Accounts") {
+      this.hasSearched = true;
+      if (this.searchForm.invalid) {
+        this.formValidationError = true;
+        this.formValid.emit(false);
+        return;
+      }
+      this.formValidationError = false;
+      this.formValid.emit(true);
+      this.searchClicked.emit(this.buildSearchCriteria());
+    }
+
+
+    if (this.ReportName == "Accounting") {
+      this.hasSearched = true;
+      if (this.searchForm.invalid) {
+        this.formValidationError = true;
+        // this.markFormGroupTouched(this.searchForm);
+        this.formValid.emit(false);
+        return;
+      }
+      this.formValidationError = false;
+      this.formValid.emit(true);
+      this.searchClicked.emit(this.buildSearchCriteria());
+    }
+
+    if (this.ReportName === "Credit Limit Status Enquiry") {
+      this.hasSearched = true;
+      if (this.searchForm.invalid) {
+        this.formValidationError = true;
+        this.formValid.emit(false);
+        return;
+      }
+      this.formValidationError = false;
+      this.formValid.emit(true);
+      this.searchClicked.emit(this.buildSearchCriteria());
+    }
+    if (this.ReportName == "Funding") {
+      this.hasSearched = true;
+      if (this.searchForm.invalid) {
+        this.formValidationError = true;
+        this.formValid.emit(false);
+        return;
+      }
+      this.formValidationError = false;
+      this.formValid.emit(true);
+      this.searchClicked.emit(this.buildSearchCriteria());
+    }
+    if (this.ReportName == "Trial Balance - Accounts") {
+      this.hasSearched = true;
+      if (this.searchForm.invalid) {
+        this.formValidationError = true;
+        this.formValid.emit(false);
+        return;
+      }
+      this.formValidationError = false;
+      this.formValid.emit(true);
+      this.searchClicked.emit(this.buildSearchCriteria());
+    }
+   if (this.ReportName == "Branch Activity Send Summary")
+ {
+      this.hasSearched = true;
+      if (this.searchForm.invalid) {
+        this.formValidationError = true;
+        this.formValid.emit(false);
+        return;
+      }
+      this.formValidationError = false;
+      this.formValid.emit(true);
+      this.searchClicked.emit(this.buildSearchCriteria());
+    }
+     if (this.ReportName == "Transaction Monitoring") {
+      this.hasSearched = true;
+      if (this.searchForm.invalid) {
+        this.formValidationError = true;
+        this.formValid.emit(false);
+        return;
+      }
+      this.formValidationError = false;
+      this.formValid.emit(true);
+      this.searchClicked.emit(this.buildSearchCriteria());
+    }
+  }
+
+  private buildSearchCriteria(): any {
+
+    const formValue = this.searchForm.value;
+    const fromDate = new Date(formValue.fromDate);
+    const toDate = new Date(formValue.toDate);
+
+    const formatDate = (d: Date) => {
+      const day = String(d.getDate()).padStart(2, "0");
+      const month = String(d.getMonth() + 1).padStart(2, "0");
+      const year = d.getFullYear();
+      return `${day}/${month}/${year}`;
+    };
+
+    const searchCriteria = this.getSearchCriteriaArray();
+
+    if (this.ReportName == "Transaction Enquiry") {
+      const formValue = this.searchForm.value;
+      formValue.fromDate = this.toIsoFormat(formValue.fromDate);
+      formValue.toDate = this.toIsoFormat(formValue.toDate);
+      return {
+        modal: formValue,
+        sysUserID: this.currentUser,
+        reportPeriod: `${formatDate(fromDate)} - ${formatDate(toDate)}`,
+        searchCriteria: searchCriteria
+      };
+    }
+
+    if (this.ReportName == "Branch Activity Send") {
+      const formValue = this.searchForm.value;
+      formValue.fromDate = this.toIsoFormat(formValue.fromDate);
+      formValue.toDate = this.toIsoFormat(formValue.toDate);
+      const searchCriteria: [string, string][] = [
+        ['Client:', this.clients1.find(c => c.businessPartnerCode === formValue.client)?.businessPartnerName || ''],
+        ['Transaction Status:', formValue.transactionStatus.join(",")],
+        ['Branch:', this.branches.find(b => b.branchCode === formValue.branch)?.businessPartnerBranch || ''],
+        ['Product:', formValue.product],
+        ['From Date:', angularCommon.formatDate(this.toIsoFormat(formValue.fromDate), 'dd/MM/yyyy', 'en-US')],
+        ['Receive Currency:', this.currencies.find(c => c.currencyCode === formValue.receiveCurrency)?.currency || ''],
+        ['To Date:', angularCommon.formatDate(this.toIsoFormat(formValue.toDate), 'dd/MM/yyyy', 'en-US')],
+        ['Send Country:', this.countries.find(c => c.countryCode === formValue.sendCountry)?.country || ''],
+        ['Receive Country:', this.countries.find(c => c.countryCode === formValue.receiveCountry)?.country || ''],
+      ];
+      return {
+        modal: formValue,
+        sysUserID: this.currentUser,
+        searchCriteria: searchCriteria
+      }
+    }
+
+    if (this.ReportName == "Branch Activity Receive") {
+      const formValue = this.searchForm.value;
+      formValue.fromDate = this.toIsoFormat(formValue.fromDate);
+      formValue.toDate = this.toIsoFormat(formValue.toDate);
+      const searchCriteria: [string, string][] = [
+        ['Client:', this.clients1.find(c => c.businessPartnerCode === formValue.client)?.businessPartnerName || ''],
+        ['Transaction Status:', formValue.transactionStatus.join(",")],
+        ['Branch:', this.branches.find(b => b.branchCode === formValue.branch)?.businessPartnerBranch || ''],
+        ['Product:', formValue.product],
+        ['From Date:', angularCommon.formatDate(this.toIsoFormat(formValue.fromDate), 'dd/MM/yyyy', 'en-US')],
+        ['Receive Currency:', this.currencies.find(c => c.currencyCode === formValue.receiveCurrency)?.currency || ''],
+        ['To Date:', angularCommon.formatDate(this.toIsoFormat(formValue.toDate), 'dd/MM/yyyy', 'en-US')],
+        ['Send Country:', this.countries.find(c => c.countryCode === formValue.sendCountry)?.country || ''],
+        ['Receive Country:', this.countries.find(c => c.countryCode === formValue.receiveCountry)?.country || ''],
+      ];
+      return {
+        modal: formValue,
+        sysUserID: this.currentUser,
+        searchCriteria: searchCriteria
+      }
+    }
+
+    if (this.ReportName == "Cancellation Transaction") {
+      const formValue = this.searchForm.value;
+      formValue.fromDate = this.toIsoFormat(formValue.fromDate);
+      formValue.toDate = this.toIsoFormat(formValue.toDate);
+      const searchCriteria: [string, string][] = [
+        ['Client:', this.clients1.find(c => c.businessPartnerCode === formValue.client)?.businessPartnerName || ''],
+        ['Branch:', this.branches.find(b => b.branchCode === formValue.branch)?.businessPartnerBranch || ''],
+        ['Product:', formValue.product],
+        ['From Date:', angularCommon.formatDate(this.toIsoFormat(formValue.fromDate), 'dd/MM/yyyy', 'en-US')],
+        ['Receive Currency:', this.currencies.find(c => c.currencyCode === formValue.receiveCurrency)?.currency || ''],
+        ['To Date:', angularCommon.formatDate(this.toIsoFormat(formValue.toDate), 'dd/MM/yyyy', 'en-US')],
+        ['Send Country:', this.countries.find(c => c.countryCode === formValue.sendCountry)?.country || ''],
+        ['Receive Country:', this.countries.find(c => c.countryCode === formValue.receiveCountry)?.country || ''],
+
+      ];
+      return {
+        modal: formValue,
+        sysUserID: this.currentUser,
+        reportPeriod: `${formatDate(fromDate)} - ${formatDate(toDate)}`,
+        searchCriteria: searchCriteria
+      };
+    }
+
+    if (this.ReportName === "Revenue Per Transaction") {
+      const formValue = this.searchForm.value;
+      formValue.fromDate = this.toIsoFormat(formValue.fromDate);
+      formValue.toDate = this.toIsoFormat(formValue.toDate);
+      const searchCriteria: [string, string][] = [
+        ['Sender Partner:', this.sendBusinessPartnerAgents.find(c => c.id === formValue.sendBusinessPartner)?.name || ''],
+        ['Receive Partner:', this.recvBusinessPartnerAgents.find(c => c.id === formValue.recvBusinessPartner)?.name || ''],
+        ['Send Country:', this.countries.find(c => c.countryCode === formValue.sendCountry)?.country || ''],
+        ['Receive Country:', this.countries.find(c => c.countryCode === formValue.receiveCountry)?.country || ''],
+        ['From Date:', angularCommon.formatDate(this.toIsoFormat(formValue.fromDate), 'dd/MM/yyyy', 'en-US')],
+        ['To Date:', angularCommon.formatDate(this.toIsoFormat(formValue.toDate), 'dd/MM/yyyy', 'en-US')],
+        ['Transaction Status:', formValue.transactionStatus.join(",")],
+      ];
+      return {
+        modal: formValue,
+        sysUserId: this.currentUser,
+        searchCriteria: searchCriteria
+      }
+    }
+
+    if (this.ReportName == "Statement of Accounts") {
+      const formValue = this.searchForm.value;
+      formValue.fromDate = this.toIsoFormat(formValue.fromDate);
+      formValue.toDate = this.toIsoFormat(formValue.toDate);
+      return {
+        modal: formValue,
+        clientType: this.clientType,
+        sysUserID: this.currentUser,
+        clientName: this.clientName,
+        reportPeriod: `${formatDate(fromDate)} - ${formatDate(toDate)}`,
+        searchCriteria: searchCriteria
+      }
+    }
+
+    if (this.ReportName == "Accounting") {
+      const formValue = this.searchForm.value;
+      const searchCriteria = [
+        ['Client:', this.clients1.find(c => c.businessPartnerCode === formValue.client)?.businessPartnerName || ''],
+        ['Transaction Status:', formValue.transactionStatus.join(",")],
+        ['Branch:', this.branches.find(b => b.branchCode === formValue.branch)?.businessPartnerBranch || ''],
+        ['Product:', this.transactionProducts.find(t => t.productCode === formValue.product)?.name || ''],
+        ['From Date:', angularCommon.formatDate(this.toIsoFormat(formValue.fromDate), 'dd/MM/yyyy', 'en-US')],
+        ['Send Currency:', this.currencies.find(c => c.currencyCode === formValue.currency)?.currency || ''],
+        ['To Date:', angularCommon.formatDate(this.toIsoFormat(formValue.toDate), 'dd/MM/yyyy', 'en-US')],
+        ['Send Country:', this.countries.find(c => c.countryCode === formValue.sendCountry)?.country || ''],
+        ['Receive Country:', this.countries.find(c => c.countryCode === formValue.receiveCountry)?.country || ''],
+      ];
+      return {
+        modal: {
+          ...formValue,
+          fromDate: this.toIsoFormat(formValue.fromDate),
+          toDate: this.toIsoFormat(formValue.toDate),
+        },
+        sysUserID: this.currentUser,
+        searchCriteria: searchCriteria
+      };
+    }
+
+    if (this.ReportName === "Credit Limit Status Enquiry") {
+      const clientCode = this.searchForm.controls['client'].value;
+      const formValue = this.searchForm.value;
+      formValue.fromDate = this.toIsoFormat(formValue.fromDate);
+      formValue.toDate = this.toIsoFormat(formValue.toDate);
+      formValue.client = this.clients1.find(c => c.businessPartnerCode === clientCode)?.businessPartnerName || '';
+      const searchCriteria: [string, string][] = [
+        ['Client:', this.clients1.find(c => c.businessPartnerCode === clientCode)?.businessPartnerName || ''],
+        ['Transaction status:', formValue.transactionStatus],
+        ['From Date:', angularCommon.formatDate(this.toIsoFormat(formValue.fromDate), 'dd/MM/yyyy', 'en-US')],
+        ['To Date:', angularCommon.formatDate(this.toIsoFormat(formValue.toDate), 'dd/MM/yyyy', 'en-US')],
+      ];
+      return {
+        modal: formValue,
+        sysUserID: this.currentUser,
+        searchCriteria: searchCriteria
+      }
+    }
+    if (this.ReportName == "Funding") {
+      return {
+        modal: formValue,
+        sysUserID: this.currentUser,
+        reportPeriod: `${formatDate(fromDate)} - ${formatDate(toDate)}`,
+        searchCriteria: searchCriteria
+      };
+    }
+    if (this.ReportName == "Trial Balance - Accounts") {
+      const formValue = this.searchForm.value;
+      const dateRange = this.prepareFromDateAndToDateForTrialBalanceAccountReport();
+      return {
+        modal: {
+          ...formValue,
+          fromDate: dateRange.fromDate,
+          toDate: dateRange.toDate,
+        },
+        sysUserID: this.currentUser
+      };
+
+    }
+      if (this.ReportName == "Branch Activity Send Summary")
+ {
+      const formValue = this.searchForm.value;
+      formValue.fromDate = this.toIsoFormat(formValue.fromDate);
+      formValue.toDate = this.toIsoFormat(formValue.toDate);
+      const searchCriteria: [string, string][] = [
+        ['Client:', this.clients1.find(c => c.businessPartnerCode === formValue.client)?.businessPartnerName || ''],
+        ['Transaction Status:', formValue.transactionStatus.join(",")],
+        ['Branch:', this.branches.find(b => b.branchCode === formValue.branch)?.businessPartnerBranch || ''],
+        ['Product:', formValue.product],
+        ['From Date:', angularCommon.formatDate(this.toIsoFormat(formValue.fromDate), 'dd/MM/yyyy', 'en-US')],
+        ['Receive Currency:', this.currencies.find(c => c.currencyCode === formValue.receiveCurrency)?.currency || ''],
+        ['To Date:', angularCommon.formatDate(this.toIsoFormat(formValue.toDate), 'dd/MM/yyyy', 'en-US')],
+        ['Send Country:', this.countries.find(c => c.countryCode === formValue.sendCountry)?.country || ''],
+        ['Receive Country:', this.countries.find(c => c.countryCode === formValue.receiveCountry)?.country || ''],
+        ['Summary Report:', formValue.summaryReport], 
+      ];
+      return {
+        modal: formValue,
+        sysUserID: this.currentUser,
+        searchCriteria: searchCriteria
+      }
+    }
+    if (this.ReportName == "Transaction Monitoring") {
+      const formValue = this.searchForm.value;
+      // formValue.fromDate = this.toIsoFormat(formValue.fromDate);
+      // formValue.toDate = this.toIsoFormat(formValue.toDate);
+      if (this.initialFilters?.isRealtime && (formValue.fromDate == '' && formValue.toDate == '')) {
+        formValue.fromDate = null;
+        formValue.toDate = null;
+      } else {
+        formValue.fromDate = this.toIsoFormat(fromDate);
+        formValue.toDate = this.toIsoFormat(toDate);
+        if (this.initialFilters?.isRealtime) {
+          this.initialFilters.isRealtime = false;
+        }
+       
+      }
+      const searchCriteria: [string, string][] = [
+        ['Client:', this.clients1.find(c => c.businessPartnerCode === formValue.client)?.businessPartnerName || ''],
+        ['Transaction Status:', formValue.transactionStatus.join(",")],
+        ['Branch:', this.branches.find(b => b.branchCode === formValue.branch)?.businessPartnerBranch || ''],
+        ['Product:', formValue.product],
+        ['From Date:', this.initialFilters?.isRealtime ? '' : angularCommon.formatDate(this.toIsoFormat(formValue.fromDate), 'dd/MM/yyyy', 'en-US')],
+        ['Receive Currency:', this.currencies.find(c => c.currencyCode === formValue.receiveCurrency)?.currency || ''],
+        ['To Date:', this.initialFilters?.isRealtime ? '' : angularCommon.formatDate(this.toIsoFormat(formValue.toDate), 'dd/MM/yyyy', 'en-US')],
+        ['Send Country:', this.countries.find(c => c.countryCode === formValue.sendCountry)?.country || ''],
+        ['Receive Country:', this.countries.find(c => c.countryCode === formValue.receiveCountry)?.country || ''],
+      ];
+      return {
+        modal: formValue,
+        sysUserID: this.currentUser,
+        isRealtime: this.initialFilters?.isRealtime,
+        searchCriteria: searchCriteria
+      }
+   }
+  }
+
+  toIsoFormat(dateInput: any): string | undefined {
+    if (!dateInput) return undefined;
+
+    // Handle { year, month, day }
+    if (
+      typeof dateInput === 'object' &&
+      dateInput.year &&
+      dateInput.month &&
+      dateInput.day
+    ) {
+      const year = dateInput.year;
+      const month = String(dateInput.month).padStart(2, '0');
+      const day = String(dateInput.day).padStart(2, '0');
+      return `${year}-${month}-${day}`;
+    }
+
+    // Handle JS Date object
+    if (dateInput instanceof Date) {
+      if (isNaN(dateInput.getTime())) return undefined;
+      const year = dateInput.getFullYear();
+      const month = String(dateInput.getMonth() + 1).padStart(2, '0');
+      const day = String(dateInput.getDate()).padStart(2, '0');
+      return `${year}-${month}-${day}`;
+    }
+
+    // Handle dd/MM/yyyy string
+    if (typeof dateInput === 'string' && dateInput.includes('/')) {
+      const parts = dateInput.split('/');
+      if (parts.length === 3) {
+        const [day, month, year] = parts;
+        return `${year}-${month.padStart(2, '0')}-${day.padStart(2, '0')}`;
+      }
+    }
+
+    // Handle ISO string (yyyy-MM-dd or yyyy-MM-ddTHH:mm:ss.sssZ)
+    if (typeof dateInput === 'string' && /^\d{4}-\d{2}-\d{2}/.test(dateInput)) {
+      // Use only date part if full ISO string
+      return dateInput.substring(0, 10);
+    }
+
+    return undefined;
+  }
+
+  onOpen() {
+    this.isOpen = true;
+  }
+  onClose() {
+    this.isOpen = false;
+  }
+
+
+  get errorMessage(): string {
+    return this._errorMessage;
+  }
+
+  set errorMessage(value: string) {
+    this._errorMessage = value;
+  }
+
+  get isLoading(): boolean {
+    return this.loadingState === ComponentLoadingState.Loading;
+  }
+
+  get isError(): boolean {
+    return this.loadingState === ComponentLoadingState.Error;
+  }
+
+  currencySearch = (term: string, item: any) => {
+    term = term.toLowerCase();
+    return (
+      item.currencyCode.toLowerCase().includes(term)
+    );
+  };
+
+  toNgbDateStruct(fromDate: Date): NgbDateStruct {
+    return {
+      year: fromDate.getFullYear(),
+      month: fromDate.getMonth() + 1,
+      day: fromDate.getDate()
+    };
+  }
+
+  transactionStatusSubscribe() {
+    this.searchForm.get('transactionStatus').valueChanges.subscribe((val) => {
+      const allStatus = this.transactionStatuses
+        .map((status) => status.transactionStatus);
+
+      if (val.includes('All')) {
+        if (this.isSelectAllChecked) {
+          const filteredStatus = val.filter(s => s !== 'All');
+          this.searchForm.get('transactionStatus')
+            .setValue(filteredStatus, { emitEvent: false });
+          this.isSelectAllChecked = false;
+        } else {
+          this.searchForm.get('transactionStatus')
+            .setValue(['All'], { emitEvent: false });
+          this.isSelectAllChecked = true;
+        }
+      }
+
+    })
+  }
+
+  handleDateChange() {
+    this.searchForm.get('fromDate')?.valueChanges.subscribe(fromDateStr => {
+      const toDateControl = this.searchForm.get('toDate');
+      const toDateStr = toDateControl?.value;
+      if (!fromDateStr || !toDateStr) return;
+      const fromDate = new Date(fromDateStr);
+      this.disabledDate = this.toNgbDateStruct(fromDate);
+    });
+  }
+
+
+  // **  for trial balance accounting report - 
+
+  onSelectFromMonth() {
+    this.loadingState = ComponentLoadingState.Loading;
+    const year = +this.searchForm.get('financialYear')?.value;
+    const fromMonth = +this.searchForm.get('fromMonth')?.value;
+
+    if (!year || !fromMonth) {
+      return;
+    }
+
+    this.reportService.GetToMonthsForTrialBalanceAccountsReport(year, fromMonth)
+      .pipe(catchError(err => of([])))
+      .subscribe((toMonths) => {
+        this.toMonths = toMonths;
+
+        // update "toMonth" form control with default (first option)
+        this.searchForm.patchValue({
+          toMonth: this.toMonths[0]?.pMonth ?? ""
+        });
+        this.loadingState = ComponentLoadingState.Complete;
+      });
+
+    // on select fromMonth goes call to fromDay
+
+    const financialYear = +this.searchForm.get('financialYear')?.value;
+    const selectedPMonth = this.searchForm.get('fromMonth')?.value;
+    const fromMonthObj = this.fromMonths.find(m => m.pOrder === selectedPMonth);
+    const fromMonthLabel = fromMonthObj?.period;
+    this.reportService.GetFromDatesForTrialBalanceAccountsReport(financialYear, fromMonthLabel)
+      .subscribe(
+        (fromDays) => {
+          this.fromDays = fromDays;
+          this.searchForm.patchValue({ fromDay: undefined })
+          this.searchForm.patchValue({ toDay: "" })
+          this.searchForm.get('toDay')?.disable();
+        },
+        (error) => {
+          console.error('Error while fetching To Days:', error);
+        }
+      );
+
+  }
+
+  onSelectFromDay() {
+    this.loadingState = ComponentLoadingState.Loading;
+    const currentToDayValue = this.searchForm.get('toDay')?.value;
+    const currentToDayObject = this.toDays.find(d => d.individualDate === currentToDayValue)
+
+    const financialYear = this.searchForm.get('financialYear')?.value;
+    const fromMonth = this.searchForm.get('fromMonth')?.value;
+    const toMonth = this.searchForm.get('toMonth')?.value;
+    const fromDay = this.searchForm.get('fromDay')?.value;
+
+    const requestPayload = {
+      Year: financialYear,
+      FromMonth: fromMonth,
+      ToMonth: toMonth,
+      FromDate: fromDay
+    };
+
+    this.reportService.GetToDatesForTrialBalanceAccountsReport(requestPayload)
+      .pipe(
+        finalize(() => {
+          this.loadingState = ComponentLoadingState.Complete;
+        })
+      )
+      .subscribe(
+        (toDays) => {
+          this.toDays = toDays;
+
+          if (this.searchForm.get('fromMonth')?.value != this.searchForm.get('toMonth')?.value && this.searchForm.get('toDay')?.value) {
+            const matchedToDayObject = this.toDays.find(d => d.pDate === currentToDayObject.pDate);
+            this.searchForm.patchValue({
+              toDay: matchedToDayObject.individualDate ?? ""
+            });
+          } else {
+            this.searchForm.patchValue({
+              toDay: this.toDays[0]?.individualDate ?? ""
+            });
+          }
+          this.searchForm.get('toDay')?.enable();
+
+        },
+        (error) => {
+          console.error('Error fetching To Days:', error);
+          window.alert('Error fetching To Days');
+          this.toDays = [];
+          this.searchForm.get('toDay')?.patchValue("");
+        },
+        () => {
+          this.loadingState = ComponentLoadingState.Complete;
+        }
+      );
+  }
+
+
+  onSelectToMonth() {
+    this.loadingState = ComponentLoadingState.Loading;
+
+    const currentToDayValue = this.searchForm.get('toDay')?.value;
+
+    const financialYear = this.searchForm.get('financialYear')?.value;
+    const fromMonth = this.searchForm.get('fromMonth')?.value;
+    const toMonth = this.searchForm.get('toMonth')?.value;
+    const fromDay = this.searchForm.get('fromDay')?.value;
+
+    if (!financialYear || !fromMonth || !toMonth || !fromDay) {
+      this.loadingState = ComponentLoadingState.Complete;
+      return;
+    }
+
+    const requestPayload = {
+      Year: financialYear,
+      FromMonth: fromMonth,
+      ToMonth: toMonth,
+      FromDate: fromDay
+    };
+
+    this.reportService.GetToDatesForTrialBalanceAccountsReport(requestPayload)
+      .subscribe(
+        (toDays) => {
+          this.toDays = toDays;
+
+          if (this.searchForm.get('fromMonth')?.value === this.searchForm.get('toMonth')?.value) {
+            const fromDay = this.searchForm.get('fromDay')?.value;
+            const fromDayObject = this.fromDays.find(d => d.individualDate === fromDay);
+            const toDayObject = this.toDays.find(d => d.pDate === fromDayObject?.individualDay);
+
+            this.searchForm.patchValue({
+              toDay: toDayObject?.individualDate ?? ""
+            });
+          } else {
+            this.searchForm.patchValue({
+              toDay: this.toDays[0].individualDate
+            });
+          }
+        },
+
+        (error) => {
+          console.error('Error fetching To Days:', error);
+          window.alert('Error fetching To Days:');
+          this.toDays = [];
+          this.searchForm.get('toDay')?.patchValue("");
+        },
+        () => {
+          this.loadingState = ComponentLoadingState.Complete;
+        }
+      );
+  }
+
+  onSelectFinancialYear() {
+    // on financialYear change fromday and today should change to default values acocrding to year and frommonth,tomonth -
+
+    this.loadingState = ComponentLoadingState.Loading;
+
+    // call fromDays
+
+    const financialYear = +this.searchForm.get('financialYear')?.value;
+
+    const selectedPMonth = this.searchForm.get('fromMonth')?.value;
+    const fromMonthObj = this.fromMonths.find(m => m.pOrder === selectedPMonth);
+    const fromMonthLabel = fromMonthObj?.period;
+
+    this.reportService.GetFromDatesForTrialBalanceAccountsReport(financialYear, fromMonthLabel)
+      .subscribe(
+        (fromDays) => {
+          this.fromDays = fromDays;
+          this.searchForm.patchValue({ fromDay: undefined })
+          this.searchForm.patchValue({ toDay: "" })
+          this.searchForm.get('toDay')?.disable();
+        },
+        (error) => {
+          console.error('Error while fetching To Days:', error);
+        }
+      );
+
+    const fromMonth = this.searchForm.get('fromMonth')?.value;
+    const toMonth = this.searchForm.get('toMonth')?.value;
+    const fromDay = this.searchForm.get('fromDay')?.value;
+
+    const requestPayload = {
+      Year: financialYear,
+      FromMonth: fromMonth,
+      ToMonth: toMonth,
+      FromDate: fromDay
+    };
+
+    this.reportService.GetToDatesForTrialBalanceAccountsReport(requestPayload)
+      .subscribe(
+        (toDays) => {
+          this.toDays = toDays;
+
+          if (this.searchForm.get('fromMonth')?.value === this.searchForm.get('toMonth')?.value) {
+            const fromDay = this.searchForm.get('fromDay')?.value;
+            const fromDayObject = this.fromDays.find(d => d.individualDate === fromDay);
+            const toDayObject = this.toDays.find(d => d.pDate === fromDayObject?.individualDay);
+
+            this.searchForm.patchValue({
+              toDay: toDayObject?.individualDate ?? ""
+            });
+          } else {
+            this.searchForm.patchValue({
+              toDay: ""
+            });
+            this.searchForm.get('toDay')?.disable();
+          }
+        },
+
+        (error) => {
+          console.error('Error fetching To Days:', error);
+          window.alert('Error fetching To Days:');
+          this.toDays = [];
+          this.searchForm.get('toDay')?.patchValue("");
+        },
+        () => {
+          this.loadingState = ComponentLoadingState.Complete;
+        }
+      );
+  }
+
+
+
+  prepareFromDateAndToDateForTrialBalanceAccountReport() {
+    const financialYear = +this.searchForm.get('financialYear')?.value;
+    const fromMonth = this.searchForm.get('fromMonth')?.value;
+    const toMonth = this.searchForm.get('toMonth')?.value;
+
+    const selectedFromDay = this.searchForm.get('fromDay')?.value;
+    const fromDayObj = this.fromDays.find(m => m.individualDate === selectedFromDay);
+    const fromDay = fromDayObj?.individualDay;
+
+    const selectedToDay = this.searchForm.get('toDay')?.value;
+    const toDayObj = this.toDays.find(m => m.individualDate === selectedToDay);
+    const toDay = toDayObj?.pDate;
+
+    const fromDate = new Date(financialYear, +fromMonth - 1, +fromDay); // JS month is 0-based
+    const toDate = new Date(financialYear, +toMonth - 1, +toDay);
+
+    return {
+      fromDate: fromDate,
+      toDate: toDate
+    };
+  }
+
+  // ----------------- Improved search criteria helpers (handles product) -----------------
+
+  private fieldLabelMap: Record<string, string> = {
+    client: 'Client:',
+    branch: 'Branch:',
+    fromDate: 'From Date:',
+    toDate: 'To Date:',
+    product: 'Product:',
+    transactionProduct: 'Product:',
+    userId: 'User:',
+    currency: 'Currency:',
+    sendCurrency: 'Send Currency:',
+    receiveCurrency: 'Receive Currency:',
+    transactionStatus: 'Txn. Status:',
+    transactionStatusSingleSelect: 'Txn. Status:',
+    transactionNo: 'Txn. Number:',
+    date: 'Date:',
+    dateType: 'Date Type:',
+    valueDate: 'Value Date:',
+    sendCountry: 'Send Country:',
+    receiveCountry: 'Receive Country:',
+    sendBusinessPartner: 'Sender Partner:',
+    recvBusinessPartner: 'Receiver Partner:',
+    businessUnit: 'Business Unit:',
+    financialYear: 'Financial Year:',
+    fromMonth: 'From Month:',
+    toMonth: 'To Month:',
+    fromDay: 'From Day:',
+    toDay: 'To Day:',
+    accountStatus: 'Account Status:',
+    // add more mappings as needed
+  };
+
+  // map visible field name -> actual form control name (when they differ)
+  private fieldToControlMap: Record<string, string> = {
+    transactionStatusSingleSelect: 'transactionStatus',
+    transactionProduct: 'product', // important: transactionProduct UI uses form control named 'product'
+    // add other mappings if visibleField name differs from the form control name
+  };
+
+  // maps to use bindLabel / bindValue for lookups
+  private fieldBindLabelMap: Record<string, string> = {
+    client: 'businessPartnerName',
+    branch: 'businessPartnerBranch',
+    product: 'productCode',
+    transactionProduct: 'productCode',
+    transactionStatus: 'transactionStatus',
+    transactionStatusSingleSelect: 'transactionStatus',
+    userId: 'userName',
+    currency: 'currency',
+    sendCurrency: 'currency',
+    receiveCurrency: 'currency',
+    sendBusinessPartner: 'name',
+    recvBusinessPartner: 'name',
+    businessUnit: 'businessUnit',
+    financialYear: 'financialYear',
+    fromMonth: 'period',
+    toMonth: 'pMonthName',
+    fromDay: 'individualDay',
+    toDay: 'pDate',
+    accountStatus: 'statusName'
+  };
+
+  private fieldBindValueMap: Record<string, string> = {
+    client: 'businessPartnerCode',
+    branch: 'branchCode',
+    product: 'productCode',
+    transactionProduct: 'productCode',
+    transactionStatus: 'transactionStatus',
+    transactionStatusSingleSelect: 'transactionStatus',
+    userId: 'userId',
+    currency: 'currencyCode',
+    sendCurrency: 'currencyCode',
+    receiveCurrency: 'currencyCode',
+    sendBusinessPartner: 'id',
+    recvBusinessPartner: 'id',
+    businessUnit: 'businessUnit',
+    financialYear: 'financialYear',
+    fromMonth: 'pOrder',
+    toMonth: 'pMonth',
+    fromDay: 'individualDate',
+    toDay: 'individualDate',
+    accountStatus: 'statusCode'
+  };
+
+  private formatDateToDDMMYYYY(d: string | Date | null | undefined): string {
+    if (!d) return '';
+    const date = (typeof d === 'string' && d.length) ? new Date(d) : (d instanceof Date ? d : new Date(d));
+    if (isNaN(date.getTime())) return '';
+    const day = String(date.getDate()).padStart(2, '0');
+    const month = String(date.getMonth() + 1).padStart(2, '0');
+    const year = date.getFullYear();
+    return `${day}/${month}/${year}`;
+  }
+
+  /** helper to find item in the known lists by bindValue and return its bindLabel
+   *  improved: tries multiple fallback value keys so product lookup is robust */
+  private lookupFromListByField(field: string, scalarValue: any): string {
+    const bindLabel = this.fieldBindLabelMap[field];
+    const bindValue = this.fieldBindValueMap[field];
+
+    // choose candidate list based on field
+    let list: any[] | undefined;
+    switch (field) {
+      case 'client': list = this.clients1; break;
+      case 'branch': list = this.branches; break;
+      case 'product': list = this.products; break;
+      case 'transactionProduct': list = this.transactionProducts; break;
+      case 'transactionStatus':
+      case 'transactionStatusSingleSelect': list = this.transactionStatuses; break;
+      case 'userId': list = this.users; break;
+      case 'sendBusinessPartner': list = this.sendBusinessPartnerAgents; break;
+      case 'recvBusinessPartner': list = this.recvBusinessPartnerAgents; break;
+      case 'businessUnit': list = this.businessUnits; break;
+      case 'financialYear': list = this.financialYears; break;
+      case 'fromMonth': list = this.fromMonths; break;
+      case 'toMonth': list = this.toMonths; break;
+      case 'fromDay': list = this.fromDays; break;
+      case 'toDay': list = this.toDays; break;
+      case 'accountStatus': list = this.accountStatuses; break;
+      case 'sendCountry':
+      case 'receiveCountry': list = this.countries; break;
+      case 'currency':
+      case 'sendCurrency':
+      case 'receiveCurrency': list = this.currencies; break;
+      default: list = undefined;
+    }
+
+    // handle common 'All' sentinel
+    if (scalarValue === 'All' || scalarValue === '' || scalarValue === null || scalarValue === undefined) return String(scalarValue || '');
+
+    if (list && list.length) {
+      // try the configured bindValue key first
+      if (bindValue) {
+        const found = list.find((x: any) => String(x[bindValue]) === String(scalarValue));
+        if (found) {
+          if (bindLabel && found[bindLabel]) return found[bindLabel];
+          return found.transactionStatusLabel || found.transactionStatus || found.name || found.productName || found.businessPartnerName || String(scalarValue);
+        }
+      }
+
+      // fallback: try matching on common keys in case shapes differ
+      const commonKeys = ['productCode', 'code', 'id', 'value', 'currencyCode', 'statusCode'];
+      for (const key of commonKeys) {
+        const found2 = list.find((x: any) => x && x[key] !== undefined && String(x[key]) === String(scalarValue));
+        if (found2) {
+          const labelCandidate = bindLabel && found2[bindLabel] ? found2[bindLabel] : (found2.productName || found2.name || found2.transactionStatusLabel || found2.businessPartnerName);
+          return labelCandidate || String(scalarValue);
+        }
+      }
+
+      // last attempt: if scalarValue equals a label in the list, return it
+      if (bindLabel) {
+        const found3 = list.find((x: any) => String(x[bindLabel]) === String(scalarValue));
+        if (found3) return String(found3[bindLabel]);
+      }
+    }
+
+    // not found — return scalar as string
+    return String(scalarValue);
+  }
+
+  // --- lookup that prefers bindLabel when possible ---
+  private getLookupDisplayValue(field: string, value: any): string {
+    if (value === null || value === undefined || value === '') return '';
+
+    // Date handling
+    if (field === 'fromDate' || field === 'toDate' || field === 'date' || field === 'valueDate') {
+      return this.formatDateToDDMMYYYY(value);
+    }
+
+    // Currencies: show "CODE - Name"
+    if (['currency', 'sendCurrency', 'receiveCurrency'].includes(field)) {
+      if (value === 'All') return 'All';
+      if (typeof value === 'object') {
+        const code = value.currencyCode || value.currency || '';
+        const name = value.currency || '';
+        return code ? `${code} - ${name}` : String(value);
+      }
+      const cur = this.currencies?.find((x: any) => x.currencyCode === value);
+      return cur ? `${cur.currencyCode} - ${cur.currency}` : String(value);
+    }
+
+    // If it's an array (multi-select), map each item
+    if (Array.isArray(value)) {
+      const mapped = value.map(v => {
+        if (typeof v === 'object') {
+          const bindLabel = this.fieldBindLabelMap[field];
+          return bindLabel && v[bindLabel] ? v[bindLabel] : (v.transactionStatusLabel || v.statusName || v.productName || v.name || JSON.stringify(v));
+        }
+        return this.lookupFromListByField(field, v);
+      });
+      if (mapped.length === 1 && (mapped[0] === 'All' || mapped[0] === '')) return 'All';
+      return mapped.join(', ');
+    }
+
+    // If value is an object (single select returned object)
+    if (typeof value === 'object') {
+      // product special-case: product object might have productName/productCode
+      if (field === 'product' || field === 'transactionProduct') {
+        const pn = value.productName || value.name || value.label || value.display || value.product || value.transactionProduct;
+        if (pn) return pn;
+        // try common keys
+        return value.productCode || value.code || value.id ? String(value.productCode || value.code || value.id) : JSON.stringify(value);
+      }
+
+      const bindLabel = this.fieldBindLabelMap[field];
+      if (bindLabel && value[bindLabel]) return value[bindLabel];
+      return value.transactionStatus || value.name || value.businessPartnerName || JSON.stringify(value);
+    }
+
+    // Scalar -> lookup in lists using bindValue -> return bindLabel
+    // product special-case: if value === 'All' then return 'All'
+    if ((field === 'product' || field === 'transactionProduct') && String(value) === 'All') return 'All';
+
+    return this.lookupFromListByField(field, value);
+  }
+
+  /**
+   * Returns search criteria array for the currently visible fields.
+   * Output: [ ['Label:', 'Value'], ... ]
+   */
+  public getSearchCriteriaArray(): [string, string][] {
+    if (!this.searchForm) return [];
+
+    const criteria: [string, string][] = [];
+    const formValue = this.searchForm.value;
+    const fields = this.visibleFields; // uses your getter
+
+    fields.forEach(field => {
+      const label = this.fieldLabelMap[field] || (field + ':');
+      const controlName = this.fieldToControlMap[field] || field;
+      const value = formValue[controlName];
+
+      // dates
+      if (controlName === 'fromDate' || controlName === 'toDate' || controlName === 'date' || controlName === 'valueDate') {
+        criteria.push([label, this.formatDateToDDMMYYYY(value) || '']);
+        return;
+      }
+
+      // Use getLookupDisplayValue to produce the human-friendly string (handles arrays/objects/scalars)
+      const display = this.getLookupDisplayValue(field, value);
+
+      criteria.push([label, display || '']);
+    });
+
+    return criteria;
+  }
+
+
+
+}