@beauraines/toggl-cli 2.3.9 → 2.3.10

package/CHANGELOG.md

@@ -2,6 +2,8 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+### [2.3.10](https://github.com/beauraines/toggl-cli/compare/v2.3.9...v2.3.10) (2024-08-08)
+
 ### [2.3.9](https://github.com/beauraines/toggl-cli/compare/v2.3.8...v2.3.9) (2024-07-23)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@beauraines/toggl-cli",
-  "version": "2.3.9",
+  "version": "2.3.10",
   "description": "CLI client for Toggl Time Tracker",
   "main": "cli.js",
   "bin": {

package/utils.js

@@ -149,16 +149,24 @@ export const displayTimeEntry = async function (timeEntry) {
  * @returns {object} dayjs object
  */
 export function parseTime (timeString) {
-  let h, m
+  let h_orig, h, m
   // Assumes time in format 4:50 PM
   const time = timeString.split(':', 2)
-  h = time[0]
-  m = time[1].match(/[0-9]+/)[0]
-  if (timeString.match(/PM/i) && h <= 12) {
-    // + in front of string converts to a number, cool!
-    h = +h + 12
-  } else if (h == 12) {
-    h = 0
+
+  // + in front of string converts to a number, cool!
+  h_orig = +time[0]
+  m = +time[1].match(/[0-9]+/)[0]
+
+  if (h_orig > 12) {
+    // 24 hour time
+    h = h_orig
+  } else if (h_orig == 12) {
+    // 12 is a special case
+    h = timeString.match(/PM/i) ? 12 : 0
+  } else {
+    // 12 hour time
+    h = h_orig
+    if (timeString.match(/PM/i)) h += 12
   }
   return dayjs().hour(h).minute(m).second(0).millisecond(0)
 }