@sachin9822/reports-lib 0.0.223 → 0.0.225

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -2268,16 +2268,9 @@ class SearchFilterComponent {
2268
2268
  this.searchForm.get('fromDate')?.valueChanges.subscribe(fromDateStr => {
2269
2269
  const toDateControl = this.searchForm.get('toDate');
2270
2270
  const toDateStr = toDateControl?.value;
2271
- if (!fromDateStr)
2271
+ if (!fromDateStr || !toDateStr)
2272
2272
  return;
2273
2273
  const fromDate = new Date(fromDateStr);
2274
- // If ToDate is empty → set default
2275
- if (!toDateControl?.value) {
2276
- const maxToDate = new Date(fromDate);
2277
- maxToDate.setDate(fromDate.getDate() + 30);
2278
- toDateControl.patchValue(maxToDate.toISOString().split("T")[0]);
2279
- return;
2280
- }
2281
2274
  const toDate = new Date(toDateStr);
2282
2275
  const maxToDate = new Date(fromDate);
2283
2276
  maxToDate?.setDate(fromDate.getDate() + 30);
@@ -2293,16 +2286,9 @@ class SearchFilterComponent {
2293
2286
  this.searchForm.get('toDate')?.valueChanges.subscribe(toDateStr => {
2294
2287
  const fromDateControl = this.searchForm.get('fromDate');
2295
2288
  const fromDateStr = fromDateControl?.value;
2296
- if (!toDateStr)
2289
+ if (!toDateStr || !fromDateStr)
2297
2290
  return;
2298
2291
  const toDate = new Date(toDateStr);
2299
- // If FromDate is empty → set default
2300
- if (!fromDateControl?.value) {
2301
- const minFromDate = new Date(toDate);
2302
- minFromDate.setDate(toDate.getDate() - 30);
2303
- fromDateControl.patchValue(minFromDate.toISOString().split("T")[0]);
2304
- return;
2305
- }
2306
2292
  const fromDate = new Date(fromDateStr);
2307
2293
  this.disabledDate = this.toNgbDateStruct(fromDate);
2308
2294
  const minFromDate = new Date(toDate);
@@ -2999,7 +2985,7 @@ class SearchFilterComponent {
2999
2985
  const formValue = this.searchForm.value;
3000
2986
  // formValue.fromDate = this.toIsoFormat(formValue.fromDate);
3001
2987
  // formValue.toDate = this.toIsoFormat(formValue.toDate);
3002
- if (this.initialFilters?.isRealtime && (!formValue.fromDate && !formValue.toDate)) {
2988
+ if (this.initialFilters?.isRealtime && (formValue.fromDate == '' && formValue.toDate == '')) {
3003
2989
  formValue.fromDate = null;
3004
2990
  formValue.toDate = null;
3005
2991
  }
@@ -3024,6 +3010,7 @@ class SearchFilterComponent {
3024
3010
  return {
3025
3011
  modal: formValue,
3026
3012
  sysUserID: this.currentUser,
3013
+ isRealtime: this.initialFilters?.isRealtime,
3027
3014
  searchCriteria: searchCriteria
3028
3015
  };
3029
3016
  }
@@ -3603,7 +3590,7 @@ class AccGlDetailsEnquiryReportComponent {
3603
3590
  };
3604
3591
  this.rowData = formattedEntries;
3605
3592
  this.companyName = data.companyName;
3606
- this.reportUser = data.reportUser?.toLowerCase();
3593
+ this.reportUser = data.reportUser.toLowerCase();
3607
3594
  this.reportTime = formatDate(new Date(), 'dd/MM/yyyy hh:mm a', 'en-US');
3608
3595
  this.currentReportValueOrPostDate = formatDate(data.date, 'dd/MM/yyyy', 'en-US');
3609
3596
  const DateType = this.dateType === 'VD' ? 'Value Date' : 'Posting Date';
@@ -3775,11 +3762,9 @@ class TransactionEnquiryComponent {
3775
3762
  { headerName: 'Send Client Branch', field: 'sendAgtBranch', flex: 1, minWidth: 120, tooltipField: 'sendAgtBranch' },
3776
3763
  { headerName: 'Receive Client', field: 'recvAgent', flex: 1, minWidth: 120, tooltipField: 'recvAgent' },
3777
3764
  { headerName: 'Receive Client Branch', field: 'rcvAgtBranch', flex: 1, minWidth: 120, tooltipField: 'rcvAgtBranch' },
3778
- { headerName: 'Is Sender Corporate', field: 'isSenderCorporate', flex: 1, minWidth: 80 },
3779
3765
  { headerName: 'Sender Name', field: 'sendName', flex: 1, minWidth: 120, tooltipField: 'sendName' },
3780
3766
  { headerName: 'Sender ID Type', field: 'sendIdType', flex: 1, minWidth: 90, tooltipField: 'sendIdType' },
3781
3767
  { headerName: 'Sender ID Number', field: 'sendIdNumber', flex: 1, minWidth: 85, tooltipField: 'sendIdNumber' },
3782
- { headerName: 'Is Beneficiary Corporate', field: 'isBeneficiaryCorporate', flex: 1, minWidth: 80 },
3783
3768
  { headerName: 'Benf. Name', field: 'benName', flex: 1, minWidth: 100, tooltipField: 'benName' },
3784
3769
  { headerName: 'Receive Currency', field: 'payOutCurrency', flex: 1, minWidth: 80, tooltipField: 'payOutCurrency' },
3785
3770
  { headerName: 'Receive Amount', field: 'payOutAmount', flex: 1, minWidth: 100, cellClass: 'ag-right-aligned-cell ', tooltipField: 'payOutAmount' },
@@ -4027,12 +4012,11 @@ class BranchActivitySendReportComponent {
4027
4012
  { field: 'businessDateTime', headerName: 'Business Date', flex: 1, wrapText: true, autoHeight: true, headerClass: 'ag-left-aligned-header', minWidth: 70, width: 70, tooltipField: 'businessDateTime' },
4028
4013
  { field: 'transactionDateTime', headerName: 'Transaction Date', minWidth: 100, flex: 2, wrapText: true, autoHeight: true, tooltipField: 'transactionDateTime' },
4029
4014
  { field: 'transactionNumber', headerName: 'Transaction Number', flex: 1.8, wrapText: true, autoHeight: true, minWidth: 90, width: 130, cellClass: 'ag-left-cols-cell compact-cell-transaction', tooltipField: 'transactionNumber' },
4015
+ { field: 'transactionReferenceNumber', headerName: 'Transaction Reference Number', flex: 1.8, wrapText: true, autoHeight: true, minWidth: 90, width: 130, cellClass: 'ag-left-cols-cell compact-cell-transaction', tooltipField: 'transactionReferenceNumber' },
4030
4016
  { field: 'product', headerName: 'Product', flex: 0.5, wrapText: true, autoHeight: true, minWidth: 80, width: 120, tooltipField: 'product' },
4031
4017
  { field: 'sendAgentBranchCode', headerName: 'SendClient BranchCode', flex: 1, wrapText: true, autoHeight: true, minWidth: 90, width: 120, tooltipField: 'sendAgentBranchCode' },
4032
4018
  { field: 'receiveAgentCode', headerName: 'Receive ClientCode', flex: 1, wrapText: true, autoHeight: true, minWidth: 90, width: 70, tooltipField: 'receiveAgentCode' },
4033
- { headerName: 'Is Sender Corporate', field: 'isSenderCorporate', flex: 1, minWidth: 80 },
4034
4019
  { headerName: 'Sender Name', field: 'senderName', flex: 1, minWidth: 120, tooltipField: 'senderName' },
4035
- { headerName: 'Is Beneficiary Corporate', field: 'isBeneficiaryCorporate', flex: 1, minWidth: 80 },
4036
4020
  { headerName: 'Beneficiary Name', field: 'beneficiaryName', flex: 1, minWidth: 100, tooltipField: 'beneficiaryName' },
4037
4021
  { field: 'payoutCCcode', headerName: 'ReceiveCcy Code', flex: 1, wrapText: true, autoHeight: true, minWidth: 90, width: 110, tooltipField: 'payoutCCcode' },
4038
4022
  { field: 'payoutAmount', headerName: 'Receive Amount', flex: 1, wrapText: true, autoHeight: true, minWidth: 90, maxWidth: 120, cellClass: 'ag-right-aligned-cell compact-cell', tooltipField: 'payoutAmount' },
@@ -4482,10 +4466,6 @@ class CancellationTransactionReportComponent {
4482
4466
  { headerName: 'Send Client Branch Code', field: 'sendAgentBranchCode', flex: 1, minWidth: 90, tooltipField: 'sendAgentBranchCode' },
4483
4467
  { headerName: 'Send Principal Client Code (If Applicable)', field: 'sendPrincipalAgentCode', flex: 1, minWidth: 90, tooltipField: 'sendPrincipalAgentCode' },
4484
4468
  { headerName: 'Receive Client Code', field: 'recvAGTcode', flex: 1, minWidth: 80, tooltipField: 'recvAGTcode' },
4485
- { headerName: 'Is Sender Corporate', field: 'isSenderCorporate', flex: 1, minWidth: 80 },
4486
- { headerName: 'Sender Name', field: 'senderName', flex: 1, minWidth: 120, tooltipField: 'senderName' },
4487
- { headerName: 'Is Beneficiary Corporate', field: 'isBeneficiaryCorporate', flex: 1, minWidth: 80 },
4488
- { headerName: 'Beneficiary Name', field: 'beneficiaryName', flex: 1, minWidth: 100, tooltipField: 'beneficiaryName' },
4489
4469
  { headerName: 'Receive CcyCode', field: 'payoutCCcode', flex: 1, minWidth: 65, tooltipField: 'payoutCCcode' },
4490
4470
  { headerName: 'Receive Amount', field: 'payOutAmount', flex: 1, minWidth: 82, cellClass: 'ag-right-aligned-cell', tooltipField: 'payOutAmount' },
4491
4471
  { headerName: 'Send CcyCode', field: 'payinCCcode', flex: 1, minWidth: 69, tooltipField: 'payinCCcode' },
@@ -4727,8 +4707,6 @@ class RevenuePerTransactionReportComponent {
4727
4707
  { field: 'receiveCountry', headerName: 'Receive Country', flex: 1, headerClass: 'ag-header-cell', minWidth: 80, wrapText: true, autoHeight: true, tooltipField: 'receiveCountry' },
4728
4708
  { field: 'receiveAgentName', headerName: 'ReceiveClient Name', flex: 1, headerClass: 'ag-header-cell', minWidth: 150, wrapText: true, autoHeight: true, tooltipField: 'receiveAgentName' },
4729
4709
  { field: 'receiveAgentCode', headerName: 'ReceiveClient Code', flex: 1, headerClass: 'ag-header-cell', minWidth: 90, wrapText: true, autoHeight: true, tooltipField: 'receiveAgentCode' },
4730
- { headerName: 'Is Sender Corporate', field: 'isSenderCorporate', flex: 1, minWidth: 80 },
4731
- { headerName: 'Is Beneficiary Corporate', field: 'isBeneficiaryCorporate', flex: 1, minWidth: 80 },
4732
4710
  { field: 'payInCurrency', headerName: 'Send CcyCode', flex: 1, headerClass: 'ag-header-cell', minWidth: 80, wrapText: true, autoHeight: true, tooltipField: 'payInCurrency' },
4733
4711
  { field: 'payInAmount', headerName: 'Send Amount', flex: 1, headerClass: 'ag-header-cell', minWidth: 80, wrapText: true, autoHeight: true, cellClass: 'ag-right-aligned-cell compact-cell', tooltipField: 'payInAmount' },
4734
4712
  { field: 'transactionCommission', headerName: 'Service Fee', flex: 1, headerClass: 'ag-header-cell', minWidth: 80, wrapText: true, autoHeight: true, cellClass: 'ag-right-aligned-cell compact-cell', tooltipField: 'transactionCommission' },
@@ -5721,30 +5699,28 @@ class AccountingReportComponent {
5721
5699
  autoHeight: true
5722
5700
  };
5723
5701
  this.columnDefs = [
5724
- { headerName: 'BusinessDate', field: 'businessDate', minWidth: 95, tooltipField: 'businessDate' },
5702
+ { headerName: 'BusinessDate', field: 'businessDate', tooltipField: 'businessDate' },
5725
5703
  { headerName: 'TxnDate&Time', field: 'transactionDateAndTime', tooltipField: 'transactionDateAndTime', minWidth: 110, },
5726
- { headerName: 'Transaction Number', field: 'transactionNumber', minWidth: 100, tooltipField: 'transactionNumber' },
5727
- { headerName: 'SendClient', field: 'sendClient', minWidth: 80, tooltipField: 'sendClient' },
5728
- { headerName: 'Principle SendClient (If Applicable)', field: 'principleSendClient', tooltipField: 'principleSendClient', minWidth: 90, },
5729
- { headerName: 'ReceiveClient', field: 'receiveClient', minWidth: 90, tooltipField: 'receiveClient' },
5730
- { headerName: 'Principle ReceiveClient (If Applicable)', field: 'principleReceiveClient', tooltipField: 'principleReceiveClient', minWidth: 90 },
5731
- { headerName: 'Is Sender Corporate', field: 'isSenderCorporate', minWidth: 80 },
5732
- { headerName: 'Is Beneficiary Corporate', field: 'isBeneficiaryCorporate', minWidth: 80 },
5733
- { headerName: 'ReceiveCcy', field: 'receiveCurrency', minWidth: 80, tooltipField: 'receiveCurrency' },
5734
- { headerName: 'AmountPaid', field: 'amountPaid', minWidth: 85, tooltipField: 'amountPaid', cellClass: 'ag-right-aligned-cell' },
5735
- { headerName: 'SendCcy', field: 'sendCurrency', minWidth: 80, tooltipField: 'sendCurrency', },
5736
- { headerName: 'ServiceFee', field: 'serviceFee', minWidth: 80, tooltipField: 'serviceFee', cellClass: 'ag-right-aligned-cell' },
5737
- { headerName: 'Tax', field: 'tax', minWidth: 70, tooltipField: 'tax', cellClass: 'ag-right-aligned-cell' },
5738
- { headerName: 'PrincipleSend Amount', field: 'principleSendAmount', minWidth: 90, tooltipField: 'principleSendAmount', cellClass: 'ag-right-aligned-cell' },
5739
- { headerName: 'Transaction Status', field: 'transactionStatus', minWidth: 90, tooltipField: 'transactionStatus' },
5740
- { headerName: 'SettlementCcy', field: 'settlementCurrency', minWidth: 90, tooltipField: 'settlementCurrency', cellClass: 'ag-right-aligned-cell' },
5741
- { headerName: 'ClientSettl (in SCcy)', field: 'clientSettlementInSCcy', minWidth: 80, tooltipField: 'clientSettlementInSCcy', cellClass: 'ag-right-aligned-cell' },
5742
- { headerName: 'ClientSettl (in USD)', field: 'clientSettlementInUSD', minWidth: 80, tooltipField: 'clientSettlementInUSD', cellClass: 'ag-right-aligned-cell' },
5743
- { headerName: 'ShareType', field: 'shareType', minWidth: 85, tooltipField: 'shareType' },
5744
- { headerName: 'ShareValue', field: 'shareValue', minWidth: 85, tooltipField: 'shareValue', cellClass: 'ag-right-aligned-cell' },
5745
- { headerName: 'Send/Receive FeeCcy', field: 'sendReceiveFeeCcy', minWidth: 85, tooltipField: 'sendReceiveFeeCcy' },
5746
- { headerName: 'ShareAmt (in USD)', field: 'shareAmountInUSD', minWidth: 80, tooltipField: 'shareAmountInUSD', cellClass: 'ag-right-aligned-cell' },
5747
- { headerName: 'Settlement Rate', field: 'settlementRate', minWidth: 85, tooltipField: 'settlementRate', cellClass: 'ag-right-aligned-cell' },
5704
+ { headerName: 'Transaction Number', field: 'transactionNumber', tooltipField: 'transactionNumber' },
5705
+ { headerName: 'SendClient', field: 'sendClient', tooltipField: 'sendClient' },
5706
+ { headerName: 'Principle SendClient (If Applicable)', field: 'principleSendClient', tooltipField: 'principleSendClient', width: 90, minWidth: 80, maxWidth: 110 },
5707
+ { headerName: 'ReceiveClient', field: 'receiveClient', tooltipField: 'receiveClient' },
5708
+ { headerName: 'Principle ReceiveClient (If Applicable)', field: 'principleReceiveClient', tooltipField: 'principleReceiveClient', width: 100, minWidth: 90, maxWidth: 120 },
5709
+ { headerName: 'ReceiveCcy', field: 'receiveCurrency', tooltipField: 'receiveCurrency' },
5710
+ { headerName: 'AmountPaid', field: 'amountPaid', tooltipField: 'amountPaid', cellClass: 'ag-right-aligned-cell' },
5711
+ { headerName: 'SendCcy', field: 'sendCurrency', tooltipField: 'sendCurrency', },
5712
+ { headerName: 'ServiceFee', field: 'serviceFee', tooltipField: 'serviceFee', cellClass: 'ag-right-aligned-cell' },
5713
+ { headerName: 'Tax', field: 'tax', tooltipField: 'tax', cellClass: 'ag-right-aligned-cell' },
5714
+ { headerName: 'PrincipleSend Amount', field: 'principleSendAmount', tooltipField: 'principleSendAmount', cellClass: 'ag-right-aligned-cell' },
5715
+ { headerName: 'Transaction Status', field: 'transactionStatus', tooltipField: 'transactionStatus' },
5716
+ { headerName: 'SettlementCcy', field: 'settlementCurrency', tooltipField: 'settlementCurrency', cellClass: 'ag-right-aligned-cell' },
5717
+ { headerName: 'ClientSettl (in SCcy)', field: 'clientSettlementInSCcy', tooltipField: 'clientSettlementInSCcy', cellClass: 'ag-right-aligned-cell' },
5718
+ { headerName: 'ClientSettl (in USD)', field: 'clientSettlementInUSD', tooltipField: 'clientSettlementInUSD', cellClass: 'ag-right-aligned-cell' },
5719
+ { headerName: 'ShareType', field: 'shareType', tooltipField: 'shareType' },
5720
+ { headerName: 'ShareValue', field: 'shareValue', tooltipField: 'shareValue', cellClass: 'ag-right-aligned-cell' },
5721
+ { headerName: 'Send/Receive FeeCcy', field: 'sendReceiveFeeCcy', tooltipField: 'sendReceiveFeeCcy' },
5722
+ { headerName: 'ShareAmt (in USD)', field: 'shareAmountInUSD', tooltipField: 'shareAmountInUSD', cellClass: 'ag-right-aligned-cell' },
5723
+ { headerName: 'Settlement Rate', field: 'settlementRate', tooltipField: 'settlementRate', cellClass: 'ag-right-aligned-cell' },
5748
5724
  ];
5749
5725
  this.gridApis = [];
5750
5726
  this.gridColumnApis = [];
@@ -5864,15 +5840,11 @@ class AccountingReportComponent {
5864
5840
  const columnApi = this.gridColumnApis[id];
5865
5841
  if (!columnApi)
5866
5842
  return;
5867
- const columns = columnApi.getColumns();
5868
- // prevent undefined error
5869
- if (!columns?.length)
5870
- return;
5871
5843
  const allColumnIds = [];
5872
5844
  columnApi.getColumns().forEach((column) => {
5873
5845
  allColumnIds.push(column.getId());
5874
5846
  });
5875
- columnApi.autoSizeColumns(allColumnIds, true);
5847
+ columnApi.autoSizeColumns(allColumnIds, skipHeader);
5876
5848
  }
5877
5849
  formatNumber(params) {
5878
5850
  if (params.value == null)
@@ -7955,7 +7927,6 @@ class TransactionMonitoringReportComponent {
7955
7927
  this.showMessage = false;
7956
7928
  this.noDataFound = false;
7957
7929
  this.isFormValid = false;
7958
- this.clearSearch = false;
7959
7930
  this.columnDefs = [
7960
7931
  { field: 'businessDateTime', headerName: 'Business Date', flex: 1, headerClass: 'ag-left-aligned-header', minWidth: 70, wrapText: true, autoHeight: true, tooltipField: 'businessDateTime' },
7961
7932
  { field: 'transactionDateTime', headerName: 'Transaction Date', flex: 2, headerClass: 'ag-left-aligned-header', minWidth: 100, wrapText: true, autoHeight: true, tooltipField: 'transactionDateTime' },
@@ -8036,9 +8007,7 @@ class TransactionMonitoringReportComponent {
8036
8007
  receiveCountry: params['receiveCountry'],
8037
8008
  toDate: params['toDate'],
8038
8009
  fromDate: params['fromDate'],
8039
- isRealtime: params['isRealtime'] === 'true' || params['isRealtime'] === true,
8040
- loggedInTime: params['loggedInTime'],
8041
- count: Number(params['count'])
8010
+ isRealtime: params['isRealtime'] === 'true' || params['isRealtime'] === true
8042
8011
  };
8043
8012
  }
8044
8013
  else {
@@ -8157,27 +8126,13 @@ class TransactionMonitoringReportComponent {
8157
8126
  return '';
8158
8127
  }
8159
8128
  handleSearch(criteria) {
8160
- if (this.initialFilters != null) {
8161
- const realtimeStatuses = ['Paid', 'PaidCancelled', 'Cancelled', 'Void', 'Rejected'];
8162
- const isTerminatingStatus = realtimeStatuses.includes(this.initialFilters?.transactionStatus);
8163
- const isZeroCount = this.initialFilters?.count === 0;
8164
- // block api call
8165
- if (isTerminatingStatus && isZeroCount && (!criteria.modal.fromDate && !criteria.modal.toDate)) {
8166
- this.noDataFound = true;
8167
- this.showReport = true;
8168
- this.loadingState = ComponentLoadingStates.Complete;
8169
- this.clearSearch = false;
8170
- this.showMessage = true;
8171
- return;
8172
- }
8173
- }
8174
8129
  this.searchCriteria = criteria.searchCriteria;
8175
8130
  this.reportDate = new Date().toISOString();
8176
8131
  this.reportDate = formatDate(this.reportDate, 'dd/MM/yyyy hh:mm a', 'en-US');
8177
8132
  const modal = criteria.modal;
8178
8133
  this.user = criteria.sysUserID;
8179
8134
  // this.fromDate = formatDate(modal.fromDate, 'dd/MM/yyyy hh:mm a', 'en-US').slice(0, 10);
8180
- // this.toDate = formatDate(modal.toDate, 'dd/MM/yyyy hh:mm a', 'en-US').slice(0, 10);
8135
+ //this.toDate = formatDate(modal.toDate, 'dd/MM/yyyy hh:mm a', 'en-US').slice(0, 10);
8181
8136
  this.fromDate = modal.fromDate
8182
8137
  ? formatDate(modal.fromDate, 'dd/MM/yyyy hh:mm a', 'en-US').slice(0, 10)
8183
8138
  : null;
@@ -8187,7 +8142,7 @@ class TransactionMonitoringReportComponent {
8187
8142
  console.log(modal);
8188
8143
  // Code For Meta Data
8189
8144
  this.leftData = {
8190
- // 'Report Period': this.fromDate + " - " + this.toDate,
8145
+ // 'Report Period': this.fromDate + " - " + this.toDate,
8191
8146
  'Report Period': this.fromDate && this.toDate
8192
8147
  ? `${this.fromDate} - ${this.toDate}`
8193
8148
  : ''
@@ -8205,11 +8160,9 @@ class TransactionMonitoringReportComponent {
8205
8160
  "PayoutCurrency": modal.receiveCurrency,
8206
8161
  "TransactionType": modal.product,
8207
8162
  "BranchCode": modal.branch,
8208
- "IsrealTime": this.initialFilters?.isRealtime ?? false,
8209
- "LoggedInTime": this.initialFilters?.loggedInTime ?? null
8163
+ "IsrealTime": criteria.isRealtime
8210
8164
  };
8211
8165
  this.showMessage = true;
8212
- this.clearSearch = true;
8213
8166
  this.loadingState = ComponentLoadingStates.Loading;
8214
8167
  this.reportService.getTransactionMonitoringReport(searchData).subscribe({
8215
8168
  next: (data) => {
@@ -8224,12 +8177,10 @@ class TransactionMonitoringReportComponent {
8224
8177
  },
8225
8178
  error: (err) => {
8226
8179
  this.loadingState = ComponentLoadingStates.Complete;
8227
- this.clearSearch = false;
8228
8180
  },
8229
8181
  complete: () => {
8230
8182
  this.loadingState = ComponentLoadingStates.Complete;
8231
8183
  this.showReport = true;
8232
- this.clearSearch = false;
8233
8184
  }
8234
8185
  });
8235
8186
  }