Skip to content

Implement duration and end-time mode toggle in EventCreatorAdminPage #2101

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

Open
aTrueYety wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Implement duration and end-time mode toggle in EventCreatorAdminPage #2101

Show file tree
Hide file tree
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
33 changes: 33 additions & 0 deletions frontend/src/PagesAdmin/EventCreatorAdminPage/EventCreatorAdminPage.module.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,39 @@
margin-top: 1.5em;
}

.field_label_row {
@include flex-row;
align-items: baseline;
justify-content: space-between;
gap: 0.5em;
}

.mode_switch_row {
@include flex-row;
align-items: center;
gap: 0.5em;
margin-bottom: 0.25em;
}

.mode_label {
font-size: 0.82em;
color: $grey-3;
transition: color 0.15s;
}

.mode_label_active {
font-size: 0.82em;
font-weight: 600;
transition: color 0.15s;
}

.conversion_hint {
display: block;
font-size: 0.78em;
color: $grey-3;
margin-top: 0.2em;
}

.preview {
@include flex-row-center;
align-items: center;
Expand Down
100 changes: 78 additions & 22 deletions frontend/src/PagesAdmin/EventCreatorAdminPage/EventCreatorAdminPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ import {
ImageCard,
Input,
Textarea,
ToggleSwitch,
} from '~/Components';
import type { DropdownOption } from '~/Components/Dropdown/Dropdown';
import { ImagePicker } from '~/Components/ImagePicker/ImagePicker';
Expand Down Expand Up @@ -149,6 +150,29 @@ export function EventCreatorAdminPage() {
}
}, [id, t, form]);

// ================================== //
// Duration / End-time mode //
// ================================== //

const [durationMode, setDurationMode] = useState(true);

const watchStartDt = form.watch('start_dt');
const watchDuration = form.watch('duration');
const watchEndDt = form.watch('end_dt');

useEffect(() => {
if (durationMode && watchStartDt && watchDuration > 0) {
const start = new Date(watchStartDt);
const end = new Date(start.getTime() + watchDuration * 60_000);
form.setValue('end_dt', utcTimestampToLocal(end.toISOString(), false));
} else if (!durationMode && watchStartDt && watchEndDt) {
const start = new Date(watchStartDt);
const end = new Date(watchEndDt);
const diffMin = Math.round((end.getTime() - start.getTime()) / 60_000);
form.setValue('duration', Math.max(0, diffMin));
}
}, [watchStartDt, watchDuration, watchEndDt, durationMode, form]);

// ================================== //
// Creation Steps //
// ================================== //
Expand Down Expand Up @@ -284,7 +308,8 @@ export function EventCreatorAdminPage() {
title_nb: 'Dato og informasjon',
title_en: 'Date & info',
validate: (data) => {
return !!(data.start_dt && data.duration > 0 && data.category && data.host && data.location);
const timeValid = durationMode ? !!(data.start_dt && data.duration > 0) : !!(data.start_dt && data.end_dt);
return timeValid && !!(data.category && data.host && data.location);
},
template: (
<>
Expand All @@ -305,26 +330,57 @@ export function EventCreatorAdminPage() {
</FormItem>
)}
/>
<FormField
control={form.control}
name="duration"
key={'duration'}
render={({ field }) => (
<FormItem className={styles.form_item}>
<FormLabel>
{t(KEY.recruitment_duration)} ({t(KEY.common_minutes)})
</FormLabel>
<FormControl>
<Input
type="number"
{...field}
onChange={(e) => field.onChange(Number.parseInt(e.target.value) || 0)}
/>
</FormControl>
<FormMessage />
</FormItem>
)}
/>
{durationMode ? (
<FormField
control={form.control}
name="duration"
key={'duration'}
render={({ field }) => (
<FormItem className={styles.form_item}>
<div className={styles.field_label_row}>
<FormLabel>
{t(KEY.recruitment_duration)} ({t(KEY.common_minutes)})
</FormLabel>
<div className={styles.mode_switch_row}>
<span className={styles.mode_label_active}>{t(KEY.recruitment_duration)}</span>
<ToggleSwitch checked={!durationMode} onChange={() => setDurationMode((prev) => !prev)} />
<span className={styles.mode_label}>{t(KEY.end_time)}</span>
</div>
</div>
<FormControl>
<Input
type="number"
{...field}
onChange={(e) => field.onChange(Number.parseInt(e.target.value) || 0)}
/>
</FormControl>
<FormMessage />
</FormItem>
)}
/>
) : (
<FormField
control={form.control}
name="end_dt"
key={'end_dt'}
render={({ field }) => (
<FormItem className={styles.form_item}>
<div className={styles.field_label_row}>
<FormLabel>{t(KEY.end_time)}</FormLabel>
<div className={styles.mode_switch_row}>
<span className={styles.mode_label}>{t(KEY.recruitment_duration)}</span>
<ToggleSwitch checked={!durationMode} onChange={() => setDurationMode((prev) => !prev)} />
<span className={styles.mode_label_active}>{t(KEY.end_time)}</span>
</div>
</div>
<FormControl>
<Input type="datetime-local" {...field} />
</FormControl>
<FormMessage />
</FormItem>
)}
/>
)}
</div>
<div className={styles.input_row}>
<FormField
Expand Down Expand Up @@ -506,7 +562,7 @@ export function EventCreatorAdminPage() {

function onSubmit(values: FormType) {
const start = values.start_dt ? new Date(values.start_dt) : null;
const computedEndDt = start ? new Date(start?.getTime() + (values.duration ?? 0) * 60_000) : null;
const computedEndDt = values.end_dt ? new Date(values.end_dt) : null;
const payload: Partial<EventDto> = {
...values,
visibility_to_dt: computedEndDt ? computedEndDt.toISOString() : '',
Expand Down