Open the report on last month
The report answered for the whole index, which is the one window a spending report is least often asked for: last January's groceries sat in the same total as last week's, and nothing on screen said which was which. It now opens on the month that has just ended -- the last one a statement can be complete for -- and left/right step along an axis beside the totals, from all time down through the named windows to the oldest month the index holds. The period narrows the report and nothing else. reloadReport runs its own query rather than reusing the rows the transaction list is showing: the two share the account, the search and the untagged toggle, and differ only in the date bounds, so opening on last month must not hide the rest of the index from the list beside it. Nothing may put the period into m.filter, which is exactly what would make it leak. The windows are relative to today, never to the newest statement. "Last month" with nothing in it reports nothing and says so, because silently answering for a month nobody asked for is worse than an empty screen; an empty period and an empty index therefore give different messages, one asking for another period and the other for an import. The rolling windows run to the end of this month rather than to the last complete one -- "last 3 months" is asked in order to see what is happening now, and leaving out the days since the 1st answers a question nobody put. The axis is built over the whole index rather than the rows in view, or it would grow and shrink as the account or search filter changed and move under the cursor; a reload rebuilds it, since an import can reach further back, but keeps the window the user was on. s cycles how those rows are arranged: largest out first as before, then in, net lowest first so the biggest losses lead, count, and the tag A to Z. A letter rather than a chord because the report is not a form. The marked heading says which column the rows are read from and the help names what the key does next, as the rule builder's preview already does. The sort rearranges rows and never changes which rows there are, so the order stays out of the filter for the same reason the period does. Currency remains the outer key under every order -- there are no rates here, so two currencies interleaved by amount would invite a comparison that cannot be made -- and every order falls back to the tag, so ties keep a fixed position instead of reshuffling between reloads. money report takes the same choice as --sort out|in|net|count|tag, and a misspelt one is refused rather than silently reporting in the default order. It keeps --month and has no equivalent of the wider windows. store.Filter gains From and To, compared as strings because dates are stored ISO-8601 and a string comparison is therefore a date comparison. store.Months replaces report.Months, which nothing had ever called: the axis needs the months of the whole index, not of a slice already in hand. Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
This commit is contained in:
+37
-2
@@ -203,8 +203,13 @@ type Filter struct {
|
||||
// leaves out anyway.
|
||||
Untagged bool
|
||||
Month string // YYYY-MM
|
||||
Search string // case-insensitive substring of the description
|
||||
Limit int
|
||||
// From and To bound the dates inclusively, as YYYY-MM-DD, either side empty
|
||||
// for unbounded. Dates are stored ISO-8601, so a string comparison is a date
|
||||
// comparison; nothing has to be parsed to filter on a range.
|
||||
From string
|
||||
To string
|
||||
Search string // case-insensitive substring of the description
|
||||
Limit int
|
||||
}
|
||||
|
||||
// Transactions returns rows matching f, newest first.
|
||||
@@ -231,6 +236,14 @@ func (d *DB) Transactions(f Filter) ([]model.Transaction, error) {
|
||||
q += ` AND substr(t.date, 1, 7) = ?`
|
||||
args = append(args, f.Month)
|
||||
}
|
||||
if f.From != "" {
|
||||
q += ` AND t.date >= ?`
|
||||
args = append(args, f.From)
|
||||
}
|
||||
if f.To != "" {
|
||||
q += ` AND t.date <= ?`
|
||||
args = append(args, f.To)
|
||||
}
|
||||
q += ` ORDER BY t.date DESC, t.id DESC`
|
||||
// Search and Limit are applied in Go: SQLite's upper()/LIKE fold ASCII
|
||||
// only, which would silently fail on Cyrillic statement descriptions.
|
||||
@@ -358,6 +371,28 @@ func (d *DB) Count(accountID int64) (int, error) {
|
||||
return n, err
|
||||
}
|
||||
|
||||
// Months lists the distinct YYYY-MM the index holds, most recent first. It is
|
||||
// asked of the whole index rather than of a filtered view on purpose: it is the
|
||||
// time axis the report screen steps along, and an axis that grew and shrank as
|
||||
// the account or search filter changed would move under the cursor.
|
||||
func (d *DB) Months() ([]string, error) {
|
||||
rows, err := d.sql.Query(
|
||||
`SELECT DISTINCT substr(date, 1, 7) FROM transactions ORDER BY 1 DESC`)
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("list months: %w", err)
|
||||
}
|
||||
defer rows.Close()
|
||||
var out []string
|
||||
for rows.Next() {
|
||||
var s string
|
||||
if err := rows.Scan(&s); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
out = append(out, s)
|
||||
}
|
||||
return out, rows.Err()
|
||||
}
|
||||
|
||||
// Tags lists every tag in use, for completion in the TUI.
|
||||
func (d *DB) Tags() ([]string, error) {
|
||||
rows, err := d.sql.Query(`
|
||||
|
||||
Reference in New Issue
Block a user