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

Fixed bugs on lunch time interactions

Browse source
This commit is contained in:
Luis Aleixo 2022-03-10 11:36:10 +00:00
parent 7926f55872
commit 8d533f9c57
2 changed files with 14 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
cara/apps/calculator/static/css/report.css
View file

@ -144,6 +144,12 @@ p.notes {
padding: 15px;
page-break-inside: avoid;
}
#button_full_exposure {
display: none!important;
}
#button_long_exposure {
display: none!important;
}
}

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

@ -528,8 +528,14 @@ function overlapped_times(obj, start_time, finish_time) {
let simulation_start = parseTimeToMins($("#exposed_start").val())
let simulation_finish = parseTimeToMins($("#exposed_finish").val())
let simulation_lunch_start = parseTimeToMins($("#exposed_lunch_start").val())
let simulation_lunch_finish = parseTimeToMins($("#exposed_lunch_finish").val())
var simulation_lunch_start, simulation_lunch_finish;
if ($('input[name=exposed_lunch_option]:checked').val() == 1) {
simulation_lunch_start = parseTimeToMins($("#exposed_lunch_start").val())
simulation_lunch_finish = parseTimeToMins($("#exposed_lunch_finish").val())
} else {
simulation_lunch_start = 0
simulation_lunch_finish = 0
}
if (start_time < simulation_start || start_time > simulation_finish ||
finish_time < simulation_start || finish_time > simulation_finish ||
start_time >= simulation_lunch_start && start_time <= simulation_lunch_finish ||