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

Handled overlapped times and added empty row for first new interaction on short range

Browse source
This commit is contained in:
Luis Aleixo 2022-03-14 15:28:04 +00:00
parent 79d3f2e01a
commit 78a428ab22
2 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -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 () {
</div>`
}
// 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;

2
cara/apps/templates/base/calculator.form.html.j2
View file

@ -377,7 +377,7 @@
<div id="DIVsr_interactions" class="none">
<div class="d-flex">
<button type="button" class="btn btn-primary btn-sm" data-toggle="modal" data-target="#short_range_dialog" data-keyboard="false" data-backdrop="static">Set interactions</button>
<button type="button" id="set_interactions_button" class="btn btn-primary btn-sm" data-toggle="modal" data-target="#short_range_dialog" data-keyboard="false" data-backdrop="static">Set interactions</button>
<p class="align-self-center pl-4"><b id="sr_interactions">0</b> short range interactions.</p>
</div>
</div>