Chapril/date.chapril.org-framadate
Chapril/date.chapril.org-framadate
24
1
Fork 0
Code Issues Pull Requests Releases Activity

Check date format and display warning on the failing fields

Browse Source
This commit is contained in:
Olivier PEREZ 2015-11-30 22:23:57 +01:00
parent 4cf28bf8f6
commit 44c24493b6
1 changed files with 31 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
js/app/date_poll.js
View File

@ -52,6 +52,10 @@ $(document).ready(function () {
var dtsplit = dateStr.split(/[\/ .:-]/);
var dfsplit = format.split(/[\/ .:-]/);
if (dfsplit.length != dtsplit.length) {
return null;
}
// creates assoc array for date
var df = [];
for (var dc = 0; dc < dtsplit.length; dc++) {
@ -239,26 +243,37 @@ $(document).ready(function () {
// console.log('start_date as date', startDate);
// console.log('start_end as date', endDate);
if (startDate <= endDate) {
while (startDate <= endDate) {
var dateStr = formatDate(startDate, window.date_formats.DATE);
if (!useFirstEmptyDateField(dateStr)) {
newDateFields(dateStr);
if (startDate != null && endDate != null) {
if (startDate <= endDate) {
while (startDate <= endDate) {
var dateStr = formatDate(startDate, window.date_formats.DATE);
if (!useFirstEmptyDateField(dateStr)) {
newDateFields(dateStr);
}
startDate.setDate(startDate.getDate() + 1);
}
startDate.setDate(startDate.getDate() + 1);
// Hide modal
startDateField.val('');
endDateField.val('');
$('#add_days').modal('hide');
submitDaysAvalaible();
} else {
setTimeout(function () {
startDateField.parent().addClass('has-error');
endDateField.parent().addClass('has-error');
}, 200);
}
// Hide modal
startDateField.val('');
endDateField.val('');
$('#add_days').modal('hide');
submitDaysAvalaible();
} else {
setTimeout(function () {
startDateField.parent().addClass('has-error');
endDateField.parent().addClass('has-error');
if (startDate == null) {
startDateField.parent().addClass('has-error');
}
if (endDate == null) {
endDateField.parent().addClass('has-error');
}
}, 200);
}