diff --git a/cara/apps/calculator/static/js/form.js b/cara/apps/calculator/static/js/form.js index 9b5d2f06..1b9804f7 100644 --- a/cara/apps/calculator/static/js/form.js +++ b/cara/apps/calculator/static/js/form.js @@ -548,9 +548,7 @@ function overlapped_times(obj, start_time, finish_time) { (start_time <= start_time_2 && finish_time >= finish_time_2) || //If start and finish inputs encompass other time range start_time == start_time_2) { let parameter = document.getElementById($(obj).attr('id')); - if (!$(obj).hasClass("red_border")) { //Adds the red border and error message. - $(parameter).addClass("red_border"); - } + if (!$(obj).hasClass("red_border")) $(parameter).addClass("red_border"); //Adds the red border and error message. removeErrorFor($(obj)); insertErrorFor(parameter, "Short range interactions must not overlap.") return false; @@ -564,6 +562,7 @@ function overlapped_times(obj, start_time, finish_time) { function validate_sr_time(obj) { if ($(obj).val() != "") { let obj_id = $(obj).attr('id').split('_').slice(-1)[0]; + if ($(obj).attr('id').startsWith("sr_start_no_")) $("#sr_duration_no_" + obj_id).prop("disabled", false); let start_time = parseTimeToMins($('#sr_start_no_' + String(obj_id)).val()); let finish_time = start_time + parseInt($('#sr_duration_no_' + String(obj_id)).val()); overlapped_times(obj, start_time, finish_time); @@ -826,7 +825,7 @@ $(document).ready(function () {