Commit 526f3282 authored by System Administrator's avatar System Administrator

[etersoft] Cherry-pick 103d7dc8

parent af4d92df
......@@ -328,6 +328,7 @@ window.addEventListener("load", function() {
// если время не задано, то пусть будет нулём
workTime = workTime || 0;
<<<<<<< HEAD
const workTimeValue = calcTimeValue(workTime);
const productiveTime = parseTimeInt("#ProductTime") || workTime;
......@@ -348,6 +349,27 @@ window.addEventListener("load", function() {
// check comment before submit
const comment = document.querySelector("#comment").value;
=======
// получаем estimatedTime
const estimatedTimeElement = document.querySelector('#estimated_time');
const workedTimeElement = document.querySelector('.bz_time_tracking_table > tbody:nth-child(1) > tr:nth-child(2) > td:nth-child(3)');
if (estimatedTimeElement && workedTimeElement) {
const estimatedTime = Number(estimatedTimeElement.value);
// получаем отработанное время
const workedTime = Number(workedTimeElement.innerText);
// пересчитанное отработанное время
const updatedWorkedTime = ((workedTime * 100) + (workTimeValue * 100)) / 100;
// считаем сколько осталось
const remainingTimeValue = Math.ceil(((estimatedTime * 100) - (updatedWorkedTime * 100))) / 100;
// обновляем оставшееся время
document.querySelector("#remaining_time").value = remainingTimeValue > 0 ? remainingTimeValue : 0;
}
>>>>>>> 103d7dc8c ([fix] #14867: fix bug creating)
const commentData = [
comment,
......
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