Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
bugzilla
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
etersoft
bugzilla
Commits
04a65e14
Commit
04a65e14
authored
4 years ago
by
Давид Добряков
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[fix] #14867: fix remaining time recounting
parent
c1c877f8
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
11 additions
and
2 deletions
+11
-2
timer.js
js/etersoft/timer.js
+9
-0
timersplash.html.tmpl
template/en/default/etersoft/timersplash.html.tmpl
+1
-1
timersplash.html.tmpl
template/ru/default/etersoft/timersplash.html.tmpl
+1
-1
No files found.
js/etersoft/timer.js
View file @
04a65e14
...
...
@@ -239,6 +239,15 @@ window.addEventListener("load", function() {
document
.
querySelector
(
"#work_time"
).
value
=
workTimeValue
;
document
.
querySelector
(
"#productive_time"
).
value
=
productiveTimeValue
;
// получаем 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"
);
...
...
This diff is collapsed.
Click to expand it.
template/en/default/etersoft/timersplash.html.tmpl
View file @
04a65e14
...
...
@@ -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/timer_common.js?25_10_2017"></script>
<script language="javascript" type="text/javascript" src="js/etersoft/timer.js?
10_11_2020
"></script>
<script language="javascript" type="text/javascript" src="js/etersoft/timer.js?
24_02_2021
"></script>
This diff is collapsed.
Click to expand it.
template/ru/default/etersoft/timersplash.html.tmpl
View file @
04a65e14
...
...
@@ -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/timer_common.js?25_10_2017"></script>
<script language="javascript" type="text/javascript" src="js/etersoft/timer.js?
10_11_2020
"></script>
<script language="javascript" type="text/javascript" src="js/etersoft/timer.js?
24_02_2021
"></script>
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment