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

Remove finish time error when not required

Browse source
This commit is contained in:
gaazzopa 2020-11-26 16:04:26 +01:00
parent f4795a6198
commit 8041cb3da6
1 changed files with 5 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -381,6 +381,9 @@ function validateFinishTime(obj) {
if ($(obj).hasClass("finish_time_error")) {
$(obj).removeClass("red_border");
$(obj).removeClass("finish_time_error");
if (!$(obj).hasClass("lunch_break_error")) {
$(obj).next('span').remove();
}
}
var startTime = parseValToNumber($(obj).prev().val());
@ -413,6 +416,7 @@ function validateLunchBreak(obj) {
}
$(obj).removeClass("red_border");
$(obj).removeClass("lunch_break_error");
if (!$(otherObj).hasClass("red_border") && !$(spanObj).hasClass("finish_time_error")) {
$(spanObj).next('span').remove();
}
@ -429,6 +433,7 @@ function validateLunchBreak(obj) {
if ((time < globalStart) || (time > globalFinish)) {
$(obj).addClass("red_border");
$(obj).addClass("lunch_break_error");
if (!$(otherObj).hasClass("red_border") && !$(spanObj).hasClass("finish_time_error")) {
insertSpanAfter(spanObj, "Lunch break must be within activity times");
}