From abbb7e60bfd22f195fa2215ae94f39b3daf9d633 Mon Sep 17 00:00:00 2001 From: DhaaraniCIT Date: Wed, 12 Feb 2025 12:21:38 +0530 Subject: [PATCH] lint fix --- .../core/models/common/export-settings.model.ts | 14 +++++++------- .../qbo-export-settings.component.ts | 8 ++++---- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/app/core/models/common/export-settings.model.ts b/src/app/core/models/common/export-settings.model.ts index b7f07480f..a18ed75e6 100644 --- a/src/app/core/models/common/export-settings.model.ts +++ b/src/app/core/models/common/export-settings.model.ts @@ -136,27 +136,27 @@ export class ExportSettingModel { static dateGrouping(exportType: string, expenseGrouping: string, showApprovedDate: boolean, showVerificationDate: boolean): SelectFormOption[] { // Determine the excluded date based on expenseGrouping - const excludedDate = expenseGrouping === ExpenseGroupingFieldOption.EXPENSE_ID - ? ExportDateType.LAST_SPENT_AT + const excludedDate = expenseGrouping === ExpenseGroupingFieldOption.EXPENSE_ID + ? ExportDateType.LAST_SPENT_AT : ExportDateType.SPENT_AT; - + // Handle CCC export type if (exportType === 'CCC') { return this.getCreditCardExpenseGroupingDateOptions().filter(option => option.value !== excludedDate); } - + // Get base date options const dateOptions = this.getReimbursableExpenseGroupingDateOption(); - + // Determine filter options based on showApprovedDate and showVerificationDate const filterOptions = [ ...(showApprovedDate ? [ExportDateType.VERIFIED_AT] : []), ...(showVerificationDate ? [ExportDateType.APPROVED_AT] : []), excludedDate ]; - + // Filter out excluded and unwanted dates - return dateOptions.filter(option => + return dateOptions.filter(option => option.value !== null && !filterOptions.includes(option.value as ExportDateType) ); } diff --git a/src/app/integrations/qbo/qbo-shared/qbo-export-settings/qbo-export-settings.component.ts b/src/app/integrations/qbo/qbo-shared/qbo-export-settings/qbo-export-settings.component.ts index 97ef274b0..444006dcf 100644 --- a/src/app/integrations/qbo/qbo-shared/qbo-export-settings/qbo-export-settings.component.ts +++ b/src/app/integrations/qbo/qbo-shared/qbo-export-settings/qbo-export-settings.component.ts @@ -341,9 +341,9 @@ export class QboExportSettingsComponent implements OnInit { private setupCustomDateOptionWatchers(): void { this.exportSettingForm.controls.reimbursableExportGroup?.valueChanges.subscribe((reimbursableExportGroup) => { - // this.reimbursableExpenseGroupingDateOptions = QBOExportSettingModel.getReimbursableExpenseGroupingDateOptions(); - // this.reimbursableExpenseGroupingDateOptions = ExportSettingModel.constructGroupingDateOptions(reimbursableExportGroup, this.reimbursableExpenseGroupingDateOptions); - this.reimbursableExpenseGroupingDateOptions = ExportSettingModel.dateGrouping('rem', this.exportSettingForm.controls.reimbursableExportGroup.value, true, false) + // This.reimbursableExpenseGroupingDateOptions = QBOExportSettingModel.getReimbursableExpenseGroupingDateOptions(); + // This.reimbursableExpenseGroupingDateOptions = ExportSettingModel.constructGroupingDateOptions(reimbursableExportGroup, this.reimbursableExpenseGroupingDateOptions); + this.reimbursableExpenseGroupingDateOptions = ExportSettingModel.dateGrouping('rem', this.exportSettingForm.controls.reimbursableExportGroup.value, true, false); }); this.exportSettingForm.controls.creditCardExportType?.valueChanges.subscribe(creditCardExportType => { @@ -355,7 +355,7 @@ export class QboExportSettingsComponent implements OnInit { if (this.exportSettingForm.get('creditCardExportType')?.value && this.exportSettingForm.get('creditCardExportType')?.value !== QBOCorporateCreditCardExpensesObject.CREDIT_CARD_PURCHASE && this.exportSettingForm.get('creditCardExportType')?.value !== QBOCorporateCreditCardExpensesObject.DEBIT_CARD_EXPENSE) { // // this.cccExpenseGroupingDateOptions = QBOExportSettingModel.getReimbursableExpenseGroupingDateOptions(); // // this.cccExpenseGroupingDateOptions = ExportSettingModel.constructGroupingDateOptions(creditCardExportGroup, this.cccExpenseGroupingDateOptions); - this.cccExpenseGroupingDateOptions = ExportSettingModel.dateGrouping('rem', creditCardExportGroup, true, false) + this.cccExpenseGroupingDateOptions = ExportSettingModel.dateGrouping('rem', creditCardExportGroup, true, false); } }); }