diff --git a/cara/apps/calculator/static/js/form.js b/cara/apps/calculator/static/js/form.js index 2f2c9fb8..bcf393d6 100644 --- a/cara/apps/calculator/static/js/form.js +++ b/cara/apps/calculator/static/js/form.js @@ -553,8 +553,8 @@ function overlapped_times(obj, start_time, finish_time) { let current_duration_el = $(el).find("input[name='short_range_duration']") start_time_2 = parseTimeToMins(current_start_el.val()) finish_time_2 = parseTimeToMins(current_start_el.val()) + parseInt(current_duration_el.val()); - if ((start_time >= start_time_2 && start_time <= finish_time_2) || ( //If hour input is within other time range - finish_time >= start_time_2 && finish_time <= finish_time_2) || //If finish time input is within other time range + if ((start_time > start_time_2 && start_time < finish_time_2) || ( //If hour input is within other time range + finish_time > start_time_2 && finish_time < finish_time_2) || //If finish time input is within other time range (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')); @@ -853,6 +853,11 @@ $(document).ready(function () { ` } + // Add one empty row if none. + $("#set_interactions_button").on("click", e => { + if ($(".form_field_outer").find(".form_field_outer_row").length == 0) $(".add_node_btn_frm_field").click(); + }); + // When short_range_yes option is selected, we want to inject rows for each expiractory activity, start_time and duration. $("body").on("click", ".add_node_btn_frm_field", function(e) { let index = $(".form_field_outer").find(".form_field_outer_row").length; diff --git a/cara/apps/templates/base/calculator.form.html.j2 b/cara/apps/templates/base/calculator.form.html.j2 index d25b66e1..ad51ddf8 100644 --- a/cara/apps/templates/base/calculator.form.html.j2 +++ b/cara/apps/templates/base/calculator.form.html.j2 @@ -377,7 +377,7 @@
0 short range interactions.