Skip to content

fix getPeriodTypeName calls #207

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 10, 2024
Merged

fix getPeriodTypeName calls #207

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions packages/svelte-ux/src/lib/components/DateRangeField.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,14 @@
import Dialog from './Dialog.svelte';
import Field from './Field.svelte';

import { PeriodType, getDateFuncsByPeriodType, getPeriodTypeName } from '../utils/date';
import { PeriodType, getDateFuncsByPeriodType } from '../utils/date';
import { getDateRangePresets, type DateRange as DateRangeType } from '../utils/dateRange';
import { cls } from '../utils/styles';
import { getSettings } from './settings';

const dispatch = createEventDispatcher();
const settings = getSettings();
const { format } = settings;

const _defaultValue: DateRangeType = {
from: null,
Expand Down Expand Up @@ -60,7 +61,7 @@
</script>

<Field
label={label ?? (value.periodType ? getPeriodTypeName(settings, value.periodType) : '')}
label={label ?? (value.periodType ? $format.getPeriodTypeName(value.periodType) : '')}
{icon}
{error}
{hint}
Expand Down Expand Up @@ -153,7 +154,7 @@
>
<div class="flex flex-col justify-center bg-primary text-primary-content px-6 h-24">
<div class="text-sm opacity-50">
{currentValue.periodType ? getPeriodTypeName(settings, currentValue.periodType) : ''}&nbsp;
{currentValue.periodType ? $format.getPeriodTypeName(currentValue.periodType) : ''}&nbsp;
</div>
<div class="text-xl sm:text-2xl">
<DateRangeDisplay value={currentValue} />
Expand Down