pingu_98/cara
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Restructured form validation

Browse source
This commit is contained in:
gaazzopa 2020-12-07 22:59:30 +01:00
parent e75d87cf8f
commit a91c6a4c90
1 changed files with 21 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
cara/apps/calculator/static/js/form.js
View file

@ -285,31 +285,16 @@ $("[data-has-radio]").on('change', function(event){
function validate_form(form) {
var submit = true;
//Validate all non zero values
$("input[required].non_zero").each(function() {
if (!validateValue(this)) {
// Activity times and lunch break times are co-dependent
// -> So if 1 fails it doesn't make sense to check the rest
//Validate all finish times
$("input[required].finish_time").each(function() {
if (!validateFinishTime(this)) {
submit = false;
}
});
//Validate all dates
if (submit) {
$("input[required].datepicker").each(function() {
if (!validateDate(this)) {
submit = false;
}
});
}
//Validate all times
if (submit) {
$("input[required].finish_time").each(function() {
if (!validateFinishTime(this)) {
submit = false;
}
});
}
//Validate all lunch breaks
if (submit) {
$("input[required].lunch").each(function() {
@ -345,9 +330,22 @@ function validate_form(form) {
}
}
//Validate window venting duration < venting frequency
if (submit && !$("#windows_duration").hasClass("disabled")) {
//Validate all non zero values
$("input[required].non_zero").each(function() {
if (!validateValue(this)) {
submit = false;
}
});
//Validate all dates
$("input[required].datepicker").each(function() {
if (!validateDate(this)) {
submit = false;
}
});
//Validate window venting duration < venting frequency
if (!$("#windows_duration").hasClass("disabled")) {
var windowsDurationObj = document.getElementById("windows_duration");
var windowsFrequencyObj = document.getElementById("windows_frequency");
removeErrorFor(windowsFrequencyObj);