[etersoft] Cherry-pick 04a65e14

js/etersoft/timer.js

@@ -369,8 +369,22 @@ window.addEventListener("load", function() {
     // считаем сколько осталось
     const remainingTimeValue = Math.ceil(((estimatedTime * 100) - (updatedWorkedTime * 100))) / 100;
 
+<<<<<<< HEAD
     console.log("REMAINING", remainingTimeValue)
 >>>>>>> 7da229e67 ([fix] #14867: fix bug with recounting remaining time)
+=======
+    // получаем estimatedTime
+    const estimatedTime = Number(document.querySelector('#estimated_time').value);
+
+    // считаем сколько осталось
+    const remainingTimeValue = ((estimatedTime * 100) - Math.ceil((workTime / 60) * 100)) / 100;
+
+    // обновляем оставшееся время
+    document.querySelector("#remaining_time").value = remainingTimeValue > 0 ? remainingTimeValue : 0;
+
+    // now we ready for submiting all forms
+    let mainCommitBtn = document.querySelector("#commit_top");
+>>>>>>> 04a65e142 ([fix] #14867: fix remaining time recounting)
 
         // получаем отработанное время
         const workedTime = Number(workedTimeElement.innerText);

template/en/default/etersoft/timersplash.html.tmpl

@@ -47,7 +47,11 @@
 <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>
 <<<<<<< 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?22_04_2021"></script>
 >>>>>>> d2827f5de ([ref] Refactor js/etersoft/timer.js. #14950)
+=======
+<script language="javascript" type="text/javascript" src="js/etersoft/timer.js?24_02_2021"></script>
+>>>>>>> 04a65e142 ([fix] #14867: fix remaining time recounting)

template/ru/default/etersoft/timersplash.html.tmpl

@@ -47,7 +47,11 @@
 <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>
 <<<<<<< 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?22_04_2021"></script>
 >>>>>>> d2827f5de ([ref] Refactor js/etersoft/timer.js. #14950)
+=======
+<script language="javascript" type="text/javascript" src="js/etersoft/timer.js?24_02_2021"></script>
+>>>>>>> 04a65e142 ([fix] #14867: fix remaining time recounting)