Cancel tracker

.vscode/settings.json

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

mite/mite.go

@@ -51,8 +51,10 @@ type Project struct {
 func (p Project) String() string {
 	return fmt.Sprintf("%d: %s (%s)", p.ID, p.Name, p.CustomerName)
 }
-func (p Project) GetID() int      { return p.ID }
-func (p Project) GetName() string { return p.Name + " (" + p.CustomerName + ")" }
+func (p Project) GetID() int { return p.ID }
+func (p Project) GetName() string {
+	return p.Name + " (" + p.CustomerName + ")"
+}
 
 func (a APIClient) GetProjects() (Projects, error) {
 	// GET /projects.json
@@ -238,7 +240,9 @@ type requestAddTimeEntry struct {
 	} `json:"time_entry"`
 }
 
-func (a APIClient) AddTimeEntry(date string, minutes int, notes string, projectId, serviceId int) error {
+type apiPostTimeEntry timeEntryHolder
+
+func (a APIClient) AddTimeEntry(date string, minutes int, notes string, projectId, serviceId int) (int, error) {
 	// POST /time_entries.json
 	// {
 	// 	"time_entry": {
@@ -254,8 +258,10 @@ func (a APIClient) AddTimeEntry(date string, minutes int, notes string, projectI
 	req.RequestTimeEntryHolder.ProjectID = projectId
 	req.RequestTimeEntryHolder.ServiceID = serviceId
 
-	err := a.post("/time_entries.json", req)
-	return err
+	res := apiPostTimeEntry{}
+
+	err := a.post("/time_entries.json", req, &res)
+	return res.TimeEntry.ID, err
 }
 
 type apiTimeTrackerEntry struct {
@@ -398,9 +404,9 @@ func (a APIClient) patch(path string, data any) error {
 	return nil
 }
 
-func (a APIClient) post(path string, data any) error {
+func (a APIClient) post(path string, dataIn any, dataOut any) error {
 
-	b, err := json.Marshal(data)
+	b, err := json.Marshal(dataIn)
 	if err != nil {
 		return err
 	}
@@ -421,6 +427,11 @@ func (a APIClient) post(path string, data any) error {
 		return fmt.Errorf("expected 2XX, got %d", resp.StatusCode)
 	}
 
+	err = json.NewDecoder(resp.Body).Decode(&dataOut)
+	if err != nil {
+		return err
+	}
+
 	return nil
 
 }

model.go

@@ -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
+}

model_form.go

@@ -35,6 +35,7 @@ func (m model) updateForm(msg tea.Msg) (tea.Model, tea.Cmd) {
 		projectID := m.formData.form.GetString("project")
 		description := m.formData.form.GetString("description")
 		minutes := m.formData.form.GetString("minutes")
+		tracker := m.formData.form.GetBool("tracker")
 
 		minutesInt, err1 := strconv.ParseInt(minutes, 10, 64)
 		serviceIDInt, err2 := strconv.ParseInt(serviceID, 10, 64)
@@ -45,14 +46,27 @@ func (m model) updateForm(msg tea.Msg) (tea.Model, tea.Cmd) {
 			m.tuiMode = MODE_CAL
 		} else {
 
-			err := m.miteAPI.AddTimeEntry(m.dest.Format(time.DateOnly), int(minutesInt), description, int(projectIDInt), int(serviceIDInt))
+			id, err := m.miteAPI.AddTimeEntry(m.dest.Format(time.DateOnly), int(minutesInt), description, int(projectIDInt), int(serviceIDInt))
 			if err != nil {
 				m.statusBarMessage = err.Error()
 				m.tuiMode = MODE_CAL
 			} else {
-				m.statusBarMessage = "Successfully logged time"
-				m.tuiMode = MODE_CAL
-				return m, m.fetchMiteData()
+				if tracker {
+					_, _, err = m.miteAPI.StartTimeTracker(id)
+					if err != nil {
+						m.statusBarMessage = err.Error()
+						m.tuiMode = MODE_CAL
+					} else {
+						m.statusBarMessage = "Successfully logged time and started tracker"
+						m.tuiMode = MODE_CAL
+						return m, m.fetchMiteData()
+					}
+				} else {
+
+					m.statusBarMessage = "Successfully logged time"
+					m.tuiMode = MODE_CAL
+					return m, m.fetchMiteData()
+				}
 			}
 		}
 
@@ -101,38 +115,51 @@ func (m model) buildForm() *huh.Form {
 		Key("project").
 		Title("Project").
 		Options(projOptions...).
-		Height(10)
+		Height(6)
+
+	description := huh.NewText().
+		Key("description").
+		Title("description").
+		Validate(func(s string) error {
+			if s == "" {
+				return errors.New("must enter a description")
+			}
+			return nil
+		})
+
+	defMinutes := "0"
+	minutes := huh.NewInput().
+		Key("minutes").
+		CharLimit(5).
+		Validate(
+			func(s string) error {
+				h, err := strconv.ParseInt(s, 10, 64)
+				if err != nil {
+					return err
+				}
+				if h < 0 {
+					return errors.New("must be positive")
+				}
+				return err
+			}).
+		Title("Minutes").
+		Value(&defMinutes)
+
+	confirmTracker := huh.NewConfirm().
+		Key("tracker").
+		Affirmative("Yes").
+		Negative("No").
+		Title("Start tracker")
 
 	form := huh.NewForm(
 		huh.NewGroup(
 			pl,
 			sl,
+			description,
 		),
 		huh.NewGroup(
-			huh.NewText().
-				Key("description").
-				Title("description").
-				Validate(func(s string) error {
-					if s == "" {
-						return errors.New("must enter a description")
-					}
-					return nil
-				}),
-			huh.NewInput().
-				Key("minutes").
-				CharLimit(5).
-				Validate(
-					func(s string) error {
-						h, err := strconv.ParseInt(s, 10, 64)
-						if err != nil {
-							return err
-						}
-						if h < 0 {
-							return errors.New("must be positive")
-						}
-						return err
-					}).
-				Title("Minutes"),
+			minutes,
+			confirmTracker,
 		),
 	)
 	return form