Skip to content

Phase end date - calendar fixed #1852

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
Didayolo merged 2 commits into from
May 15, 2025
Merged

Phase end date - calendar fixed #1852

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
200a683
Calendar lock fixed, additional check added for start and end date
ihsaan-ullah May 15, 2025
9376366
Simplify code
Didayolo May 15, 2025
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
26 changes: 10 additions & 16 deletions src/static/riot/competitions/editor/_phases.tag
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -432,22 +432,10 @@
}
}

// Create a new options object for the start date calendar by combining 'date_options'
// with an additional option to link the end date calendar. This ensures that the start date
// cannot be after the selected end date.
var start_options = Object.assign({}, date_options, {endCalendar: self.refs.calendar_end_date})

// Similarly, create a new options object for the end date calendar, linking it to the start date.
// This ensures that the end date cannot be before the selected start date.
var end_options = Object.assign({}, date_options, {startCalendar: self.refs.calendar_start_date})

// Initialize the start date calendar using the options defined above, including the end date limitation.
$(self.refs.calendar_start_date).calendar(start_options)

// Initialize the end date calendar using the options defined above, which includes the start date limitation.
$(self.refs.calendar_end_date).calendar(end_options)


// Create a new options object for the start date calendar using 'date_options'
$(self.refs.calendar_start_date).calendar(date_options)
// Create a new options object for the end date calendar using 'date_options'
$(self.refs.calendar_end_date).calendar(date_options)

// Initialize the start time calendar with the defined options.
// This will create a time picker for the 'start time' field.
Expand Down Expand Up @@ -806,6 +794,12 @@
data.end_time = "00:00"
}
data.end = self.formatDateTo_Y_m_d_T_H_M_S(data.end_date + " " + data.end_time)

// Check: start date must not be after end date
if (new Date(data.start) > new Date(data.end)) {
toastr.error("End date cannot be earlier than the start date. Please choose a valid date range.")
return
}
}else{
// end date is set to null if it is not selected because it is optional in the form
data.end = null
Expand Down