refactor: minor changes

f3rno64 · Nov 29, 2023 · b3cdd86 · b3cdd86
1 parent 4263d3c
commit b3cdd86
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 4 deletions.
diff --git a/src/commands/now.ts b/src/commands/now.ts
@@ -31,10 +31,10 @@ const handler = (args: NowCommandArguments) => {
   )
 
   const [sheet] = sheetsWithActiveEntries
-  const { activeEntryID, entries } = sheet
+  const { name, activeEntryID, entries } = sheet
   const entry = entries.find(({ id }) => id === activeEntryID)
 
-  P.printSheetEntry(entry, true)
+  P.printSheetEntry(entry, true, name)
 }
 
 export default {

diff --git a/src/print/sheet_entry.ts b/src/print/sheet_entry.ts
@@ -1,11 +1,16 @@
 import ago from 's-ago'
 import colors from 'colors'
+import _isEmpty from 'lodash/isEmpty'
 import formatDuration from 'format-duration'
 
 import * as C from '../color'
 import { type TimeSheetEntry } from '../types'
 
-const printSheetEntry = (entry: TimeSheetEntry, isActive?: boolean): void => {
+const printSheetEntry = (
+  entry: TimeSheetEntry,
+  isActive?: boolean,
+  sheetName?: string
+): void => {
   const { id, start, end, description } = entry
   const idUI = C.clID(`${id}`)
   const startUI = C.clDateAgo(ago(start))
@@ -15,7 +20,12 @@ const printSheetEntry = (entry: TimeSheetEntry, isActive?: boolean): void => {
   const endedUI = end === null ? '' : C.clDateAgo(ago(end))
   const startEndUI = end === null ? `started ${startUI}` : `ended ${endedUI}`
 
-  let result = `(${idUI}) [${durationUI}] ${descriptionUI}`
+  const sheetNamePrefix = _isEmpty(sheetName)
+    ? ''
+    : `${C.clText('sheet')} ${C.clSheet(sheetName)}`
+
+  let result =
+    `${sheetNamePrefix} (${idUI}) [${durationUI}] ${descriptionUI}`.trim()
 
   if (end === null) {
     result += `: ${startEndUI}`