From a4c33e57c0d142edf1540770f65f49d887c00e76 Mon Sep 17 00:00:00 2001 From: Lucas dos Santos Abreu Date: Mon, 25 Apr 2022 15:52:32 -0300 Subject: [PATCH] fix: dont hide description --- CHANGELOG.md | 4 ++++ internal/output/timeEntry.go | 18 ++++++++++-------- 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 37b36d45..497566a2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +### Fixed + +- enabling `show-task` config were hiding the description column for table report format. + ## [v0.33.0] - 2022-04-21 ### Added diff --git a/internal/output/timeEntry.go b/internal/output/timeEntry.go index cc44cd64..b1fec234 100644 --- a/internal/output/timeEntry.go +++ b/internal/output/timeEntry.go @@ -164,14 +164,16 @@ func TimeEntriesPrint(opts ...TimeEntryOutputOpt) func([]dto.TimeEntry, io.Write return func(timeEntries []dto.TimeEntry, w io.Writer) error { tw := tablewriter.NewWriter(w) + taskColumn := 6 + projectColumn := 4 header := []string{"ID", "Start", "End", "Dur", "Project", "Description", "Tags"} if options.ShowTasks { header = append( - header[:5], - header[5:]..., + header[:taskColumn], + header[taskColumn-1:]..., ) - header[5] = "Task" + header[taskColumn] = "Task" } tw.SetHeader(header) @@ -188,9 +190,9 @@ func TimeEntriesPrint(opts ...TimeEntryOutputOpt) func([]dto.TimeEntry, io.Write } projectName := "" - colors[4] = []int{} + colors[projectColumn] = []int{} if t.Project != nil { - colors[4] = colorToTermColor(t.Project.Color) + colors[projectColumn] = colorToTermColor(t.Project.Color) projectName = t.Project.Name } @@ -205,10 +207,10 @@ func TimeEntriesPrint(opts ...TimeEntryOutputOpt) func([]dto.TimeEntry, io.Write } if options.ShowTasks { - line = append(line[:5], line[5:]...) - line[5] = "" + line = append(line[:taskColumn], line[taskColumn-1:]...) + line[taskColumn] = "" if t.Task != nil { - line[5] = fmt.Sprintf("%s (%s)", t.Task.Name, t.Task.ID) + line[taskColumn] = fmt.Sprintf("%s (%s)", t.Task.Name, t.Task.ID) } }