Lancaster-University/DEMOS2
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Ready for merge

Browse source
This commit is contained in:
Rumperuu 2018-08-29 14:44:37 +01:00
parent 9ea59723a5
commit de517c19c5
4 changed files with 16 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

12
static/js/create-event-poll.js
View file

@ -235,12 +235,16 @@ function isEventTimingsValid() {
var valid = true;
var helpBlockId = "event-timings-error-block";
// Extract the dates from the vote start and end input controls
var start_date_time = $('#vote-start-input').data('DateTimePicker').date();
var end_date_time = $('#vote-end-input').data('DateTimePicker').date();
// Extract the string val from the vote start and end input controls
var start_date_time = $('#vote-start-input').val();
var end_date_time = $('#vote-end-input').val();
// Convert the string vals to Date objects
var start_dateObj = new Date(start_date_time);
var end_dateObj = new Date(end_date_time);
// Ensure that the start date is before the end date and that the end date is after the start date
if(!(start_date_time < end_date_time && end_date_time > start_date_time)) {
if(!(start_dateObj < end_dateObj && end_dateObj > start_dateObj)) {
checkAndAddError({
error: "The start date must be before the end date and the end after the start date.",
helpBlockId: "event-timings-error-block"