From 0642d919109f9172c12689567877d58a634bf069 Mon Sep 17 00:00:00 2001 From: DhaaraniCIT Date: Wed, 5 Feb 2025 15:29:42 +0530 Subject: [PATCH] poc --- src/app/core/models/common/export-settings.model.ts | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/src/app/core/models/common/export-settings.model.ts b/src/app/core/models/common/export-settings.model.ts index af25625d8..567a5627a 100644 --- a/src/app/core/models/common/export-settings.model.ts +++ b/src/app/core/models/common/export-settings.model.ts @@ -136,7 +136,7 @@ export class ExportSettingModel { static dateGrouping(exportType:string, expenseGrouping: string, showApprovedDate: boolean, showVerificationDate: boolean): SelectFormOption[] { - const excludedDate = expenseGrouping === 'expense' + const excludedDate = expenseGrouping === ExpenseGroupingFieldOption.EXPENSE_ID ? ExportDateType.LAST_SPENT_AT : ExportDateType.SPENT_AT; @@ -154,10 +154,16 @@ export class ExportSettingModel { } filterOptions.push(excludedDate); - - return dateOptions.filter((item): item is { label: string; value: ExportDateType } => + + console.log(filterOptions, excludedDate) + + const d = dateOptions.filter((item): item is { label: string; value: ExportDateType } => item.value !== null && !filterOptions.includes(item.value as ExportDateType)) + console.log(d) + + return d; + } static filterDateOptions(exportDateType: ExportDateType, dateOptions: SelectFormOption[]){