@beauraines/toggl-cli 0.10.20 → 0.10.22

package/CHANGELOG.md

@@ -2,6 +2,26 @@
 
 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.
 
+### [0.10.22](https://github.com/beauraines/toggl-cli/compare/v0.10.21...v0.10.22) (2023-07-08)
+
+
+### Features
+
+* **ls:** Adds today option ([adc9779](https://github.com/beauraines/toggl-cli/commit/adc977912859d599a2a02c53d3c6529b52ecc9b4))
+
+
+### Bug Fixes
+
+* **edit:** updates duration when editing a running entry ([60a6d47](https://github.com/beauraines/toggl-cli/commit/60a6d474e83379c69861e063afc48b74f88473a8))
+* **utils:** properly handles null time in displayTimeEntry ([0476db0](https://github.com/beauraines/toggl-cli/commit/0476db098c72f2997d916149dfdeb4f50d7a43ce))
+
+### [0.10.21](https://github.com/beauraines/toggl-cli/compare/v0.10.20...v0.10.21) (2023-07-08)
+
+
+### Features
+
+* **ls:** adds details to time entry listing ([7ad05c7](https://github.com/beauraines/toggl-cli/commit/7ad05c797729bbaa34dc2a6be99397e1a01c24a2)), closes [#72](https://github.com/beauraines/toggl-cli/issues/72)
+
 ### [0.10.20](https://github.com/beauraines/toggl-cli/compare/v0.10.19...v0.10.20) (2023-07-08)
 
 ### [0.10.19](https://github.com/beauraines/toggl-cli/compare/v0.10.18...v0.10.19) (2023-07-08)

package/cmds/edit.mjs

@@ -12,7 +12,6 @@ dayjs.extend(timezone)
 const debug = debugClient('toggl-cli-edit');
 
 export const command = 'edit'
-// FIXME editing not working
 export const desc = 'Edits the current running time entry. Only updating the time is supported and the time must be parsable by dayjs, e.g. 4:50PM or \'12:00 AM\'.'
 
 export const builder = {
@@ -30,7 +29,7 @@ export const handler = async function (argv) {
   }
   const client = new Client()
   const currentTimeEntry = await client.timeEntries.current()
-
+  debug(currentTimeEntry)
   const params = {}
 
   params.workspace_id = +defaultWorkspaceId
@@ -59,10 +58,16 @@ export const handler = async function (argv) {
   }
 
   params.created_with = appName
-  params.at = dayjs().toISOString()
   project ? params.project_id = +project.id : undefined
   startTime ? params.start = startTime.toISOString() : undefined
   endTime ? params.stop = endTime.toISOString() : undefined
+  if (startTime || endTime) {
+    const startTimeUnix = (startTime || dayjs(currentTimeEntry.start)).unix()
+    const endTimeUnix = (endTime || dayjs(currentTimeEntry.end) || dayjs()).unix()
+    let duration = endTimeUnix - startTimeUnix
+    duration = endTime ? duration : startTimeUnix * -1
+    params.duration = duration
+  }
   argv.description ? params.description = argv.description : undefined
   debug(params)
   const timeEntry = await client.timeEntries.update(currentTimeEntry.id, params)

package/cmds/ls.mjs

@@ -10,13 +10,14 @@ export const command = 'ls [searchStrings...]'
 export const desc = 'Lists recent time entries. Defaults to the last 14 days.'
 
 export const builder = {
-  d: { alias: ['days'], describe: 'The number of days to return.', type: 'number', demandOption: false, default: 14 }
+  d: { alias: ['days'], describe: 'The number of days to return. Ignored if --today provided', type: 'number', demandOption: false, default: 14 },
+  today: {describe: 'Only returns today\'s time entries. Overrides --days.', type: 'boolean', demandOption: false}
 }
 
 export const handler = async function (argv) {
   debug(argv)
   const client = Client()
-  const days = argv.days
+  const days = argv.today ? 0 : argv.days
   let timeEntries = await client.timeEntries.list({
     start_date: dayjs().subtract(days, 'days').startOf('day').toISOString(),
     end_date: dayjs().toISOString()
@@ -27,20 +28,30 @@ export const handler = async function (argv) {
     debug(searchString)
     timeEntries = timeEntries.filter(x => x.description.includes(searchString))
   }
+
+  const workspaces = await client.workspaces.list()
+  const workspace = workspaces[0]
+  debug('Workspace: ' + workspace.name)
+  debug('id: ' + workspace.id)
+  const projects = await client.workspaces.projects(workspace.id)
+
   const report = []
   timeEntries.forEach(element => {
     report.push(
       {
         description: element.description,
+        project: projects.filter(p => p.id == element.project_id)[0]?.name,
+        project_id: projects.filter(p => p.id == element.project_id)[0]?.id,
         start: convertUtcTime(element.start),
         stop: convertUtcTime(element.stop),
-        duration: formatDuration(element.duration * 1000)
+        duration: formatDuration(element.duration * 1000),
+        id: element.id
       }
     )
   })
 
   const table = new Table({
-    head: ['Description', 'Start', 'Stop', 'Duration'],
+    head: ['Description', 'Project', 'Start', 'Stop', 'Duration', 'Time Entry ID'],
     chars: { mid: '', 'left-mid': '', 'mid-mid': '', 'right-mid': '' }
   })
   for (let i = 0; i < report.length; i++) {
@@ -53,9 +64,9 @@ export const handler = async function (argv) {
     }
     const entry = report[i]
     if (i === 0) {
-      table.push([entry.description, entry.start, entry.stop, entry.duration].map((content) => ({ content, chars })))
+      table.push([entry.description, entry.project, entry.start, entry.stop, entry.duration, entry.id].map((content) => ({ content, chars })))
     } else {
-      table.push([entry.description, entry.start, entry.stop, entry.duration])
+      table.push([entry.description, entry.project, entry.start, entry.stop, entry.duration, entry.id])
     }
   }
   console.log(table.toString())

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@beauraines/toggl-cli",
-  "version": "0.10.20",
+  "version": "0.10.22",
   "description": "",
   "main": "cli.js",
   "bin": {

package/utils.js

@@ -121,7 +121,7 @@ export const displayTimeEntry = async function (timeEntry) {
 
     const tz = process.env.TOGGL_TIMEZONE || 'America/New_York'
     const startTimeFormatted = dayjs(timeEntry.start).tz(tz).format('YYYY-MM-DD HH:mm')
-    const stopTimeFormatted = dayjs(timeEntry.stop).tz(tz).format('YYYY-MM-DD HH:mm')
+    const stopTimeFormatted = timeEntry.stop ? dayjs(timeEntry.stop).tz(tz).format('YYYY-MM-DD HH:mm') : 'Currently Running'
 
     console.info(`Start: ${startTimeFormatted}`)
     console.info(`Stop: ${stopTimeFormatted}`) // This will always be blank for the current entry, but will be useful for a time entry