Skip to content
Snippets Groups Projects
Commit e142eb28 authored by Maxime's avatar Maxime
Browse files

Merge branch 'red-line' into 'master'

bugfix: fix displayed change of date in error message

See merge request !19
parents 3f2fac62 7b3e0e25
No related branches found
No related tags found
1 merge request!19bugfix: fix displayed change of date in error message
Pipeline #7343 passed with stage
in 57 seconds
......@@ -273,10 +273,10 @@ function disableVotes(){
//console.log("current poll is :", currentPoll);
//console.log("startdate block is :", currentPoll.querySelector("solid-display-date[name=startDate]"));
let dateSeparator = "/";
let startDate = currentPoll.querySelector("solid-display-date[name=startDate]").textContent;
startDate = startDate.split("/");
let endDate = currentPoll.querySelector("solid-display-date[name=endDate]").textContent;
let cleanEndDate = endDate.split("/");
let displayStartDate = currentPoll.querySelector("solid-display-date[name=startDate]").textContent;
startDate = displayStartDate.split("/");
let displayEndDate = currentPoll.querySelector("solid-display-date[name=endDate]").textContent;
let cleanEndDate = displayEndDate.split("/");
cleanStartDate = startDate[1] +dateSeparator + startDate[0] +dateSeparator + startDate[2];
cleanEndDate = cleanEndDate[1] +dateSeparator + cleanEndDate[0] +dateSeparator + cleanEndDate[2];
......@@ -296,10 +296,10 @@ function disableVotes(){
let submitButton = votingSection.querySelector("input[type=submit]");
if (comparisonStartDate > date) {
let errorMessage = "This poll hasn't started yet, you can start voting on :" + startDate+".";
let errorMessage = "This poll hasn't started yet, you can start voting on :" + displayStartDate+".";
deactivateButton(errorMessage);
} else if(comparisonEndDate < date) {
let errorMessage = "This poll is closed since : " + endDate+".";
let errorMessage = "This poll is closed since : " + displayEndDate+".";
deactivateButton(errorMessage);
}
else if(comparisonEndDate = date) {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment