Skip to content

Commit

Permalink
lint fix
Browse files Browse the repository at this point in the history
  • Loading branch information
DhaaraniCIT committed Feb 12, 2025
1 parent 29c1a90 commit abbb7e6
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 11 deletions.
14 changes: 7 additions & 7 deletions src/app/core/models/common/export-settings.model.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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)
);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 => {
Expand All @@ -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);
}
});
}
Expand Down

0 comments on commit abbb7e6

Please sign in to comment.