feat: QSO rate meter — per-operator AND team totals
GetQSORate now returns both the active operator's rate (their own performance) and the whole station's rate (all operators combined). RecentRateBreakdown computes both in one scan of the recent rows (per-operator + all-operators), replacing RecentRate.
This commit is contained in:
@@ -4518,31 +4518,31 @@ func (a *App) GetOperators() ([]string, error) {
|
||||
// QSORate is the live QSO-rate meter shown in the header: how many QSOs were
|
||||
// logged in the trailing 10 and 60 minutes.
|
||||
type QSORate struct {
|
||||
Last10 int `json:"last10"`
|
||||
Last60 int `json:"last60"`
|
||||
Last10 int `json:"last10"` // active operator, last 10 min
|
||||
Last60 int `json:"last60"` // active operator, last 60 min
|
||||
TeamLast10 int `json:"team_last10"` // ALL operators (the whole station), last 10 min
|
||||
TeamLast60 int `json:"team_last60"` // ALL operators, last 60 min
|
||||
}
|
||||
|
||||
// GetQSORate returns the number of QSOs logged in the last 10 and 60 minutes.
|
||||
// Cheap (scans only the most recent rows); polled by the header and refreshed on
|
||||
// each qso:logged event.
|
||||
// GetQSORate returns the number of QSOs logged in the last 10 and 60 minutes, both
|
||||
// for the active operator (their own performance) AND for all operators combined
|
||||
// (the team/station rate). Cheap (one scan of the most recent rows); polled by the
|
||||
// header and refreshed on each qso:logged event.
|
||||
func (a *App) GetQSORate() QSORate {
|
||||
if a.qso == nil {
|
||||
return QSORate{}
|
||||
}
|
||||
// Per-operator on a shared logbook: count only the ACTIVE profile's operator
|
||||
// so each op sees their own performance, not the cumulative station rate. An
|
||||
// empty operator (single-op / station owner) matches all their QSOs.
|
||||
operator := ""
|
||||
if a.profiles != nil {
|
||||
if p, err := a.profiles.Active(a.ctx); err == nil {
|
||||
operator = p.Operator
|
||||
}
|
||||
}
|
||||
counts, err := a.qso.RecentRate(a.ctx, time.Now(), operator, 10*time.Minute, 60*time.Minute)
|
||||
if err != nil || len(counts) < 2 {
|
||||
op, all, err := a.qso.RecentRateBreakdown(a.ctx, time.Now(), operator, 10*time.Minute, 60*time.Minute)
|
||||
if err != nil || len(op) < 2 || len(all) < 2 {
|
||||
return QSORate{}
|
||||
}
|
||||
return QSORate{Last10: counts[0], Last60: counts[1]}
|
||||
return QSORate{Last10: op[0], Last60: op[1], TeamLast10: all[0], TeamLast60: all[1]}
|
||||
}
|
||||
|
||||
// GetContestRuns lists the (contest, year) pairs actually present in the log, so
|
||||
|
||||
Reference in New Issue
Block a user