Skip to content

bugzilla
bugzilla
Commit d66ffdbe authored by System Administrator's avatar System Administrator
Browse files
Options

[etersoft] Cherry-pick 10034a1a

parent 75503835
Hide whitespace changes
Inline Side-by-side
Showing with 12 additions and 0 deletions
js/etersoft/timer.js
View file @ d66ffdbe
...@@ -978,7 +978,11 @@ window.addEventListener("load", function() { ...@@ -978,7 +978,11 @@ 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);
<<<<<<< HEAD
productiveTime = productiveTime > 0 ? productiveTime : workTime; productiveTime = productiveTime > 0 ? productiveTime : workTime;
=======
productiveTime = productiveTime > 0 ? productiveTime : 0;
>>>>>>> 10034a1af (Add ability for no comment when workTime is null)
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 @ d66ffdbe
...@@ -54,6 +54,7 @@ ...@@ -54,6 +54,7 @@
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD
<script language="javascript" type="text/javascript" src="js/etersoft/timer.js?23_04_2021"></script> <script language="javascript" type="text/javascript" src="js/etersoft/timer.js?23_04_2021"></script>
======= =======
<script language="javascript" type="text/javascript" src="js/etersoft/timer.js?22_04_2021"></script> <script language="javascript" type="text/javascript" src="js/etersoft/timer.js?22_04_2021"></script>
...@@ -79,3 +80,6 @@ ...@@ -79,3 +80,6 @@
======= =======
<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>
>>>>>>> f5887e7c4 (Add rule checking productiveTime === workTime, if productiveTime is not seted) >>>>>>> f5887e7c4 (Add rule checking productiveTime === workTime, if productiveTime is not seted)
=======
<script language="javascript" type="text/javascript" src="js/etersoft/timer.js?11_09_2020_"></script>
>>>>>>> 10034a1af (Add ability for no comment when workTime is null)
template/ru/default/etersoft/timersplash.html.tmpl
View file @ d66ffdbe
...@@ -54,6 +54,7 @@ ...@@ -54,6 +54,7 @@
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD
<script language="javascript" type="text/javascript" src="js/etersoft/timer.js?23_04_2021"></script> <script language="javascript" type="text/javascript" src="js/etersoft/timer.js?23_04_2021"></script>
======= =======
<script language="javascript" type="text/javascript" src="js/etersoft/timer.js?22_04_2021"></script> <script language="javascript" type="text/javascript" src="js/etersoft/timer.js?22_04_2021"></script>
...@@ -79,3 +80,6 @@ ...@@ -79,3 +80,6 @@
======= =======
<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>
>>>>>>> f5887e7c4 (Add rule checking productiveTime === workTime, if productiveTime is not seted) >>>>>>> f5887e7c4 (Add rule checking productiveTime === workTime, if productiveTime is not seted)
=======
<script language="javascript" type="text/javascript" src="js/etersoft/timer.js?11_09_2020_"></script>
>>>>>>> 10034a1af (Add ability for no comment when workTime is null)
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