-
{row.action || row.target_label || row.market_question || row.id}
+
+ {normalizeTemperatureLabel(row.action || row.target_label, tempSymbol) ||
+ row.market_question ||
+ row.id}
+
{row.deb_prediction != null
? `DEB ${formatTemperatureValue(row.deb_prediction, tempSymbol)} · `
@@ -440,15 +532,36 @@ function CalendarView({
onSelectRow: (row: ScanOpportunityRow) => void;
}) {
const groups = useMemo(() => {
- const byDate = new Map();
+ const order = ["active", "next", "today", "later", "past"];
+ const byPhase = new Map<
+ string,
+ {
+ label: string;
+ sort: number;
+ items: Array<{ row: ScanOpportunityRow; meta: ReturnType }>;
+ }
+ >();
rows.forEach((row) => {
- const key = String(row.selected_date || row.local_date || "unknown");
- const list = byDate.get(key) || [];
- list.push(row);
- byDate.set(key, list);
+ const meta = getPeakCountdownMeta(row, locale);
+ const current = byPhase.get(meta.key) || {
+ label: meta.groupLabel,
+ sort: order.indexOf(meta.key) >= 0 ? order.indexOf(meta.key) : order.length,
+ items: [],
+ };
+ current.items.push({ row, meta });
+ byPhase.set(meta.key, current);
});
- return Array.from(byDate.entries()).sort(([left], [right]) => left.localeCompare(right));
- }, [rows]);
+ return Array.from(byPhase.entries())
+ .sort(([, left], [, right]) => left.sort - right.sort)
+ .map(([key, group]) => ({
+ key,
+ label: group.label,
+ items: group.items.sort((left, right) => {
+ if (left.meta.sort !== right.meta.sort) return left.meta.sort - right.meta.sort;
+ return Number(right.row.edge_percent || 0) - Number(left.row.edge_percent || 0);
+ }),
+ }));
+ }, [locale, rows]);
if (!groups.length) {
return (
@@ -462,20 +575,27 @@ function CalendarView({
return (
- {groups.map(([date, items]) => (
-
+ {groups.map((group) => (
+
-
{formatShortDate(date, locale)}
+
+
{group.label}
+
+ {locale === "en-US"
+ ? "Ordered by DEB peak-window countdown"
+ : "按 DEB 峰值窗口倒计时排序"}
+
+
- {locale === "en-US" ? `${items.length} rows` : `${items.length} 条`}
+ {locale === "en-US" ? `${group.items.length} rows` : `${group.items.length} 条`}
- {items.map((row) => (
+ {group.items.map(({ row, meta }) => (
+
+ {meta.title}
+ {meta.detail}
+
- {locale === "en-US" ? "DEB high" : "DEB 预测高点"} ·{" "}
- {row.deb_prediction != null
- ? formatTemperatureValue(row.deb_prediction, tempSymbol)
- : "--"}
+ {locale === "en-US" ? "DEB high" : "DEB 预测高点"}
+
+ {row.deb_prediction != null
+ ? formatTemperatureValue(row.deb_prediction, tempSymbol)
+ : "--"}
+
- {row.local_time || "--"}
+
+ {formatShortDate(row.selected_date || row.local_date, locale)} · {row.local_time || "--"}
+
{phaseMeta.label}
@@ -1026,51 +1154,20 @@ function ScanTerminalScreen() {
{userLocalTime}
- {isPro ? (
- <>
-
-
-
- ) : (
+ {isPro ? null : store.proAccess.authenticated ? (
+ ) : (
+
+
+ {isEn ? "Sign in" : "登录"}
+
)}
diff --git a/frontend/lib/dashboard-types.ts b/frontend/lib/dashboard-types.ts
index 20d9bca1..b6317c72 100644
--- a/frontend/lib/dashboard-types.ts
+++ b/frontend/lib/dashboard-types.ts
@@ -521,6 +521,11 @@ export interface ScanOpportunityRow {
window_phase?: string | null;
window_score?: number | null;
remaining_window_minutes?: number | null;
+ peak_window_start?: string | null;
+ peak_window_end?: string | null;
+ peak_window_label?: string | null;
+ minutes_until_peak_start?: number | null;
+ minutes_until_peak_end?: number | null;
liquidity_score?: number | null;
price_usefulness_score?: number | null;
spread_penalty?: number | null;
diff --git a/src/data_collection/polymarket_readonly.py b/src/data_collection/polymarket_readonly.py
index 0bf8f4b4..5c12ca33 100644
--- a/src/data_collection/polymarket_readonly.py
+++ b/src/data_collection/polymarket_readonly.py
@@ -2153,7 +2153,8 @@ class PolymarketReadOnlyLayer:
question = str(market.get("question") or market.get("title") or "").strip()
direction = self._extract_market_bucket_direction(market)
bucket_range = self._extract_market_bucket_range(market)
- unit = bucket_range[2] if bucket_range else "C"
+ raw_unit = bucket_range[2] if bucket_range else "C"
+ unit = "°F" if str(raw_unit).upper().endswith("F") else "°C"
if bucket_range and bucket_range[1] is not None:
return f"{bucket_range[0]:g}-{bucket_range[1]:g}{unit}"
if bucket_temp is not None:
@@ -2520,6 +2521,18 @@ class PolymarketReadOnlyLayer:
peak = context.get("peak") if isinstance(context.get("peak"), dict) else {}
first_h = int(_safe_float(peak.get("first_h")) or 13)
last_h = int(_safe_float(peak.get("last_h")) or 15)
+ first_minutes = max(0, first_h * 60)
+ last_minutes = min(23 * 60 + 59, last_h * 60)
+ display_last_minutes = min(23 * 60 + 59, last_h * 60 + 59)
+ peak_fields: Dict[str, Any] = {
+ "peak_window_start": f"{first_h:02d}:00",
+ "peak_window_end": f"{last_h:02d}:59",
+ "peak_window_label": f"{first_h:02d}:00-{last_h:02d}:59",
+ "minutes_until_peak_start": None,
+ "minutes_until_peak_end": None,
+ "peak_start_minutes": first_minutes,
+ "peak_end_minutes": display_last_minutes,
+ }
target_iso = _extract_iso_date(target_date)
if not local_date or not target_iso:
return {
@@ -2527,6 +2540,7 @@ class PolymarketReadOnlyLayer:
"score": 0.65,
"remaining_minutes": None,
"same_day": True,
+ **peak_fields,
}
try:
@@ -2537,19 +2551,26 @@ class PolymarketReadOnlyLayer:
except Exception:
diff_days = 0
+ now_minutes = _parse_hhmm_to_minutes(local_time)
+ if now_minutes is not None:
+ peak_fields["minutes_until_peak_start"] = diff_days * 1440 + first_minutes - now_minutes
+ peak_fields["minutes_until_peak_end"] = diff_days * 1440 + display_last_minutes - now_minutes
+
if diff_days >= 2:
return {
"phase": "week_ahead",
"score": 0.45,
- "remaining_minutes": None,
+ "remaining_minutes": peak_fields["minutes_until_peak_start"],
"same_day": False,
+ **peak_fields,
}
if diff_days == 1:
return {
"phase": "tomorrow",
"score": 0.60,
- "remaining_minutes": None,
+ "remaining_minutes": peak_fields["minutes_until_peak_start"],
"same_day": False,
+ **peak_fields,
}
if diff_days < 0:
return {
@@ -2557,25 +2578,25 @@ class PolymarketReadOnlyLayer:
"score": 0.0,
"remaining_minutes": None,
"same_day": False,
+ **peak_fields,
}
- now_minutes = _parse_hhmm_to_minutes(local_time)
if now_minutes is None:
return {
"phase": "today_default",
"score": 0.65,
"remaining_minutes": None,
"same_day": True,
+ **peak_fields,
}
- first_minutes = max(0, first_h * 60)
- last_minutes = min(23 * 60 + 59, last_h * 60)
if now_minutes > last_minutes + 120:
return {
"phase": "post_peak",
"score": 0.50,
"remaining_minutes": 0,
"same_day": True,
+ **peak_fields,
}
if first_minutes <= now_minutes <= last_minutes + 120:
return {
@@ -2583,6 +2604,7 @@ class PolymarketReadOnlyLayer:
"score": 1.00,
"remaining_minutes": max(0, last_minutes + 120 - now_minutes),
"same_day": True,
+ **peak_fields,
}
if first_minutes - 180 <= now_minutes < first_minutes:
return {
@@ -2590,12 +2612,14 @@ class PolymarketReadOnlyLayer:
"score": 0.85,
"remaining_minutes": max(0, last_minutes + 120 - now_minutes),
"same_day": True,
+ **peak_fields,
}
return {
"phase": "early_today",
"score": 0.70,
"remaining_minutes": max(0, first_minutes - now_minutes),
"same_day": True,
+ **peak_fields,
}
def _resolve_market_target_threshold(
@@ -3198,6 +3222,11 @@ class PolymarketReadOnlyLayer:
"window_phase": window_meta.get("phase"),
"window_score": window_meta.get("score"),
"remaining_window_minutes": window_meta.get("remaining_minutes"),
+ "peak_window_start": window_meta.get("peak_window_start"),
+ "peak_window_end": window_meta.get("peak_window_end"),
+ "peak_window_label": window_meta.get("peak_window_label"),
+ "minutes_until_peak_start": window_meta.get("minutes_until_peak_start"),
+ "minutes_until_peak_end": window_meta.get("minutes_until_peak_end"),
"liquidity_score": liquidity_score,
"price_usefulness_score": price_usefulness_score,
"spread_penalty": spread_penalty,