Skip to content
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

Force CTF end time to be equal or after start time #213

Merged
merged 6 commits into from
May 9, 2023
Merged

Force CTF end time to be equal or after start time #213

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
23c2004
Force CTF end time to be equal or after start time
JJ-8 May 5, 2023
20f367b
Update illegal dates migration ID to 43
JJ-8 May 5, 2023
e26fafe
Revert "Update illegal dates migration ID to 43"
JJ-8 May 5, 2023
08c45b2
Fix 'must be hyphenated' warning
JJ-8 May 6, 2023
ada7a1c
Update CTF end date if before start date
XeR May 8, 2023
2026b0d
Merge pull request #31 from XeR/0-fix-illegal-dates
JJ-8 May 9, 2023
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
2 changes: 2 additions & 0 deletions api/migrations/41-illegal-dates.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
UPDATE ctfnote.ctf SET end_time = start_time WHERE end_time < start_time;
ALTER TABLE ctfnote.ctf ADD CONSTRAINT no_illegal_end_time CHECK (end_time >= start_time);
28 changes: 25 additions & 3 deletions front/src/components/Dialogs/EditCtfDialog.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,10 +42,32 @@

<div class="row q-col-gutter-md">
<div class="col">
<datetime-input v-model="form.startTime" label="Start on" />
<datetime-input
v-model="form.startTime"
label="Start on"
@update:model-value="
() => {
if (form.endTime < form.startTime) {
form.endTime = new Date(
form.startTime.getTime() +
1000 * 60 * 60 * 24 /* 24 hours in milliseconds */
);
}
}
"
/>
</div>
<div class="col">
<datetime-input v-model="form.endTime" label="End on" />
<datetime-input
v-model="form.endTime"
label="End on"
lazy-rules
:rules="[
() =>
(form.endTime && form.endTime >= form.startTime) ||
'End time must be after start time',
]"
/>
</div>
</div>
<div class="row q-col-gutter-md">
Expand Down Expand Up @@ -91,7 +113,7 @@ export default defineComponent({
title: '',
description: '',
startTime: now,
endTime: now,
endTime: new Date(now.getTime() + 1000 * 60 * 60 * 24),
weight: 0,
ctfUrl: null,
ctftimeUrl: null,
Expand Down