diff --git a/libs/common/src/lib/calculation-helper.ts b/libs/common/src/lib/calculation-helper.ts index 4292f2383..fd3e69050 100644 --- a/libs/common/src/lib/calculation-helper.ts +++ b/libs/common/src/lib/calculation-helper.ts @@ -7,6 +7,7 @@ import { startOfWeek, startOfYear, subDays, + subMonths, subYears } from 'date-fns'; import { isNumber } from 'lodash'; @@ -55,12 +56,21 @@ export function getIntervalFromDateRange( subDays(startOfWeek(resetHours(new Date()), { weekStartsOn: 1 }), 1) ]); break; + case '1w': + startDate = max([startDate, subDays(resetHours(new Date()), 7)]); + break; case 'ytd': startDate = max([ startDate, subDays(startOfYear(resetHours(new Date())), 1) ]); break; + case '1m': + startDate = max([startDate, subMonths(resetHours(new Date()), 1)]); + break; + case '3m': + startDate = max([startDate, subMonths(resetHours(new Date()), 3)]); + break; case '1y': startDate = max([startDate, subYears(resetHours(new Date()), 1)]); break; diff --git a/libs/ui/src/lib/assistant/assistant.component.ts b/libs/ui/src/lib/assistant/assistant.component.ts index e6fdf93d7..1d94ce876 100644 --- a/libs/ui/src/lib/assistant/assistant.component.ts +++ b/libs/ui/src/lib/assistant/assistant.component.ts @@ -222,10 +222,23 @@ export class GfAssistantComponent implements OnChanges, OnDestroy, OnInit { label: $localize`Week to date` + ' (' + $localize`WTD` + ')', value: 'wtd' }, + { + label: '1 ' + $localize`Week` + ' (' + $localize`1W` + ')', + value: '1w' + }, { label: $localize`Month to date` + ' (' + $localize`MTD` + ')', value: 'mtd' }, + { + label: '1 ' + $localize`Month` + ' (' + $localize`1M` + ')', + value: '1m' + }, + + { + label: '3 ' + $localize`Month` + ' (' + $localize`3M` + ')', + value: '3m' + }, { label: $localize`Year to date` + ' (' + $localize`YTD` + ')', value: 'ytd'