Skip to content

Commit

Permalink
Merge pull request #983 from DeepBlueCLtd/965_auditlist_filter_for_da…
Browse files Browse the repository at this point in the history
…te_misses_out_today

auditlist filter for date misses for today issue resolved
  • Loading branch information
IanMayo authored Jan 9, 2024
2 parents afe9c86 + 961a758 commit 47e8c3f
Showing 1 changed file with 12 additions and 6 deletions.
18 changes: 12 additions & 6 deletions src/components/DateFilter.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -37,12 +37,9 @@ const getFilter = (value: Values, source: string, format: string): Filter[] => {
return formattedDate
}

const now = formatter(DateTime.now())
const gteKeyName: string = `${source}_gte`
const lteKeyName: string = `${source}_lte`

const todayFilter: Filter = { key: lteKeyName, value: now }

const resetTodayFilter: Filter = { key: source, value: undefined }
const resetGTFilter: Filter = { key: gteKeyName, value: undefined }
const resetLTFilter: Filter = { key: lteKeyName, value: undefined }
Expand All @@ -63,7 +60,10 @@ const getFilter = (value: Values, source: string, format: string): Filter[] => {
case 'past_week':
return [
resetTodayFilter,
todayFilter,
{
key: lteKeyName,
value: DateTime.now().endOf('day').toISO() ?? ''
},
{
key: gteKeyName,
value: minusFromNow('week')
Expand All @@ -72,7 +72,10 @@ const getFilter = (value: Values, source: string, format: string): Filter[] => {
case 'past_month':
return [
resetTodayFilter,
todayFilter,
{
key: lteKeyName,
value: DateTime.now().endOf('day').toISO() ?? ''
},
{
key: gteKeyName,
value: minusFromNow('month')
Expand All @@ -81,7 +84,10 @@ const getFilter = (value: Values, source: string, format: string): Filter[] => {
case 'past_year':
return [
resetTodayFilter,
todayFilter,
{
key: lteKeyName,
value: DateTime.now().endOf('day').toISO() ?? ''
},
{
key: gteKeyName,
value: minusFromNow('year')
Expand Down

0 comments on commit 47e8c3f

Please sign in to comment.