Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 0 additions & 20 deletions internal/types/date_helpers.go
Original file line number Diff line number Diff line change
Expand Up @@ -126,23 +126,3 @@ func GetDateRangeFromPeriod(period string, now time.Time, fullWeek bool, maxDays
NumDays: numDays,
}, nil
}

func GetShiftedTime(ts time.Time, direction TimeShiftDirection, duration TimeShiftDuration) time.Time {
var d time.Duration

switch duration {
case ShiftMinute:
d = time.Minute
case ShiftFiveMinutes:
d = time.Minute * 5
case ShiftHour:
d = time.Hour
case ShiftDay:
d = time.Hour * 24
}

if direction == ShiftBackward {
d = -1 * d
}
return ts.Add(d)
}
16 changes: 0 additions & 16 deletions internal/types/types.go
Original file line number Diff line number Diff line change
Expand Up @@ -47,22 +47,6 @@ func HumanizeDuration(durationInSecs int) string {
return fmt.Sprintf("%dh %dm", int(duration.Hours()), modMins)
}

type TimeShiftDirection uint8

const (
ShiftForward TimeShiftDirection = iota
ShiftBackward
)

type TimeShiftDuration uint8

const (
ShiftMinute TimeShiftDuration = iota
ShiftFiveMinutes
ShiftHour
ShiftDay
)

type TaskStatus uint8

const (
Expand Down
4 changes: 2 additions & 2 deletions internal/ui/handle.go
Original file line number Diff line number Diff line change
Expand Up @@ -242,15 +242,15 @@ func (m *Model) goBackwardInView() {
}
}

func (m *Model) shiftTime(direction types.TimeShiftDirection, duration types.TimeShiftDuration) error {
func (m *Model) shiftTime(direction timeShiftDirection, duration timeShiftDuration) error {
switch m.trackingFocussedField {
case entryBeginTS, entryEndTS:
ts, err := time.ParseInLocation(timeFormat, m.tLInputs[m.trackingFocussedField].Value(), time.Local)
if err != nil {
return err
}

newTs := types.GetShiftedTime(ts, direction, duration)
newTs := getShiftedTime(ts, direction, duration)

m.tLInputs[m.trackingFocussedField].SetValue(newTs.Format(timeFormat))
}
Expand Down
39 changes: 39 additions & 0 deletions internal/ui/time.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
package ui

import "time"

type timeShiftDirection uint8

const (
shiftForward timeShiftDirection = iota
shiftBackward
)

type timeShiftDuration uint8

const (
shiftMinute timeShiftDuration = iota
shiftFiveMinutes
shiftHour
shiftDay
)

func getShiftedTime(ts time.Time, direction timeShiftDirection, duration timeShiftDuration) time.Time {
var d time.Duration

switch duration {
case shiftMinute:
d = time.Minute
case shiftFiveMinutes:
d = time.Minute * 5
case shiftHour:
d = time.Hour
case shiftDay:
d = time.Hour * 24
}

if direction == shiftBackward {
d = -1 * d
}
return ts.Add(d)
}
12 changes: 6 additions & 6 deletions internal/ui/update.go
Original file line number Diff line number Diff line change
Expand Up @@ -112,39 +112,39 @@ func (m Model) processMessage(msg tea.Msg) (Model, tea.Cmd) {
case "k":
switch m.activeView {
case editActiveTLView, finishActiveTLView, manualTasklogEntryView, editSavedTLView:
err := m.shiftTime(types.ShiftBackward, types.ShiftMinute)
err := m.shiftTime(shiftBackward, shiftMinute)
if err != nil {
return m, tea.Batch(cmds...)
}
}
case "j":
switch m.activeView {
case editActiveTLView, finishActiveTLView, manualTasklogEntryView, editSavedTLView:
err := m.shiftTime(types.ShiftForward, types.ShiftMinute)
err := m.shiftTime(shiftForward, shiftMinute)
if err != nil {
return m, tea.Batch(cmds...)
}
}
case "K":
switch m.activeView {
case editActiveTLView, finishActiveTLView, manualTasklogEntryView, editSavedTLView:
err := m.shiftTime(types.ShiftBackward, types.ShiftFiveMinutes)
err := m.shiftTime(shiftBackward, shiftFiveMinutes)
if err != nil {
return m, tea.Batch(cmds...)
}
}
case "J":
switch m.activeView {
case editActiveTLView, finishActiveTLView, manualTasklogEntryView, editSavedTLView:
err := m.shiftTime(types.ShiftForward, types.ShiftFiveMinutes)
err := m.shiftTime(shiftForward, shiftFiveMinutes)
if err != nil {
return m, tea.Batch(cmds...)
}
}
case "h":
switch m.activeView {
case editActiveTLView, finishActiveTLView, manualTasklogEntryView, editSavedTLView:
err := m.shiftTime(types.ShiftBackward, types.ShiftDay)
err := m.shiftTime(shiftBackward, shiftDay)
if err != nil {
return m, tea.Batch(cmds...)
}
Expand All @@ -155,7 +155,7 @@ func (m Model) processMessage(msg tea.Msg) (Model, tea.Cmd) {
case "l":
switch m.activeView {
case editActiveTLView, finishActiveTLView, manualTasklogEntryView, editSavedTLView:
err := m.shiftTime(types.ShiftForward, types.ShiftDay)
err := m.shiftTime(shiftForward, shiftDay)
if err != nil {
return m, tea.Batch(cmds...)
}
Expand Down
Loading