🐛 fixed issue [bug] Stopwatch doesn't save hours if a time greater th…

…an an hour is tracked #221

⬆️ updated package dependencies

.meteor/versions

@@ -7,7 +7,7 @@ [email protected]
 [email protected]
 [email protected]
 [email protected]
-[email protected].0
+[email protected].1
 [email protected]
 [email protected]
 [email protected]
@@ -59,7 +59,7 @@ [email protected]
 [email protected]
 [email protected]
 [email protected]
-mongo-decimal@0.1.4
+mongo-decimal@0.2.0
 [email protected]
 [email protected]
 [email protected]
@@ -89,7 +89,7 @@ [email protected]
 [email protected]
 [email protected]
 [email protected]
-[email protected].0
+[email protected].1
 [email protected]
 [email protected]
 [email protected]

imports/ui/pages/track/components/timetracker.js

@@ -77,6 +77,7 @@ Template.timetracker.events({
       return
     }
     const duration = dayjs.preciseDiff(dayjs(), templateInstance.timer.get(), true)
+    const dayjsDuration = dayjs.duration(dayjs().diff(templateInstance.timer.get()))
     const hours = (Number(duration.days * 24))
       + Number(duration.hours) + Number((duration.minutes / 60))
     const project = templateInstance.project.get()
@@ -90,7 +91,7 @@ Template.timetracker.events({
       $('#startTime').val(templateInstance.startTime.get())
     }
     if (getUserSetting('timeunit')==='m') {
-      $('#hours').val(duration.minutes)
+      $('#hours').val(dayjsDuration.asMinutes().toFixed(0).toString())
     } else {
       $('#hours').val(Number(hours).toFixed(getUserSetting('precision'))).trigger('change')
     }

imports/ui/pages/track/tracktime.js

@@ -180,7 +180,11 @@ Template.tracktime.events({
         hours: Number.parseInt(hoursString, 10),
         minutes: Number.parseInt(minutesString, 10),
       })
-      hours = duration.asHours().toString()
+      if (getUserSetting('timeunit') === 'h') {
+        hours = duration.asHours().toString()
+      } else if (getUserSetting('timeunit') === 'm') {
+        hours = duration.asMinutes().toString()
+      }
     } else if (!hours && hours !== 0 && !Number.isNaN(hours)) {
       templateInstance.$('#hours').addClass('is-invalid')
       showToast(t('notifications.enter_time'))

package.json

@@ -1,6 +1,6 @@
 {
   "name": "titra",
-  "version": "0.99.19",
+  "version": "0.99.20",
   "private": true,
   "scripts": {
     "start": "meteor run"
@@ -32,7 +32,7 @@
     "jquery": "3.7.1",
     "jquery-serializejson": "^3.2.1",
     "ldapjs": "3.0.7",
-    "math-expression-evaluator": "^2.0.5",
+    "math-expression-evaluator": "^2.0.6",
     "meteor-node-stubs": "^1.2.12",
     "namedavatar": "^1.2.0",
     "node-emoji": "^2.1.3",