justin/charmite
2
1
Fork 0
Code Issues Pull Requests 1 Actions Releases 6 Activity

Clean up display, add focus indication
All checks were successful
CI / test (push) Successful in 1m33s
Details

Browse Source
This commit is contained in:
Justin Hawkins 2025-06-20 12:11:17 +02:00
parent d7f0ac16d4
commit e7fa789b2b
2 changed files with 24 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
model.go
View File

@ -76,10 +76,10 @@ func initialModel(miteDomain, miteApiKey string) model {
tab.SetStyles(s) tab.SetStyles(s)
tab.SetColumns([]table.Column{ tab.SetColumns([]table.Column{
table.Column{Title: "min", Width: 5}, {Title: " min", Width: 4},
table.Column{Title: "lck", Width: 4}, {Title: "🔐", Width: 2},
table.Column{Title: "customer", Width: 10}, {Title: "customer", Width: 10},
table.Column{Title: "description", Width: 40}, {Title: "description", Width: 40},
}) })
m.start = calendarTime{time.Now()} m.start = calendarTime{time.Now()}
@ -304,7 +304,7 @@ func (m model) tableDataForDate(t time.Time) []table.Row {
if entry.Locked { if entry.Locked {
lock = "🔐" lock = "🔐"
} }
rows = append(rows, table.Row{fmt.Sprint(entry.Minutes), lock, entry.CustomerName, entry.Note}) rows = append(rows, table.Row{fmt.Sprintf("%4d", entry.Minutes), lock, entry.CustomerName, entry.Note})
} }
return rows return rows
} }
@ -346,6 +346,12 @@ func (m model) View() string {
lhs := strings.Builder{} lhs := strings.Builder{}
rhs := strings.Builder{} rhs := strings.Builder{}
nb := lipgloss.NewStyle().Border(lipgloss.NormalBorder())
db := lipgloss.NewStyle().Border(lipgloss.DoubleBorder())
lhsS := nb
rhsS := nb
// if any entries are not "locked", we always use that // if any entries are not "locked", we always use that
// regular colour in preference // regular colour in preference
styles := map[string]lipgloss.Style{} styles := map[string]lipgloss.Style{}
@ -367,6 +373,7 @@ func (m model) View() string {
if m.tuiMode == MODE_CAL { if m.tuiMode == MODE_CAL {
lhs.WriteString("(f)etch time data\n") lhs.WriteString("(f)etch time data\n")
lhsS = db
} else { } else {
lhs.WriteString("\n") lhs.WriteString("\n")
} }
@ -378,18 +385,24 @@ func (m model) View() string {
if m.tuiMode == MODE_FORMENTRY { if m.tuiMode == MODE_FORMENTRY {
lhs.WriteString("(esc) abort form\n") lhs.WriteString("(esc) abort form\n")
lhs.WriteString("\n") lhs.WriteString("\n")
rhsS = db
} else { } else {
lhs.WriteString("(tab) switch panes\n") lhs.WriteString("(tab) switch panes\n")
lhs.WriteString("(q)uit\n") lhs.WriteString("(q)uit\n")
} }
if m.tuiMode == MODE_TIMEENTRIES {
rhsS = db
}
calendarWidth := 25 lhsWidth := 25
tableWidth := m.windowWidth - calendarWidth rhsWidth := m.windowWidth - lhsWidth - 4
if m.tuiMode == MODE_FORMENTRY { if m.tuiMode == MODE_FORMENTRY {
rhs.WriteString(m.formData.form.View()) rhs.WriteString(m.formData.form.View())
} else { } else {
if m.fetchedData { if m.fetchedData {
m.timeData.table.Columns()[3].Width = rhsWidth - 30
m.timeData.table.SetHeight(14)
rhs.WriteString(m.timeData.table.View()) rhs.WriteString(m.timeData.table.View())
rhs.WriteString("\n") rhs.WriteString("\n")
} }
@ -397,8 +410,8 @@ func (m model) View() string {
out := lipgloss.JoinHorizontal( out := lipgloss.JoinHorizontal(
lipgloss.Top, lipgloss.Top,
lipgloss.NewStyle().Width(calendarWidth).Render(lhs.String()), lhsS.Render(lipgloss.NewStyle().Width(lhsWidth).Render(lhs.String())),
lipgloss.NewStyle().Width(tableWidth).Render(rhs.String()), rhsS.Render(lipgloss.NewStyle().Width(rhsWidth).Render(rhs.String())),
) )
sofar := lipgloss.Height(out) sofar := lipgloss.Height(out)

2
model_form.go
View File

@ -20,6 +20,8 @@ func (m model) updateForm(msg tea.Msg) (tea.Model, tea.Cmd) {
case "esc": case "esc":
m.tuiMode = MODE_CAL m.tuiMode = MODE_CAL
return m, nil return m, nil
case "ctrl+c":
return m, tea.Quit
} }
} }