Merge pull request #171 from delcroip/develop

rev 4.4.11
delcroip · Dec 1, 2021 · d25a848 · d25a848
2 parents b365ff2 + d63fb56
commit d25a848
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/htdocs/timesheet/ChangeLog.md b/htdocs/timesheet/ChangeLog.md
@@ -1,4 +1,7 @@
 # dolibarr_project_timesheet changelog
+4.4.10 (2021-12-01)
+- fix the watch clock issue (going way to fast)
+
 4.4.10 (2021-10-16)
 - fix sendapproval
 - Fix: User rights for viewing PDF. #165 

diff --git a/htdocs/timesheet/core/js/stopWatch.js b/htdocs/timesheet/core/js/stopWatch.js
@@ -62,7 +62,11 @@ class Stopwatch {
         //var date_now.setTime(performance.now());
          this.timestampHeartbeart=performance.now();
          this.timestampClock=performance.now();
-         this.time =performance.now()+ (this.event.date_time_event_start-this.event.processedTime)*1000;
+         if(typeof this.time === 'undefined' ||  this.time == 0) {
+            this.time = (this.event.date_time_event_start-this.event.processedTime)*1000;
+         }else{
+            this.time = performance.now();
+         }
 
         if (this.event.event_type<3  && this.event.event_type!=0) { // launch the clock for heartbeat and
              this.running = true;

diff --git a/htdocs/timesheet/core/modules/modtimesheet.class.php b/htdocs/timesheet/core/modules/modtimesheet.class.php
@@ -54,7 +54,7 @@ public function __construct($db)
 		        $this->editor_name = 'Patrick Delcroix';
 		        $this->editor_url = 'https://github.com/delcroip';
                 // Possible values for version are: 'development', 'experimental', 'dolibarr' or version
-                $this->version = '4.4.10';
+                $this->version = '4.4.11';
                 // Key used in llx_cons table to save module status enabled/disabled(where timesheet is value of property name of module in uppercase)
                 $this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
                 // Where to store the module in setup page(0=common, 1=interface, 2=others, 3=very specific)