Compare commits

...

3 Commits
0.0.6 ... main

Author SHA1 Message Date
9887b8134d Cancel tracker
All checks were successful
CI / test (push) Successful in 1m57s
2025-06-22 13:47:25 +02:00
6b25be64d7 Spelling 2025-06-22 13:46:51 +02:00
4eaf1e73bb Show the current tracker time if it is active.
All checks were successful
CI / test (push) Successful in 40s
2025-06-20 19:13:48 +02:00
2 changed files with 81 additions and 7 deletions

View File

@ -1,6 +1,9 @@
{
"cSpell.ignoreWords": [
"FORMENTRY",
"TIMEENTRIES",
"ancel",
"lipgloss",
"oday"
]
}

View File

@ -34,7 +34,17 @@ const MODE_FORMENTRY tuiMode = "MODE_FORMENTRY"
var version = "dev"
type tickMsg time.Time
func tick() tea.Cmd {
return tea.Tick(time.Second, func(t time.Time) tea.Msg {
return tickMsg(t)
})
}
type model struct {
currentTime time.Time
miteAPI mite.APIClient
start calendarTime
dest calendarTime
@ -53,6 +63,7 @@ type model struct {
timeData struct {
entries mite.TimeEntries
table table.Model
tracker *mite.TrackingTimeEntry
}
statusBarMessage string
windowWidth int
@ -96,7 +107,11 @@ func initialModel(miteDomain, miteApiKey string) model {
}
func (m model) Init() tea.Cmd {
return m.fetchMiteData()
return tea.Batch(
m.fetchMiteData(),
tick(),
)
}
func (m model) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
@ -105,6 +120,10 @@ func (m model) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
switch msg := msg.(type) {
case tickMsg:
m.currentTime = time.Time(msg)
return m, tick() // schedule next tick
case miteDataFetchedMsg:
if msg.Error != nil {
m.statusBarMessage = fmt.Sprintf("Error fetching: %s", msg.Error.Error())
@ -116,6 +135,7 @@ func (m model) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
m.formData.customers = msg.Customers
m.formData.services = msg.Services
m.formData.projects = msg.Projects
m.timeData.tracker = msg.Tracker
m.fetchedData = true
slices.SortFunc(m.formData.customers, func(a, b mite.Customer) int { return strings.Compare(a.GetName(), b.GetName()) })
@ -133,13 +153,14 @@ func (m model) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
}
m.debug = append(m.debug, fmt.Sprintf("Got a %#v", msg))
if m.tuiMode == MODE_TIMEENTRIES {
switch m.tuiMode {
case MODE_TIMEENTRIES:
return m.updateEntries(msg)
} else if m.tuiMode == MODE_CAL {
case MODE_CAL:
return m.updateCal(msg)
} else if m.tuiMode == MODE_FORMENTRY {
case MODE_FORMENTRY:
return m.updateForm(msg)
} else {
default:
panic(m.tuiMode)
}
}
@ -188,13 +209,29 @@ func (m model) updateEntries(msg tea.Msg) (tea.Model, tea.Cmd) {
m.formData.form = m.buildForm()
m.formData.form.Init()
return m, nil
case "c":
if m.timeData.tracker != nil {
m, msg := m.cancelTracker()
return m, msg
}
}
}
newTable, tableCmd := m.timeData.table.Update(msg)
m.timeData.table = newTable
return m, tableCmd
}
func (m model) cancelTracker() (model, tea.Cmd) {
stopped, err := m.miteAPI.StopTimeTracker(m.timeData.tracker.ID)
if err != nil {
m.statusBarMessage = err.Error()
return m, nil
} else {
m.statusBarMessage = fmt.Sprintf("Stopped tracking: %d", stopped.ID)
m.timeData.tracker = nil
return m, m.fetchMiteData()
}
}
func (m model) updateCal(msg tea.Msg) (tea.Model, tea.Cmd) {
@ -234,6 +271,12 @@ func (m model) updateCal(msg tea.Msg) (tea.Model, tea.Cmd) {
m.statusBarMessage = "Fetching data from API"
return m, m.fetchMiteData()
// cancel tracker
case "c":
if m.timeData.tracker != nil {
return m.cancelTracker()
}
// // The "up" and "k" keys move the cursor up
// case "up", "k":
// if m.cursor > 0 {
@ -275,7 +318,7 @@ func (m model) updateCal(msg tea.Msg) (tea.Model, tea.Cmd) {
m.timeData.table.SetRows(m.tableDataForDate(m.dest.Time))
return m, nil
}
// The "enter" key and the spacebar (a literal space) toggle
// The "enter" key and the space bar (a literal space) toggle
// the selected state for the item that the cursor is pointing at.
// case "enter", " ":
// _, ok := m.selected[m.cursor]
@ -315,6 +358,7 @@ type miteDataFetchedMsg struct {
Customers mite.Customers
Services mite.Services
Projects mite.Projects
Tracker *mite.TrackingTimeEntry
Error error
}
@ -327,12 +371,20 @@ func (m model) fetchMiteData() tea.Cmd {
cst, err2 := m.miteAPI.GetCustomers()
svc, err3 := m.miteAPI.GetServices()
pjt, err4 := m.miteAPI.GetProjects()
tt, err5 := m.miteAPI.GetTimeTracker()
var msgTT = &tt
if err5 == mite.ErrNoTracker {
err5 = nil
msgTT = nil
}
return miteDataFetchedMsg{
TimeEntries: te,
Customers: cst,
Services: svc,
Projects: pjt,
Tracker: msgTT,
Error: errors.Join(err1, err2, err3, err4),
start: t0,
}
@ -377,11 +429,12 @@ func (m model) View() string {
} else {
lhs.WriteString("\n")
}
if m.tuiMode != MODE_FORMENTRY {
if m.globalKeyMode() {
lhs.WriteString("(a)dd time entry\n")
} else {
lhs.WriteString("\n")
}
if m.tuiMode == MODE_FORMENTRY {
lhs.WriteString("(esc) abort form\n")
lhs.WriteString("\n")
@ -390,6 +443,18 @@ func (m model) View() string {
lhs.WriteString("(tab) switch panes\n")
lhs.WriteString("(q)uit\n")
}
if m.timeData.tracker != nil {
activeTime := time.Since(m.timeData.tracker.Since).Truncate(time.Second).String()
activeTime = strings.Replace(activeTime, "0ms", "", 1)
lhs.WriteString("\nTracker active: " + activeTime + "\n")
if m.globalKeyMode() {
lhs.WriteString("(c)ancel\n")
} else {
lhs.WriteString("\n")
}
}
if m.tuiMode == MODE_TIMEENTRIES {
rhsS = db
}
@ -430,3 +495,9 @@ func (m model) View() string {
return out
}
// globalKeyMode indicates when the UI can receive most keystrokes for global operations -
// mostly this means the form is not active
func (m model) globalKeyMode() bool {
return m.tuiMode != MODE_FORMENTRY
}