mirror of
https://github.com/mauriceboe/TREK.git
synced 2026-10-22 23:16:46 +00:00
bde2ad2ca8
With the Tours addon on, the Atlas panel gets a third tab, Tours, beside
Stats and Bucket List: what you have done on your tours across all your
trips. A period (all time, this year, the last 12 months or an earlier year)
and a tour type narrow it; the tab shows the distance large with the number
of tours at its corner, the ascent and descent, and the types with their
distance. "Show tours" opens every tour of the period in a dialog with the
same filters, the sums, the split by type and one row per tour.
What counts is said, never guessed. A tour counts once the day it is on is
over, with the values of the planning, badged "Planned" and explained as
not measured. A linked actual track (ACT-01) replaces those values for its
execution, badged "Recorded" and named, and is never added on top nor
counted as a tour of its own. A tour on several days counts once, a whole
route does not count beside the stages planned from it, a paddle tour sums
no heights, and a value nobody knows stays out of the sum, which then reads
"at least". Only the user's own part counts: a day names them among its
participants, or names nobody on a trip of their own; being able to open
somebody else's trip makes none of its tours theirs. Tours still ahead, on
no day or only on undated days are named as not counting. A tour that fell
through can be left out of the sums ("Leave out"): it stays in the plan
and in the list, dimmed, and "Count again" brings it back. Only the user's
own numbers change.
Server: GET /api/tours/activity-stats answers the user's activity entries
across every trip they can open, and PUT /api/tours/activity-stats/exclusions
leaves a tour out or counts it again (the tour must be in such a trip, else
404). A tour_activity_exclusions table keeps the exclusions per user and
tour. The sums are added up by a shared summary in @trek/shared, so the
Atlas and the assistant say the same numbers. MCP: get_tour_activity_stats
and set_tour_activity_excluded over the same service. The tab reads live
and needs a connection, like the rest of the Atlas statistics.
100 lines
4.0 KiB
TypeScript
100 lines
4.0 KiB
TypeScript
import type { TourActivityBasis, TourActivityStatsEntry } from './tour-activity-stats.schema';
|
|
import type { TourTypeKey } from './tours.schema';
|
|
|
|
/**
|
|
* STA-02: what the user's done tours add up to, for the Atlas and for the
|
|
* assistant alike, so both say the same numbers. A sum knows how many entries
|
|
* had the value and of how many could: `value` is null when none had it, never
|
|
* a zero standing in for "unknown", and `known < of` says it is short of the
|
|
* whole. Paddling sums no heights (a climb on the water says nothing), as in
|
|
* the trip's own tour totals (STA-01).
|
|
*/
|
|
export interface TourActivitySum {
|
|
value: number | null;
|
|
known: number;
|
|
of: number;
|
|
}
|
|
|
|
export interface TourActivityTotals {
|
|
count: number;
|
|
distanceKm: TourActivitySum;
|
|
ascentM: TourActivitySum;
|
|
descentM: TourActivitySum;
|
|
/** How many of the entries rest on the plan and how many on a recorded track. */
|
|
byBasis: Record<TourActivityBasis, number>;
|
|
}
|
|
|
|
export interface TourActivityFilter {
|
|
/** Today in the reader's own calendar, YYYY-MM-DD: a tour counts once its day is over. */
|
|
today: string;
|
|
/** The period, both days included; left out, open on that side. */
|
|
from?: string | null;
|
|
to?: string | null;
|
|
/** One type; left out, all of them. */
|
|
type?: TourTypeKey | null;
|
|
}
|
|
|
|
export interface TourActivitySummary {
|
|
totals: TourActivityTotals;
|
|
/** By type, the most tours first; empty when nothing counts. */
|
|
types: Array<TourActivityTotals & { type: TourTypeKey }>;
|
|
/** Every entry done in the period, the newest first; those the user left out are among them, flagged and not summed. */
|
|
done: TourActivityStatsEntry[];
|
|
/** In the period and of the type, but their day is not over yet. */
|
|
upcoming: number;
|
|
}
|
|
|
|
/** Whether the day an entry is on is over: it counts from the next day on. */
|
|
export function isTourActivityDone(entry: Pick<TourActivityStatsEntry, 'date'>, today: string): boolean {
|
|
return entry.date < today;
|
|
}
|
|
|
|
function inPeriod(date: string, filter: TourActivityFilter): boolean {
|
|
return (!filter.from || date >= filter.from) && (!filter.to || date <= filter.to);
|
|
}
|
|
|
|
function sumOf(values: ReadonlyArray<number | null>): TourActivitySum {
|
|
const known = values.filter((value): value is number => value !== null && Number.isFinite(value));
|
|
return {
|
|
value: known.length ? known.reduce((total, value) => total + value, 0) : null,
|
|
known: known.length,
|
|
of: values.length,
|
|
};
|
|
}
|
|
|
|
function totalsOf(entries: readonly TourActivityStatsEntry[]): TourActivityTotals {
|
|
const withHeights = entries.filter((entry) => entry.tour_type !== 'kayak');
|
|
return {
|
|
count: entries.length,
|
|
distanceKm: sumOf(entries.map((entry) => entry.distance_km)),
|
|
ascentM: sumOf(withHeights.map((entry) => entry.ascent_m)),
|
|
descentM: sumOf(withHeights.map((entry) => entry.descent_m)),
|
|
byBasis: {
|
|
plan: entries.filter((entry) => entry.basis === 'plan').length,
|
|
track: entries.filter((entry) => entry.basis === 'track').length,
|
|
},
|
|
};
|
|
}
|
|
|
|
/** The entries of the period and type, done and counted, summed as a whole and by type. */
|
|
export function summarizeTourActivities(
|
|
entries: readonly TourActivityStatsEntry[],
|
|
filter: TourActivityFilter,
|
|
): TourActivitySummary {
|
|
const matching = entries.filter(
|
|
(entry) => inPeriod(entry.date, filter) && (!filter.type || entry.tour_type === filter.type),
|
|
);
|
|
const done = matching.filter((entry) => isTourActivityDone(entry, filter.today));
|
|
const counted = done.filter((entry) => !entry.excluded);
|
|
const byType = new Map<TourTypeKey, TourActivityStatsEntry[]>();
|
|
for (const entry of counted) byType.set(entry.tour_type, [...(byType.get(entry.tour_type) ?? []), entry]);
|
|
return {
|
|
totals: totalsOf(counted),
|
|
types: [...byType.entries()]
|
|
.map(([type, ofType]) => ({ type, ...totalsOf(ofType) }))
|
|
.sort((a, b) => b.count - a.count || a.type.localeCompare(b.type)),
|
|
done: [...done].sort((a, b) => b.date.localeCompare(a.date) || a.name.localeCompare(b.name)),
|
|
upcoming: matching.filter((entry) => !entry.excluded && !isTourActivityDone(entry, filter.today)).length,
|
|
};
|
|
}
|