Skip to content

bugzilla
bugzilla
Commit f5887e7c authored by Давид Добряков's avatar Давид Добряков
Browse files
Options

Add rule checking productiveTime === workTime, if productiveTime is not seted

parent 10034a1a
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 3 deletions
js/etersoft/timer.js
View file @ f5887e7c
...@@ -190,7 +190,7 @@ window.addEventListener("load", function() { ...@@ -190,7 +190,7 @@ window.addEventListener("load", function() {
workTime = workTime > 0 ? workTime : 0; workTime = workTime > 0 ? workTime : 0;
let workTimeValue = Math.ceil((workTime / 60) * 100) / 100; let workTimeValue = Math.ceil((workTime / 60) * 100) / 100;
let productiveTime = parseInt(document.querySelector("#ProductTime").value); let productiveTime = parseInt(document.querySelector("#ProductTime").value);
productiveTime = productiveTime > 0 ? productiveTime : 0; productiveTime = productiveTime > 0 ? productiveTime : workTime;
let productiveTimeValue = Math.ceil((productiveTime / 60) * 100) / 100; let productiveTimeValue = Math.ceil((productiveTime / 60) * 100) / 100;
document.querySelector("#work_time").value = workTimeValue; document.querySelector("#work_time").value = workTimeValue;
document.querySelector("#productive_time").value = productiveTimeValue; document.querySelector("#productive_time").value = productiveTimeValue;
......
template/en/default/etersoft/timersplash.html.tmpl
View file @ f5887e7c
...@@ -46,4 +46,4 @@ ...@@ -46,4 +46,4 @@
<script language="javascript" type="text/javascript" src="js/etersoft/focusManager.js"></script> <script language="javascript" type="text/javascript" src="js/etersoft/focusManager.js"></script>
<script language="javascript" type="text/javascript" src="js/etersoft/timer_common.js?25_10_2017"></script> <script language="javascript" type="text/javascript" src="js/etersoft/timer_common.js?25_10_2017"></script>
<script language="javascript" type="text/javascript" src="js/etersoft/timer.js?11_09_2020_"></script> <script language="javascript" type="text/javascript" src="js/etersoft/timer.js?11_09_2020__"></script>
template/ru/default/etersoft/timersplash.html.tmpl
View file @ f5887e7c
...@@ -46,4 +46,4 @@ ...@@ -46,4 +46,4 @@
<script language="javascript" type="text/javascript" src="js/etersoft/focusManager.js"></script> <script language="javascript" type="text/javascript" src="js/etersoft/focusManager.js"></script>
<script language="javascript" type="text/javascript" src="js/etersoft/timer_common.js?25_10_2017"></script> <script language="javascript" type="text/javascript" src="js/etersoft/timer_common.js?25_10_2017"></script>
<script language="javascript" type="text/javascript" src="js/etersoft/timer.js?11_09_2020_"></script> <script language="javascript" type="text/javascript" src="js/etersoft/timer.js?11_09_2020__"></script>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment