Merge pull request #53 from dvklopfenstein/dev

Improved `report` output

Author: dvklopfenstein

CHANGELOG.md

@@ -2,6 +2,7 @@
 
 # Summary
 * [**Unreleased**](#unreleased)
+* [**Release 2025-05-18 v0.5a7**](#release-2025-05-18-v05a7) Add starttime to `report`; Bug fix in `cancel`
 * [**Release 2025-05-16 v0.5a6**](#release-2025-05-16-v05a6) Add options to `projects` command; Fix `report` command
 * [**Release 2025-05-15 v0.5a5**](#release-2025-05-15-v05a5) Report command tested and updated; Get csv files for a single user tested and implemented
 * **Release 2025-05-14 v0.5a4** Optimized getting csv files to report locally or globally for a single user
@@ -29,6 +30,10 @@
 
 ## Unreleased
 
+## Release 2025-05-18 v0.5a7
+* ADDED start time to `report` stdout
+* FIXED incorrect param order in `cancel`
+
 ## Release 2025-05-16 v0.5a6
 * ADDED `trk project` option, `--exists` to mark which projects exist
 * ADDED `trk project` option, `--rm-missing` to

pyproject.toml

@@ -7,7 +7,7 @@ build-backend = "setuptools.build_meta"
 [project]
 name = "timetracker-csv"
 description = "Pandas-friendly time tracking from the CLI"
-version = "0.5a6"
+version = "0.5a7"
 license = "AGPL-3.0-or-later"
 authors = [
     {name = 'DV Klopfenstein, PhD', email = 'dvklopfenstein@protonmail.com'},

timetracker/__init__.py

@@ -2,6 +2,6 @@
 
 __copyright__ = 'Copyright (C) 2025-present, DV Klopfenstein, PhD. All rights reserved'
 __author__ = 'DV Klopfenstein, PhD'
-__version__ = '0.5a6'
+__version__ = '0.5a7'
 
 # Copyright (C) 2025-present, DV Klopfenstein, PhD. All rights reserved

timetracker/cli.py

@@ -246,7 +246,7 @@ def _add_subparser_csv(self, subparsers):
 
     def _add_subparser_report(self, subparsers):
         parser = subparsers.add_parser(name='report',
-            help='Generate an report for all time units and include cumulative time',
+            help='Generate a project report for time units and include cumulative time',
             formatter_class=ArgumentDefaultsHelpFormatter)
         return parser
 

timetracker/cmd/cancel.py

@@ -25,7 +25,7 @@ def run_cancel(cfgproj, name=None):
     debug(yellow('RUNNING COMMAND CANCEL'))
     start_obj = cfgproj.get_starttime_obj(name)
     if start_obj and exists(start_obj.filename):
-        prt_elapsed(f'{str_cancelled1()}; was', start_obj)
+        prt_elapsed(start_obj, f'{str_cancelled1()}; was')
         remove(start_obj.filename)
         return start_obj.filename
     print(str_not_running())

timetracker/epoch/text.py

@@ -37,7 +37,7 @@ def _get_nto(has_activity, has_tags, pnum):
 
 def get_fstr(has_activity, has_tags, pnum):
     """Get formatting for printing to stdout"""
-    lst = ['{Day:3}', '{Date:10}', '{Span:>5}', '{Total:5}']
+    lst = ['{Day:3}', '{Date:10}', '{Start:8}', '{Span:>5}', '{Total:5}']
     if pnum:
         lst.append('{Sum:5}')
     if has_activity:
@@ -48,7 +48,7 @@ def get_fstr(has_activity, has_tags, pnum):
     return ' '.join(lst)
 
 def _get_nto_fieldnames(has_activity, has_tags, pnum):
-    lst = ['Day', 'Date', 'Span', 'Total']
+    lst = ['Day', 'Date', 'Start', 'Span', 'Total']
     if pnum:
         lst.append('Sum')
     if has_activity:
@@ -80,7 +80,8 @@ def _get_dfmttd_at010(nto, nts):
     debug(white('timetext: _get_dfmttd_at010'))
     tot = timedelta()
     return [nto._make(_nttxt(ntd) +
-        (str_td(tot:=tot+ntd.duration), ntd.activity, ntd.message))
+        (str_td(tot:=tot+ntd.duration),
+         ntd.activity, ntd.message))
         for ntd in nts]
 
 def _get_dfmttd_at001(nto, nts):
@@ -100,10 +101,10 @@ def _get_dfmttd_at011(nto, nts):
         for ntd in nts]
 
 def _nttxt(ntd):
-    weekday = ntd.start_datetime.strftime('%a')
-    startdt = ntd.start_datetime.strftime('%Y-%m-%d')  ### FMTDT12HM)
-    span = str_td(ntd.duration)
-    return (weekday, startdt, f'{span}')
+    return (ntd.start_datetime.strftime('%a'),       # weekday
+            ntd.start_datetime.strftime('%Y-%m-%d'), # FMTDT12HM
+            ntd.start_datetime.strftime('%I:%M %p'),
+            f'{str_td(ntd.duration)}')               # span (HH:MM)
 
 FUNCS = {
     ( True, False, False): _get_dfmttd_at100,

timetracker/report.py

@@ -4,7 +4,7 @@
 __author__ = "DV Klopfenstein, PhD"
 
 
-FMT_STDOUT = '{Day:3}  {Date:10}  {Span:5}  {Total:>7}  {Description}'
+FMT_STDOUT = '{Day:3}  {Date:10}  {Start:8}  {Span:5}  {Total:>7}  {Description}'
 
 def prt_basic(timefmtd):
     """Prints a basic time report to stdout"""