From 99388d2fe58407deb6c657ae8f55e87bec877415 Mon Sep 17 00:00:00 2001 From: Luis Aleixo Date: Fri, 28 Jan 2022 12:08:28 +0100 Subject: [PATCH] Removed unused console.log and changed logic for generating the short range interactions list --- cara/apps/calculator/static/js/form.js | 11 +++++------ cara/apps/calculator/static/js/report.js | 2 -- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/cara/apps/calculator/static/js/form.js b/cara/apps/calculator/static/js/form.js index 402b0805..575179bd 100644 --- a/cara/apps/calculator/static/js/form.js +++ b/cara/apps/calculator/static/js/form.js @@ -395,13 +395,12 @@ function validate_form(form) { // Generate the short range interactions list let short_range_interactions = []; - $(".form_field_outer_row").each(function (index){ - index = index + 1; - + $(".form_field_outer_row").each(function (index, element){ let obj = {}; - obj.activity = $("#sr_activity_no_" + String(index)).val(); - obj.start_time = $("#sr_start_no_" + String(index)).val(); - obj.duration = $("#sr_duration_no_" + String(index)).val(); + obj.activity = $(element).find("[name='short_range_activity']").val(); + obj.start_time = $(element).find("[name='short_range_start_time']").val(); + obj.duration = $(element).find("[name='short_range_duration']").val(); + console.log(JSON.stringify(obj)) short_range_interactions.push(JSON.stringify(obj)); }); $("input[type=text][name=short_range_interactions]").val('[' + short_range_interactions + ']'); diff --git a/cara/apps/calculator/static/js/report.js b/cara/apps/calculator/static/js/report.js index 2a916544..c9c79841 100644 --- a/cara/apps/calculator/static/js/report.js +++ b/cara/apps/calculator/static/js/report.js @@ -1,8 +1,6 @@ /* Generate the concentration plot using d3 library. */ function draw_concentration_plot(svg_id, times, concentrations, cumulative_doses, exposed_presence_intervals) { - console.log(cumulative_doses) - var time_format = d3.timeFormat('%H:%M'); var data_for_graphs = {