Show version info

.gitea/workflows/ci.yaml

@@ -0,0 +1,42 @@
+name: CI
+run-name: ${{ gitea.actor }} running CI
+on: [push]
+
+jobs:
+  test:
+    runs-on: ubuntu-22.04
+    env: 
+      RUNNER_TOOL_CACHE: /toolcache # Runner Tool Cache
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/setup-go@v4
+        with:
+          go-version: '1.24.4' # The Go version to download (if necessary) and use.
+      - uses: https://gitea.com/actions/go-hashfiles@v0.0.1
+        id: hash-go
+        with:
+          patterns: |
+            go.mod
+            go.sum
+      - name: Echo hash
+        run: echo ${{ steps.hash-go.outputs.hash }}
+      - name: Cache go
+        id: cache-go
+        uses: https://github.com/actions/cache@v3 # Action cache
+        with: # specify with your GOMODCACHE and GOCACHE
+          path: |-
+            /root/go/pkg/mod
+            /root/.cache/go-build
+          key: go_cache-${{ steps.hash-go.outputs.hash }}
+          restore-keys: |-
+            go_cache-${{ steps.hash-go.outputs.hash }}
+      - run: go version
+
+      # unit and integration tests, coverage
+      - run: go test ./...  -coverprofile cover.out
+      - run: go tool cover -html=cover.out -o cover.html
+
+      - uses: actions/upload-artifact@v3
+        with:
+          name: coverage.html
+          path: ./cover.html

.gitignore

@@ -0,0 +1,2 @@
+# Added by goreleaser init:
+dist/

.goreleaser.yaml

@@ -0,0 +1,47 @@
+# This is an example .goreleaser.yml file with some sensible defaults.
+# Make sure to check the documentation at https://goreleaser.com
+
+# The lines below are called `modelines`. See `:help modeline`
+# Feel free to remove those if you don't want/need to use them.
+# yaml-language-server: $schema=https://goreleaser.com/static/schema.json
+# vim: set ts=2 sw=2 tw=0 fo=cnqoj
+
+version: 2
+
+before:
+  hooks:
+    - go mod tidy
+
+builds:
+  - env:
+      - CGO_ENABLED=0
+    goos:
+      - linux
+      - windows
+      - darwin
+
+archives:
+  - formats: [tar.gz]
+    # this name template makes the OS and Arch compatible with the results of `uname`.
+    name_template: >-
+      {{ .ProjectName }}_
+      {{- title .Os }}_
+      {{- if eq .Arch "amd64" }}x86_64
+      {{- else if eq .Arch "386" }}i386
+      {{- else }}{{ .Arch }}{{ end }}
+      {{- if .Arm }}v{{ .Arm }}{{ end }}
+    # use zip for windows archives
+    format_overrides:
+      - goos: windows
+        formats: [zip]
+
+gitea_urls:
+  api: https://code.ppl.town/api/v1
+  download: https://code.ppl.town
+
+release:
+  footer: >-
+
+    ---
+
+    Released by [GoReleaser](https://github.com/goreleaser/goreleaser).

.vscode/settings.json

@@ -0,0 +1,6 @@
+{
+    "cSpell.ignoreWords": [
+        "FORMENTRY",
+        "oday"
+    ]
+}

go.mod

@@ -2,10 +2,7 @@ module charmcal
 
 go 1.24.1
 
-require (
-	github.com/charmbracelet/bubbles v0.21.0
-	github.com/stretchr/testify v1.10.0
-)
+require github.com/charmbracelet/bubbles v0.21.0
 
 require (
 	github.com/atotto/clipboard v0.1.4 // indirect
@@ -36,8 +33,5 @@ require (
 	github.com/charmbracelet/bubbletea v1.3.5
 	github.com/charmbracelet/huh v0.7.0
 	github.com/charmbracelet/lipgloss v1.1.0
-	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/dustin/go-humanize v1.0.1
-	github.com/pmezard/go-difflib v1.0.0 // indirect
-	gopkg.in/yaml.v3 v3.0.1 // indirect
 )

go.sum

@@ -38,8 +38,6 @@ github.com/charmbracelet/x/xpty v0.1.2 h1:Pqmu4TEJ8KeA9uSkISKMU3f+C1F6OGBn8ABuGl
 github.com/charmbracelet/x/xpty v0.1.2/go.mod h1:XK2Z0id5rtLWcpeNiMYBccNNBrP2IJnzHI0Lq13Xzq4=
 github.com/creack/pty v1.1.24 h1:bJrF4RRfyJnbTJqzRLHzcGaZK1NeM5kTC9jGgovnR1s=
 github.com/creack/pty v1.1.24/go.mod h1:08sCNb52WyoAwi2QDyzUCTgcvVFhUzewun7wtTfvcwE=
-github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
-github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/dustin/go-humanize v1.0.1 h1:GzkhY7T5VNhEkwH0PVJgjz+fX1rhBrR7pRT3mDkpeCY=
 github.com/dustin/go-humanize v1.0.1/go.mod h1:Mu1zIs6XwVuF/gI1OepvI0qD18qycQx+mFykh5fBlto=
 github.com/erikgeiser/coninput v0.0.0-20211004153227-1c3628e74d0f h1:Y/CXytFA4m6baUTXGLOoWe4PQhGxaX0KpnayAqC48p4=
@@ -60,13 +58,9 @@ github.com/muesli/cancelreader v0.2.2 h1:3I4Kt4BQjOR54NavqnDogx/MIoWBFa0StPA8ELU
 github.com/muesli/cancelreader v0.2.2/go.mod h1:3XuTXfFS2VjM+HTLZY9Ak0l6eUKfijIfMUZ4EgX0QYo=
 github.com/muesli/termenv v0.16.0 h1:S5AlUN9dENB57rsbnkPyfdGuWIlkmzJjbFf0Tf5FWUc=
 github.com/muesli/termenv v0.16.0/go.mod h1:ZRfOIKPFDYQoDFF4Olj7/QJbW60Ol/kL1pU3VfY/Cnk=
-github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
-github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=
 github.com/rivo/uniseg v0.4.7 h1:WUdvkW8uEhrYfLC4ZzdpI2ztxP1I582+49Oc5Mq64VQ=
 github.com/rivo/uniseg v0.4.7/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88=
-github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA=
-github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
 github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e h1:JVG44RsyaB9T2KIHavMF/ppJZNG9ZpyihvCd0w101no=
 github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e/go.mod h1:RbqR21r5mrJuqunuUZ/Dhy/avygyECGrLceyNeo4LiM=
 golang.org/x/exp v0.0.0-20231006140011-7918f672742d h1:jtJma62tbqLibJ5sFQz8bKtEM8rJBtfilJ2qTU199MI=
@@ -79,7 +73,3 @@ golang.org/x/sys v0.32.0 h1:s77OFDvIQeibCmezSnk/q6iAfkdiQaJi4VzroCFrN20=
 golang.org/x/sys v0.32.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
 golang.org/x/text v0.23.0 h1:D71I7dUrlY+VX0gQShAThNGHFxZ13dGLBHQLVl1mJlY=
 golang.org/x/text v0.23.0/go.mod h1:/BLNzu4aZCJ1+kcD0DNRotWKage4q2rGVAg4o22unh4=
-gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
-gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
-gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

mite/mite.go

@@ -51,7 +51,7 @@ 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 }
+func (p Project) GetName() string { return p.Name + " (" + p.CustomerName + ")" }
 
 func (a APIClient) GetProjects() (Projects, error) {
 	// GET /projects.json
@@ -129,8 +129,15 @@ type Service struct {
 func (s Service) String() string {
 	return fmt.Sprintf("%d: %s", s.ID, s.Name)
 }
-func (s Service) GetID() int      { return s.ID }
-func (s Service) GetName() string { return s.Name }
+func (s Service) GetID() int { return s.ID }
+func (s Service) GetName() string {
+	prefix := "💰"
+	if !s.Billable {
+		prefix = "☮️"
+	}
+	return prefix + " " + s.Name
+
+}
 
 func (a APIClient) GetServices() (Services, error) {
 	// GET /services.json
@@ -224,8 +231,8 @@ type requestAddTimeEntry struct {
 	RequestTimeEntryHolder struct {
 		DateAt    string `json:"date_at"`
 		Minutes   int    `json:"minutes"`
-		ProjectID int    `json:"project_id,omit_empty"`
-		ServiceID int    `json:"service_id,omit_empty"`
+		ProjectID int    `json:"project_id,omitempty"`
+		ServiceID int    `json:"service_id,omitempty"`
 		Note      string `json:"note"`
 	} `json:"time_entry"`
 }

model.go

@@ -4,7 +4,7 @@ import (
 	"charmcal/mite"
 	"errors"
 	"fmt"
-	"strconv"
+	"slices"
 	"strings"
 	"time"
 
@@ -32,6 +32,8 @@ const MODE_CAL tuiMode = "MODE_CAL"
 const MODE_TIMEENTRIES tuiMode = "MODE_TIMEENTRIES"
 const MODE_FORMENTRY tuiMode = "MODE_FORMENTRY"
 
+var version = "dev"
+
 type model struct {
 	miteAPI     mite.APIClient
 	start       calendarTime
@@ -54,6 +56,7 @@ type model struct {
 	}
 	statusBarMessage string
 	windowWidth      int
+	windowHeight     int
 }
 
 func initialModel(miteDomain, miteApiKey string) model {
@@ -92,86 +95,6 @@ func initialModel(miteDomain, miteApiKey string) model {
 	return m
 }
 
-func (m model) buildForm() *huh.Form {
-
-	clOptions := []huh.Option[string]{}
-	for _, cust := range m.formData.customers {
-		op := miteToHuhOption(cust)
-		clOptions = append(clOptions, op)
-	}
-
-	svcOptions := []huh.Option[string]{}
-	for _, svc := range m.formData.services {
-		op := miteToHuhOption(svc)
-		svcOptions = append(svcOptions, op)
-	}
-
-	cl := huh.NewSelect[string]().
-		Key("client").
-		Options(clOptions...).
-		Title("Client").Height(5).Value(&m.formData.selected.customer)
-
-	sl := huh.NewSelect[string]().
-		Key("service").
-		Options(svcOptions...).
-		Title("Service").Height(5)
-
-	pl := huh.NewSelect[string]().
-		Key("project").
-		Title("Project").Height(3).
-		OptionsFunc(func() []huh.Option[string] {
-			out := []huh.Option[string]{}
-			for _, proj := range m.formData.projects {
-				if fmt.Sprint(proj.CustomerID) == m.formData.selected.customer {
-					out = append(out, miteToHuhOption(proj))
-				}
-			}
-			return out
-		}, &m.formData.selected.customer)
-
-	form := huh.NewForm(
-		huh.NewGroup(
-			cl,
-			sl,
-			pl,
-		),
-		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"),
-		),
-	)
-	return form
-}
-
-func miteToHuhOption[T mite.APIObject](i T) huh.Option[string] {
-	return huh.Option[string]{
-		Key:   i.GetName(),
-		Value: fmt.Sprint(i.GetID()),
-	}
-}
-
 func (m model) Init() tea.Cmd {
 	return m.fetchMiteData()
 }
@@ -188,13 +111,17 @@ func (m model) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 			m.fetchedData = false
 
 		} else {
-			m.statusBarMessage = fmt.Sprintf("Fetched %d time entries", len(msg.TimeEntries))
+			m.statusBarMessage = fmt.Sprintf("Fetched %d time entries in %s", len(msg.TimeEntries), time.Since(msg.start).Truncate(time.Millisecond))
 			m.timeData.entries = msg.TimeEntries
 			m.formData.customers = msg.Customers
 			m.formData.services = msg.Services
 			m.formData.projects = msg.Projects
 			m.fetchedData = true
 
+			slices.SortFunc(m.formData.customers, func(a, b mite.Customer) int { return strings.Compare(a.GetName(), b.GetName()) })
+			slices.SortFunc(m.formData.services, func(a, b mite.Service) int { return strings.Compare(a.GetName(), b.GetName()) })
+			slices.SortFunc(m.formData.projects, func(a, b mite.Project) int { return strings.Compare(a.GetName(), b.GetName()) })
+
 			// just in case there is data for the currently focused day
 			m.timeData.table.SetRows(m.tableDataForDate(m.dest.Time))
 		}
@@ -275,6 +202,7 @@ func (m model) updateCal(msg tea.Msg) (tea.Model, tea.Cmd) {
 	switch msg := msg.(type) {
 	case tea.WindowSizeMsg:
 		m.windowWidth = msg.Width
+		m.windowHeight = msg.Height
 
 	// Is it a key press?
 	case tea.KeyMsg:
@@ -382,6 +310,7 @@ func (m model) tableDataForDate(t time.Time) []table.Row {
 }
 
 type miteDataFetchedMsg struct {
+	start       time.Time
 	TimeEntries mite.TimeEntries
 	Customers   mite.Customers
 	Services    mite.Services
@@ -391,12 +320,10 @@ type miteDataFetchedMsg struct {
 
 func (m model) fetchMiteData() tea.Cmd {
 	return func() tea.Msg {
-		//	time.Sleep(time.Second * 5)
-		loc := time.Local
-		te, err1 := m.miteAPI.GetTimeEntries(
-			time.Date(2024, time.January, 1, 0, 0, 0, 0, loc),
-			time.Date(2025, time.December, 31, 0, 0, 0, 0, loc),
-		)
+		t0 := time.Now()
+		from := time.Now().Add(-time.Hour * 24 * 30 * 6) // about 6 months
+		to := time.Now().Add(time.Hour * 20 * 30)        // about 1 month
+		te, err1 := m.miteAPI.GetTimeEntries(from, to)
 		cst, err2 := m.miteAPI.GetCustomers()
 		svc, err3 := m.miteAPI.GetServices()
 		pjt, err4 := m.miteAPI.GetProjects()
@@ -407,6 +334,7 @@ func (m model) fetchMiteData() tea.Cmd {
 			Services:    svc,
 			Projects:    pjt,
 			Error:       errors.Join(err1, err2, err3, err4),
+			start:       t0,
 		}
 	}
 }
@@ -475,8 +403,17 @@ func (m model) View() string {
 
 	sofar := lipgloss.Height(out)
 
-	out +=
-		styleStatusBar.MarginTop(19 - sofar).Width(m.windowWidth).Render(m.statusBarMessage)
+	statusMsg := strings.ReplaceAll(m.statusBarMessage, "\n", " ")
+
+	mainMsg := styleStatusBar.Width(m.windowWidth - len(version)).MarginTop(m.windowHeight - sofar).Render(statusMsg)
+	versionMsg := styleStatusBar.MarginTop(m.windowHeight - sofar).Render(version)
+
+	bar := lipgloss.JoinHorizontal(lipgloss.Top,
+		mainMsg,
+		versionMsg,
+	)
+
+	out += bar
 
 	return out
 }

model_form.go

@@ -1,7 +1,9 @@
 package main
 
 import (
+	"charmcal/mite"
 	"errors"
+	"fmt"
 	"strconv"
 	"time"
 
@@ -43,11 +45,12 @@ func (m model) updateForm(msg tea.Msg) (tea.Model, tea.Cmd) {
 
 			err := m.miteAPI.AddTimeEntry(m.dest.Format(time.DateOnly), int(minutesInt), description, int(projectIDInt), int(serviceIDInt))
 			if err != nil {
-				m.statusBarMessage = errors.Join(err1, err2, err3).Error()
+				m.statusBarMessage = err.Error()
 				m.tuiMode = MODE_CAL
 			} else {
 				m.statusBarMessage = "Successfully logged time"
 				m.tuiMode = MODE_CAL
+				return m, m.fetchMiteData()
 			}
 		}
 
@@ -55,3 +58,87 @@ func (m model) updateForm(msg tea.Msg) (tea.Model, tea.Cmd) {
 
 	return m, formCmd
 }
+
+func (m model) buildForm() *huh.Form {
+
+	clOptions := []huh.Option[string]{}
+	for _, cust := range m.formData.customers {
+		op := miteToHuhOption(cust)
+		clOptions = append(clOptions, op)
+	}
+
+	svcOptions := []huh.Option[string]{}
+	for _, svc := range m.formData.services {
+		op := miteToHuhOption(svc)
+		svcOptions = append(svcOptions, op)
+	}
+
+	projOptions := []huh.Option[string]{
+		{
+			Key:   "[no project]",
+			Value: "0",
+		},
+	}
+	for _, proj := range m.formData.projects {
+		op := miteToHuhOption(proj)
+		projOptions = append(projOptions, op)
+	}
+
+	// cl := huh.NewSelect[string]().
+	// 	Key("client").
+	// 	Options(clOptions...).
+	// 	Title("Client").Height(5).Value(&m.formData.selected.customer)
+
+	sl := huh.NewSelect[string]().
+		Key("service").
+		Options(svcOptions...).
+		Title("Service").
+		Height(6)
+
+	pl := huh.NewSelect[string]().
+		Key("project").
+		Title("Project").
+		Options(projOptions...).
+		Height(10)
+
+	form := huh.NewForm(
+		huh.NewGroup(
+			pl,
+			sl,
+		),
+		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"),
+		),
+	)
+	return form
+}
+
+func miteToHuhOption[T mite.APIObject](i T) huh.Option[string] {
+	return huh.Option[string]{
+		Key:   i.GetName(),
+		Value: fmt.Sprint(i.GetID()),
+	}
+}