@beauraines/toggl-cli 0.10.19 → 0.10.21

package/CHANGELOG.md

@@ -2,12 +2,28 @@
 
 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.19](https://github.com/beauraines/toggl-cli/compare/v0.10.18...v0.10.19) (2023-06-12)
+### [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)
+
+
+### Features
+
+* **weekly report:** Add weekly report options ([73bb7fe](https://github.com/beauraines/toggl-cli/commit/73bb7fe8b815978feb39de5db4b6cc96811314cf)), closes [#44](https://github.com/beauraines/toggl-cli/issues/44)
 
 
 ### Bug Fixes
 
 * **deps:** bump dayjs from 1.11.7 to 1.11.8 ([2b47fde](https://github.com/beauraines/toggl-cli/commit/2b47fde79a538cfe6a486e84a21e58cfa2ddd6b4))
+* **deps:** bump dotenv from 16.1.3 to 16.1.4 ([14eaefa](https://github.com/beauraines/toggl-cli/commit/14eaefa93394e93708dc05319db73d86ac6fe9e5))
+* **deps:** bump dotenv from 16.1.4 to 16.3.1 ([#83](https://github.com/beauraines/toggl-cli/issues/83)) ([6511956](https://github.com/beauraines/toggl-cli/commit/65119569c782afd7d22ae2532b23568d7517bc2a))
 
 ### [0.10.18](https://github.com/beauraines/toggl-cli/compare/v0.10.17...v0.10.18) (2023-06-03)
 

package/cmds/ls.mjs

@@ -27,20 +27,31 @@ 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 => {
+    console.log(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/cmds/weekly.mjs

@@ -15,13 +15,21 @@ const debug = debugClient('toggl-cli-week');
 export const command = 'week'
 // FIXME descriptions
 export const desc = 'Weekly project summary by day'
-export const builder = {}
+export const builder = {
+  p: { alias: ['previous','prior'], describe: 'Return the prior week\'s data', type: 'boolean', demandOption: false, requiresArg: false}
+}
 
 export const handler = async function (argv) {
   const client = Client()
   const workspace = await getWorkspace()
 
-  const params = { } // Leave this for future options, like rounding
+  const weekOffset = argv.previous ? 1 : 0
+  const startDate = dayjs().startOf('week').subtract(weekOffset,'weeks')
+
+  const params = {
+    start_date: startDate.format('YYYY-MM-DD')
+  }
+
   const weeklyReport = await client.reports.weekly(workspace.id, params)
   debug(weeklyReport)
   const reportData = []
@@ -36,11 +44,11 @@ export const handler = async function (argv) {
 
     for (let i = 0; i < project.seconds.length; i++) {
       const element = project.seconds[i]
-      const date = dayjs().startOf('week').add(i, 'days').format('ddd MM-DD')
+      const date = startDate.add(i, 'days').format('ddd MM-DD')
       const duration = element || 0
       row[date] = formatDuration(duration * 1000)
       totals[i] += duration // for use with a daily total row
-      row.Total += duration // accumulate the projects weekly totoal
+      row.Total += duration // accumulate the projects weekly total
     }
     reportData.push(row)
   }
@@ -52,9 +60,9 @@ export const handler = async function (argv) {
 
   for (let i = 0; i < totals.length; i++) {
     const seconds = totals[i]
-    const date = dayjs().startOf('week').add(i, 'days').format('ddd MM-DD')
+    const date = startDate.add(i, 'days').format('ddd MM-DD')
     totalRow[date] = formatDuration(seconds * 1000)
-    totalRow.Total += seconds // accumulate the projects weekly totoal
+    totalRow.Total += seconds // accumulate the projects weekly total
   }
   reportData.push(totalRow)
 

package/package.json

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