skruecken/task-master
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Allow editing time entry start and end in TUI and web.

Browse Source 
Duration is derived from the range so timer sessions can be corrected after the fact.

Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
skruecken
2026-10-27 22:59:40 +01:00
co-authored by Cursor
parent afbf86dcf2
commit 79b0821837
10 changed files with 479 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/ui/app.go
+43 -21
View File
@@ -88,6 +88,7 @@ type Model struct {
timeEntries views.TimeEntriesView
timeEntriesTicket string // ticket ID for ModeTimeEntries
editingTimeEntry ticket.TimeEntry
timeEdit views.TimeEditForm
activeTimer *ticket.ActiveTimer
spentByID map[string]time.Duration
width int
@@ -207,8 +208,10 @@ func (m Model) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
case tea.KeyMsg:
switch m.mode {
case ModeCreate, ModeSearch, ModeTimeManual, ModeTimeEdit:
case ModeCreate, ModeSearch, ModeTimeManual:
return m.updateInput(msg)
case ModeTimeEdit:
return m.updateTimeEdit(msg)
case ModeEditProject:
return m.updateEditProject(msg)
case ModeProjects:
@@ -238,8 +241,10 @@ func (m Model) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
switch m.mode {
case ModeProjects, ModeMoveTicket:
m.projectList, cmd = m.projectList.Update(msg)
case ModeCreate, ModeSearch, ModeTimeManual, ModeTimeEdit:
case ModeCreate, ModeSearch, ModeTimeManual:
m.input, cmd = m.input.Update(msg)
case ModeTimeEdit:
cmd = m.timeEdit.Update(msg)
case ModeEditProject:
cmd = m.projectEdit.Update(msg)
}
@@ -585,8 +590,6 @@ func (m Model) updateInput(msg tea.KeyMsg) (tea.Model, tea.Cmd) {
switch {
case wasProject:
m.mode = ModeProjects
case m.mode == ModeTimeEdit:
m.mode = ModeTimeEntries
default:
m.mode = ModeList
}
@@ -608,16 +611,6 @@ func (m Model) updateInput(msg tea.KeyMsg) (tea.Model, tea.Cmd) {
case key.Matches(msg, m.keys.Enter):
value := strings.TrimSpace(m.input.Value())
if m.mode == ModeTimeEdit {
if err := m.saveEditedTime(value); err != nil {
m.setError(err)
return m, nil
}
m.input.Blur()
m.mode = ModeTimeEntries
m.setStatus("time updated")
return m, nil
}
if m.mode == ModeTimeManual {
if err := m.addManualTime(value); err != nil {
m.setError(err)
@@ -708,10 +701,8 @@ func (m Model) updateTimeEntries(msg tea.KeyMsg) (tea.Model, tea.Cmd) {
return m, nil
}
m.editingTimeEntry = e
m.timeEdit = views.NewTimeEditForm(e, m.width)
m.mode = ModeTimeEdit
m.input = views.NewTimeManualInput()
m.input.SetValue(ticket.FormatDurationHuman(e.Duration))
m.input.Focus()
return m, textinput.Blink
case key.Matches(msg, m.keys.Undo):
@@ -1717,18 +1708,49 @@ func (m *Model) deleteRemoteWorkItem(e ticket.TimeEntry) error {
return nil
}
func (m *Model) saveEditedTime(raw string) error {
func (m Model) updateTimeEdit(msg tea.KeyMsg) (tea.Model, tea.Cmd) {
switch {
case key.Matches(msg, m.keys.Escape):
m.mode = ModeTimeEntries
m.clearStatus()
return m, nil
case key.Matches(msg, m.keys.Tab), msg.Type == tea.KeyDown:
m.timeEdit.NextField()
return m, textinput.Blink
case key.Matches(msg, m.keys.ShiftTab), msg.Type == tea.KeyUp:
m.timeEdit.PrevField()
return m, textinput.Blink
case key.Matches(msg, m.keys.Enter):
m.clearStatus()
if err := m.saveEditedTime(); err != nil {
m.setError(err)
return m, nil
}
m.mode = ModeTimeEntries
m.setStatus("time updated")
return m, nil
}
cmd := m.timeEdit.Update(msg)
return m, cmd
}
func (m *Model) saveEditedTime() error {
if m.timeStore == nil {
return fmt.Errorf("time store not configured")
}
dur, err := ticket.ParseDurationFlexible(raw)
start, end, err := m.timeEdit.Parse()
if err != nil {
return err
}
before := m.editingTimeEntry
after := before
after.Duration = dur
after.End = after.Start.Add(dur)
after.Start = start
after.End = end
after.Duration = end.Sub(start)
if err := m.exec.Do(&command.UpdateTimeEntry{
Store: m.timeStore,
Before: before,
internal/ui/helpbar.go
+2 -1
View File
@@ -87,13 +87,14 @@ func (m Model) helpEntries() []helpEntry {
case ModeTimeEntries:
return []helpEntry{
{"j/k", "navigate"},
{"e", "edit"},
{"e", "edit times"},
{"x", "delete"},
{"u/U", "undo/redo"},
{"esc", "back"},
}
case ModeTimeEdit:
return []helpEntry{
{"tab/↑↓", "fields"},
{"enter", "save"},
{"esc", "cancel"},
}
internal/ui/layout.go
+1 -3
View File
@@ -60,9 +60,7 @@ func (m Model) renderBody(height int) string {
return lipgloss.NewStyle().Height(height).Width(m.width).Render(content)
case ModeTimeEdit:
prompt := m.styles.InputPrompt.Render("Edit duration:")
content := prompt + "\n" + m.input.View()
return lipgloss.NewStyle().Height(height).Width(m.width).Render(content)
return lipgloss.NewStyle().Height(height).Width(m.width).Render(m.timeEdit.View())
case ModeTimeEntries:
m.timeEntries.SetSize(m.width, height)
internal/ui/views/timeedit.go
+154
View File
@@ -0,0 +1,154 @@
package views
import (
"fmt"
"strings"
"time"
"github.com/charmbracelet/bubbles/textinput"
tea "github.com/charmbracelet/bubbletea"
"github.com/charmbracelet/lipgloss"
"task/internal/ticket"
)
// Time edit field indices.
const (
FieldTimeStart = iota
FieldTimeEnd
TimeEditFieldCount
)
const timeEditLayout = "2006-01-02 15:04"
// TimeEditStyles styles the time-entry edit form.
type TimeEditStyles struct {
Label lipgloss.Style
Focused lipgloss.Style
Blurred lipgloss.Style
Hint lipgloss.Style
Title lipgloss.Style
}
// DefaultTimeEditStyles returns sensible defaults.
func DefaultTimeEditStyles() TimeEditStyles {
return TimeEditStyles{
Label: lipgloss.NewStyle().Foreground(lipgloss.Color("245")),
Focused: lipgloss.NewStyle().Foreground(lipgloss.Color("205")),
Blurred: lipgloss.NewStyle().Foreground(lipgloss.Color("240")),
Hint: lipgloss.NewStyle().Foreground(lipgloss.Color("241")),
Title: lipgloss.NewStyle().Bold(true),
}
}
// TimeEditForm edits start and end of a time entry.
type TimeEditForm struct {
Inputs []textinput.Model
Focus int
Styles TimeEditStyles
Width int
}
// NewTimeEditForm builds a form prefilled from an entry.
func NewTimeEditForm(e ticket.TimeEntry, width int) TimeEditForm {
styles := DefaultTimeEditStyles()
inputs := make([]textinput.Model, TimeEditFieldCount)
mk := func(placeholder string) textinput.Model {
ti := textinput.New()
ti.Placeholder = placeholder
ti.CharLimit = 16
ti.Width = max(20, width-10)
return ti
}
inputs[FieldTimeStart] = mk(timeEditLayout)
inputs[FieldTimeEnd] = mk(timeEditLayout)
if !e.Start.IsZero() {
inputs[FieldTimeStart].SetValue(e.Start.Local().Format(timeEditLayout))
}
if !e.End.IsZero() {
inputs[FieldTimeEnd].SetValue(e.End.Local().Format(timeEditLayout))
} else if !e.Start.IsZero() && e.Duration > 0 {
inputs[FieldTimeEnd].SetValue(e.Start.Add(e.Duration).Local().Format(timeEditLayout))
}
f := TimeEditForm{
Inputs: inputs,
Focus: FieldTimeStart,
Styles: styles,
Width: width,
}
f.focusIndex(FieldTimeStart)
return f
}
func (f *TimeEditForm) focusIndex(i int) {
f.Focus = i
for idx := range f.Inputs {
if idx == i {
f.Inputs[idx].Focus()
f.Inputs[idx].PromptStyle = f.Styles.Focused
f.Inputs[idx].TextStyle = f.Styles.Focused
} else {
f.Inputs[idx].Blur()
f.Inputs[idx].PromptStyle = f.Styles.Blurred
f.Inputs[idx].TextStyle = f.Styles.Blurred
}
}
}
// NextField moves focus to the next field.
func (f *TimeEditForm) NextField() {
f.focusIndex((f.Focus + 1) % TimeEditFieldCount)
}
// PrevField moves focus to the previous field.
func (f *TimeEditForm) PrevField() {
f.focusIndex((f.Focus - 1 + TimeEditFieldCount) % TimeEditFieldCount)
}
// Update forwards a message to the focused text input.
func (f *TimeEditForm) Update(msg tea.Msg) tea.Cmd {
var cmd tea.Cmd
f.Inputs[f.Focus], cmd = f.Inputs[f.Focus].Update(msg)
return cmd
}
// Parse returns start and end in UTC, or an error.
func (f TimeEditForm) Parse() (start, end time.Time, err error) {
startRaw := strings.TrimSpace(f.Inputs[FieldTimeStart].Value())
endRaw := strings.TrimSpace(f.Inputs[FieldTimeEnd].Value())
if startRaw == "" || endRaw == "" {
return time.Time{}, time.Time{}, fmt.Errorf("start and end are required")
}
start, err = time.ParseInLocation(timeEditLayout, startRaw, time.Local)
if err != nil {
return time.Time{}, time.Time{}, fmt.Errorf("start: use %s", timeEditLayout)
}
end, err = time.ParseInLocation(timeEditLayout, endRaw, time.Local)
if err != nil {
return time.Time{}, time.Time{}, fmt.Errorf("end: use %s", timeEditLayout)
}
if !end.After(start) {
return time.Time{}, time.Time{}, fmt.Errorf("end must be after start")
}
return start.UTC(), end.UTC(), nil
}
// View renders the form.
func (f TimeEditForm) View() string {
var b strings.Builder
b.WriteString(f.Styles.Title.Render("Edit time entry"))
b.WriteString("\n\n")
labels := []string{"Start", "End"}
for i, label := range labels {
b.WriteString(f.Styles.Label.Render(label+":"))
b.WriteString(" ")
b.WriteString(f.Inputs[i].View())
b.WriteString("\n")
}
b.WriteString("\n")
b.WriteString(f.Styles.Hint.Render("format " + timeEditLayout + " · tab fields · enter save · esc cancel"))
return b.String()
}
internal/ui/views/timeedit_test.go
+34
View File
@@ -0,0 +1,34 @@
package views
import (
"testing"
"time"
"task/internal/ticket"
)
func TestTimeEditFormParse(t *testing.T) {
start := time.Date(2024, 6, 1, 9, 0, 0, 0, time.Local)
end := start.Add(90 * time.Minute)
f := NewTimeEditForm(ticket.TimeEntry{Start: start, End: end, Duration: 90 * time.Minute}, 80)
gotStart, gotEnd, err := f.Parse()
if err != nil {
t.Fatal(err)
}
if !gotStart.Equal(start.UTC()) {
t.Fatalf("start: got %v want %v", gotStart, start.UTC())
}
if !gotEnd.Equal(end.UTC()) {
t.Fatalf("end: got %v want %v", gotEnd, end.UTC())
}
}
func TestTimeEditFormRejectsBadRange(t *testing.T) {
start := time.Date(2024, 6, 1, 9, 0, 0, 0, time.Local)
f := NewTimeEditForm(ticket.TimeEntry{Start: start, End: start, Duration: time.Minute}, 80)
f.Inputs[FieldTimeEnd].SetValue(start.Format(timeEditLayout))
if _, _, err := f.Parse(); err == nil {
t.Fatal("expected error for end == start")
}
}
internal/ui/views/timeentries.go
+1 -1
View File
@@ -97,7 +97,7 @@ func (v TimeEntriesView) View() string {
title = "ticket"
}
head := v.Styles.Title.Render(fmt.Sprintf("Time entries · %s", truncateOneLine(title, max(8, v.Width-20))))
hint := v.Styles.Hint.Render("j/k navigate · e edit · x delete · esc back")
hint := v.Styles.Hint.Render("j/k navigate · e edit start/end · x delete · esc back")
innerW := max(20, v.Width-2)
var lines []string