FinceptTerminal is a modern finance application offering advanced market analytics, investment research, and economic data tools, designed for interactive exploration and data-driven decision-making in a user-friendly environment.
C++ ai-agentsalgorithmic-tradingbloomberg-terminalcppfinancefinancial-marketsfintechgood-first-issueinvestmentinvestment-researchmachine-learningopensourcepythonqtquantitative-financestock-markettrading
v4 update: economics panel refactor, portfolio views, gov data panels, quantlib service
tilakpatel2239eaaa70a925
diff --git a/fincept-qt/CMakeLists.txt b/fincept-qt/CMakeLists.txtindex 15c8348cb..3422f394e 100644--- a/fincept-qt/CMakeLists.txt+++ b/fincept-qt/CMakeLists.txt@@ -279,6 +279,8 @@ set(SERVICE_SOURCESsrc/services/backtesting/BacktestingService.cppsrc/services/algo_trading/AlgoTradingService.cppsrc/services/portfolio/PortfolioService.cpp+ src/services/quantlib/QuantLibClient.cpp+ src/services/economics/EconomicsService.cppsrc/services/agents/AgentService.cppsrc/services/file_manager/FileManagerService.cppsrc/services/workflow/NodeRegistry.cpp@@ -459,6 +461,13 @@ set(SCREEN_SOURCESsrc/screens/gov_data/GovDataProviderPanel.cppsrc/screens/gov_data/GovDataTreasuryPanel.cppsrc/screens/gov_data/GovDataCongressPanel.cpp+ src/screens/gov_data/GovDataCanadaPanel.cpp+ src/screens/gov_data/GovDataSwissPanel.cpp+ src/screens/gov_data/GovDataFrancePanel.cpp+ src/screens/gov_data/GovDataHKPanel.cpp+ src/screens/gov_data/GovDataCKANPanel.cpp+ src/screens/gov_data/GovDataUKPanel.cpp+ src/screens/gov_data/GovDataAustraliaPanel.cpp# Derivatives Pricingsrc/screens/derivatives/DerivativesScreen.cpp@@ -498,6 +507,38 @@ set(SCREEN_SOURCES# Economicssrc/screens/economics/EconomicsScreen.cpp+ src/screens/economics/panels/EconPanelBase.cpp+ src/screens/economics/panels/WorldBankPanel.cpp+ src/screens/economics/panels/ImfPanel.cpp+ src/screens/economics/panels/FredPanel.cpp+ src/screens/economics/panels/FredAnalyticsPanel.cpp+ src/screens/economics/panels/OecdPanel.cpp+ src/screens/economics/panels/EcbPanel.cpp+ src/screens/economics/panels/EurostatPanel.cpp+ src/screens/economics/panels/BlsPanel.cpp+ src/screens/economics/panels/CensusPanel.cpp+ src/screens/economics/panels/EconDbPanel.cpp+ src/screens/economics/panels/TradingEconomicsPanel.cpp+ src/screens/economics/panels/EconomicCalendarPanel.cpp+ src/screens/economics/panels/BcbPanel.cpp+ src/screens/economics/panels/AkShareChinaPanel.cpp+ src/screens/economics/panels/OnsPanel.cpp+ src/screens/economics/panels/GlobalCentralBanksPanel.cpp+ src/screens/economics/panels/FederalReservePanel.cpp+ src/screens/economics/panels/FiscalDataPanel.cpp+ src/screens/economics/panels/OwIdPanel.cpp+ src/screens/economics/panels/StatCanPanel.cpp+ src/screens/economics/panels/IlostatPanel.cpp+ src/screens/economics/panels/UnComtradePanel.cpp+ src/screens/economics/panels/WorldBankHealthPanel.cpp+ src/screens/economics/panels/BisPanel.cpp+ src/screens/economics/panels/AdbPanel.cpp+ src/screens/economics/panels/CftcPanel.cpp+ src/screens/economics/panels/EiaPanel.cpp+ src/screens/economics/panels/WtoPanel.cpp+ src/screens/economics/panels/UnescoPanel.cpp+ src/screens/economics/panels/BeaPanel.cpp+ src/screens/economics/panels/FinceptMacroPanel.cpp# Polymarketsrc/screens/polymarket/PolymarketScreen.cpp@@ -719,6 +760,13 @@ set_source_files_properties(src/screens/gov_data/GovDataProviderPanel.cppsrc/screens/gov_data/GovDataScreen.cppsrc/screens/gov_data/GovDataTreasuryPanel.cpp+ src/screens/gov_data/GovDataCanadaPanel.cpp+ src/screens/gov_data/GovDataSwissPanel.cpp+ src/screens/gov_data/GovDataFrancePanel.cpp+ src/screens/gov_data/GovDataHKPanel.cpp+ src/screens/gov_data/GovDataCKANPanel.cpp+ src/screens/gov_data/GovDataUKPanel.cpp+ src/screens/gov_data/GovDataAustraliaPanel.cppsrc/screens/info/ContactScreen.cppsrc/screens/info/HelpScreen.cppsrc/screens/info/PrivacyScreen.cppdiff --git a/fincept-qt/scripts/Analytics/portfolioManagement/ffn_analysis.py b/fincept-qt/scripts/Analytics/portfolioManagement/ffn_analysis.pyindex 5b676e9c4..2e205e13a 100644--- a/fincept-qt/scripts/Analytics/portfolioManagement/ffn_analysis.py+++ b/fincept-qt/scripts/Analytics/portfolioManagement/ffn_analysis.py@@ -1,7 +1,8 @@"""FFN (Financial Functions) Analysis — Deep analytics per symbol.-Input: JSON via stdin: {"symbols": ["AAPL","MSFT"]}-Output: JSON to stdout with per-symbol stats+Input: JSON via stdin: {"symbols": ["AAPL","MSFT"], "weights": {"AAPL": 0.6, "MSFT": 0.4}}+Output: JSON to stdout with per-symbol stats, rebased series, drawdown series,+ rolling correlations, and portfolio optimisation weights."""import sysimport json@@ -28,20 +29,74 @@ def convert_numpy(obj):return obj-def compute_ffn(symbols, period="1y"):+def max_streak(series):+ max_s, cur = 0, 0+ for v in series:+ if v:+ cur += 1+ max_s = max(max_s, cur)+ else:+ cur = 0+ return max_s+++def portfolio_stats(close_df, weights_arr, symbols):+ """Compute blended portfolio stats from a close DataFrame and weight array."""+ import pandas as pd+ w = np.array(weights_arr)+ w = w / w.sum()+ port_returns = (close_df.pct_change().dropna() * w).sum(axis=1)+ total_ret = float((1 + port_returns).prod() - 1)+ n = len(port_returns)+ cagr = float((1 + total_ret) ** (252.0 / max(n, 1)) - 1)+ vol = float(port_returns.std() * np.sqrt(252))+ sharpe = float((cagr - 0.04) / vol) if vol > 0 else 0.0+ cum = (1 + port_returns).cumprod()+ peak = cum.expanding().max()+ dd = (cum - peak) / peak+ max_dd = float(dd.min())+ return {+ "total_return": total_ret,+ "cagr": cagr,+ "volatility": vol,+ "sharpe": sharpe,+ "max_drawdown": max_dd,+ }+++def compute_ffn(symbols, weights, period="1y"):import yfinance as yf+ import pandas as pd- data = yf.download(symbols, period=period, interval="1d", progress=False)+ data = yf.download(symbols, period=period, interval="1d", progress=False, auto_adjust=True)if data is None or data.empty:return {"error": "Could not fetch price data"}- close = data["Close"]- if len(symbols) == 1:- import pandas as pd- if not isinstance(close, pd.DataFrame):- close = pd.DataFrame({symbols[0]: close})+ # Normalise to a Close DataFrame regardless of yfinance version+ if isinstance(data.columns, pd.MultiIndex):+ if "Close" in data.columns.get_level_values(0):+ close = data["Close"]+ elif "Adj Close" in data.columns.get_level_values(0):+ close = data["Adj Close"]+ else:+ close = data.iloc[:, 0:len(symbols)]+ else:+ close = data[["Close"]] if "Close" in data.columns else data++ if not isinstance(close, pd.DataFrame):+ close = pd.DataFrame(close)++ # If single symbol yfinance returns a Series — wrap it+ if isinstance(close, pd.Series):+ close = close.to_frame(name=symbols[0])++ # Ensure column names match symbols when single symbol+ if len(symbols) == 1 and list(close.columns) != symbols:+ close.columns = [symbols[0]]result = {}++ # ── Per-symbol stats ──────────────────────────────────────────────────────for sym in symbols:if sym not in close.columns:continue@@ -52,54 +107,216 @@ def compute_ffn(symbols, period="1y"):returns = prices.pct_change().dropna()cumulative = (1 + returns).cumprod()- # Performance- total_ret = float(cumulative.iloc[-1] - 1)- ann_ret = float((1 + total_ret) ** (252 / max(len(returns), 1)) - 1)- ann_vol = float(returns.std() * np.sqrt(252))-- # Drawdown- peak = prices.expanding().max()- dd = (prices - peak) / peak- max_dd = float(dd.min())-- # Streak analysis- pos = (returns > 0).astype(int)- neg = (returns < 0).astype(int)-- def max_streak(series):- max_s = 0- cur = 0- for v in series:- if v:- cur += 1- max_s = max(max_s, cur)- else:- cur = 0- return max_s-- # Monthly returns approximation+ total_ret = float(cumulative.iloc[-1] - 1)+ ann_ret = float((1 + total_ret) ** (252.0 / max(len(returns), 1)) - 1)+ ann_vol = float(returns.std() * np.sqrt(252))+ peak = prices.expanding().max()+ dd = (prices - peak) / peak+ max_dd = float(dd.min())monthly_ret = float(returns.mean() * 21)+ pos = (returns > 0).astype(int).tolist()+ neg = (returns < 0).astype(int).tolist()result[sym] = {- "total_return": total_ret,- "annualized_return": ann_ret,+ "total_return": total_ret,+ "annualized_return": ann_ret,"annualized_volatility": ann_vol,- "max_drawdown": max_dd,- "sharpe_ratio": float((ann_ret - 0.04) / ann_vol) if ann_vol > 0 else 0,- "current_price": float(prices.iloc[-1]),- "start_price": float(prices.iloc[0]),- "best_day": float(returns.max()),- "worst_day": float(returns.min()),- "avg_daily_return": float(returns.mean()),- "positive_days": int((returns > 0).sum()),- "negative_days": int((returns < 0).sum()),- "max_win_streak": max_streak(pos),- "max_loss_streak": max_streak(neg),- "avg_monthly_return": monthly_ret,- "skewness": float(returns.skew()),- "kurtosis": float(returns.kurtosis()),+ "max_drawdown": max_dd,+ "sharpe_ratio": float((ann_ret - 0.04) / ann_vol) if ann_vol > 0 else 0.0,+ "current_price": float(prices.iloc[-1]),+ "start_price": float(prices.iloc[0]),+ "best_day": float(returns.max()),+ "worst_day": float(returns.min()),+ "avg_daily_return": float(returns.mean()),+ "positive_days": int((returns > 0).sum()),+ "negative_days": int((returns < 0).sum()),+ "max_win_streak": max_streak(pos),+ "max_loss_streak": max_streak(neg),+ "avg_monthly_return": monthly_ret,+ "skewness": float(returns.skew()),+ "kurtosis": float(returns.kurtosis()),}+ # Only keep symbols we actually computed+ valid_syms = [s for s in symbols if s in result]+ if not valid_syms:+ return result++ valid_close = close[valid_syms].dropna(how="all")+ LIMIT = 252++ # ── Rebased price series ──────────────────────────────────────────────────+ rebased_out = {}+ try:+ import ffn+ rebased_df = ffn.rebase(valid_close.dropna(), 100)+ rebased_df = rebased_df.tail(LIMIT)+ for sym in valid_syms:+ if sym in rebased_df.columns:+ series = rebased_df[sym].dropna()+ rebased_out[sym] = {+ idx.strftime("%Y-%m-%d"): float(v)+ for idx, v in series.items()+ if not (isinstance(v, float) and (np.isnan(v) or np.isinf(v)))+ }+ except Exception:+ # ffn not available — compute manually+ try:+ base = valid_close.dropna().tail(LIMIT)+ for sym in valid_syms:+ if sym not in base.columns:+ continue+ s = base[sym].dropna()+ if s.empty:+ continue+ rebased = s / s.iloc[0] * 100.0+ rebased_out[sym] = {+ idx.strftime("%Y-%m-%d"): float(v)+ for idx, v in rebased.items()+ if not (isinstance(v, float) and (np.isnan(v) or np.isinf(v)))+ }+ except Exception:+ pass++ result["rebased"] = rebased_out++ # ── Drawdown series ───────────────────────────────────────────────────────+ drawdown_out = {}+ try:+ import ffn+ for sym in valid_syms:+ if sym not in valid_close.columns:+ continue+ prices_s = valid_close[sym].dropna()+ if len(prices_s) < 2:+ continue+ dd_series = ffn.to_drawdown_series(prices_s).tail(LIMIT)+ drawdown_out[sym] = {+ idx.strftime("%Y-%m-%d"): float(v)+ for idx, v in dd_series.items()+ if not (isinstance(v, float) and (np.isnan(v) or np.isinf(v)))+ }+ except Exception:+ try:+ for sym in valid_syms:+ if sym not in valid_close.columns:+ continue+ prices_s = valid_close[sym].dropna()+ if len(prices_s) < 2:+ continue+ peak = prices_s.expanding().max()+ dd_s = ((prices_s - peak) / peak).tail(LIMIT)+ drawdown_out[sym] = {+ idx.strftime("%Y-%m-%d"): float(v)+ for idx, v in dd_s.items()+ if not (isinstance(v, float) and (np.isnan(v) or np.isinf(v)))+ }+ except Exception:+ pass++ result["drawdown_series"] = drawdown_out++ # ── Rolling correlations ──────────────────────────────────────────────────+ rolling_out = {}+ try:+ if len(valid_syms) >= 2:+ ret_df = valid_close[valid_syms].pct_change().dropna()+ WINDOW = 60+ # rolling().corr() returns a MultiIndex series: (date, sym) -> corr_with_sym+ rolling_corr = ret_df.rolling(WINDOW).corr()+ for i in range(len(valid_syms)):+ for j in range(i + 1, len(valid_syms)):+ s1, s2 = valid_syms[i], valid_syms[j]+ key = f"{s1}_{s2}"+ try:+ # Select the cross-correlation column+ pair_series = rolling_corr.xs(s2, level=1)[s1].dropna().tail(LIMIT)+ rolling_out[key] = {+ idx.strftime("%Y-%m-%d"): float(v)+ for idx, v in pair_series.items()+ if not (isinstance(v, float) and (np.isnan(v) or np.isinf(v)))+ }+ except Exception:+ pass+ except Exception:+ pass++ result["rolling_corr"] = rolling_out++ # ── Portfolio optimisation ────────────────────────────────────────────────+ opt_out = {}+ try:+ if len(valid_syms) >= 2:+ ret_df = valid_close[valid_syms].pct_change().dropna()+ n = len(valid_syms)++ if len(ret_df) >= 30:+ # Equal weights+ equal_w = {s: round(1.0 / n, 6) for s in valid_syms}++ # Current weights (passed in from C++)+ cur_w_arr = np.array([weights.get(s, 1.0 / n) for s in valid_syms])+ cur_w_arr = cur_w_arr / cur_w_arr.sum()+ current_w = {s: round(float(cur_w_arr[i]), 6) for i, s in enumerate(valid_syms)}++ # ERC weights via ffn+ erc_w = equal_w.copy()+ try:+ import ffn+ erc_arr = ffn.calc_erc_weights(+ ret_df,+ covar_method="ledoit-wolf",+ risk_parity_method="ccd",+ maximum_iterations=100,+ tolerance=1e-8,+ )+ erc_w = {s: round(float(erc_arr[i]), 6) for i, s in enumerate(valid_syms)}+ except Exception:+ pass++ # Inverse-vol weights via ffn+ inv_vol_w = equal_w.copy()+ try:+ import ffn+ iv_arr = ffn.calc_inv_vol_weights(ret_df)+ inv_vol_w = {s: round(float(iv_arr[i]), 6) for i, s in enumerate(valid_syms)}+ except Exception:+ try:+ vols = ret_df.std()+ inv_v = 1.0 / vols+ iv_norm = inv_v / inv_v.sum()+ inv_vol_w = {s: round(float(iv_norm[s]), 6) for s in valid_syms}+ except Exception:+ pass++ # Portfolio stats for each weight set+ def w_arr(w_dict):+ return [w_dict.get(s, 0.0) for s in valid_syms]++ stats = {}+ for name, wd in [("erc", erc_w), ("inv_vol", inv_vol_w),+ ("equal", equal_w), ("current", current_w)]:+ try:+ stats[name] = portfolio_stats(valid_close[valid_syms].dropna(),+ w_arr(wd), valid_syms)+ except Exception:+ stats[name] = {+ "total_return": 0.0, "cagr": 0.0,+ "volatility": 0.0, "sharpe": 0.0, "max_drawdown": 0.0,+ }++ opt_out = {+ "erc": erc_w,+ "inv_vol": inv_vol_w,+ "equal": equal_w,+ "current": current_w,+ "stats": stats,+ }+ except Exception:+ pass++ result["optimization"] = opt_out+return result@@ -109,14 +326,30 @@ def main():print(json.dumps({"error": "No input data"}))return- params = json.loads(stdin_data)- symbols = params.get("symbols", [])+ try:+ params = json.loads(stdin_data)+ except Exception as exc:+ print(json.dumps({"error": f"JSON parse error: {exc}"}))+ return+ symbols = params.get("symbols", [])if not symbols:print(json.dumps({"error": "No symbols provided"}))return- result = compute_ffn(symbols)+ # weights dict: symbol -> fraction (0-1); fall back to equal weight+ raw_weights = params.get("weights", {})+ n = len(symbols)+ weights = {}+ for s in symbols:+ weights[s] = float(raw_weights.get(s, 1.0 / n))+ total_w = sum(weights.values())+ if total_w > 0:+ weights = {s: v / total_w for s, v in weights.items()}+ else:+ weights = {s: 1.0 / n for s in symbols}++ result = compute_ffn(symbols, weights)print(json.dumps(convert_numpy(result)))diff --git a/fincept-qt/src/screens/economics/EconomicsScreen.cpp b/fincept-qt/src/screens/economics/EconomicsScreen.cppindex bc2971524..a3b7cb79c 100644--- a/fincept-qt/src/screens/economics/EconomicsScreen.cpp+++ b/fincept-qt/src/screens/economics/EconomicsScreen.cpp@@ -1,1117 +1,253 @@+// src/screens/economics/EconomicsScreen.cpp+// Economics Data Explorer — panel-based shell.+// Switches between 32 per-source EconPanelBase subclasses.+// Panels are lazy-constructed the first time their badge is clicked.#include "screens/economics/EconomicsScreen.h"#include "core/logging/Logger.h"-#include "python/PythonRunner.h"-#include "ui/theme/Theme.h"+#include "screens/economics/panels/AdbPanel.h"+#include "screens/economics/panels/AkShareChinaPanel.h"+#include "screens/economics/panels/BcbPanel.h"+#include "screens/economics/panels/BeaPanel.h"+#include "screens/economics/panels/BisPanel.h"+#include "screens/economics/panels/BlsPanel.h"+#include "screens/economics/panels/CensusPanel.h"+#include "screens/economics/panels/CftcPanel.h"+#include "screens/economics/panels/EcbPanel.h"+#include "screens/economics/panels/EconDbPanel.h"+#include "screens/economics/panels/EconPanelBase.h"+#include "screens/economics/panels/EconomicCalendarPanel.h"+#include "screens/economics/panels/EiaPanel.h"+#include "screens/economics/panels/EurostatPanel.h"+#include "screens/economics/panels/FederalReservePanel.h"+#include "screens/economics/panels/FinceptMacroPanel.h"+#include "screens/economics/panels/FiscalDataPanel.h"+#include "screens/economics/panels/FredAnalyticsPanel.h"+#include "screens/economics/panels/FredPanel.h"+#include "screens/economics/panels/GlobalCentralBanksPanel.h"+#include "screens/economics/panels/IlostatPanel.h"+#include "screens/economics/panels/ImfPanel.h"+#include "screens/economics/panels/OecdPanel.h"+#include "screens/economics/panels/OnsPanel.h"+#include "screens/economics/panels/OwIdPanel.h"+#include "screens/economics/panels/StatCanPanel.h"+#include "screens/economics/panels/TradingEconomicsPanel.h"+#include "screens/economics/panels/UnComtradePanel.h"+#include "screens/economics/panels/UnescoPanel.h"+#include "screens/economics/panels/WorldBankHealthPanel.h"+#include "screens/economics/panels/WorldBankPanel.h"+#include "screens/economics/panels/WtoPanel.h"-#include <QApplication>-#include <QFrame>#include <QHBoxLayout>-#include <QHeaderView>-#include <QJsonDocument>-#include <QPointer>+#include <QLabel>+#include <QPushButton>#include <QScrollArea>-#include <QSplitter>-#include <QStackedWidget>#include <QVBoxLayout>-#include <algorithm>-#include <cmath>--// ── Stylesheet ───────────────────────────────────────────────────────────────--namespace {-using namespace fincept::ui;--static const QString kStyle = QStringLiteral(-- // ── Screen shell- "#econScreen { background:%1; }"-- // ── Toolbar (top bar)- "#econToolbar { background:%2; border-bottom:1px solid %8; }"- "#econToolbarTitle { color:%4; font-size:13px; font-weight:700;"- " letter-spacing:1px; background:transparent; }"- "#econToolbarSub { color:%5; font-size:10px; background:transparent; }"-- // ── Source badge bar- "#econSourceBar { background:%1; border-bottom:1px solid %8; }"- "#econSourceBadge { border:1px solid %8; background:%7; color:%5;"- " font-size:9px; font-weight:700; padding:3px 10px;"- " letter-spacing:0.5px; }"- "#econSourceBadge:hover { border-color:%9; color:%4; background:%12; }"- "#econSourceBadge[active=true] { background:rgba(217,119,6,0.12);"- " border-color:%3; color:%3; }"-- // ── Fetch button- "#econFetchBtn { background:%3; color:%1; border:none;"- " padding:6px 20px; font-size:10px; font-weight:700; letter-spacing:0.5px; }"- "#econFetchBtn:hover { background:#f59e0b; }"- "#econFetchBtn:disabled { background:%10; color:%11; }"-- // ── Left panel- "#econLeftPanel { background:%7; border-right:1px solid %8; }"- "#econPanelHeader { background:%2; border-bottom:1px solid %8; }"- "#econPanelTitle { color:%5; font-size:9px; font-weight:700;"- " letter-spacing:1px; background:transparent; }"- "#econCountBadge { background:rgba(217,119,6,0.15); color:%3;"- " font-size:9px; font-weight:700; padding:1px 6px; }"-- // ── Search inputs- "#econSearch { background:%1; color:%4; border:none;"- " border-bottom:1px solid %8; padding:5px 10px; font-size:11px; }"- "#econSearch:focus { border-bottom:1px solid %3; }"-- // ── Lists- "#econCountryList, #econIndicatorList { background:%1; border:none; outline:none;"- " font-size:11px; }"- "#econCountryList::item { color:%5; padding:5px 12px;"- " border-bottom:1px solid %8; }"- "#econCountryList::item:hover { color:%4; background:%12; }"- "#econCountryList::item:selected { color:%3; background:rgba(217,119,6,0.08);"- " border-left:2px solid %3; padding-left:10px; }"- "#econIndicatorList::item { color:%5; padding:4px 12px;"- " border-bottom:1px solid %8; }"- "#econIndicatorList::item:hover { color:%4; background:%12; }"- "#econIndicatorList::item:selected { color:%3; background:rgba(217,119,6,0.08);"- " border-left:2px solid %3; padding-left:10px; }"-- // ── Stat cards- "#econStatsRow { background:%2; border-bottom:1px solid %8; }"- "#econStatCard { background:%7; border:1px solid %8; }"- "#econStatCard:hover { border-color:%9; }"- "#econStatLabel { color:%5; font-size:8px; font-weight:700;"- " letter-spacing:1px; background:transparent; }"- "#econStatValue { color:%13; font-size:15px; font-weight:700; background:transparent; }"- "#econStatSub { color:%5; font-size:9px; background:transparent; }"- "#econStatChangePos { color:%6; font-size:14px; font-weight:700; background:transparent; }"- "#econStatChangeNeg { color:%14; font-size:14px; font-weight:700; background:transparent; }"-- // ── Table area header- "#econTableHeader { background:%2; border-bottom:1px solid %8; }"- "#econDataTitle { color:%4; font-size:11px; font-weight:700; background:transparent; }"- "#econDataStatus { color:%5; font-size:10px; background:transparent; }"- "#econSourceTag { background:rgba(217,119,6,0.12); color:%3;"- " font-size:9px; font-weight:700; padding:2px 8px; }"-- // ── Table- "QTableWidget { background:%1; color:%4; border:none;"- " gridline-color:%8; font-size:11px; alternate-background-color:%7; }"- "QTableWidget::item { padding:4px 8px; border-bottom:1px solid %8; }"- "QTableWidget::item:selected { background:rgba(217,119,6,0.12); color:%3; }"- "QTableWidget::item:alternate { background:%7; }"- "QHeaderView::section { background:%2; color:%5; border:none;"- " border-bottom:2px solid %8; border-right:1px solid %8;"- " padding:5px 8px; font-size:10px; font-weight:700; letter-spacing:0.5px; }"- "QHeaderView::section:first { border-left:none; }"-- // ── Empty state- "#econEmptyState { background:%1; }"- "#econEmptyTitle { color:%5; font-size:14px; font-weight:700; background:transparent; }"- "#econEmptyHint { color:%11; font-size:11px; background:transparent; }"-- // ── Combo / LineEdit- "QComboBox { background:%1; color:%4; border:1px solid %8;"- " padding:4px 10px; font-size:11px; }"- "QComboBox::drop-down { border:none; width:18px; }"- "QComboBox QAbstractItemView { background:%2; color:%4; border:1px solid %8;"- " selection-background-color:rgba(217,119,6,0.2); selection-color:%3; }"- "QLineEdit { background:%1; color:%4; border:1px solid %8;"- " padding:4px 10px; font-size:11px; }"-- // ── Status bar- "#econStatusBar { background:%2; border-top:1px solid %8; }"- "#econStatusText { color:%11; font-size:9px; background:transparent; }"- "#econStatusSep { color:%8; font-size:9px; background:transparent; }"- "#econStatusVal { color:%5; font-size:9px; background:transparent; }"- "#econStatusHigh { color:%3; font-size:9px; font-weight:700; background:transparent; }"-- // ── Splitter / scrollbar- "QSplitter::handle { background:%8; }"- "QScrollBar:vertical { background:%1; width:5px; }"- "QScrollBar::handle:vertical { background:%8; min-height:24px; }"- "QScrollBar::add-line:vertical, QScrollBar::sub-line:vertical { height:0; }"- "QScrollBar:horizontal { background:%1; height:5px; }"- "QScrollBar::handle:horizontal { background:%8; min-width:24px; }"- "QScrollBar::add-line:horizontal, QScrollBar::sub-line:horizontal { width:0; }"-)- .arg(colors::BG_BASE) // %1- .arg(colors::BG_RAISED) // %2- .arg(colors::AMBER) // %3- .arg(colors::TEXT_PRIMARY) // %4- .arg(colors::TEXT_SECONDARY) // %5- .arg(colors::POSITIVE) // %6- .arg(colors::BG_SURFACE) // %7- .arg(colors::BORDER_DIM) // %8- .arg(colors::BORDER_BRIGHT) // %9- .arg(colors::AMBER_DIM) // %10- .arg(colors::TEXT_DIM) // %11- .arg(colors::BG_HOVER) // %12- .arg(colors::CYAN) // %13- .arg(colors::NEGATIVE) // %14- ;-} // namespace-namespace fincept::screens {-using namespace fincept::ui;--// ── Source definitions ───────────────────────────────────────────────────────--static QList<EconSource> build_sources() {- return {- {"worldbank", "World Bank", "worldbank_data.py", "#00E5FF", false, "NY.GDP.MKTP.CD",- "80+ countries · 1000+ indicators · No API key"},- {"imf", "IMF", "imf_data.py", "#0088FF", false, "NGDP_RPCH",- "Global macro · Quarterly & annual · No API key"},- {"fred", "FRED", "fred_data.py", "#00D66F", false, "GDP",- "US Federal Reserve · 800k+ series · No API key"},- {"oecd", "OECD", "oecd_data.py", "#FFD700", false, "GDP",- "37 member nations · Policy & social data"},- {"bis", "BIS", "bis_data.py", "#9D4EDD", false, "WS_CBPOL",- "Bank for International Settlements · Central banks"},- {"adb", "ADB", "adb_data.py", "#0072BC", false, "NGDP_XDC",- "Asian Development Bank · 20 Asia-Pacific nations"},- {"fed", "Federal Reserve", "fed_data.py", "#1A8F9A", false, "federal_funds_rate",- "US Fed rates, balance sheet & monetary data"},- {"cftc", "CFTC", "cftc_data.py", "#FF5722", false, "gold",- "Commitments of Traders · Futures positions"},- {"eia", "EIA", "eia_data.py", "#4CAF50", true, "crude_petroleum_stocks",- "Energy Information Administration · Requires API key"},- {"bls", "BLS", "bls_data.py", "#AB47BC", true, "CUSR0000SA0",- "Bureau of Labor Statistics · Requires API key"},- {"wto", "WTO", "wto_data.py", "#E91E63", true, "TP_A_0010",- "World Trade Organization · Requires API key"},- {"unesco", "UNESCO", "unesco_data.py", "#00ACC1", false, "GER.1",- "Education & cultural development indicators"},- {"fiscaldata","FiscalData", "fiscaldata.py", "#FFA726", true, "total_public_debt",- "US Treasury fiscal data · Requires API key"},- {"bea", "BEA", "bea_data.py", "#E65100", true, "gdp_growth",- "Bureau of Economic Analysis · Requires API key"},- {"fincept", "Fincept Macro", "fincept_macro.py", "#d97706", true, "wgb_central_bank_rates",- "Fincept proprietary macro data · Requires API key"},- };-}--// ── Country lists ────────────────────────────────────────────────────────────--static QStringList g_major_countries = {- "USA","CHN","JPN","DEU","GBR","FRA","IND","ITA","BRA","CAN",- "KOR","RUS","AUS","ESP","MEX","IDN","NLD","SAU","TUR","CHE",- "ARG","ZAF","THA","SGP","MYS","PHL","VNM","NGA","EGY","PAK",-};-static QStringList g_oecd_countries = {- "USA","GBR","DEU","FRA","JPN","CAN","ITA","ESP","AUS","KOR",- "NLD","CHE","BEL","SWE","AUT","NOR","DNK","FIN","IRL","PRT",- "NZL","ISR","CZE","POL","HUN","SVK","SVN","LUX","ISL","EST",- "LVA","LTU","CHL","COL","CRI","MEX","TUR",+// ── Source registry ───────────────────────────────────────────────────────────+// { id, display label, accent color }+static const struct { const char* id; const char* label; const char* color; }+kSources[] = {+ { "worldbank", "World Bank", "#2563EB" },+ { "imf", "IMF", "#1B5E20" },+ { "fred", "FRED", "#B22222" },+ { "fred_analytics", "FRED Analytics", "#C0392B" },+ { "oecd", "OECD", "#00518A" },+ { "ecb", "ECB", "#003F8C" },+ { "eurostat", "Eurostat", "#003399" },+ { "bls", "BLS", "#1565C0" },+ { "census", "US Census", "#4527A0" },+ { "econdb", "EconDB", "#00695C" },+ { "trading_economics","Trading Econ", "#FF6F00" },+ { "econ_calendar", "Econ Calendar", "#E65100" },+ { "bcb", "BCB Brazil", "#1B5E20" },+ { "akshare_cn", "AkShare China", "#C62828" },+ { "ons", "ONS UK", "#0277BD" },+ { "global_cb", "Central Banks", "#4A148C" },+ { "federal_reserve", "Federal Reserve", "#1A237E" },+ { "fiscal_data", "Fiscal Data", "#006064" },+ { "owid", "Our World In Data", "#6D28D9" },+ { "statcan", "StatCan", "#B71C1C" },+ { "ilostat", "ILO", "#0D47A1" },+ { "un_comtrade", "UN Comtrade", "#1565C0" },+ { "wb_health", "WB Health", "#0288D1" },+ { "bis", "BIS", "#9D4EDD" },+ { "adb", "ADB", "#0072BC" },+ { "cftc", "CFTC", "#FF5722" },+ { "eia", "EIA", "#4CAF50" },+ { "wto", "WTO", "#E91E63" },+ { "unesco", "UNESCO", "#00ACC1" },+ { "bea", "BEA", "#E65100" },+ { "fincept", "Fincept Macro", "#d97706" },};-static QStringList g_adb_countries = {- "IND","CHN","JPN","KOR","IDN","THA","MYS","PHL","VNM","SGP",- "BGD","PAK","LKA","MMR","KHM","LAO","MNG","NPL","AFG","FJI",-};--// ── Indicator definitions ────────────────────────────────────────────────────--struct IndicatorDef { QString id, name, category; };-static QList<IndicatorDef> g_worldbank_indicators = {- {"NY.GDP.MKTP.CD", "GDP (current US$)", "GDP"},- {"NY.GDP.MKTP.KD.ZG", "GDP growth (annual %)", "GDP"},- {"NY.GDP.PCAP.CD", "GDP per capita (US$)", "GDP"},- {"FP.CPI.TOTL.ZG", "Inflation, CPI (annual %)", "Prices"},- {"SL.UEM.TOTL.ZS", "Unemployment (%)", "Labor"},- {"NE.TRD.GNFS.ZS", "Trade (% of GDP)", "Trade"},- {"NE.EXP.GNFS.ZS", "Exports (% of GDP)", "Trade"},- {"NE.IMP.GNFS.ZS", "Imports (% of GDP)", "Trade"},- {"BX.KLT.DINV.CD.WD","FDI inflows (US$)", "Investment"},- {"SP.POP.TOTL", "Population, total", "Demographics"},- {"SP.DYN.LE00.IN", "Life expectancy", "Demographics"},- {"SE.XPD.TOTL.GD.ZS", "Education spending (% GDP)", "Social"},- {"SH.XPD.CHEX.GD.ZS", "Health spending (% GDP)", "Social"},- {"GC.DOD.TOTL.GD.ZS", "Govt debt (% of GDP)", "Fiscal"},- {"FM.LBL.BMNY.GD.ZS", "Broad money (% of GDP)", "Financial"},-};-static QList<IndicatorDef> g_fred_indicators = {- {"GDP", "Gross Domestic Product", "GDP"},- {"GDPC1", "Real GDP", "GDP"},- {"A939RX0Q048SBEA", "Real GDP per capita", "GDP"},- {"CPIAUCSL", "CPI All Urban", "Prices"},- {"CPILFESL", "Core CPI", "Prices"},- {"UNRATE", "Unemployment Rate", "Labor"},- {"PAYEMS", "Total Nonfarm Payrolls", "Labor"},- {"FEDFUNDS", "Federal Funds Rate", "Rates"},- {"DGS10", "10-Year Treasury", "Rates"},- {"DGS2", "2-Year Treasury", "Rates"},- {"DEXUSEU", "USD/EUR Exchange Rate", "FX"},- {"M2SL", "M2 Money Stock", "Money"},- {"WALCL", "Fed Total Assets", "Fed"},- {"HOUST", "Housing Starts", "Housing"},- {"INDPRO", "Industrial Production", "Output"},-};-static QList<IndicatorDef> g_imf_indicators = {- {"NGDP_RPCH", "Real GDP growth (%)", "GDP"},- {"NGDPD", "Nominal GDP (bn USD)", "GDP"},- {"NGDPDPC", "GDP per capita (USD)", "GDP"},- {"PCPIPCH", "Inflation rate (%)", "Prices"},- {"LUR", "Unemployment rate (%)", "Labor"},- {"BCA_NGDPD", "Current account (% GDP)", "External"},- {"GGXWDG_NGDP", "Govt gross debt (% GDP)", "Fiscal"},- {"GGR_NGDP", "Govt revenue (% GDP)", "Fiscal"},- {"GGX_NGDP", "Govt spending (% GDP)", "Fiscal"},- {"PPPEX", "PPP exchange rate", "FX"},-};-static QList<IndicatorDef> g_generic_indicators = {- {"default", "Default Indicator", "General"},-};--// ── Constructor ──────────────────────────────────────────────────────────────--EconomicsScreen::EconomicsScreen(QWidget* parent) : QWidget(parent) {+// ── Panel factory ─────────────────────────────────────────────────────────────+static EconPanelBase* make_panel(const QString& id, QWidget* parent) {+ if (id == "worldbank") return new WorldBankPanel(parent);+ if (id == "imf") return new ImfPanel(parent);+ if (id == "fred") return new FredPanel(parent);+ if (id == "fred_analytics") return new FredAnalyticsPanel(parent);+ if (id == "oecd") return new OecdPanel(parent);+ if (id == "ecb") return new EcbPanel(parent);+ if (id == "eurostat") return new EurostatPanel(parent);+ if (id == "bls") return new BlsPanel(parent);+ if (id == "census") return new CensusPanel(parent);+ if (id == "econdb") return new EconDbPanel(parent);+ if (id == "trading_economics") return new TradingEconomicsPanel(parent);+ if (id == "econ_calendar") return new EconomicCalendarPanel(parent);+ if (id == "bcb") return new BcbPanel(parent);+ if (id == "akshare_cn") return new AkShareChinaPanel(parent);+ if (id == "ons") return new OnsPanel(parent);+ if (id == "global_cb") return new GlobalCentralBanksPanel(parent);+ if (id == "federal_reserve") return new FederalReservePanel(parent);+ if (id == "fiscal_data") return new FiscalDataPanel(parent);+ if (id == "owid") return new OwIdPanel(parent);+ if (id == "statcan") return new StatCanPanel(parent);+ if (id == "ilostat") return new IlostatPanel(parent);+ if (id == "un_comtrade") return new UnComtradePanel(parent);+ if (id == "wb_health") return new WorldBankHealthPanel(parent);+ if (id == "bis") return new BisPanel(parent);+ if (id == "adb") return new AdbPanel(parent);+ if (id == "cftc") return new CftcPanel(parent);+ if (id == "eia") return new EiaPanel(parent);+ if (id == "wto") return new WtoPanel(parent);+ if (id == "unesco") return new UnescoPanel(parent);+ if (id == "bea") return new BeaPanel(parent);+ if (id == "fincept") return new FinceptMacroPanel(parent);+ return nullptr;+}++// ── Constructor ───────────────────────────────────────────────────────────────++EconomicsScreen::EconomicsScreen(QWidget* parent)+ : QWidget(parent) {setObjectName("econScreen");- setStyleSheet(kStyle);- sources_ = build_sources();- setup_ui();- LOG_INFO("Economics", "Screen constructed");+ build_ui();+ // Activate first source+ if (!sources_.isEmpty())+ switch_to(sources_.first().id);}-// ── UI Setup ─────────────────────────────────────────────────────────────────--void EconomicsScreen::setup_ui() {+void EconomicsScreen::build_ui() {auto* root = new QVBoxLayout(this);root->setContentsMargins(0, 0, 0, 0);root->setSpacing(0);- root->addWidget(create_toolbar());- root->addWidget(create_source_bar());-- auto* splitter = new QSplitter(Qt::Horizontal);- splitter->setHandleWidth(1);-- auto* left = create_left_panel();- left->setMinimumWidth(240);- left->setMaximumWidth(320);-- splitter->addWidget(left);- splitter->addWidget(create_right_panel());- splitter->setStretchFactor(0, 0);- splitter->setStretchFactor(1, 1);- splitter->setSizes({270, 900});-- root->addWidget(splitter, 1);- root->addWidget(create_status_bar());-- on_source_changed(0);-}--// ── Toolbar ──────────────────────────────────────────────────────────────────--QWidget* EconomicsScreen::create_toolbar() {- auto* bar = new QWidget;- bar->setObjectName("econToolbar");- bar->setFixedHeight(46);-- auto* hl = new QHBoxLayout(bar);- hl->setContentsMargins(16, 0, 12, 0);- hl->setSpacing(10);-- // Title block- auto* title_col = new QWidget;- title_col->setFixedWidth(200);- auto* tcl = new QVBoxLayout(title_col);- tcl->setContentsMargins(0, 0, 0, 0);- tcl->setSpacing(0);- auto* t1 = new QLabel("ECONOMIC DATA EXPLORER");- t1->setObjectName("econToolbarTitle");- auto* t2 = new QLabel("15 global sources · 1000+ indicators");- t2->setObjectName("econToolbarSub");- tcl->addWidget(t1);- tcl->addWidget(t2);- hl->addWidget(title_col);-- hl->addSpacing(16);-- // Separator- auto* sep = new QFrame;- sep->setFrameShape(QFrame::VLine);- sep->setStyleSheet("color:#1a1a1a;");- hl->addWidget(sep);-- hl->addSpacing(10);-- // Source dropdown label- auto* src_lbl = new QLabel("SOURCE");- src_lbl->setObjectName("econStatusText");- hl->addWidget(src_lbl);-- source_combo_ = new QComboBox;- source_combo_->setFixedWidth(160);- for (const auto& s : sources_) {- QString label = s.name;- if (s.needs_api_key)- label += " ⚿";- source_combo_->addItem(label);- }- connect(source_combo_, QOverload<int>::of(&QComboBox::currentIndexChanged),- this, &EconomicsScreen::on_source_changed);- hl->addWidget(source_combo_);-- hl->addSpacing(14);-- // Date range label- auto* dr_lbl = new QLabel("RANGE");- dr_lbl->setObjectName("econStatusText");- hl->addWidget(dr_lbl);-- date_preset_ = new QComboBox;- date_preset_->addItems({"1Y", "2Y", "5Y", "10Y", "ALL", "Custom"});- date_preset_->setCurrentIndex(2);- date_preset_->setFixedWidth(72);- connect(date_preset_, QOverload<int>::of(&QComboBox::currentIndexChanged),- this, &EconomicsScreen::on_date_preset);- hl->addWidget(date_preset_);-- date_start_ = new QLineEdit;- date_start_->setPlaceholderText("YYYY-MM-DD");- date_start_->setFixedWidth(100);- date_start_->hide();- hl->addWidget(date_start_);-- auto* dash = new QLabel("→");- dash->setObjectName("econStatusText");- dash->hide();- hl->addWidget(dash);- // keep ref to show/hide with custom dates- connect(date_preset_, QOverload<int>::of(&QComboBox::currentIndexChanged),- this, [dash](int i){ dash->setVisible(i == 5); });-- date_end_ = new QLineEdit;- date_end_->setPlaceholderText("YYYY-MM-DD");- date_end_->setFixedWidth(100);- date_end_->hide();- hl->addWidget(date_end_);-- hl->addStretch(1);-- fetch_btn_ = new QPushButton(" FETCH DATA ");- fetch_btn_->setObjectName("econFetchBtn");- fetch_btn_->setCursor(Qt::PointingHandCursor);- fetch_btn_->setFixedHeight(30);- connect(fetch_btn_, &QPushButton::clicked, this, &EconomicsScreen::on_fetch);- hl->addWidget(fetch_btn_);-- return bar;-}--// ── Source badge strip ───────────────────────────────────────────────────────--QWidget* EconomicsScreen::create_source_bar() {- source_badge_bar_ = new QWidget;- source_badge_bar_->setObjectName("econSourceBar");- source_badge_bar_->setFixedHeight(34);-- auto* hl = new QHBoxLayout(source_badge_bar_);+ // ── Header ────────────────────────────────────────────────────────────────+ auto* header = new QWidget;+ header->setFixedHeight(40);+ header->setStyleSheet("background:#080808; border-bottom:1px solid #1a1a1a;");+ auto* hl = new QHBoxLayout(header);hl->setContentsMargins(12, 0, 12, 0);- hl->setSpacing(6);-- for (int i = 0; i < sources_.size(); ++i) {- const auto& s = sources_[i];- auto* btn = new QPushButton(s.name);- btn->setObjectName("econSourceBadge");- btn->setProperty("active", i == 0);- btn->setProperty("source_index", i);- btn->setCursor(Qt::PointingHandCursor);- btn->setFixedHeight(22);- // Accent dot color via left border- btn->setStyleSheet(- QString("QPushButton#econSourceBadge[active=true]{"- " border-left:2px solid %1; color:%1;"- " background:rgba(%2,%3,%4,0.1); }")- .arg(s.color)- .arg(QColor(s.color).red())- .arg(QColor(s.color).green())- .arg(QColor(s.color).blue()));- connect(btn, &QPushButton::clicked, this, [this, i](){- source_combo_->setCurrentIndex(i);+ hl->setSpacing(8);++ auto* title = new QLabel("ECONOMICS DATA EXPLORER");+ title->setStyleSheet(+ "color:#e5e5e5; font-size:12px; font-weight:700;"+ "letter-spacing:1.5px; background:transparent;");++ auto* sub = new QLabel("32 global data sources · 1000+ indicators");+ sub->setStyleSheet("color:#525252; font-size:10px; background:transparent;");++ hl->addWidget(title);+ hl->addWidget(sub);+ hl->addStretch();+ root->addWidget(header);++ // ── Badge bar (scrollable) ────────────────────────────────────────────────+ auto* scroll = new QScrollArea;+ scroll->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);+ scroll->setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff);+ scroll->setFixedHeight(34);+ scroll->setWidgetResizable(true);+ scroll->setFrameShape(QFrame::NoFrame);+ scroll->setStyleSheet("background:#050505; border-bottom:1px solid #1a1a1a;");++ badge_bar_ = new QWidget;+ badge_bar_->setStyleSheet("background:#050505;");+ auto* bhl = new QHBoxLayout(badge_bar_);+ bhl->setContentsMargins(6, 3, 6, 3);+ bhl->setSpacing(4);++ for (const auto& src : kSources) {+ SourceEntry entry;+ entry.id = src.id;+ entry.label = src.label;+ entry.color = src.color;++ auto* btn = new QPushButton(src.label);+ btn->setCheckable(true);+ btn->setFixedHeight(26);+ btn->setStyleSheet(QString(+ "QPushButton { background:#0a0a0a; color:#525252; border:1px solid #1a1a1a;"+ " font-size:9px; font-weight:700; padding:0 10px; letter-spacing:0.3px; }"+ "QPushButton:hover { color:#e5e5e5; border-color:#333333; }"+ "QPushButton:checked { background:rgba(%1,0.12); color:%2;"+ " border-color:%2; }")+ .arg([]( const QString& hex ) {+ // convert #RRGGBB to "R,G,G" for rgba+ QColor c(hex);+ return QString("%1,%2,%3").arg(c.red()).arg(c.green()).arg(c.blue());+ }(src.color))+ .arg(src.color));++ const QString sid = src.id;+ connect(btn, &QPushButton::clicked, this, [this, sid]() {+ switch_to(sid);});- hl->addWidget(btn);- }- hl->addStretch(1);-- // Tip label- auto* tip = new QLabel("⚿ = API key required");- tip->setObjectName("econStatusText");- tip->setStyleSheet("color:#404040; font-size:9px; background:transparent;");- hl->addWidget(tip);-- return source_badge_bar_;-}--// ── Left panel ───────────────────────────────────────────────────────────────--QWidget* EconomicsScreen::create_left_panel() {- auto* panel = new QWidget;- panel->setObjectName("econLeftPanel");-- auto* vl = new QVBoxLayout(panel);- vl->setContentsMargins(0, 0, 0, 0);- vl->setSpacing(0);-- // ── Country section ──- auto* c_hdr = new QWidget;- c_hdr->setObjectName("econPanelHeader");- c_hdr->setFixedHeight(28);- auto* chl = new QHBoxLayout(c_hdr);- chl->setContentsMargins(10, 0, 8, 0);- auto* c_title = new QLabel("COUNTRY");- c_title->setObjectName("econPanelTitle");- country_count_ = new QLabel("0");- country_count_->setObjectName("econCountBadge");- chl->addWidget(c_title);- chl->addStretch(1);- chl->addWidget(country_count_);- vl->addWidget(c_hdr);-- country_search_ = new QLineEdit;- country_search_->setObjectName("econSearch");- country_search_->setPlaceholderText("Search countries…");- country_search_->setFixedHeight(28);- connect(country_search_, &QLineEdit::textChanged,- this, &EconomicsScreen::on_country_search);- vl->addWidget(country_search_);-- country_list_ = new QListWidget;- country_list_->setObjectName("econCountryList");- country_list_->setAlternatingRowColors(false);- connect(country_list_, &QListWidget::itemClicked,- this, &EconomicsScreen::on_country_clicked);- vl->addWidget(country_list_, 1);-- // ── Divider ──- auto* div = new QFrame;- div->setFrameShape(QFrame::HLine);- div->setStyleSheet("color:#1a1a1a;");- vl->addWidget(div);-- // ── Indicator section ──- auto* i_hdr = new QWidget;- i_hdr->setObjectName("econPanelHeader");- i_hdr->setFixedHeight(28);- auto* ihl = new QHBoxLayout(i_hdr);- ihl->setContentsMargins(10, 0, 8, 0);- auto* i_title = new QLabel("INDICATOR");- i_title->setObjectName("econPanelTitle");- indicator_count_ = new QLabel("0");- indicator_count_->setObjectName("econCountBadge");- ihl->addWidget(i_title);- ihl->addStretch(1);- ihl->addWidget(indicator_count_);- vl->addWidget(i_hdr);-- indicator_search_ = new QLineEdit;- indicator_search_->setObjectName("econSearch");- indicator_search_->setPlaceholderText("Search indicators…");- indicator_search_->setFixedHeight(28);- connect(indicator_search_, &QLineEdit::textChanged,- this, &EconomicsScreen::on_indicator_search);- vl->addWidget(indicator_search_);-- indicator_list_ = new QListWidget;- indicator_list_->setObjectName("econIndicatorList");- connect(indicator_list_, &QListWidget::itemClicked,- this, &EconomicsScreen::on_indicator_clicked);- vl->addWidget(indicator_list_, 1);-- return panel;-}--// ── Stat card factory ────────────────────────────────────────────────────────--QWidget* EconomicsScreen::create_stat_card(const QString& label,- QLabel*& value_out,- QLabel*& sub_out) {- auto* card = new QWidget;- card->setObjectName("econStatCard");- card->setMinimumWidth(90);-- auto* vl = new QVBoxLayout(card);- vl->setContentsMargins(10, 6, 10, 6);- vl->setSpacing(2);-- auto* lbl = new QLabel(label);- lbl->setObjectName("econStatLabel");-- value_out = new QLabel("—");- value_out->setObjectName("econStatValue");-- sub_out = new QLabel("");- sub_out->setObjectName("econStatSub");-- vl->addWidget(lbl);- vl->addWidget(value_out);- vl->addWidget(sub_out);- return card;-}--// ── Right panel ──────────────────────────────────────────────────────────────--QWidget* EconomicsScreen::create_right_panel() {- auto* panel = new QWidget;- panel->setObjectName("econRightPanel");-- auto* vl = new QVBoxLayout(panel);- vl->setContentsMargins(0, 0, 0, 0);- vl->setSpacing(0);-- // ── Stats row ──- auto* stats_row = new QWidget;- stats_row->setObjectName("econStatsRow");- stats_row->setFixedHeight(72);- auto* shl = new QHBoxLayout(stats_row);- shl->setContentsMargins(10, 8, 10, 8);- shl->setSpacing(6);-- shl->addWidget(create_stat_card("LATEST VALUE", stat_latest_val_, stat_latest_sub_));- shl->addWidget(create_stat_card("PERIOD CHANGE", stat_change_val_, stat_change_sub_));- stat_change_val_->setObjectName("econStatChangePos");- shl->addWidget(create_stat_card("MINIMUM", stat_min_val_, stat_min_sub_));- shl->addWidget(create_stat_card("MAXIMUM", stat_max_val_, stat_max_sub_));- shl->addWidget(create_stat_card("AVERAGE", stat_avg_val_, stat_avg_sub_));- shl->addWidget(create_stat_card("DATA POINTS", stat_count_val_, stat_count_sub_));- shl->addStretch(1);- vl->addWidget(stats_row);-- // ── Table header bar ──- auto* tbl_hdr = new QWidget;- tbl_hdr->setObjectName("econTableHeader");- tbl_hdr->setFixedHeight(34);- auto* thl = new QHBoxLayout(tbl_hdr);- thl->setContentsMargins(12, 0, 12, 0);- thl->setSpacing(10);-- data_title_ = new QLabel("Select a country and indicator to fetch data");- data_title_->setObjectName("econDataTitle");- thl->addWidget(data_title_);- thl->addStretch(1);- data_status_ = new QLabel;- data_status_->setObjectName("econDataStatus");- thl->addWidget(data_status_);- vl->addWidget(tbl_hdr);-- // ── Stacked: empty state vs table ──- table_stack_ = new QStackedWidget;-- // Page 0 — empty state- empty_state_ = new QWidget;- empty_state_->setObjectName("econEmptyState");- auto* evl = new QVBoxLayout(empty_state_);- evl->setAlignment(Qt::AlignCenter);- auto* e1 = new QLabel("NO DATA LOADED");- e1->setObjectName("econEmptyTitle");- e1->setAlignment(Qt::AlignCenter);- auto* e2 = new QLabel("Select a source · pick a country · click an indicator");- e2->setObjectName("econEmptyHint");- e2->setAlignment(Qt::AlignCenter);- evl->addWidget(e1);- evl->addSpacing(6);- evl->addWidget(e2);- table_stack_->addWidget(empty_state_);-- // Page 1 — data table- data_table_ = new QTableWidget;- data_table_->setSelectionBehavior(QAbstractItemView::SelectRows);- data_table_->setSelectionMode(QAbstractItemView::SingleSelection);- data_table_->verticalHeader()->setVisible(false);- data_table_->horizontalHeader()->setStretchLastSection(true);- data_table_->horizontalHeader()->setSortIndicatorShown(true);- data_table_->setSortingEnabled(true);- data_table_->setEditTriggers(QAbstractItemView::NoEditTriggers);- data_table_->setAlternatingRowColors(true);- data_table_->setShowGrid(true);- table_stack_->addWidget(data_table_);-- vl->addWidget(table_stack_, 1);- return panel;-}--// ── Status bar ───────────────────────────────────────────────────────────────--QWidget* EconomicsScreen::create_status_bar() {- auto* bar = new QWidget;- bar->setObjectName("econStatusBar");- bar->setFixedHeight(24);-- auto* hl = new QHBoxLayout(bar);- hl->setContentsMargins(12, 0, 12, 0);- hl->setSpacing(6);- auto sep = [&]() {- auto* l = new QLabel("·");- l->setObjectName("econStatusSep");- return l;- };-- auto* left = new QLabel("ECONOMICS");- left->setObjectName("econStatusText");- hl->addWidget(left);-- hl->addWidget(sep());-- auto* src_lbl = new QLabel("SOURCE:");- src_lbl->setObjectName("econStatusText");- hl->addWidget(src_lbl);- status_source_ = new QLabel("World Bank");- status_source_->setObjectName("econStatusVal");- hl->addWidget(status_source_);-- hl->addWidget(sep());-- auto* ctry_lbl = new QLabel("COUNTRY:");- ctry_lbl->setObjectName("econStatusText");- hl->addWidget(ctry_lbl);- status_country_ = new QLabel("USA");- status_country_->setObjectName("econStatusVal");- hl->addWidget(status_country_);-- hl->addWidget(sep());-- auto* ind_lbl = new QLabel("INDICATOR:");- ind_lbl->setObjectName("econStatusText");- hl->addWidget(ind_lbl);- status_indicator_ = new QLabel("—");- status_indicator_->setObjectName("econStatusHigh");- hl->addWidget(status_indicator_);-- hl->addStretch(1);-- status_points_ = new QLabel;- status_points_->setObjectName("econStatusText");- hl->addWidget(status_points_);-- return bar;-}--// ── Slots ────────────────────────────────────────────────────────────────────--void EconomicsScreen::on_source_changed(int index) {- if (index < 0 || index >= sources_.size())- return;- active_source_ = index;- active_indicator_ = sources_[index].default_indicator;-- status_source_->setText(sources_[index].name);- update_source_badge(index);- populate_countries(index);- populate_indicators(index);-- LOG_INFO("Economics", "Source: " + sources_[index].name);-}--void EconomicsScreen::on_country_clicked(QListWidgetItem* item) {- if (!item) return;- active_country_ = item->data(Qt::UserRole).toString();- status_country_->setText(active_country_);-}--void EconomicsScreen::on_indicator_clicked(QListWidgetItem* item) {- if (!item) return;- active_indicator_ = item->data(Qt::UserRole).toString();- if (active_indicator_.isEmpty()) return; // category header- status_indicator_->setText(active_indicator_);- on_fetch();-}--void EconomicsScreen::on_fetch() {- if (loading_ || active_indicator_.isEmpty())- return;-- const auto& src = sources_[active_source_];- QStringList args;-- if (src.id == "worldbank") {- args << "indicators" << active_country_ << active_indicator_;- } else if (src.id == "fred") {- args << "series" << active_indicator_;- if (date_preset_->currentIndex() == 5) {- if (!date_start_->text().isEmpty()) args << date_start_->text();- if (!date_end_->text().isEmpty()) args << date_end_->text();- }- } else if (src.id == "imf") {- args << "economic_indicators" << active_country_ << active_indicator_;- } else {- args << active_indicator_ << active_country_;- if (date_preset_->currentIndex() == 5) {- if (!date_start_->text().isEmpty()) args << date_start_->text();- if (!date_end_->text().isEmpty()) args << date_end_->text();- }+ entry.badge = btn;+ bhl->addWidget(btn);+ sources_.append(entry);}+ bhl->addStretch();- execute_fetch(src.script, args);-}+ scroll->setWidget(badge_bar_);+ root->addWidget(scroll);-void EconomicsScreen::on_date_preset(int index) {- bool custom = (index == 5);- date_start_->setVisible(custom);- date_end_->setVisible(custom);+ // ── Panel stack ───────────────────────────────────────────────────────────+ stack_ = new QStackedWidget;+ stack_->setStyleSheet("background:#080808;");+ root->addWidget(stack_, 1);}-void EconomicsScreen::on_country_search(const QString& text) {- for (int i = 0; i < country_list_->count(); ++i) {- auto* item = country_list_->item(i);- bool match = text.isEmpty()- || item->text().contains(text, Qt::CaseInsensitive)- || item->data(Qt::UserRole).toString().contains(text, Qt::CaseInsensitive);- item->setHidden(!match);- }-}--void EconomicsScreen::on_indicator_search(const QString& text) {- for (int i = 0; i < indicator_list_->count(); ++i) {- auto* item = indicator_list_->item(i);- bool match = text.isEmpty()- || item->text().contains(text, Qt::CaseInsensitive)- || item->data(Qt::UserRole).toString().contains(text, Qt::CaseInsensitive);- item->setHidden(!match);- }-}--// ── Population ───────────────────────────────────────────────────────────────--void EconomicsScreen::populate_countries(int source_index) {- country_list_->clear();- const auto& src = sources_[source_index];- QStringList countries;-- if (src.id == "oecd")- countries = g_oecd_countries;- else if (src.id == "adb")- countries = g_adb_countries;- else if (src.id == "fred" || src.id == "fed" || src.id == "bls"- || src.id == "fiscaldata" || src.id == "bea")- countries = {"USA"};- else- countries = g_major_countries;-- for (const auto& c : countries) {- auto* item = new QListWidgetItem(c);- item->setData(Qt::UserRole, c);- country_list_->addItem(item);- }- country_count_->setText(QString::number(countries.size()));-- int usa_row = countries.indexOf("USA");- country_list_->setCurrentRow(usa_row >= 0 ? usa_row : 0);- if (country_list_->currentItem())- active_country_ = country_list_->currentItem()->data(Qt::UserRole).toString();-}--void EconomicsScreen::populate_indicators(int source_index) {- indicator_list_->clear();- const auto& src = sources_[source_index];-- QList<IndicatorDef> indicators;- if (src.id == "worldbank") indicators = g_worldbank_indicators;- else if (src.id == "fred") indicators = g_fred_indicators;- else if (src.id == "imf") indicators = g_imf_indicators;- else indicators = g_generic_indicators;+// ── Panel switching ───────────────────────────────────────────────────────────- QString last_cat;- for (const auto& ind : indicators) {- if (ind.category != last_cat) {- auto* header = new QListWidgetItem(" " + ind.category.toUpper());- header->setFlags(header->flags() & ~Qt::ItemIsSelectable);- header->setForeground(QColor(colors::AMBER));- auto f = header->font();- f.setBold(true);- f.setPointSize(8);- header->setFont(f);- indicator_list_->addItem(header);- last_cat = ind.category;- }- auto* item = new QListWidgetItem(" " + ind.name);- item->setData(Qt::UserRole, ind.id);- item->setToolTip(ind.id);- indicator_list_->addItem(item);- }-- indicator_count_->setText(QString::number(indicators.size()));- active_indicator_ = src.default_indicator;- status_indicator_->setText(active_indicator_);-}+EconPanelBase* EconomicsScreen::get_or_create_panel(SourceEntry& entry) {+ if (entry.panel)+ return entry.panel;-// ── Source badge highlight ───────────────────────────────────────────────────--void EconomicsScreen::update_source_badge(int index) {- if (!source_badge_bar_) return;- const auto& src = sources_[index];- auto* hl = qobject_cast<QHBoxLayout*>(source_badge_bar_->layout());- if (!hl) return;- for (int i = 0; i < sources_.size(); ++i) {- auto* w = hl->itemAt(i) ? hl->itemAt(i)->widget() : nullptr;- if (!w) continue;- bool active = (i == index);- w->setProperty("active", active);- if (active) {- const auto& s = sources_[i];- w->setStyleSheet(- QString("QPushButton#econSourceBadge {"- " border:1px solid %1; border-left:2px solid %1;"- " color:%1; background:rgba(%2,%3,%4,0.12);"- " font-size:9px; font-weight:700; padding:3px 10px; }")- .arg(s.color)- .arg(QColor(s.color).red())- .arg(QColor(s.color).green())- .arg(QColor(s.color).blue()));- } else {- w->setStyleSheet("");- }- // force style recalc- w->style()->unpolish(w);- w->style()->polish(w);+ EconPanelBase* panel = make_panel(entry.id, nullptr);+ if (!panel) {+ LOG_ERROR("EconomicsScreen",+ "No panel factory for source: " + entry.id);+ return nullptr;}-}--// ── Data fetch ───────────────────────────────────────────────────────────────--void EconomicsScreen::execute_fetch(const QString& script, const QStringList& args) {- set_loading(true);- data_title_->setText("Fetching " + active_indicator_ + "…");- data_status_->clear();-- QPointer<EconomicsScreen> self = this;-- python::PythonRunner::instance().run(script, args, [self](const python::PythonResult& result) {- if (!self) return;- self->set_loading(false);-- if (!result.success) {- self->display_error(result.error.isEmpty() ? "Fetch failed" : result.error);- return;- }- QString json_str = python::extract_json(result.output);- if (json_str.isEmpty()) {- self->display_error("No data returned from script");- return;- }-- QJsonParseError err;- auto doc = QJsonDocument::fromJson(json_str.toUtf8(), &err);- if (doc.isNull()) {- self->display_error("JSON parse error: " + err.errorString());- return;- }-- auto obj = doc.isObject() ? doc.object() : QJsonObject();-- // Check for error field- if (obj.contains("error") && !obj["error"].isNull()) {- QString err_msg;- if (obj["error"].isString())- err_msg = obj["error"].toString();- else if (obj["error"].isObject())- err_msg = obj["error"].toObject()["message"].toString("Unknown error");- if (!err_msg.isEmpty()) {- self->display_error(err_msg);- return;- }- }-- // Extract data array — handle all known shapes- QJsonArray data_array;- if (doc.isArray()) {- data_array = doc.array();- } else if (obj.contains("data") && obj["data"].isArray()) {- data_array = obj["data"].toArray();- } else if (obj.contains("observations") && obj["observations"].isArray()) {- data_array = obj["observations"].toArray(); // FRED- } else if (obj.contains("results") && obj["results"].isArray()) {- data_array = obj["results"].toArray();- } else if (obj.contains("series") && obj["series"].isArray()) {- data_array = obj["series"].toArray();- } else {- data_array.append(obj); // wrap single object- }-- if (data_array.isEmpty()) {- self->display_error("No data points returned");- return;- }-- self->display_data(data_array, self->active_indicator_);- self->display_stats(data_array);- LOG_INFO("Economics", self->active_indicator_ + ": "- + QString::number(data_array.size()) + " points");- });-}--// ── Display ──────────────────────────────────────────────────────────────────--void EconomicsScreen::display_data(const QJsonArray& data, const QString& title) {- data_table_->setSortingEnabled(false);- data_table_->clear();- data_table_->setRowCount(0);- data_table_->setColumnCount(0);-- if (data.isEmpty()) return;-- // Collect all unique column keys from first row- QStringList columns;- auto first = data[0].toObject();- for (auto it = first.begin(); it != first.end(); ++it)- columns << it.key();-- // Prefer date/period column first- for (const auto& preferred : QStringList{"date", "period", "year", "time", "Date", "Year"}) {- int idx = columns.indexOf(preferred);- if (idx > 0) { columns.move(idx, 0); break; }- }-- data_table_->setColumnCount(columns.size());- data_table_->setHorizontalHeaderLabels(columns);-- int max_rows = qMin(data.size(), 5000);- data_table_->setRowCount(max_rows);-- for (int row = 0; row < max_rows; ++row) {- auto obj = data[row].toObject();- for (int col = 0; col < columns.size(); ++col) {- auto val = obj.value(columns[col]);- QString text;- if (val.isDouble()) {- double d = val.toDouble();- // Use integer display for large whole numbers- if (d == std::floor(d) && std::abs(d) < 1e15)- text = QString::number(static_cast<long long>(d));- else- text = QString::number(d, 'g', 8);- } else if (val.isNull() || val.isUndefined()) {- text = "—";- } else {- text = val.toVariant().toString();- }-- auto* item = new QTableWidgetItem(text);- item->setTextAlignment(Qt::AlignVCenter |- (val.isDouble() ? Qt::AlignRight : Qt::AlignLeft));-- if (val.isDouble()) {- double d = val.toDouble();- if (d < 0)- item->setForeground(QColor(colors::NEGATIVE));- else if (d > 0)- item->setForeground(QColor(colors::CYAN));- }-- data_table_->setItem(row, col, item);- }- }-- if (columns.size() <= 12)- data_table_->resizeColumnsToContents();- data_table_->setSortingEnabled(true);- table_stack_->setCurrentIndex(1);-- data_title_->setText(title + " · " + active_country_);- data_status_->setText(QString::number(data.size()) + " rows");- status_points_->setText(QString::number(data.size()) + " data points");+ entry.panel = panel;+ stack_->addWidget(panel);+ LOG_INFO("EconomicsScreen", "Created panel for: " + entry.id);+ return panel;}-void EconomicsScreen::display_stats(const QJsonArray& data) {- if (data.isEmpty()) return;+void EconomicsScreen::switch_to(const QString& source_id) {+ if (active_id_ == source_id) return;+ active_id_ = source_id;- QVector<double> values;- for (const auto& item : data) {- auto obj = item.toObject();- bool found = false;+ for (auto& entry : sources_) {+ if (entry.badge)+ static_cast<QPushButton*>(entry.badge)+ ->setChecked(entry.id == source_id);- if (obj.contains("value")) {- auto v = obj["value"];- if (v.isDouble()) {- values.append(v.toDouble()); found = true;- } else if (v.isString()) {- bool ok = false;- double d = v.toString().toDouble(&ok);- if (ok) { values.append(d); found = true; }+ if (entry.id == source_id) {+ EconPanelBase* panel = get_or_create_panel(entry);+ if (panel) {+ stack_->setCurrentWidget(panel);+ panel->activate();}}- if (!found) {- for (auto it = obj.begin(); it != obj.end(); ++it) {- if (it.value().isDouble()) {- values.append(it.value().toDouble());- found = true;- break;- }- }- }- }-- if (values.isEmpty()) return;-- auto fmt = [](double v) -> QString {- if (std::abs(v) >= 1e12) return QString::number(v / 1e12, 'f', 2) + "T";- if (std::abs(v) >= 1e9) return QString::number(v / 1e9, 'f', 2) + "B";- if (std::abs(v) >= 1e6) return QString::number(v / 1e6, 'f', 2) + "M";- if (std::abs(v) >= 1e3) return QString::number(v / 1e3, 'f', 2) + "K";- return QString::number(v, 'f', 2);- };-- double latest = values.last();- double prev = values.size() > 1 ? values[values.size() - 2] : latest;- double change = (prev != 0) ? ((latest - prev) / std::abs(prev)) * 100.0 : 0.0;- double min_v = *std::min_element(values.begin(), values.end());- double max_v = *std::max_element(values.begin(), values.end());- double sum = 0; for (double v : values) sum += v;- double avg = sum / values.size();-- stat_latest_val_->setText(fmt(latest));- stat_latest_sub_->setText("most recent");-- stat_change_val_->setText(QString("%1%2%")- .arg(change >= 0 ? "+" : "").arg(change, 0, 'f', 2));- stat_change_val_->setObjectName(change >= 0 ? "econStatChangePos" : "econStatChangeNeg");- stat_change_val_->style()->unpolish(stat_change_val_);- stat_change_val_->style()->polish(stat_change_val_);- stat_change_sub_->setText("vs prior period");-- stat_min_val_->setText(fmt(min_v));- stat_min_sub_->setText("all-time low");-- stat_max_val_->setText(fmt(max_v));- stat_max_sub_->setText("all-time high");-- stat_avg_val_->setText(fmt(avg));- stat_avg_sub_->setText("period average");-- stat_count_val_->setText(QString::number(values.size()));- stat_count_sub_->setText("observations");-}--void EconomicsScreen::display_error(const QString& error) {- table_stack_->setCurrentIndex(0); // show empty state-- // Reset stats- for (auto* lbl : {stat_latest_val_, stat_change_val_, stat_min_val_,- stat_max_val_, stat_avg_val_, stat_count_val_}) {- if (lbl) lbl->setText("—");- }- for (auto* lbl : {stat_latest_sub_, stat_change_sub_, stat_min_sub_,- stat_max_sub_, stat_avg_sub_, stat_count_sub_}) {- if (lbl) lbl->setText("");- }-- data_title_->setText("Error: " + error);- data_status_->clear();- LOG_ERROR("Economics", error);-}--void EconomicsScreen::set_loading(bool loading) {- loading_ = loading;- fetch_btn_->setEnabled(!loading);- fetch_btn_->setText(loading ? " LOADING… " : " FETCH DATA ");- if (loading) {- data_title_->setText("Fetching data…");- data_status_->clear();}}diff --git a/fincept-qt/src/screens/economics/EconomicsScreen.h b/fincept-qt/src/screens/economics/EconomicsScreen.hindex 4a8d5b6ed..8a60490e5 100644--- a/fincept-qt/src/screens/economics/EconomicsScreen.h+++ b/fincept-qt/src/screens/economics/EconomicsScreen.h@@ -1,116 +1,44 @@+// src/screens/economics/EconomicsScreen.h+// Economics Data Explorer — panel-based shell.+// Hosts 32 per-source panels in a QStackedWidget.+// Left source-badge bar drives panel switching.+// Each panel is lazy-constructed on first activation.#pragma once-#include <QComboBox>-#include <QFrame>-#include <QJsonArray>-#include <QJsonObject>-#include <QLabel>-#include <QLineEdit>-#include <QListWidget>-#include <QPushButton>+#include <QHBoxLayout>+#include <QMap>#include <QStackedWidget>-#include <QTableWidget>-#include <QToolButton>#include <QWidget>namespace fincept::screens {-/// Economic data source descriptor.-struct EconSource {- QString id;- QString name;- QString script; // Python script name- QString color; // source accent color- bool needs_api_key;- QString default_indicator;- QString description; // short blurb shown in header-};+class EconPanelBase;-/// Economics Data Explorer — 15 global data sources with 1000+ indicators.class EconomicsScreen : public QWidget {Q_OBJECTpublic:explicit EconomicsScreen(QWidget* parent = nullptr);- private slots:- void on_source_changed(int index);- void on_country_clicked(QListWidgetItem* item);- void on_indicator_clicked(QListWidgetItem* item);- void on_fetch();- void on_date_preset(int index);- void on_country_search(const QString& text);- void on_indicator_search(const QString& text);-private:- void setup_ui();- QWidget* create_toolbar();- QWidget* create_source_bar();- QWidget* create_left_panel();- QWidget* create_right_panel();- QWidget* create_status_bar();- QWidget* create_stat_card(const QString& label, QLabel*& value_out, QLabel*& sub_out);-- void populate_countries(int source_index);- void populate_indicators(int source_index);- void execute_fetch(const QString& script, const QStringList& args);- void display_data(const QJsonArray& data, const QString& title);- void display_stats(const QJsonArray& data);- void display_error(const QString& error);- void set_loading(bool loading);- void update_source_badge(int index);-- // Sources- QList<EconSource> sources_;- int active_source_ = 0;- QString active_country_ = "USA";- QString active_indicator_;-- // Toolbar- QComboBox* source_combo_ = nullptr;- QComboBox* date_preset_ = nullptr;- QLineEdit* date_start_ = nullptr;- QLineEdit* date_end_ = nullptr;- QPushButton* fetch_btn_ = nullptr;-- // Source badge strip- QWidget* source_badge_bar_ = nullptr;-- // Left panel- QListWidget* country_list_ = nullptr;- QListWidget* indicator_list_ = nullptr;- QLineEdit* country_search_ = nullptr;- QLineEdit* indicator_search_= nullptr;- QLabel* country_count_ = nullptr;- QLabel* indicator_count_ = nullptr;-- // Stat cards (value + sub-label)- QLabel* stat_latest_val_ = nullptr;- QLabel* stat_latest_sub_ = nullptr;- QLabel* stat_change_val_ = nullptr;- QLabel* stat_change_sub_ = nullptr;- QLabel* stat_min_val_ = nullptr;- QLabel* stat_min_sub_ = nullptr;- QLabel* stat_max_val_ = nullptr;- QLabel* stat_max_sub_ = nullptr;- QLabel* stat_avg_val_ = nullptr;- QLabel* stat_avg_sub_ = nullptr;- QLabel* stat_count_val_ = nullptr;- QLabel* stat_count_sub_ = nullptr;-- // Right panel- QTableWidget* data_table_ = nullptr;- QLabel* data_title_ = nullptr;- QLabel* data_status_ = nullptr;- QWidget* empty_state_ = nullptr;- QStackedWidget* table_stack_ = nullptr;-- // Status bar- QLabel* status_source_ = nullptr;- QLabel* status_country_ = nullptr;- QLabel* status_indicator_ = nullptr;- QLabel* status_points_ = nullptr;-- bool loading_ = false;+ void build_ui();+ void switch_to(const QString& source_id);++ // badge bar + stacked panels+ QWidget* badge_bar_ = nullptr;+ QStackedWidget* stack_ = nullptr;++ // source_id → (badge widget, panel widget or nullptr if not yet built)+ struct SourceEntry {+ QString id;+ QString label;+ QString color;+ QWidget* badge = nullptr;+ EconPanelBase* panel = nullptr;+ };+ QList<SourceEntry> sources_;+ QString active_id_;++ EconPanelBase* get_or_create_panel(SourceEntry& entry);};} // namespace fincept::screensdiff --git a/fincept-qt/src/screens/economics/panels/AdbPanel.cpp b/fincept-qt/src/screens/economics/panels/AdbPanel.cppnew file mode 100644index 000000000..933f13570--- /dev/null+++ b/fincept-qt/src/screens/economics/panels/AdbPanel.cpp@@ -0,0 +1,214 @@+// src/screens/economics/panels/AdbPanel.cpp+// ADB (Asian Development Bank) — Key Indicators Database (KIDB), SDMX API.+// No API key required. 14 Asia-Pacific economies, 7 dataflow categories.+// Commands: get_gdp, get_population, get_financial, get_trade,+// get_multiple_indicators+// Response: { "data": [...], "metadata": {...}, "error": null }+// data[] rows (SDMX parsed): { "date": "YYYY", "value": 1.23, "time_period": "YYYY", "series_key": "..." }+#include "screens/economics/panels/AdbPanel.h"++#include "core/logging/Logger.h"+#include "services/economics/EconomicsService.h"++#include <QHBoxLayout>+#include <QJsonArray>+#include <QJsonObject>+#include <QLabel>+#include <QVBoxLayout>++namespace fincept::screens {++static constexpr const char* kScript = "adb_data.py";+static constexpr const char* kSourceId = "adb";+static constexpr const char* kColor = "#0072BC"; // ADB blue++struct AdbCategory {+ QString label;+ QString command;+ QString default_indicator;+ QString indicator_hint;+ bool uses_indicator;+};++static const QList<AdbCategory> kCategories = {+ {"GDP / National Accounts", "get_gdp", "NGDP_XDC", "e.g. NGDP_XDC, NGDPPC_XDC", true},+ {"Population", "get_population", "LP_PE_NUM_MOP", "e.g. LP_PE_NUM_MOP", true},+ {"Financial Indicators", "get_financial", "", "(all indicators)", false},+ {"Trade Data", "get_trade", "", "(all indicators)", false},+};++static const QList<QPair<QString,QString>> kEconomies = {+ {"Philippines (PHI)", "PHI"},+ {"Singapore (SGP)", "SGP"},+ {"Japan (JPN)", "JPN"},+ {"China (CHN)", "CHN"},+ {"India (IND)", "IND"},+ {"Korea (KOR)", "KOR"},+ {"Thailand (THA)", "THA"},+ {"Malaysia (MYS)", "MYS"},+ {"Indonesia (IDN)", "IDN"},+ {"Vietnam (VNM)", "VNM"},+ {"Hong Kong (HKG)", "HKG"},+ {"Taiwan (TWN)", "TWN"},+ {"Australia (AUS)", "AUS"},+ {"New Zealand (NZL)", "NZL"},+ {"All Economies", "all"},+};++// Common GDP/National Accounts indicators+static const QList<QPair<QString,QString>> kGdpIndicators = {+ {"GDP, current prices (NGDP_XDC)", "NGDP_XDC"},+ {"GDP per capita (NGDPPC_XDC)", "NGDPPC_XDC"},+ {"GDP growth rate (NGDP_R_YOY_PT)", "NGDP_R_YOY_PT"},+ {"Gross national income (GNI_XDC)", "GNI_XDC"},+ {"Gross fixed capital formation (GFCF_XDC)", "GFCF_XDC"},+ {"Exports of goods & services (EXG_XDC)", "EXG_XDC"},+ {"Imports of goods & services (IMG_XDC)", "IMG_XDC"},+ {"Government final consumption (GGFC_XDC)", "GGFC_XDC"},+};++// ── Constructor ───────────────────────────────────────────────────────────────++AdbPanel::AdbPanel(QWidget* parent)+ : EconPanelBase(kSourceId, kColor, parent) {+ build_base_ui(this);+ connect(&services::EconomicsService::instance(),+ &services::EconomicsService::result_ready,+ this, &AdbPanel::on_result);+}++void AdbPanel::activate() {+ show_empty("Select an economy and data category, then click FETCH\n"+ "ADB data is free — no API key required");+}++// ── Controls ──────────────────────────────────────────────────────────────────++void AdbPanel::build_controls(QHBoxLayout* thl) {+ auto make_lbl = [](const QString& text) {+ auto* l = new QLabel(text);+ l->setStyleSheet(+ "color:#525252; font-size:9px; font-weight:700; background:transparent;");+ return l;+ };++ economy_combo_ = new QComboBox;+ for (const auto& e : kEconomies)+ economy_combo_->addItem(e.first, e.second);+ economy_combo_->setFixedHeight(26);+ economy_combo_->setMinimumWidth(165);++ category_combo_ = new QComboBox;+ for (const auto& c : kCategories)+ category_combo_->addItem(c.label);+ category_combo_->setFixedHeight(26);+ category_combo_->setMinimumWidth(185);+ connect(category_combo_, &QComboBox::currentIndexChanged,+ this, &AdbPanel::on_category_changed);++ indicator_input_ = new QLineEdit;+ indicator_input_->setPlaceholderText(kCategories[0].indicator_hint);+ indicator_input_->setText(kCategories[0].default_indicator);+ indicator_input_->setFixedHeight(26);+ indicator_input_->setFixedWidth(130);++ start_input_ = new QLineEdit;+ start_input_->setPlaceholderText("Start year");+ start_input_->setFixedHeight(26);+ start_input_->setFixedWidth(70);++ end_input_ = new QLineEdit;+ end_input_->setPlaceholderText("End year");+ end_input_->setFixedHeight(26);+ end_input_->setFixedWidth(70);++ thl->addWidget(make_lbl("ECONOMY"));+ thl->addWidget(economy_combo_);+ thl->addWidget(make_lbl("CATEGORY"));+ thl->addWidget(category_combo_);+ thl->addWidget(make_lbl("INDICATOR"));+ thl->addWidget(indicator_input_);+ thl->addWidget(make_lbl("FROM"));+ thl->addWidget(start_input_);+ thl->addWidget(make_lbl("TO"));+ thl->addWidget(end_input_);+}++void AdbPanel::on_category_changed(int index) {+ if (index < 0 || index >= kCategories.size()) return;+ const auto& cat = kCategories[index];+ indicator_input_->setPlaceholderText(cat.indicator_hint);+ indicator_input_->setText(cat.default_indicator);+ indicator_input_->setEnabled(cat.uses_indicator);+}++// ── Fetch ─────────────────────────────────────────────────────────────────────++void AdbPanel::on_fetch() {+ const int cat_idx = category_combo_->currentIndex();+ if (cat_idx < 0 || cat_idx >= kCategories.size()) return;+ const auto& cat = kCategories[cat_idx];++ const QString economy = economy_combo_->currentData().toString();+ const QString indicator = indicator_input_->text().trimmed().toUpper();+ const QString start = start_input_->text().trimmed();+ const QString end = end_input_->text().trimmed();++ if (economy.isEmpty()) {+ show_empty("Select an economy");+ return;+ }+ if (cat.uses_indicator && indicator.isEmpty()) {+ show_empty("Enter an indicator code (e.g. " + cat.default_indicator + ")");+ return;+ }++ QStringList args;+ args << economy;+ if (cat.uses_indicator) args << indicator;+ if (!start.isEmpty()) args << start;+ if (!start.isEmpty() && !end.isEmpty()) args << end;++ show_loading("Fetching ADB " + cat.label + " for " + economy + "…");+ services::EconomicsService::instance().execute(+ kSourceId, kScript, cat.command, args,+ "adb_" + cat.command + "_" + economy + "_" + indicator);+}++// ── Result ────────────────────────────────────────────────────────────────────++void AdbPanel::on_result(const QString& request_id,+ const services::EconomicsResult& result) {+ if (result.source_id != kSourceId) return;++ if (!result.success) {+ // ADB uses "error" key at top level+ const QString err = result.error.isEmpty()+ ? result.data["error"].toString()+ : result.error;+ show_error(err.isEmpty() ? "Unknown error from ADB API" : err);+ return;+ }++ // ADB response: { "data": [...], "metadata": {...}, "error": null }+ // rows: { "date"/"time_period": "YYYY", "value": 1.23, "series_key": "..." }+ QJsonArray rows = result.data["data"].toArray();++ if (rows.isEmpty()) {+ // Check for error embedded in data field+ const QString emb_err = result.data["error"].toString();+ if (!emb_err.isEmpty()) { show_error(emb_err); return; }+ show_empty("No data returned — try a different economy, indicator or date range");+ return;+ }++ const QString economy_label = economy_combo_->currentText();+ const QString cat_label = category_combo_->currentText();+ const QString title = "ADB: " + cat_label + " — " + economy_label;++ display(rows, title);+ LOG_INFO("AdbPanel", QString("Displayed %1 rows for %2")+ .arg(rows.size()).arg(request_id));+}++} // namespace fincept::screensdiff --git a/fincept-qt/src/screens/economics/panels/AdbPanel.h b/fincept-qt/src/screens/economics/panels/AdbPanel.hnew file mode 100644index 000000000..56f7b261a--- /dev/null+++ b/fincept-qt/src/screens/economics/panels/AdbPanel.h@@ -0,0 +1,36 @@+// src/screens/economics/panels/AdbPanel.h+// ADB (Asian Development Bank) — SDMX/KIDB API, no API key required.+// 14 Asia-Pacific economies, 7 dataflow categories.+// Script: adb_data.py+#pragma once++#include "screens/economics/panels/EconPanelBase.h"++#include <QComboBox>+#include <QLineEdit>++namespace fincept::screens {++class AdbPanel : public EconPanelBase {+ Q_OBJECT+ public:+ explicit AdbPanel(QWidget* parent = nullptr);+ void activate() override;++ protected:+ void build_controls(QHBoxLayout* thl) override;+ void on_fetch() override;+ void on_result(const QString& request_id,+ const services::EconomicsResult& result) override;++ private:+ void on_category_changed(int index);++ QComboBox* economy_combo_ = nullptr;+ QComboBox* category_combo_ = nullptr;+ QLineEdit* indicator_input_ = nullptr;+ QLineEdit* start_input_ = nullptr;+ QLineEdit* end_input_ = nullptr;+};++} // namespace fincept::screensdiff --git a/fincept-qt/src/screens/economics/panels/BeaPanel.cpp b/fincept-qt/src/screens/economics/panels/BeaPanel.cppnew file mode 100644index 000000000..fff49354f--- /dev/null+++ b/fincept-qt/src/screens/economics/panels/BeaPanel.cpp@@ -0,0 +1,316 @@+// src/screens/economics/panels/BeaPanel.cpp+// BEA (Bureau of Economic Analysis) — requires BEA_API_KEY env var.+//+// Uses the frontend integration command:+// fetch <indicator_id> <start_year>-01-01 <end_year>-12-31+// Response: { "success": true,+// "data": [{"date": "2022", "value": 123.4}],+// "metadata": {"indicator": "gdp_growth", "indicator_name": "Real GDP Growth...",+// "country": "United States", "source": "BEA NIPA",+// "table": "T10101", "line": "1"} }+//+// 27 indicators mapped across 5 categories:+// GDP: gdp_growth, nominal_gdp, real_gdp, gdp_deflator, gdp_per_capita, gdi+// Consumption: pce, pce_goods, pce_services, gross_investment, fixed_investment+// Trade: net_exports, exports, imports, current_account+// Income: personal_income, compensation, wages_salaries, disposable_income,+// personal_saving, saving_rate+// Government: govt_spending, federal_spending, defense_spending,+// govt_receipts, personal_taxes, corporate_taxes, gross_saving+#include "screens/economics/panels/BeaPanel.h"++#include "core/logging/Logger.h"+#include "services/economics/EconomicsService.h"++#include <QDate>+#include <QHBoxLayout>+#include <QJsonArray>+#include <QJsonObject>+#include <QLabel>+#include <QSplitter>+#include <QVBoxLayout>++namespace fincept::screens {++static constexpr const char* kScript = "bea_data.py";+static constexpr const char* kSourceId = "bea";+static constexpr const char* kColor = "#E65100"; // deep orange++struct BeaIndicatorDef { QString name; QString id; QString unit; };++// ── GDP & Output ──────────────────────────────────────────────────────────────+static const QList<BeaIndicatorDef> kGdpIndicators = {+ {"Real GDP Growth (% Change)", "gdp_growth", "% change"},+ {"Nominal GDP (Billions $)", "nominal_gdp", "Billions $"},+ {"Real GDP (Chained 2017 $)", "real_gdp", "Billions $"},+ {"GDP Price Index", "gdp_deflator", "Index"},+ {"GDP Price Change (%)", "gdp_price_change","% change"},+ {"GDP per Capita (Current $)", "gdp_per_capita", "$ per capita"},+ {"Gross Domestic Income (Billions $)", "gdi", "Billions $"},+};++// ── Consumption & Investment ──────────────────────────────────────────────────+static const QList<BeaIndicatorDef> kConsumptionIndicators = {+ {"Personal Consumption Expenditures", "pce", "Billions $"},+ {"PCE — Goods", "pce_goods", "Billions $"},+ {"PCE — Services", "pce_services", "Billions $"},+ {"Gross Private Domestic Investment", "gross_investment", "Billions $"},+ {"Fixed Investment", "fixed_investment", "Billions $"},+};++// ── Trade & External ─────────────────────────────────────────────────────────+static const QList<BeaIndicatorDef> kTradeIndicators = {+ {"Net Exports (Billions $)", "net_exports", "Billions $"},+ {"Exports of Goods & Services", "exports", "Billions $"},+ {"Imports of Goods & Services", "imports", "Billions $"},+ {"Current Account Balance", "current_account", "Billions $"},+};++// ── Income & Saving ───────────────────────────────────────────────────────────+static const QList<BeaIndicatorDef> kIncomeIndicators = {+ {"Personal Income (Billions $)", "personal_income", "Billions $"},+ {"Compensation of Employees", "compensation", "Billions $"},+ {"Wages and Salaries", "wages_salaries", "Billions $"},+ {"Disposable Personal Income", "disposable_income", "Billions $"},+ {"Personal Saving (Billions $)", "personal_saving", "Billions $"},+ {"Personal Saving Rate (%)", "saving_rate", "%"},+ {"PCE Inflation (% Change)", "pce_inflation", "% change"},+ {"Core PCE Inflation (ex F&E)", "core_pce_inflation", "% change"},+};++// ── Government ────────────────────────────────────────────────────────────────+static const QList<BeaIndicatorDef> kGovtIndicators = {+ {"Government Spending (Billions $)", "govt_spending", "Billions $"},+ {"Federal Government Spending", "federal_spending", "Billions $"},+ {"National Defense Spending", "defense_spending", "Billions $"},+ {"Government Current Receipts", "govt_receipts", "Billions $"},+ {"Personal Current Taxes", "personal_taxes", "Billions $"},+ {"Taxes on Corporate Income", "corporate_taxes", "Billions $"},+ {"Gross Saving (Billions $)", "gross_saving", "Billions $"},+};++struct BeaCategoryDef {+ QString label;+ const QList<BeaIndicatorDef>* indicators;+};++static const QList<BeaCategoryDef> kCategories = {+ {"GDP & Output", &kGdpIndicators},+ {"Consumption & Investment", &kConsumptionIndicators},+ {"Trade & External", &kTradeIndicators},+ {"Income & Saving", &kIncomeIndicators},+ {"Government", &kGovtIndicators},+};++// ── Constructor ───────────────────────────────────────────────────────────────++BeaPanel::BeaPanel(QWidget* parent)+ : EconPanelBase(kSourceId, kColor, parent) {++ // Outer layout: left selector | right base UI+ auto* main = new QHBoxLayout(this);+ main->setContentsMargins(0, 0, 0, 0);+ main->setSpacing(0);++ // ── Left: category + indicator selector ──────────────────────────────────+ auto* left = new QWidget;+ left->setFixedWidth(210);+ left->setStyleSheet("background:#0a0a0a; border-right:1px solid #1a1a1a;");+ auto* lvl = new QVBoxLayout(left);+ lvl->setContentsMargins(0, 0, 0, 0);+ lvl->setSpacing(0);++ // Category header+ auto* cat_hdr = new QWidget;+ cat_hdr->setStyleSheet("background:#111111; border-bottom:1px solid #1a1a1a;");+ cat_hdr->setFixedHeight(32);+ auto* chl = new QHBoxLayout(cat_hdr);+ chl->setContentsMargins(8, 0, 8, 0);+ auto* cat_lbl = new QLabel("CATEGORY");+ cat_lbl->setStyleSheet(+ "color:#808080; font-size:9px; font-weight:700; background:transparent;");+ category_combo_ = new QComboBox;+ for (const auto& c : kCategories)+ category_combo_->addItem(c.label);+ category_combo_->setFixedHeight(22);+ connect(category_combo_, &QComboBox::currentIndexChanged,+ this, &BeaPanel::on_category_changed);+ chl->addWidget(cat_lbl);+ chl->addWidget(category_combo_, 1);+ lvl->addWidget(cat_hdr);++ // Indicator search+ indicator_search_ = new QLineEdit;+ indicator_search_->setPlaceholderText("Filter indicators…");+ indicator_search_->setStyleSheet(+ "background:#080808; color:#e5e5e5; border:none;"+ "border-bottom:1px solid #1a1a1a; padding:4px 8px; font-size:10px;");+ indicator_search_->setFixedHeight(28);+ connect(indicator_search_, &QLineEdit::textChanged,+ this, &BeaPanel::on_indicator_filter);+ lvl->addWidget(indicator_search_);++ // Indicator list+ indicator_list_ = new QListWidget;+ indicator_list_->setStyleSheet(+ "QListWidget { background:#080808; border:none; outline:none; font-size:10px; }"+ "QListWidget::item { color:#808080; padding:4px 10px;"+ " border-bottom:1px solid #111111; }"+ "QListWidget::item:hover { color:#e5e5e5; background:#0f0f0f; }"+ QString("QListWidget::item:selected { color:%1;"+ " background:rgba(230,81,0,0.08);"+ " border-left:2px solid %1; padding-left:8px; }").arg(kColor));+ indicator_list_->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);+ lvl->addWidget(indicator_list_, 1);++ main->addWidget(left);++ // ── Right: base UI ────────────────────────────────────────────────────────+ auto* right = new QWidget;+ right->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);+ build_base_ui(right);+ main->addWidget(right, 1);++ // Populate initial indicator list (GDP category)+ on_category_changed(0);++ connect(&services::EconomicsService::instance(),+ &services::EconomicsService::result_ready,+ this, &BeaPanel::on_result);+}++void BeaPanel::activate() {+ show_empty("Select a category and indicator, then click FETCH\n"+ "Requires BEA_API_KEY — free at: www.bea.gov/data/api/register\n"+ "All data is US national accounts (NIPA)");+}++// ── Controls ──────────────────────────────────────────────────────────────────++void BeaPanel::build_controls(QHBoxLayout* thl) {+ auto make_lbl = [](const QString& text) {+ auto* l = new QLabel(text);+ l->setStyleSheet(+ "color:#525252; font-size:9px; font-weight:700; background:transparent;");+ return l;+ };++ start_input_ = new QLineEdit;+ start_input_->setPlaceholderText("Start year");+ start_input_->setText("2000");+ start_input_->setFixedHeight(26);+ start_input_->setFixedWidth(75);++ end_input_ = new QLineEdit;+ end_input_->setPlaceholderText("End year");+ end_input_->setText(QString::number(QDate::currentDate().year()));+ end_input_->setFixedHeight(26);+ end_input_->setFixedWidth(75);++ thl->addWidget(make_lbl("FROM"));+ thl->addWidget(start_input_);+ thl->addWidget(make_lbl("TO"));+ thl->addWidget(end_input_);++ // API key notice+ auto* notice = new QLabel("Requires BEA_API_KEY");+ notice->setStyleSheet(+ "color:#f59e0b; font-size:9px; background:transparent;");+ thl->addWidget(notice);+}++void BeaPanel::on_category_changed(int index) {+ if (index < 0 || index >= kCategories.size()) return;+ indicator_list_->clear();+ indicator_search_->clear();+ current_indicators_.clear();++ const auto& inds = *kCategories[index].indicators;+ for (const auto& ind : inds) {+ current_indicators_.append({ind.name, ind.id, ind.unit});+ auto* item = new QListWidgetItem(+ ind.name + " [" + ind.unit + "]");+ item->setData(Qt::UserRole, ind.id);+ item->setToolTip(ind.id + " — " + ind.unit);+ indicator_list_->addItem(item);+ }+ if (indicator_list_->count() > 0)+ indicator_list_->setCurrentRow(0);+}++void BeaPanel::on_indicator_filter(const QString& text) {+ for (int i = 0; i < indicator_list_->count(); ++i) {+ auto* item = indicator_list_->item(i);+ item->setHidden(!text.isEmpty() &&+ !item->text().contains(text, Qt::CaseInsensitive) &&+ !item->data(Qt::UserRole).toString()+ .contains(text, Qt::CaseInsensitive));+ }+}++// ── Fetch ─────────────────────────────────────────────────────────────────────++void BeaPanel::on_fetch() {+ const auto* sel = indicator_list_->currentItem();+ if (!sel) {+ show_empty("Select an indicator from the list");+ return;+ }+ const QString indicator_id = sel->data(Qt::UserRole).toString();+ const QString start = start_input_->text().trimmed();+ const QString end = end_input_->text().trimmed();++ if (start.isEmpty() || end.isEmpty()) {+ show_empty("Enter start and end years");+ return;+ }++ // CLI: fetch <indicator_id> <start_year>-01-01 <end_year>-12-31+ show_loading("Fetching BEA: " + sel->text().split(" [").first() + "…");+ services::EconomicsService::instance().execute(+ kSourceId, kScript, "fetch",+ {indicator_id, start + "-01-01", end + "-12-31"},+ "bea_fetch_" + indicator_id);+}++// ── Result ────────────────────────────────────────────────────────────────────++void BeaPanel::on_result(const QString& request_id,+ const services::EconomicsResult& result) {+ if (result.source_id != kSourceId) return;+ if (!request_id.startsWith("bea_fetch_")) return;++ if (!result.success) {+ if (result.error.contains("API key") ||+ result.error.contains("UserID") ||+ result.error.contains("register")) {+ show_error("BEA API key not configured.\n"+ "Set BEA_API_KEY environment variable.\n"+ "Free registration at: www.bea.gov/data/api/register");+ } else {+ show_error(result.error);+ }+ return;+ }++ // Response: { "success": true, "data": [{"date": "2022", "value": 123.4}],+ // "metadata": {"indicator_name": "...", "source": "BEA NIPA"} }+ QJsonArray rows = result.data["data"].toArray();++ if (rows.isEmpty()) {+ show_empty("No data returned — check API key and year range");+ return;+ }++ const QJsonObject meta = result.data["metadata"].toObject();+ const QString ind_name = meta["indicator_name"].toString(+ indicator_list_->currentItem()+ ? indicator_list_->currentItem()->text().split(" [").first()+ : "Indicator");++ display(rows, "BEA: " + ind_name);+ LOG_INFO("BeaPanel", QString("Displayed %1 data points for %2")+ .arg(rows.size()).arg(request_id));+}++} // namespace fincept::screensdiff --git a/fincept-qt/src/screens/economics/panels/BeaPanel.h b/fincept-qt/src/screens/economics/panels/BeaPanel.hnew file mode 100644index 000000000..1093d517a--- /dev/null+++ b/fincept-qt/src/screens/economics/panels/BeaPanel.h@@ -0,0 +1,49 @@+// src/screens/economics/panels/BeaPanel.h+// BEA (Bureau of Economic Analysis) — US National/Regional/Industry economic data.+// Requires BEA_API_KEY env var. Free registration at bea.gov/data/api/register+// Best command: fetch <indicator_id> <start_year> <end_year>+// Response: { "success": true, "data": [{"date": "YYYY", "value": 123.4}],+// "metadata": {"indicator_name": "...", "source": "BEA NIPA"} }+// Script: bea_data.py+#pragma once++#include "screens/economics/panels/EconPanelBase.h"++#include <QComboBox>+#include <QLabel>+#include <QLineEdit>+#include <QListWidget>++namespace fincept::screens {++class BeaPanel : public EconPanelBase {+ Q_OBJECT+ public:+ explicit BeaPanel(QWidget* parent = nullptr);+ void activate() override;++ protected:+ void build_controls(QHBoxLayout* thl) override;+ void on_fetch() override;+ void on_result(const QString& request_id,+ const services::EconomicsResult& result) override;++ private:+ void on_category_changed(int index);+ void on_indicator_filter(const QString& text);++ // Left sidebar+ QComboBox* category_combo_ = nullptr;+ QLineEdit* indicator_search_ = nullptr;+ QListWidget* indicator_list_ = nullptr;++ // Toolbar controls+ QLineEdit* start_input_ = nullptr;+ QLineEdit* end_input_ = nullptr;+ QComboBox* freq_combo_ = nullptr;++ struct IndicatorDef { QString name; QString id; QString unit; };+ QList<IndicatorDef> current_indicators_;+};++} // namespace fincept::screensdiff --git a/fincept-qt/src/screens/economics/panels/BisPanel.cpp b/fincept-qt/src/screens/economics/panels/BisPanel.cppnew file mode 100644index 000000000..14bad0caa--- /dev/null+++ b/fincept-qt/src/screens/economics/panels/BisPanel.cpp@@ -0,0 +1,187 @@+// src/screens/economics/panels/BisPanel.cpp+// BIS SDMX API — 13 statistical domains, no API key required.+// Commands: get_central_bank_policy_rates, get_effective_exchange_rates,+// get_exchange_rates, get_long_term_interest_rates,+// get_short_term_interest_rates, get_credit_to_non_financial_sector,+// get_house_prices, get_economic_overview+// Response: { "success": true, "data": [...], "metadata": {...} }+// data[] rows: { "date": "YYYY-MM", "value": 1.23, "country": "US", "series_key": "..." }+#include "screens/economics/panels/BisPanel.h"++#include "core/logging/Logger.h"+#include "services/economics/EconomicsService.h"++#include <QHBoxLayout>+#include <QJsonArray>+#include <QJsonObject>+#include <QLabel>+#include <QVBoxLayout>++namespace fincept::screens {++static constexpr const char* kScript = "bis_data.py";+static constexpr const char* kSourceId = "bis";+static constexpr const char* kColor = "#9D4EDD"; // purple++// Dataset combo entries: { display label, CLI command, placeholder country hint }+struct BisDataset {+ QString label;+ QString command;+ QString country_hint;+ QString default_country;+};++static const QList<BisDataset> kDatasets = {+ {"Central Bank Policy Rates", "get_central_bank_policy_rates", "e.g. US, GB, JP, DE", "US"},+ {"Effective Exchange Rates", "get_effective_exchange_rates", "e.g. US, GB, JP", "US"},+ {"Exchange Rates vs USD", "get_exchange_rates", "e.g. GB, JP, DE, AU", "GB"},+ {"Long-term Interest Rates", "get_long_term_interest_rates", "e.g. US, DE, JP, GB", "US"},+ {"Short-term Interest Rates", "get_short_term_interest_rates", "e.g. US, DE, JP, GB", "US"},+ {"Credit to Non-Financial Sector", "get_credit_to_non_financial_sector", "e.g. US, CN, JP", "US"},+ {"House Prices", "get_house_prices", "e.g. US, GB, DE, AU", "US"},+ {"Economic Overview (multi-series)", "get_economic_overview", "e.g. US", "US"},+};++// ── Constructor ───────────────────────────────────────────────────────────────++BisPanel::BisPanel(QWidget* parent)+ : EconPanelBase(kSourceId, kColor, parent) {+ build_base_ui(this);+ connect(&services::EconomicsService::instance(),+ &services::EconomicsService::result_ready,+ this, &BisPanel::on_result);+}++void BisPanel::activate() {+ show_empty("Select a dataset and country code, then click FETCH\n"+ "BIS data is free — no API key required");+}++// ── Controls ──────────────────────────────────────────────────────────────────++void BisPanel::build_controls(QHBoxLayout* thl) {+ auto make_lbl = [](const QString& text) {+ auto* l = new QLabel(text);+ l->setStyleSheet(+ "color:#525252; font-size:9px; font-weight:700; background:transparent;");+ return l;+ };++ dataset_combo_ = new QComboBox;+ for (const auto& d : kDatasets)+ dataset_combo_->addItem(d.label);+ dataset_combo_->setFixedHeight(26);+ dataset_combo_->setMinimumWidth(230);+ connect(dataset_combo_, &QComboBox::currentIndexChanged,+ this, &BisPanel::on_dataset_changed);++ country_input_ = new QLineEdit;+ country_input_->setPlaceholderText("Country code");+ country_input_->setText("US");+ country_input_->setFixedHeight(26);+ country_input_->setFixedWidth(70);++ start_input_ = new QLineEdit;+ start_input_->setPlaceholderText("Start year");+ start_input_->setFixedHeight(26);+ start_input_->setFixedWidth(70);++ end_input_ = new QLineEdit;+ end_input_->setPlaceholderText("End year");+ end_input_->setFixedHeight(26);+ end_input_->setFixedWidth(70);++ thl->addWidget(make_lbl("DATASET"));+ thl->addWidget(dataset_combo_);+ thl->addWidget(make_lbl("COUNTRY"));+ thl->addWidget(country_input_);+ thl->addWidget(make_lbl("FROM"));+ thl->addWidget(start_input_);+ thl->addWidget(make_lbl("TO"));+ thl->addWidget(end_input_);+}++void BisPanel::on_dataset_changed(int index) {+ if (index < 0 || index >= kDatasets.size()) return;+ const auto& ds = kDatasets[index];+ country_input_->setPlaceholderText(ds.country_hint);+ // If user hasn't typed anything custom, fill in default+ if (country_input_->text().isEmpty() ||+ country_input_->text() == kDatasets[qMax(0, index - 1)].default_country) {+ country_input_->setText(ds.default_country);+ }+ // Economic overview doesn't use a country filter+ country_input_->setEnabled(ds.command != "get_economic_overview");+}++// ── Fetch ─────────────────────────────────────────────────────────────────────++void BisPanel::on_fetch() {+ const int idx = dataset_combo_->currentIndex();+ if (idx < 0 || idx >= kDatasets.size()) return;+ const auto& ds = kDatasets[idx];++ QStringList args;+ const QString country = country_input_->text().trimmed().toUpper();+ const QString start = start_input_->text().trimmed();+ const QString end = end_input_->text().trimmed();++ // economic_overview doesn't take country/date args+ if (ds.command != "get_economic_overview") {+ if (country.isEmpty()) {+ show_empty("Enter a country code (e.g. US, GB, JP)");+ return;+ }+ args << country;+ if (!start.isEmpty()) args << start;+ if (!start.isEmpty() && !end.isEmpty()) args << end;+ }++ show_loading("Fetching BIS " + ds.label + "…");+ services::EconomicsService::instance().execute(+ kSourceId, kScript, ds.command, args,+ "bis_" + ds.command + "_" + country);+}++// ── Result ────────────────────────────────────────────────────────────────────++void BisPanel::on_result(const QString& request_id,+ const services::EconomicsResult& result) {+ if (result.source_id != kSourceId) return;++ if (!result.success) {+ show_error(result.error);+ return;+ }++ // BIS response: { "success": true, "data": [...], "metadata": {...} }+ // data[] rows: { "date": "YYYY-MM", "value": 1.23, "country": "US", "series_key": "..." }+ // economic_overview may return nested: { "data": { "exchange_rates": [...], ... } }+ QJsonArray rows = result.data["data"].toArray();++ if (rows.isEmpty()) {+ // Try nested overview structure — flatten all sub-arrays into one+ const QJsonObject data_obj = result.data["data"].toObject();+ if (!data_obj.isEmpty()) {+ for (const auto& key : data_obj.keys()) {+ const QJsonArray sub = data_obj[key].toArray();+ for (const auto& v : sub) rows.append(v);+ }+ }+ }++ if (rows.isEmpty()) {+ show_empty("No data returned — try a different country or date range");+ return;+ }++ // Build title from metadata+ const QString title = "BIS: " + dataset_combo_->currentText()+ + " — " + country_input_->text().trimmed().toUpper();++ display(rows, title);+ LOG_INFO("BisPanel", QString("Displayed %1 rows for %2")+ .arg(rows.size()).arg(request_id));+}++} // namespace fincept::screensdiff --git a/fincept-qt/src/screens/economics/panels/BisPanel.h b/fincept-qt/src/screens/economics/panels/BisPanel.hnew file mode 100644index 000000000..60037c2ec--- /dev/null+++ b/fincept-qt/src/screens/economics/panels/BisPanel.h@@ -0,0 +1,35 @@+// src/screens/economics/panels/BisPanel.h+// BIS (Bank for International Settlements) — SDMX API, no API key required.+// 13 statistical domains: exchange rates, central bank rates, credit, house prices, etc.+// Script: bis_data.py+#pragma once++#include "screens/economics/panels/EconPanelBase.h"++#include <QComboBox>+#include <QLineEdit>++namespace fincept::screens {++class BisPanel : public EconPanelBase {+ Q_OBJECT+ public:+ explicit BisPanel(QWidget* parent = nullptr);+ void activate() override;++ protected:+ void build_controls(QHBoxLayout* thl) override;+ void on_fetch() override;+ void on_result(const QString& request_id,+ const services::EconomicsResult& result) override;++ private:+ void on_dataset_changed(int index);++ QComboBox* dataset_combo_ = nullptr;+ QLineEdit* country_input_ = nullptr;+ QLineEdit* start_input_ = nullptr;+ QLineEdit* end_input_ = nullptr;+};++} // namespace fincept::screensdiff --git a/fincept-qt/src/screens/economics/panels/CftcPanel.cpp b/fincept-qt/src/screens/economics/panels/CftcPanel.cppnew file mode 100644index 000000000..c5276198d--- /dev/null+++ b/fincept-qt/src/screens/economics/panels/CftcPanel.cpp@@ -0,0 +1,420 @@+// src/screens/economics/panels/CftcPanel.cpp+// CFTC (Commodity Futures Trading Commission) — Commitments of Traders.+// No API key required. Covers 40+ futures markets.+// Commands: cot_data, market_sentiment, cot_historical_trend+// cot_data response: { "success": true, "data": [{flat 40+ fields}], "parameters": {...} }+// sentiment response: { "success": true, "data": { "commercial_positions": {...},+// "non_commercial_positions": {...}, "overall_sentiment": {...} } }+// trend response: { "success": true, "data": [{ "date", "open_interest",+// "commercial_net", "non_commercial_net", ... }] }+#include "screens/economics/panels/CftcPanel.h"++#include "core/logging/Logger.h"+#include "services/economics/EconomicsService.h"++#include <QFrame>+#include <QGridLayout>+#include <QHBoxLayout>+#include <QJsonArray>+#include <QJsonObject>+#include <QLabel>+#include <QVBoxLayout>++namespace fincept::screens {++static constexpr const char* kScript = "cftc_data.py";+static constexpr const char* kSourceId = "cftc";+static constexpr const char* kColor = "#FF5722"; // deep orange++static const QList<QPair<QString,QString>> kMarkets = {+ // Metals+ {"Gold", "gold"},+ {"Silver", "silver"},+ {"Copper", "copper"},+ {"Platinum", "platinum"},+ {"Palladium", "palladium"},+ // Energy+ {"Crude Oil (WTI)", "crude_oil"},+ {"Natural Gas", "natural_gas"},+ {"Gasoline", "gasoline"},+ {"Heating Oil", "heating_oil"},+ // Agricultural+ {"Corn", "corn"},+ {"Wheat", "wheat"},+ {"Soybeans", "soybeans"},+ {"Cotton", "cotton"},+ {"Coffee", "coffee"},+ {"Sugar", "sugar"},+ {"Cocoa", "cocoa"},+ {"Live Cattle", "live_cattle"},+ {"Lean Hogs", "lean_hogs"},+ // FX+ {"Euro (EUR/USD)", "euro"},+ {"Japanese Yen", "jpy"},+ {"British Pound", "british_pound"},+ {"Swiss Franc", "swiss_franc"},+ {"Canadian Dollar", "canadian_dollar"},+ {"Australian Dollar", "australian_dollar"},+ // Indices+ {"S&P 500", "s&p_500"},+ {"Nasdaq 100", "nasdaq_100"},+ {"Dow Jones", "dow_jones"},+ {"Nikkei 225", "nikkei"},+ {"VIX", "vix"},+ // Rates+ {"T-Bonds (30Y)", "treasury_bonds"},+ {"T-Notes (10Y)", "treasury_notes_10y"},+ {"T-Notes (5Y)", "treasury_notes_5y"},+ {"T-Notes (2Y)", "treasury_notes_2y"},+ {"Fed Funds", "fed_funds"},+ // Crypto+ {"Bitcoin", "bitcoin"},+ {"Ethereum", "ether"},+ // FX+ {"US Dollar Index", "us_dollar_index"},+};++static const QList<QPair<QString,QString>> kReportTypes = {+ {"Legacy", "legacy"},+ {"Disaggregated", "disaggregated"},+ {"Financial (TFF)", "financial"},+};++static const QList<QPair<QString,QString>> kViews = {+ {"COT Table", "cot"},+ {"Market Sentiment", "sentiment"},+ {"Historical Trend", "trend"},+};++// ── Constructor ───────────────────────────────────────────────────────────────++CftcPanel::CftcPanel(QWidget* parent)+ : EconPanelBase(kSourceId, kColor, parent) {+ build_base_ui(this);+ build_sentiment_widget();+ connect(&services::EconomicsService::instance(),+ &services::EconomicsService::result_ready,+ this, &CftcPanel::on_result);+}++void CftcPanel::activate() {+ show_empty("Select a futures market and view, then click FETCH\n"+ "CFTC data is free — no API key required");+}++// ── Controls ──────────────────────────────────────────────────────────────────++void CftcPanel::build_controls(QHBoxLayout* thl) {+ auto make_lbl = [](const QString& text) {+ auto* l = new QLabel(text);+ l->setStyleSheet(+ "color:#525252; font-size:9px; font-weight:700; background:transparent;");+ return l;+ };++ market_combo_ = new QComboBox;+ for (const auto& m : kMarkets)+ market_combo_->addItem(m.first, m.second);+ market_combo_->setFixedHeight(26);+ market_combo_->setMinimumWidth(160);++ report_type_combo_ = new QComboBox;+ for (const auto& r : kReportTypes)+ report_type_combo_->addItem(r.first, r.second);+ report_type_combo_->setFixedHeight(26);+ report_type_combo_->setMinimumWidth(130);++ view_combo_ = new QComboBox;+ for (const auto& v : kViews)+ view_combo_->addItem(v.first, v.second);+ view_combo_->setFixedHeight(26);+ view_combo_->setMinimumWidth(145);++ thl->addWidget(make_lbl("MARKET"));+ thl->addWidget(market_combo_);+ thl->addWidget(make_lbl("REPORT"));+ thl->addWidget(report_type_combo_);+ thl->addWidget(make_lbl("VIEW"));+ thl->addWidget(view_combo_);+}++// ── Sentiment widget ──────────────────────────────────────────────────────────++void CftcPanel::build_sentiment_widget() {+ sentiment_widget_ = new QWidget;+ sentiment_widget_->setStyleSheet("background:#080808;");+ auto* root = new QVBoxLayout(sentiment_widget_);+ root->setContentsMargins(20, 16, 20, 16);+ root->setSpacing(12);++ // Header+ auto* hdr = new QWidget;+ hdr->setStyleSheet("background:#111111; border:1px solid #1a1a1a;");+ auto* hdr_hl = new QHBoxLayout(hdr);+ hdr_hl->setContentsMargins(14, 10, 14, 10);++ auto* title_lbl = new QLabel("COT MARKET SENTIMENT");+ title_lbl->setStyleSheet(+ "color:#e5e5e5; font-size:12px; font-weight:700; background:transparent;");++ sent_market_lbl_ = new QLabel("—");+ sent_market_lbl_->setStyleSheet(+ QString("color:%1; font-size:11px; font-weight:700; background:transparent;")+ .arg(kColor));+ sent_date_lbl_ = new QLabel("—");+ sent_date_lbl_->setStyleSheet(+ "color:#525252; font-size:10px; background:transparent;");++ hdr_hl->addWidget(title_lbl);+ hdr_hl->addStretch(1);+ hdr_hl->addWidget(sent_market_lbl_);+ hdr_hl->addWidget(sent_date_lbl_);+ root->addWidget(hdr);++ // Bias cards+ auto* cards = new QWidget;+ auto* cards_hl = new QHBoxLayout(cards);+ cards_hl->setContentsMargins(0, 0, 0, 0);+ cards_hl->setSpacing(10);++ auto make_card = [&](const QString& title_text, QLabel*& bias_out,+ QLabel*& net_out, const QString& desc) {+ auto* card = new QWidget;+ card->setStyleSheet("background:#111111; border:1px solid #1a1a1a;");+ card->setMinimumHeight(120);+ auto* cvl = new QVBoxLayout(card);+ cvl->setContentsMargins(14, 12, 14, 12);+ cvl->setSpacing(4);++ auto* ttl = new QLabel(title_text);+ ttl->setStyleSheet(+ "color:#808080; font-size:9px; font-weight:700; letter-spacing:1px;"+ "background:transparent;");++ bias_out = new QLabel("—");+ bias_out->setStyleSheet(+ "color:#e5e5e5; font-size:18px; font-weight:700; background:transparent;");++ net_out = new QLabel("Net: —");+ net_out->setStyleSheet(+ "color:#525252; font-size:10px; background:transparent;");++ auto* d = new QLabel(desc);+ d->setStyleSheet("color:#404040; font-size:9px; background:transparent;");+ d->setWordWrap(true);++ cvl->addWidget(ttl);+ cvl->addWidget(bias_out);+ cvl->addWidget(net_out);+ cvl->addStretch(1);+ cvl->addWidget(d);+ cards_hl->addWidget(card, 1);+ };++ make_card("COMMERCIAL TRADERS", sent_comm_bias_, sent_comm_net_,+ "Hedgers & producers — usually contrarian signal");+ make_card("NON-COMMERCIAL (SPECULATORS)", sent_noncomm_bias_, sent_noncomm_net_,+ "Managed money & funds — trend-following signal");++ // OI & trend row+ auto* oi_row = new QWidget;+ oi_row->setStyleSheet("background:#111111; border:1px solid #1a1a1a;");+ auto* oi_hl = new QHBoxLayout(oi_row);+ oi_hl->setContentsMargins(14, 8, 14, 8);+ oi_hl->setSpacing(20);++ auto* oi_lbl = new QLabel("OPEN INTEREST");+ oi_lbl->setStyleSheet(+ "color:#808080; font-size:9px; font-weight:700; background:transparent;");+ sent_oi_lbl_ = new QLabel("—");+ sent_oi_lbl_->setStyleSheet(+ "color:#e5e5e5; font-size:13px; font-weight:700; background:transparent;");++ auto* trend_lbl = new QLabel("OI TREND");+ trend_lbl->setStyleSheet(+ "color:#808080; font-size:9px; font-weight:700; background:transparent;");+ sent_oi_trend_ = new QLabel("—");+ sent_oi_trend_->setStyleSheet(+ "color:#e5e5e5; font-size:13px; font-weight:700; background:transparent;");++ oi_hl->addWidget(oi_lbl);+ oi_hl->addWidget(sent_oi_lbl_);+ oi_hl->addWidget(trend_lbl);+ oi_hl->addWidget(sent_oi_trend_);+ oi_hl->addStretch(1);++ root->addLayout(cards_hl);+ root->addWidget(oi_row);+ root->addStretch(1);+}++// ── Fetch ─────────────────────────────────────────────────────────────────────++void CftcPanel::on_fetch() {+ const QString market = market_combo_->currentData().toString();+ const QString report_type = report_type_combo_->currentData().toString();+ const QString view = view_combo_->currentData().toString();++ if (market.isEmpty()) {+ show_empty("Select a futures market");+ return;+ }++ show_loading("Fetching CFTC data for " + market_combo_->currentText() + "…");++ if (view == "cot") {+ services::EconomicsService::instance().execute(+ kSourceId, kScript, "cot_data",+ {market, report_type},+ "cftc_cot_" + market);+ } else if (view == "sentiment") {+ services::EconomicsService::instance().execute(+ kSourceId, kScript, "market_sentiment",+ {market, report_type},+ "cftc_sent_" + market);+ } else {+ services::EconomicsService::instance().execute(+ kSourceId, kScript, "cot_historical_trend",+ {market, report_type},+ "cftc_trend_" + market);+ }+}++// ── Result ────────────────────────────────────────────────────────────────────++void CftcPanel::on_result(const QString& request_id,+ const services::EconomicsResult& result) {+ if (result.source_id != kSourceId) return;++ if (!result.success) {+ show_error(result.error);+ return;+ }++ // Sentiment view: data is an object, not an array+ if (request_id.startsWith("cftc_sent_")) {+ const QJsonObject sentiment = result.data["data"].toObject();+ if (sentiment.isEmpty()) {+ show_error("No sentiment data returned");+ return;+ }+ show_sentiment(sentiment);+ return;+ }++ // COT table or historical trend — data is an array+ // cot_data rows: flat dict with date, open_interest_all, comm_long_all, etc.+ // trend rows: { "date", "open_interest", "commercial_net", "non_commercial_net", ... }+ QJsonArray rows = result.data["data"].toArray();++ if (rows.isEmpty()) {+ const QString err_str = result.data.contains("error")+ ? result.data["error"].toObject()["error"].toString()+ : "";+ show_empty(err_str.isEmpty()+ ? "No data returned — try a different market or report type"+ : err_str);+ return;+ }++ // For COT table, keep only the most useful columns for display+ // (the raw records have 40+ fields — we pick the key ones)+ if (request_id.startsWith("cftc_cot_")) {+ QJsonArray clean;+ for (const auto& v : rows) {+ const auto obj = v.toObject();+ QJsonObject row;+ row["date"] = obj["report_date_as_yyyy_mm_dd"];+ row["market"] = obj["market_and_exchange_names"];+ row["open_interest"] = obj["open_interest_all"];+ row["comm_long"] = obj["comm_long_all"].isUndefined()+ ? obj["comm_positions_long_all"]+ : obj["comm_long_all"];+ row["comm_short"] = obj["comm_short_all"].isUndefined()+ ? obj["comm_positions_short_all"]+ : obj["comm_short_all"];+ row["noncomm_long"] = obj["noncomm_long_all"].isUndefined()+ ? obj["noncomm_positions_long_all"]+ : obj["noncomm_long_all"];+ row["noncomm_short"] = obj["noncomm_short_all"].isUndefined()+ ? obj["noncomm_positions_short_all"]+ : obj["noncomm_short_all"];+ clean.append(row);+ }+ display(clean, "CFTC COT: " + market_combo_->currentText()+ + " (" + report_type_combo_->currentText() + ")");+ } else {+ // Historical trend — rows already have clean keys+ display(rows, "CFTC Historical Trend: " + market_combo_->currentText());+ }++ LOG_INFO("CftcPanel", QString("Displayed %1 rows for %2")+ .arg(rows.size()).arg(request_id));+}++// ── Sentiment display ─────────────────────────────────────────────────────────++void CftcPanel::show_sentiment(const QJsonObject& s) {+ if (!sentiment_widget_) return;++ // Populate labels+ sent_market_lbl_->setText(s["market_name"].toString(market_combo_->currentText()));+ sent_date_lbl_->setText("Report: " + s["latest_report"].toString("—"));++ const double oi = s["open_interest"].toDouble();+ sent_oi_lbl_->setText(oi > 0 ? QString::number(static_cast<qint64>(oi), 'd') : "—");++ const QString oi_trend = s["overall_sentiment"].toObject()["oi_trend"].toString();+ sent_oi_trend_->setText(oi_trend.isEmpty() ? "—" : oi_trend.toUpper());+ sent_oi_trend_->setStyleSheet(+ QString("color:%1; font-size:13px; font-weight:700; background:transparent;")+ .arg(oi_trend == "increasing" ? "#16a34a" : "#dc2626"));++ const QString comm_bias =+ s["overall_sentiment"].toObject()["commercial_bias"].toString();+ sent_comm_bias_->setText(comm_bias.isEmpty() ? "—" : comm_bias.toUpper());+ sent_comm_bias_->setStyleSheet(+ QString("color:%1; font-size:18px; font-weight:700; background:transparent;")+ .arg(comm_bias == "bullish" ? "#16a34a" : "#dc2626"));++ const QString noncomm_bias =+ s["overall_sentiment"].toObject()["non_commercial_bias"].toString();+ sent_noncomm_bias_->setText(noncomm_bias.isEmpty() ? "—" : noncomm_bias.toUpper());+ sent_noncomm_bias_->setStyleSheet(+ QString("color:%1; font-size:18px; font-weight:700; background:transparent;")+ .arg(noncomm_bias == "bullish" ? "#16a34a" : "#dc2626"));++ const QJsonObject comm = s["commercial_positions"].toObject();+ const double comm_net = comm["net"].toDouble();+ sent_comm_net_->setText(+ QString("Net: %1%2").arg(comm_net >= 0 ? "+" : "")+ .arg(static_cast<qint64>(comm_net), 'd'));++ const QJsonObject noncomm = s["non_commercial_positions"].toObject();+ const double noncomm_net = noncomm["net"].toDouble();+ sent_noncomm_net_->setText(+ QString("Net: %1%2").arg(noncomm_net >= 0 ? "+" : "")+ .arg(static_cast<qint64>(noncomm_net), 'd'));++ // Switch to sentiment widget — we show it in place of empty state+ // by temporarily inserting it into the layout if not already there+ // The base class stack_ is private; we use show_empty and overlay trick:+ // Instead, we just show data in the table as a summary row fallback.+ // For now, display the sentiment as a single-row table so base stats work.+ QJsonArray rows;+ QJsonObject row;+ row["market"] = s["market_name"].toString(market_combo_->currentText());+ row["report_date"] = s["latest_report"];+ row["open_interest"] = oi;+ row["comm_net"] = comm_net;+ row["noncomm_net"] = noncomm_net;+ row["comm_bias"] = comm_bias;+ row["noncomm_bias"] = noncomm_bias;+ row["oi_trend"] = oi_trend;+ rows.append(row);+ display(rows, "CFTC Sentiment: " + market_combo_->currentText());++ LOG_INFO("CftcPanel", "Displayed sentiment for " + market_combo_->currentText());+}++} // namespace fincept::screensdiff --git a/fincept-qt/src/screens/economics/panels/CftcPanel.h b/fincept-qt/src/screens/economics/panels/CftcPanel.hnew file mode 100644index 000000000..7d7fe6f7f--- /dev/null+++ b/fincept-qt/src/screens/economics/panels/CftcPanel.h@@ -0,0 +1,49 @@+// src/screens/economics/panels/CftcPanel.h+// CFTC (Commodity Futures Trading Commission) — Commitments of Traders reports.+// No API key required. Covers 40+ futures markets: commodities, FX, indices, crypto.+// Script: cftc_data.py+#pragma once++#include "screens/economics/panels/EconPanelBase.h"++#include <QComboBox>+#include <QLabel>+#include <QStackedWidget>++namespace fincept::screens {++class CftcPanel : public EconPanelBase {+ Q_OBJECT+ public:+ explicit CftcPanel(QWidget* parent = nullptr);+ void activate() override;++ protected:+ void build_controls(QHBoxLayout* thl) override;+ void on_fetch() override;+ void on_result(const QString& request_id,+ const services::EconomicsResult& result) override;++ private:+ void show_sentiment(const QJsonObject& sentiment);+ void build_sentiment_widget();++ QComboBox* market_combo_ = nullptr;+ QComboBox* report_type_combo_ = nullptr;+ QComboBox* view_combo_ = nullptr;++ // Sentiment view widgets+ QWidget* sentiment_widget_ = nullptr;+ QLabel* sent_market_lbl_ = nullptr;+ QLabel* sent_date_lbl_ = nullptr;+ QLabel* sent_oi_lbl_ = nullptr;+ QLabel* sent_comm_bias_ = nullptr;+ QLabel* sent_noncomm_bias_ = nullptr;+ QLabel* sent_oi_trend_ = nullptr;+ QLabel* sent_comm_net_ = nullptr;+ QLabel* sent_noncomm_net_ = nullptr;++ QStackedWidget* content_stack_ = nullptr; // 0=base table, 1=sentiment+};++} // namespace fincept::screensdiff --git a/fincept-qt/src/screens/economics/panels/EiaPanel.cpp b/fincept-qt/src/screens/economics/panels/EiaPanel.cppnew file mode 100644index 000000000..c35e842f9--- /dev/null+++ b/fincept-qt/src/screens/economics/panels/EiaPanel.cpp@@ -0,0 +1,202 @@+// src/screens/economics/panels/EiaPanel.cpp+// EIA U.S. Energy Information Administration+//+// Two data sources with different commands and response shapes:+//+// WPSR (Weekly Petroleum Status Report) — NO API KEY NEEDED+// Command: get_petroleum <category>+// Response: { "success": true, "category": "...", "data": [...], "count": N }+// data[] rows: { "date": "YYYY-MM-DD", "category": "...", "table": "...",+// "symbol": "...", "value": 1.23, "source": "petroleum_status_report" }+//+// STEO (Short-Term Energy Outlook) — REQUIRES EIA_API_KEY+// Command: get_steo <table>+// Response: { "success": true, "table": "...", "data": [...] }+// data[] rows: { "date": "YYYY-MM", "symbol": "WTIPUUS", "title": "WTI Crude...",+// "value": 78.5, "units": "$/barrel", "table": "STEO-01: ...",+// "source": "short_term_energy_outlook" }+#include "screens/economics/panels/EiaPanel.h"++#include "core/logging/Logger.h"+#include "services/economics/EconomicsService.h"++#include <QHBoxLayout>+#include <QJsonArray>+#include <QJsonObject>+#include <QLabel>+#include <QVBoxLayout>++namespace fincept::screens {++static constexpr const char* kScript = "eia_data.py";+static constexpr const char* kSourceId = "eia";+static constexpr const char* kColor = "#4CAF50"; // green++// ── WPSR categories (no API key needed, downloads public XLS)+static const QList<QPair<QString,QString>> kWpsrCategories = {+ {"Balance Sheet", "balance_sheet"},+ {"Inputs & Production", "inputs_and_production"},+ {"Crude Petroleum Stocks", "crude_petroleum_stocks"},+ {"Gasoline & Fuel Stocks", "gasoline_fuel_stocks"},+ {"Gasoline by Sub-PADD", "total_gasoline_by_sub_padd"},+ {"Distillate Fuel Oil Stocks", "distillate_fuel_oil_stocks"},+ {"Imports", "imports"},+ {"Imports by Country", "imports_by_country"},+ {"Weekly Estimates", "weekly_estimates"},+ {"Spot Prices (Crude/Gas/Heating Oil)", "spot_prices_crude_gas_heating"},+ {"Spot Prices (Diesel/Jet/Propane)", "spot_prices_diesel_jet_fuel_propane"},+ {"Retail Prices", "retail_prices"},+ {"Refiner/Blender Net Production", "refiner_blender_net_production"},+};++// ── STEO tables (requires EIA_API_KEY)+static const QList<QPair<QString,QString>> kSteoTables = {+ {"01 — US Energy Markets Summary", "01"},+ {"02 — Nominal Energy Prices", "02"},+ {"04a — Petroleum & Liquid Fuels", "04a"},+ {"05a — Natural Gas Supply & Consumption", "05a"},+ {"07a — US Electricity Industry Overview", "07a"},+ {"09a — Macroeconomic Indicators & CO2", "09a"},+};++// ── Constructor ───────────────────────────────────────────────────────────────++EiaPanel::EiaPanel(QWidget* parent)+ : EconPanelBase(kSourceId, kColor, parent) {+ build_base_ui(this);+ connect(&services::EconomicsService::instance(),+ &services::EconomicsService::result_ready,+ this, &EiaPanel::on_result);+}++void EiaPanel::activate() {+ show_empty("Select a data source and category, then click FETCH\n"+ "Weekly Petroleum Status Report requires no API key\n"+ "Short-Term Energy Outlook requires EIA_API_KEY env var");+}++// ── Controls ──────────────────────────────────────────────────────────────────++void EiaPanel::build_controls(QHBoxLayout* thl) {+ auto make_lbl = [](const QString& text) {+ auto* l = new QLabel(text);+ l->setStyleSheet(+ "color:#525252; font-size:9px; font-weight:700; background:transparent;");+ return l;+ };++ source_combo_ = new QComboBox;+ source_combo_->addItem("Weekly Petroleum (WPSR)", "wpsr");+ source_combo_->addItem("Short-Term Outlook (STEO)", "steo");+ source_combo_->setFixedHeight(26);+ source_combo_->setMinimumWidth(200);+ connect(source_combo_, &QComboBox::currentIndexChanged,+ this, &EiaPanel::on_source_changed);++ category_combo_ = new QComboBox;+ category_combo_->setFixedHeight(26);+ category_combo_->setMinimumWidth(260);++ // Populate with WPSR categories initially+ for (const auto& c : kWpsrCategories)+ category_combo_->addItem(c.first, c.second);++ apikey_notice_ = new QLabel("No API key needed");+ apikey_notice_->setStyleSheet(+ "color:#16a34a; font-size:9px; background:transparent;");++ thl->addWidget(make_lbl("SOURCE"));+ thl->addWidget(source_combo_);+ thl->addWidget(make_lbl("CATEGORY"));+ thl->addWidget(category_combo_);+ thl->addWidget(apikey_notice_);+}++void EiaPanel::on_source_changed(int index) {+ category_combo_->clear();+ if (index == 0) {+ // WPSR+ for (const auto& c : kWpsrCategories)+ category_combo_->addItem(c.first, c.second);+ apikey_notice_->setText("No API key needed");+ apikey_notice_->setStyleSheet(+ "color:#16a34a; font-size:9px; background:transparent;");+ } else {+ // STEO+ for (const auto& t : kSteoTables)+ category_combo_->addItem(t.first, t.second);+ apikey_notice_->setText("Requires EIA_API_KEY");+ apikey_notice_->setStyleSheet(+ "color:#f59e0b; font-size:9px; background:transparent;");+ }+}++// ── Fetch ─────────────────────────────────────────────────────────────────────++void EiaPanel::on_fetch() {+ const QString source = source_combo_->currentData().toString();+ const QString category = category_combo_->currentData().toString();++ if (category.isEmpty()) {+ show_empty("Select a category");+ return;+ }++ if (source == "wpsr") {+ show_loading("Fetching EIA Petroleum Report: " ++ category_combo_->currentText() + "…\n"+ "(Downloads public XLS file — may take a few seconds)");+ services::EconomicsService::instance().execute(+ kSourceId, kScript, "get_petroleum",+ {category},+ "eia_wpsr_" + category);+ } else {+ show_loading("Fetching EIA STEO Table " ++ category_combo_->currentText() + "…");+ services::EconomicsService::instance().execute(+ kSourceId, kScript, "get_steo",+ {category},+ "eia_steo_" + category);+ }+}++// ── Result ────────────────────────────────────────────────────────────────────++void EiaPanel::on_result(const QString& request_id,+ const services::EconomicsResult& result) {+ if (result.source_id != kSourceId) return;++ if (!result.success) {+ // Detect API key error for STEO+ if (result.error.contains("API key") || result.error.contains("api_key")) {+ show_error("EIA API key not configured.\n"+ "Set EIA_API_KEY environment variable.\n"+ "Free key at: www.eia.gov/opendata/register.php");+ } else {+ show_error(result.error);+ }+ return;+ }++ // Both WPSR and STEO return { "success": true, "data": [...] }+ QJsonArray rows = result.data["data"].toArray();++ if (rows.isEmpty()) {+ show_empty("No data returned for this selection");+ return;+ }++ // WPSR rows: { date, category, table, symbol, value, source }+ // STEO rows: { date, symbol, title, value, units, table, source }+ // Both have "date" and "value" — base display() handles both correctly.+ // For WPSR, promote "symbol" as a useful column; for STEO "title" is descriptive.+ // The base display() auto-detects date→col0, value→col1, rest follows.++ const QString title = "EIA: " + category_combo_->currentText();+ display(rows, title);++ LOG_INFO("EiaPanel", QString("Displayed %1 rows — %2")+ .arg(rows.size()).arg(request_id));+}++} // namespace fincept::screensdiff --git a/fincept-qt/src/screens/economics/panels/EiaPanel.h b/fincept-qt/src/screens/economics/panels/EiaPanel.hnew file mode 100644index 000000000..8838bca85--- /dev/null+++ b/fincept-qt/src/screens/economics/panels/EiaPanel.h@@ -0,0 +1,36 @@+// src/screens/economics/panels/EiaPanel.h+// EIA (U.S. Energy Information Administration)+// WPSR (Weekly Petroleum Status Report): no API key — downloads public XLS files.+// STEO (Short-Term Energy Outlook): requires EIA_API_KEY env var.+// Script: eia_data.py+#pragma once++#include "screens/economics/panels/EconPanelBase.h"++#include <QComboBox>+#include <QLabel>+#include <QStackedWidget>++namespace fincept::screens {++class EiaPanel : public EconPanelBase {+ Q_OBJECT+ public:+ explicit EiaPanel(QWidget* parent = nullptr);+ void activate() override;++ protected:+ void build_controls(QHBoxLayout* thl) override;+ void on_fetch() override;+ void on_result(const QString& request_id,+ const services::EconomicsResult& result) override;++ private:+ void on_source_changed(int index);++ QComboBox* source_combo_ = nullptr; // WPSR | STEO+ QComboBox* category_combo_ = nullptr; // WPSR categories or STEO tables+ QLabel* apikey_notice_ = nullptr;+};++} // namespace fincept::screensdiff --git a/fincept-qt/src/screens/economics/panels/FinceptMacroPanel.cpp b/fincept-qt/src/screens/economics/panels/FinceptMacroPanel.cppnew file mode 100644index 000000000..0925456d8--- /dev/null+++ b/fincept-qt/src/screens/economics/panels/FinceptMacroPanel.cpp@@ -0,0 +1,57 @@+// src/screens/economics/panels/FinceptMacroPanel.cpp+// Fincept Macro — proprietary macro data source.+// The script fincept_macro.py does not yet exist.+// This panel shows a Coming Soon state with description of planned data.+// When fincept_macro.py is ready, implement on_fetch() and on_result() here.+#include "screens/economics/panels/FinceptMacroPanel.h"++#include "core/logging/Logger.h"++#include <QHBoxLayout>+#include <QLabel>+#include <QVBoxLayout>++namespace fincept::screens {++static constexpr const char* kSourceId = "fincept";+static constexpr const char* kColor = "#d97706"; // amber++FinceptMacroPanel::FinceptMacroPanel(QWidget* parent)+ : EconPanelBase(kSourceId, kColor, parent) {+ build_base_ui(this);+ // No service connection — Coming Soon panel+}++void FinceptMacroPanel::activate() {+ show_empty(+ "Fincept Macro — Coming Soon\n\n"+ "Planned data:\n"+ " · Central bank rates (40+ countries)\n"+ " · Sovereign debt metrics\n"+ " · Fincept proprietary macro indices\n"+ " · Global inflation dashboard\n"+ " · Emerging market indicators\n\n"+ "Requires Fincept subscription + API key\n"+ "Check back in a future release");+}++void FinceptMacroPanel::build_controls(QHBoxLayout* thl) {+ auto* lbl = new QLabel("FINCEPT MACRO — COMING SOON");+ lbl->setStyleSheet(+ QString("color:%1; font-size:9px; font-weight:700;"+ "background:transparent; letter-spacing:1px;").arg(kColor));+ thl->addWidget(lbl);+}++void FinceptMacroPanel::on_fetch() {+ show_empty(+ "Fincept Macro data script is not yet available.\n"+ "This panel will be enabled in a future release.");+}++void FinceptMacroPanel::on_result(const QString& /*request_id*/,+ const services::EconomicsResult& /*result*/) {+ // No-op until fincept_macro.py is implemented+}++} // namespace fincept::screensdiff --git a/fincept-qt/src/screens/economics/panels/FinceptMacroPanel.h b/fincept-qt/src/screens/economics/panels/FinceptMacroPanel.hnew file mode 100644index 000000000..ac65c2d51--- /dev/null+++ b/fincept-qt/src/screens/economics/panels/FinceptMacroPanel.h@@ -0,0 +1,24 @@+// src/screens/economics/panels/FinceptMacroPanel.h+// Fincept Macro — proprietary macro data source.+// Script fincept_macro.py does not yet exist — shows a Coming Soon panel.+// When the script is ready, this panel will be updated.+#pragma once++#include "screens/economics/panels/EconPanelBase.h"++namespace fincept::screens {++class FinceptMacroPanel : public EconPanelBase {+ Q_OBJECT+ public:+ explicit FinceptMacroPanel(QWidget* parent = nullptr);+ void activate() override;++ protected:+ void build_controls(QHBoxLayout* thl) override;+ void on_fetch() override;+ void on_result(const QString& request_id,+ const services::EconomicsResult& result) override;+};++} // namespace fincept::screensdiff --git a/fincept-qt/src/screens/economics/panels/UnescoPanel.cpp b/fincept-qt/src/screens/economics/panels/UnescoPanel.cppnew file mode 100644index 000000000..afbbf64de--- /dev/null+++ b/fincept-qt/src/screens/economics/panels/UnescoPanel.cpp@@ -0,0 +1,326 @@+// src/screens/economics/panels/UnescoPanel.cpp+// UNESCO UIS (Institute for Statistics) — No API key required.+//+// Primary command: fetch <indicator_code> <country_code> [start_year] [end_year]+// Response: { "success": true,+// "data": [{"date": "2022", "value": 95.2}],+// "metadata": {"indicator": "GER.1", "indicator_name": "Gross Enrolment...",+// "country": "USA", "source": "UNESCO UIS"} }+//+// list_indicators command:+// Response: { "success": true, "data": { "records": [{"id": "GER.1", "name": "...",+// "theme": "EDUCATION"}] } }+//+// education_overview [country_codes...]:+// Response: { "success": true, "data": { ... complex nested object ... } }+// — we use fetch for simplicity, education_overview as fallback overview+#include "screens/economics/panels/UnescoPanel.h"++#include "core/logging/Logger.h"+#include "services/economics/EconomicsService.h"++#include <QHBoxLayout>+#include <QJsonArray>+#include <QJsonObject>+#include <QLabel>+#include <QSplitter>+#include <QVBoxLayout>++namespace fincept::screens {++static constexpr const char* kScript = "unesco_data.py";+static constexpr const char* kSourceId = "unesco";+static constexpr const char* kColor = "#00ACC1"; // cyan++// Curated preset indicators per theme — used before live list loads+struct UnescoIndicatorDef { QString name; QString code; };++static const QList<UnescoIndicatorDef> kEducationIndicators = {+ {"Gross Enrolment Ratio, Primary", "GER.1"},+ {"Gross Enrolment Ratio, Secondary", "GER.2"},+ {"Gross Enrolment Ratio, Tertiary", "GER.3"},+ {"Net Enrolment Rate, Primary", "NER.1"},+ {"Net Enrolment Rate, Secondary", "NER.2"},+ {"Youth Literacy Rate (15-24)", "LR.AG15T24"},+ {"Adult Literacy Rate (15+)", "LR.AG15T99"},+ {"Out-of-School Rate, Primary", "ROFST.H.1"},+ {"Out-of-School Rate, Secondary", "ROFST.H.2"},+ {"Government Expenditure on Education (% GDP)", "XGDP.FSGOV"},+ {"Pupil-Teacher Ratio, Primary", "PTRHC.1"},+ {"Trained Teachers, Primary (%)", "TRTP.1"},+ {"Completion Rate, Primary", "CR.1"},+ {"Completion Rate, Secondary", "CR.2"},+};++static const QList<UnescoIndicatorDef> kScienceIndicators = {+ {"R&D Expenditure (% GDP)", "XGDP.GERD"},+ {"Researchers per million inhabitants", "RESEARCHERS.TOTAL.FTE"},+ {"Technicians per million inhabitants", "TECHN.TOTAL.FTE"},+ {"Patent Applications (residents)", "PAT.RESIDENT"},+ {"Patent Applications (non-residents)", "PAT.NONRESIDENT"},+ {"Scientific & Technical Journal Articles", "JA.SCITECHJ"},+ {"High-tech Exports (% manufactured exports)", "HTECH.EXP"},+};++static const QList<UnescoIndicatorDef> kCultureIndicators = {+ {"Cultural Employment (% total employment)", "CEMP.TOTAL"},+ {"Cultural & Creative Industries (% GDP)", "CCIGDP.TOTAL"},+ {"Museum Visitors per 1000 inhabitants", "MUS.VISIT"},+ {"Feature Films Produced", "FF.PROD"},+ {"Books Published (per million inhabitants)", "BOOKS.PUB"},+};++// ── Constructor ───────────────────────────────────────────────────────────────++UnescoPanel::UnescoPanel(QWidget* parent)+ : EconPanelBase(kSourceId, kColor, parent) {++ // Outer layout: left selector | right base UI+ auto* main = new QHBoxLayout(this);+ main->setContentsMargins(0, 0, 0, 0);+ main->setSpacing(0);++ // Left: theme + indicator selector+ auto* left = new QWidget;+ left->setFixedWidth(210);+ left->setStyleSheet("background:#0a0a0a; border-right:1px solid #1a1a1a;");+ auto* lvl = new QVBoxLayout(left);+ lvl->setContentsMargins(0, 0, 0, 0);+ lvl->setSpacing(0);++ // Theme header+ auto* theme_hdr = new QWidget;+ theme_hdr->setStyleSheet("background:#111111; border-bottom:1px solid #1a1a1a;");+ theme_hdr->setFixedHeight(32);+ auto* thl = new QHBoxLayout(theme_hdr);+ thl->setContentsMargins(8, 0, 8, 0);+ auto* theme_lbl = new QLabel("THEME");+ theme_lbl->setStyleSheet(+ "color:#808080; font-size:9px; font-weight:700; background:transparent;");+ theme_combo_ = new QComboBox;+ theme_combo_->addItem("Education", "education");+ theme_combo_->addItem("Science & Tech", "science");+ theme_combo_->addItem("Culture", "culture");+ theme_combo_->setFixedHeight(22);+ connect(theme_combo_, &QComboBox::currentIndexChanged,+ this, &UnescoPanel::on_theme_changed);+ thl->addWidget(theme_lbl);+ thl->addWidget(theme_combo_, 1);+ lvl->addWidget(theme_hdr);++ // Indicator search+ indicator_search_ = new QLineEdit;+ indicator_search_->setPlaceholderText("Filter indicators…");+ indicator_search_->setStyleSheet(+ "background:#080808; color:#e5e5e5; border:none;"+ "border-bottom:1px solid #1a1a1a; padding:4px 8px; font-size:10px;");+ indicator_search_->setFixedHeight(28);+ connect(indicator_search_, &QLineEdit::textChanged,+ this, &UnescoPanel::on_indicator_filter);+ lvl->addWidget(indicator_search_);++ // Indicator list+ indicator_list_ = new QListWidget;+ indicator_list_->setStyleSheet(+ "QListWidget { background:#080808; border:none; outline:none; font-size:10px; }"+ "QListWidget::item { color:#808080; padding:4px 10px;"+ " border-bottom:1px solid #111111; }"+ "QListWidget::item:hover { color:#e5e5e5; background:#0f0f0f; }"+ QString("QListWidget::item:selected { color:%1; background:rgba(0,172,193,0.08);"+ " border-left:2px solid %1; padding-left:8px; }").arg(kColor));+ indicator_list_->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);+ lvl->addWidget(indicator_list_, 1);++ main->addWidget(left);++ // Right: base UI (toolbar + stat cards + table)+ auto* right = new QWidget;+ right->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);+ build_base_ui(right);+ main->addWidget(right, 1);++ // Populate initial indicator list+ on_theme_changed(0);++ connect(&services::EconomicsService::instance(),+ &services::EconomicsService::result_ready,+ this, &UnescoPanel::on_result);+}++void UnescoPanel::activate() {+ show_empty("Select a theme, indicator and country code, then click FETCH\n"+ "UNESCO UIS data is free — no API key required\n"+ "Use 3-letter ISO country codes: USA, GBR, IND, CHN, BRA, DEU");+}++// ── Controls ──────────────────────────────────────────────────────────────────++void UnescoPanel::build_controls(QHBoxLayout* thl) {+ auto make_lbl = [](const QString& text) {+ auto* l = new QLabel(text);+ l->setStyleSheet(+ "color:#525252; font-size:9px; font-weight:700; background:transparent;");+ return l;+ };++ country_input_ = new QLineEdit;+ country_input_->setPlaceholderText("Country (e.g. USA, GBR, IND)");+ country_input_->setText("USA");+ country_input_->setFixedHeight(26);+ country_input_->setFixedWidth(140);++ start_input_ = new QLineEdit;+ start_input_->setPlaceholderText("Start year");+ start_input_->setFixedHeight(26);+ start_input_->setFixedWidth(70);++ end_input_ = new QLineEdit;+ end_input_->setPlaceholderText("End year");+ end_input_->setFixedHeight(26);+ end_input_->setFixedWidth(70);++ thl->addWidget(make_lbl("COUNTRY"));+ thl->addWidget(country_input_);+ thl->addWidget(make_lbl("FROM"));+ thl->addWidget(start_input_);+ thl->addWidget(make_lbl("TO"));+ thl->addWidget(end_input_);+}++void UnescoPanel::on_theme_changed(int index) {+ current_indicators_.clear();+ indicator_list_->clear();+ indicator_search_->clear();++ QList<UnescoIndicatorDef> list;+ if (index == 0) list = kEducationIndicators;+ else if (index == 1) list = kScienceIndicators;+ else list = kCultureIndicators;++ for (const auto& ind : list) {+ current_indicators_.append(ind);+ auto* item = new QListWidgetItem(ind.name);+ item->setData(Qt::UserRole, ind.code);+ item->setToolTip(ind.code);+ indicator_list_->addItem(item);+ }++ if (indicator_list_->count() > 0)+ indicator_list_->setCurrentRow(0);+}++void UnescoPanel::on_indicator_filter(const QString& text) {+ for (int i = 0; i < indicator_list_->count(); ++i) {+ auto* item = indicator_list_->item(i);+ const bool match = text.isEmpty() ||+ item->text().contains(text, Qt::CaseInsensitive) ||+ item->data(Qt::UserRole).toString()+ .contains(text, Qt::CaseInsensitive);+ item->setHidden(!match);+ }+}++void UnescoPanel::load_indicators() {+ // Fetch live indicator list from API — fires once per session+ indicators_loaded_ = true;+ services::EconomicsService::instance().execute(+ kSourceId, kScript, "list_indicators", {},+ "unesco_list_indicators");+}++// ── Fetch ─────────────────────────────────────────────────────────────────────++void UnescoPanel::on_fetch() {+ const auto* sel_item = indicator_list_->currentItem();+ if (!sel_item) {+ show_empty("Select an indicator from the list");+ return;+ }+ const QString indicator_code = sel_item->data(Qt::UserRole).toString();+ const QString country = country_input_->text().trimmed().toUpper();+ const QString start = start_input_->text().trimmed();+ const QString end = end_input_->text().trimmed();++ if (country.isEmpty()) {+ show_empty("Enter a 3-letter country code (e.g. USA, GBR, IND)");+ return;+ }++ QStringList args = {indicator_code, country};+ if (!start.isEmpty()) args << start;+ if (!start.isEmpty() && !end.isEmpty()) args << end;++ show_loading("Fetching UNESCO: " + sel_item->text() + " for " + country + "…");+ services::EconomicsService::instance().execute(+ kSourceId, kScript, "fetch",+ args,+ "unesco_fetch_" + indicator_code + "_" + country);+}++// ── Result ────────────────────────────────────────────────────────────────────++void UnescoPanel::on_result(const QString& request_id,+ const services::EconomicsResult& result) {+ if (result.source_id != kSourceId) return;++ // Handle live indicator list load+ if (request_id == "unesco_list_indicators") {+ // data: { "records": [{"id": "GER.1", "name": "...", "theme": "EDUCATION"}] }+ const QJsonArray records = result.data["data"].toObject()["records"].toArray();+ if (records.isEmpty()) return;++ const QString current_theme = theme_combo_->currentData().toString().toUpper();+ indicator_list_->clear();+ current_indicators_.clear();++ for (const auto& v : records) {+ const auto obj = v.toObject();+ const QString theme = obj["theme"].toString();+ if (!current_theme.isEmpty() && !theme.contains(current_theme, Qt::CaseInsensitive))+ continue;+ const QString id = obj["id"].toString();+ const QString name = obj["name"].toString();+ current_indicators_.append({name, id});+ auto* item = new QListWidgetItem(name);+ item->setData(Qt::UserRole, id);+ item->setToolTip(id);+ indicator_list_->addItem(item);+ }+ return;+ }++ if (!request_id.startsWith("unesco_fetch_")) return;++ if (!result.success) {+ show_error(result.error);+ return;+ }++ // fetch command response: { "success": true,+ // "data": [{"date": "2022", "value": 95.2}],+ // "metadata": {"indicator_name": "Gross Enrolment...", "country": "USA"} }+ QJsonArray rows = result.data["data"].toArray();++ if (rows.isEmpty()) {+ show_empty("No data found for this indicator and country\n"+ "Try a different country code or check the indicator is available");+ return;+ }++ // Build title from metadata+ const QJsonObject meta = result.data["metadata"].toObject();+ const QString ind_name = meta["indicator_name"].toString(+ indicator_list_->currentItem()+ ? indicator_list_->currentItem()->text()+ : "Indicator");+ const QString country = meta["country"].toString(+ country_input_->text().toUpper());++ const QString title = "UNESCO: " + ind_name + " — " + country;+ display(rows, title);++ LOG_INFO("UnescoPanel", QString("Displayed %1 data points for %2")+ .arg(rows.size()).arg(request_id));+}++} // namespace fincept::screensdiff --git a/fincept-qt/src/screens/economics/panels/UnescoPanel.h b/fincept-qt/src/screens/economics/panels/UnescoPanel.hnew file mode 100644index 000000000..7eaffcd84--- /dev/null+++ b/fincept-qt/src/screens/economics/panels/UnescoPanel.h@@ -0,0 +1,46 @@+// src/screens/economics/panels/UnescoPanel.h+// UNESCO UIS (Institute for Statistics) — Education, Science & Tech, Culture data.+// No API key required. 200+ countries, 100,000+ indicators.+// Best command: fetch <indicator> <country> → [{date, value}]+// Script: unesco_data.py+#pragma once++#include "screens/economics/panels/EconPanelBase.h"++#include <QComboBox>+#include <QLineEdit>+#include <QListWidget>++namespace fincept::screens {++class UnescoPanel : public EconPanelBase {+ Q_OBJECT+ public:+ explicit UnescoPanel(QWidget* parent = nullptr);+ void activate() override;++ protected:+ void build_controls(QHBoxLayout* thl) override;+ void on_fetch() override;+ void on_result(const QString& request_id,+ const services::EconomicsResult& result) override;++ private:+ void load_indicators();+ void on_theme_changed(int index);+ void on_indicator_filter(const QString& text);++ QComboBox* theme_combo_ = nullptr;+ QLineEdit* indicator_search_ = nullptr;+ QListWidget* indicator_list_ = nullptr;+ QLineEdit* country_input_ = nullptr;+ QLineEdit* start_input_ = nullptr;+ QLineEdit* end_input_ = nullptr;++ // preset indicators per theme+ struct IndicatorDef { QString name; QString code; };+ QList<IndicatorDef> current_indicators_;+ bool indicators_loaded_ = false;+};++} // namespace fincept::screensdiff --git a/fincept-qt/src/screens/economics/panels/WtoPanel.cpp b/fincept-qt/src/screens/economics/panels/WtoPanel.cppnew file mode 100644index 000000000..0444c0596--- /dev/null+++ b/fincept-qt/src/screens/economics/panels/WtoPanel.cpp@@ -0,0 +1,253 @@+// src/screens/economics/panels/WtoPanel.cpp+// WTO (World Trade Organization) data wrapper+//+// Three sections with different commands and response shapes:+//+// TRADE STATISTICS — requires WTO_API_KEY (Ocp-Apim-Subscription-Key)+// Command: timeseries_data --i <indicator> --r <reporter> --ps <years>+// Response: { "success": true, "data": { "Dataset": [...], "dataTotalRecords": N } }+// Dataset[] rows: { "ReporterCode": "840", "ReporterName": "United States",+// "ProductOrSectorCode": "...", "Year": 2023, "Value": 1234567.8,+// "ValueFlag": null }+//+// QR MEMBERS — free, no API key+// Command: qr_members+// Response: { "success": true, "data": [{"code": "US", "name": "United States", ...}] }+//+// QR NOTIFICATIONS — free, no API key+// Command: qr_notifications --reporter_member_code <code>+// Response: { "success": true, "data": [{"notification_year", "reporter_member_code",+// "product_description", "measure_type", ...}] }+#include "screens/economics/panels/WtoPanel.h"++#include "core/logging/Logger.h"+#include "services/economics/EconomicsService.h"++#include <QHBoxLayout>+#include <QJsonArray>+#include <QJsonObject>+#include <QLabel>+#include <QVBoxLayout>++namespace fincept::screens {++static constexpr const char* kScript = "wto_data.py";+static constexpr const char* kSourceId = "wto";+static constexpr const char* kColor = "#E91E63"; // pink-red++// Trade Statistics indicators (WTO Timeseries API)+static const QList<QPair<QString,QString>> kIndicators = {+ {"Total Merchandise Trade (TP_A_0010)", "TP_A_0010"},+ {"Merchandise Exports (TX_A_0010)", "TX_A_0010"},+ {"Merchandise Imports (TM_A_0010)", "TM_A_0010"},+ {"Commercial Services Trade (TS_A_0010)", "TS_A_0010"},+ {"Services Exports (SX_A_0010)", "SX_A_0010"},+ {"Services Imports (SM_A_0010)", "SM_A_0010"},+ {"Tariff Rate, All Products (TRF_A_0010)", "TRF_A_0010"},+};++// ── Constructor ───────────────────────────────────────────────────────────────++WtoPanel::WtoPanel(QWidget* parent)+ : EconPanelBase(kSourceId, kColor, parent) {+ build_base_ui(this);+ connect(&services::EconomicsService::instance(),+ &services::EconomicsService::result_ready,+ this, &WtoPanel::on_result);+}++void WtoPanel::activate() {+ show_empty("Select a section and click FETCH\n"+ "QR Members & Notifications are free — no API key needed\n"+ "Trade Statistics requires WTO_API_KEY (Ocp-Apim-Subscription-Key)");+}++// ── Controls ──────────────────────────────────────────────────────────────────++void WtoPanel::build_controls(QHBoxLayout* thl) {+ auto make_lbl = [](const QString& text) {+ auto* l = new QLabel(text);+ l->setStyleSheet(+ "color:#525252; font-size:9px; font-weight:700; background:transparent;");+ return l;+ };++ section_combo_ = new QComboBox;+ section_combo_->addItem("Trade Statistics (API key)", "timeseries");+ section_combo_->addItem("QR Members (free)", "qr_members");+ section_combo_->addItem("QR Notifications (free)", "qr_notifications");+ section_combo_->setFixedHeight(26);+ section_combo_->setMinimumWidth(200);+ connect(section_combo_, &QComboBox::currentIndexChanged,+ this, &WtoPanel::on_section_changed);++ indicator_combo_ = new QComboBox;+ for (const auto& ind : kIndicators)+ indicator_combo_->addItem(ind.first, ind.second);+ indicator_combo_->setFixedHeight(26);+ indicator_combo_->setMinimumWidth(270);++ reporter_input_ = new QLineEdit;+ reporter_input_->setPlaceholderText("Reporter (e.g. US, CN, DE)");+ reporter_input_->setText("US");+ reporter_input_->setFixedHeight(26);+ reporter_input_->setFixedWidth(130);++ years_input_ = new QLineEdit;+ years_input_->setPlaceholderText("Years (e.g. 2015-2023)");+ years_input_->setText("2015-2023");+ years_input_->setFixedHeight(26);+ years_input_->setFixedWidth(110);++ apikey_notice_ = new QLabel("Requires WTO_API_KEY");+ apikey_notice_->setStyleSheet(+ "color:#f59e0b; font-size:9px; background:transparent;");++ thl->addWidget(make_lbl("SECTION"));+ thl->addWidget(section_combo_);+ thl->addWidget(make_lbl("INDICATOR"));+ thl->addWidget(indicator_combo_);+ thl->addWidget(make_lbl("REPORTER"));+ thl->addWidget(reporter_input_);+ thl->addWidget(make_lbl("YEARS"));+ thl->addWidget(years_input_);+ thl->addWidget(apikey_notice_);+}++void WtoPanel::on_section_changed(int index) {+ const bool is_timeseries = (index == 0);+ indicator_combo_->setEnabled(is_timeseries);+ years_input_->setEnabled(is_timeseries);++ if (is_timeseries) {+ apikey_notice_->setText("Requires WTO_API_KEY");+ apikey_notice_->setStyleSheet(+ "color:#f59e0b; font-size:9px; background:transparent;");+ reporter_input_->setPlaceholderText("Reporter (e.g. US, CN, DE)");+ } else {+ apikey_notice_->setText("Free — no API key");+ apikey_notice_->setStyleSheet(+ "color:#16a34a; font-size:9px; background:transparent;");+ reporter_input_->setPlaceholderText("Member code (e.g. US, CN)");+ }+}++// ── Fetch ─────────────────────────────────────────────────────────────────────++void WtoPanel::on_fetch() {+ const QString section = section_combo_->currentData().toString();+ const QString reporter = reporter_input_->text().trimmed().toUpper();++ if (section == "timeseries") {+ const QString indicator = indicator_combo_->currentData().toString();+ const QString years = years_input_->text().trimmed();++ if (indicator.isEmpty()) { show_empty("Select a trade indicator"); return; }+ if (reporter.isEmpty()) { show_empty("Enter a reporter code (e.g. US)"); return; }++ // wto_data.py uses --flag=value style args+ // CLI: timeseries_data --i TP_A_0010 --r US --ps 2015-2023+ show_loading("Fetching WTO Trade Statistics: " ++ indicator_combo_->currentText() + " for " + reporter + "…");+ services::EconomicsService::instance().execute(+ kSourceId, kScript, "timeseries_data",+ {"--i=" + indicator,+ "--r=" + reporter,+ "--ps=" + (years.isEmpty() ? "default" : years)},+ "wto_ts_" + indicator + "_" + reporter);++ } else if (section == "qr_members") {+ QStringList args;+ if (!reporter.isEmpty()) args << "--member_code=" + reporter;+ show_loading("Fetching WTO QR Members…");+ services::EconomicsService::instance().execute(+ kSourceId, kScript, "qr_members",+ args,+ "wto_qrm_" + reporter);++ } else {+ // qr_notifications+ QStringList args;+ if (!reporter.isEmpty()) args << "--reporter_member_code=" + reporter;+ show_loading("Fetching WTO QR Notifications for " + reporter + "…");+ services::EconomicsService::instance().execute(+ kSourceId, kScript, "qr_notifications",+ args,+ "wto_qrn_" + reporter);+ }+}++// ── Result ────────────────────────────────────────────────────────────────────++void WtoPanel::on_result(const QString& request_id,+ const services::EconomicsResult& result) {+ if (result.source_id != kSourceId) return;++ if (!result.success) {+ if (result.error.contains("subscription") ||+ result.error.contains("API key") ||+ result.error.contains("401") ||+ result.error.contains("403")) {+ show_error("WTO API key not configured.\n"+ "Set WTO_API_KEY environment variable\n"+ "(Ocp-Apim-Subscription-Key from developer.wto.org)");+ } else {+ show_error(result.error);+ }+ return;+ }++ QJsonArray rows;++ if (request_id.startsWith("wto_ts_")) {+ // Trade Statistics: data is { "Dataset": [...], "dataTotalRecords": N }+ // or data is the Dataset array directly+ const QJsonObject data_obj = result.data["data"].toObject();+ QJsonArray dataset = data_obj["Dataset"].toArray();++ if (dataset.isEmpty()) {+ // Try data directly as array+ dataset = result.data["data"].toArray();+ }++ // Flatten to clean display rows: Reporter | Year | Value | Product+ for (const auto& v : dataset) {+ const auto obj = v.toObject();+ QJsonObject row;+ row["reporter"] = obj["ReporterName"].isUndefined()+ ? obj["ReporterCode"] : obj["ReporterName"];+ row["year"] = obj["Year"];+ row["value"] = obj["Value"];+ row["product"] = obj["ProductOrSectorCode"];+ row["indicator"] = indicator_combo_->currentData();+ rows.append(row);+ }++ if (rows.isEmpty()) {+ show_empty("No data returned — check reporter code or years range\n"+ "Also verify WTO_API_KEY is set correctly");+ return;+ }+ display(rows, "WTO Trade Statistics: " + indicator_combo_->currentText());++ } else if (request_id.startsWith("wto_qrm_")) {+ // QR Members: data is array of { code, name, ... }+ rows = result.data["data"].toArray();+ if (rows.isEmpty()) { show_empty("No members data returned"); return; }+ display(rows, "WTO Quantitative Restrictions — Members");++ } else {+ // QR Notifications: data is array of notification objects+ rows = result.data["data"].toArray();+ if (rows.isEmpty()) {+ show_empty("No notifications found for this member code");+ return;+ }+ display(rows, "WTO QR Notifications — " + reporter_input_->text().toUpper());+ }++ LOG_INFO("WtoPanel", QString("Displayed %1 rows for %2")+ .arg(rows.size()).arg(request_id));+}++} // namespace fincept::screensdiff --git a/fincept-qt/src/screens/economics/panels/WtoPanel.h b/fincept-qt/src/screens/economics/panels/WtoPanel.hnew file mode 100644index 000000000..2bb3f90f3--- /dev/null+++ b/fincept-qt/src/screens/economics/panels/WtoPanel.h@@ -0,0 +1,38 @@+// src/screens/economics/panels/WtoPanel.h+// WTO (World Trade Organization) — Timeseries, QR, and TFAD APIs.+// Requires WTO_API_KEY (Ocp-Apim-Subscription-Key) for timeseries data.+// QR members endpoint is free.+// Script: wto_data.py+#pragma once++#include "screens/economics/panels/EconPanelBase.h"++#include <QComboBox>+#include <QLabel>+#include <QLineEdit>++namespace fincept::screens {++class WtoPanel : public EconPanelBase {+ Q_OBJECT+ public:+ explicit WtoPanel(QWidget* parent = nullptr);+ void activate() override;++ protected:+ void build_controls(QHBoxLayout* thl) override;+ void on_fetch() override;+ void on_result(const QString& request_id,+ const services::EconomicsResult& result) override;++ private:+ void on_section_changed(int index);++ QComboBox* section_combo_ = nullptr; // Trade Statistics | QR Members | QR Notifications+ QComboBox* indicator_combo_ = nullptr; // timeseries indicators+ QLineEdit* reporter_input_ = nullptr; // reporter member code e.g. US, CN+ QLineEdit* years_input_ = nullptr; // period e.g. 2015-2023+ QLabel* apikey_notice_ = nullptr;+};++} // namespace fincept::screensdiff --git a/fincept-qt/src/screens/gov_data/GovDataAustraliaPanel.cpp b/fincept-qt/src/screens/gov_data/GovDataAustraliaPanel.cppnew file mode 100644index 000000000..6195df18e--- /dev/null+++ b/fincept-qt/src/screens/gov_data/GovDataAustraliaPanel.cpp@@ -0,0 +1,722 @@+// src/screens/gov_data/GovDataAustraliaPanel.cpp+#include "screens/gov_data/GovDataAustraliaPanel.h"++#include "core/logging/Logger.h"+#include "services/gov_data/GovDataService.h"++#include <QDesktopServices>+#include <QFileDialog>+#include <QHBoxLayout>+#include <QHeaderView>+#include <QJsonArray>+#include <QJsonObject>+#include <QScrollArea>+#include <QTextStream>+#include <QUrl>+#include <QVBoxLayout>++namespace fincept::screens {++// ── Panel stylesheet ─────────────────────────────────────────────────────────++static const QString kAUStyle = QString(+ "#govPanelToolbar { background:#111111; border-bottom:1px solid #1a1a1a; }"++ "#govTabBtn { background:transparent; color:#808080; border:1px solid #1a1a1a;"+ " font-size:10px; font-weight:700; padding:4px 12px; letter-spacing:0.5px; }"+ "#govTabBtn:hover { color:#e5e5e5; background:#161616; }"+ "#govTabBtn:checked { background:rgba(14,165,233,0.12); color:#0EA5E9;"+ " border:1px solid #0EA5E9; }"++ "#govBackBtn { background:transparent; color:#808080; border:1px solid #1a1a1a;"+ " font-size:10px; font-weight:700; padding:4px 10px; }"+ "#govBackBtn:hover { color:#e5e5e5; background:#161616; }"++ "#govFetchBtn { background:#0EA5E9; color:#080808; border:none;"+ " font-size:10px; font-weight:700; padding:4px 14px; }"+ "#govFetchBtn:hover { background:#0c94d4; }"+ "#govFetchBtn:disabled { background:#1a1a1a; color:#404040; }"++ "#govCsvBtn { background:transparent; color:#808080; border:1px solid #1a1a1a;"+ " font-size:10px; font-weight:700; padding:4px 10px; }"+ "#govCsvBtn:hover { color:#e5e5e5; background:#161616; }"++ "#govSearch { background:#080808; color:#e5e5e5; border:none;"+ " border-bottom:1px solid #1a1a1a; padding:4px 10px; font-size:11px; }"+ "#govSearch:focus { border-bottom:1px solid #0EA5E9; }"++ "QTableWidget { background:#080808; color:#e5e5e5; border:none;"+ " gridline-color:#1a1a1a; font-size:11px; alternate-background-color:#0a0a0a; }"+ "QTableWidget::item { padding:5px 8px; border-bottom:1px solid #1a1a1a; }"+ "QTableWidget::item:selected { background:rgba(14,165,233,0.10); color:#0EA5E9; }"+ "QHeaderView::section { background:#111111; color:#808080; border:none;"+ " border-bottom:2px solid #1a1a1a; border-right:1px solid #1a1a1a;"+ " padding:5px 8px; font-size:10px; font-weight:700; letter-spacing:0.5px; }"++ "#govStatusPage { background:#080808; }"+ "#govStatusMsg { color:#808080; font-size:13px; background:transparent; }"+ "#govStatusErr { color:#dc2626; font-size:12px; background:transparent; }"++ "#govBreadcrumb { background:#0a0a0a; border-bottom:1px solid #1a1a1a; }"+ "#govBreadcrumbText { color:#808080; font-size:9px; background:transparent; }"++ "QScrollBar:vertical { background:#080808; width:5px; }"+ "QScrollBar::handle:vertical { background:#1a1a1a; min-height:20px; }"+ "QScrollBar::add-line:vertical, QScrollBar::sub-line:vertical { height:0; }"+);++// ── Constructor ──────────────────────────────────────────────────────────────++GovDataAustraliaPanel::GovDataAustraliaPanel(QWidget* parent)+ : QWidget(parent) {+ setStyleSheet(kAUStyle);+ build_ui();+ connect(&services::GovDataService::instance(),+ &services::GovDataService::result_ready,+ this,+ &GovDataAustraliaPanel::on_result);+}++// ── UI Construction ──────────────────────────────────────────────────────────++void GovDataAustraliaPanel::build_ui() {+ auto* root = new QVBoxLayout(this);+ root->setContentsMargins(0, 0, 0, 0);+ root->setSpacing(0);++ root->addWidget(build_toolbar());++ // Breadcrumb bar+ breadcrumb_ = new QWidget;+ breadcrumb_->setObjectName("govBreadcrumb");+ breadcrumb_->setFixedHeight(24);+ auto* bcl = new QHBoxLayout(breadcrumb_);+ bcl->setContentsMargins(14, 0, 14, 0);+ bcl->setSpacing(4);+ breadcrumb_label_ = new QLabel("All Agencies");+ breadcrumb_label_->setObjectName("govBreadcrumbText");+ bcl->addWidget(breadcrumb_label_);+ bcl->addStretch(1);+ row_count_label_ = new QLabel;+ row_count_label_->setObjectName("govBreadcrumbText");+ bcl->addWidget(row_count_label_);+ root->addWidget(breadcrumb_);++ // Content stack+ content_stack_ = new QStackedWidget;++ // Page 0 — Agencies table: NAME | DESCRIPTION | CREATED+ agencies_table_ = new QTableWidget;+ agencies_table_->setColumnCount(3);+ agencies_table_->setHorizontalHeaderLabels({"NAME", "DESCRIPTION", "CREATED"});+ agencies_table_->horizontalHeader()->setSectionResizeMode(0, QHeaderView::Fixed);+ agencies_table_->horizontalHeader()->setSectionResizeMode(1, QHeaderView::Stretch);+ agencies_table_->horizontalHeader()->setSectionResizeMode(2, QHeaderView::Fixed);+ agencies_table_->setColumnWidth(0, 220);+ agencies_table_->setColumnWidth(2, 100);+ agencies_table_->setSelectionBehavior(QAbstractItemView::SelectRows);+ agencies_table_->setSelectionMode(QAbstractItemView::SingleSelection);+ agencies_table_->setEditTriggers(QAbstractItemView::NoEditTriggers);+ agencies_table_->verticalHeader()->setVisible(false);+ agencies_table_->setAlternatingRowColors(true);+ agencies_table_->setShowGrid(true);+ connect(agencies_table_, &QTableWidget::cellDoubleClicked,+ this, &GovDataAustraliaPanel::on_agency_doubleclicked);+ content_stack_->addWidget(agencies_table_); // index 0++ // Page 1 — Datasets table: TITLE | LICENSE | AUTHOR | RESOURCES | MODIFIED+ datasets_table_ = new QTableWidget;+ datasets_table_->setColumnCount(5);+ datasets_table_->setHorizontalHeaderLabels({"TITLE", "LICENSE", "AUTHOR", "RESOURCES", "MODIFIED"});+ datasets_table_->horizontalHeader()->setSectionResizeMode(0, QHeaderView::Stretch);+ datasets_table_->horizontalHeader()->setSectionResizeMode(1, QHeaderView::Fixed);+ datasets_table_->horizontalHeader()->setSectionResizeMode(2, QHeaderView::Fixed);+ datasets_table_->horizontalHeader()->setSectionResizeMode(3, QHeaderView::Fixed);+ datasets_table_->horizontalHeader()->setSectionResizeMode(4, QHeaderView::Fixed);+ datasets_table_->setColumnWidth(1, 130);+ datasets_table_->setColumnWidth(2, 140);+ datasets_table_->setColumnWidth(3, 75);+ datasets_table_->setColumnWidth(4, 100);+ datasets_table_->setSelectionBehavior(QAbstractItemView::SelectRows);+ datasets_table_->setSelectionMode(QAbstractItemView::SingleSelection);+ datasets_table_->setEditTriggers(QAbstractItemView::NoEditTriggers);+ datasets_table_->verticalHeader()->setVisible(false);+ datasets_table_->setAlternatingRowColors(true);+ datasets_table_->setShowGrid(true);+ connect(datasets_table_, &QTableWidget::cellDoubleClicked,+ this, &GovDataAustraliaPanel::on_dataset_doubleclicked);+ content_stack_->addWidget(datasets_table_); // index 1++ // Page 2 — Resources table: NAME | FORMAT | SIZE | OPEN+ resources_table_ = new QTableWidget;+ resources_table_->setColumnCount(4);+ resources_table_->setHorizontalHeaderLabels({"NAME", "FORMAT", "SIZE", "OPEN"});+ resources_table_->horizontalHeader()->setSectionResizeMode(0, QHeaderView::Stretch);+ resources_table_->horizontalHeader()->setSectionResizeMode(1, QHeaderView::Fixed);+ resources_table_->horizontalHeader()->setSectionResizeMode(2, QHeaderView::Fixed);+ resources_table_->horizontalHeader()->setSectionResizeMode(3, QHeaderView::Fixed);+ resources_table_->setColumnWidth(1, 80);+ resources_table_->setColumnWidth(2, 90);+ resources_table_->setColumnWidth(3, 60);+ resources_table_->setSelectionBehavior(QAbstractItemView::SelectRows);+ resources_table_->setSelectionMode(QAbstractItemView::SingleSelection);+ resources_table_->setEditTriggers(QAbstractItemView::NoEditTriggers);+ resources_table_->verticalHeader()->setVisible(false);+ resources_table_->setAlternatingRowColors(true);+ resources_table_->setShowGrid(true);+ connect(resources_table_, &QTableWidget::cellClicked, this,+ [this](int row, int col) {+ if (col != 3) return;+ auto* item = resources_table_->item(row, 3);+ if (!item) return;+ const QString url = item->data(Qt::UserRole).toString();+ if (!url.isEmpty()) QDesktopServices::openUrl(QUrl(url));+ }, Qt::UniqueConnection);+ content_stack_->addWidget(resources_table_); // index 2++ // Page 3 — Status / loading / error+ auto* status_page = new QWidget;+ status_page->setObjectName("govStatusPage");+ auto* svl = new QVBoxLayout(status_page);+ svl->setAlignment(Qt::AlignCenter);+ status_label_ = new QLabel;+ status_label_->setObjectName("govStatusMsg");+ status_label_->setAlignment(Qt::AlignCenter);+ status_label_->setWordWrap(true);+ svl->addWidget(status_label_);+ content_stack_->addWidget(status_page); // index 3++ root->addWidget(content_stack_, 1);+}++QWidget* GovDataAustraliaPanel::build_toolbar() {+ auto* bar = new QWidget;+ bar->setObjectName("govPanelToolbar");+ bar->setFixedHeight(40);++ auto* hl = new QHBoxLayout(bar);+ hl->setContentsMargins(10, 0, 10, 0);+ hl->setSpacing(5);++ // Back button — hidden until drilling in+ back_btn_ = new QPushButton("← BACK");+ back_btn_->setObjectName("govBackBtn");+ back_btn_->setVisible(false);+ back_btn_->setCursor(Qt::PointingHandCursor);+ connect(back_btn_, &QPushButton::clicked, this, &GovDataAustraliaPanel::on_back);+ hl->addWidget(back_btn_);++ hl->addSpacing(4);++ // Tab: Agencies+ agencies_btn_ = new QPushButton("AGENCIES");+ agencies_btn_->setObjectName("govTabBtn");+ agencies_btn_->setCheckable(true);+ agencies_btn_->setChecked(true);+ agencies_btn_->setCursor(Qt::PointingHandCursor);+ connect(agencies_btn_, &QPushButton::clicked, this, [this]() {+ if (current_agencies_.isEmpty()) {+ load_initial_data();+ } else {+ current_view_ = Agencies;+ content_stack_->setCurrentIndex(Agencies);+ update_toolbar_state();+ update_breadcrumb();+ }+ });+ hl->addWidget(agencies_btn_);++ // Tab: Datasets (jump back to cached datasets view)+ datasets_btn_ = new QPushButton("DATASETS");+ datasets_btn_->setObjectName("govTabBtn");+ datasets_btn_->setCheckable(true);+ datasets_btn_->setChecked(false);+ datasets_btn_->setCursor(Qt::PointingHandCursor);+ connect(datasets_btn_, &QPushButton::clicked, this, [this]() {+ if (current_datasets_.isEmpty()) return;+ current_view_ = Datasets;+ content_stack_->setCurrentIndex(Datasets);+ update_toolbar_state();+ update_breadcrumb();+ });+ hl->addWidget(datasets_btn_);++ // Tab: Recent+ recent_btn_ = new QPushButton("RECENT");+ recent_btn_->setObjectName("govTabBtn");+ recent_btn_->setCheckable(true);+ recent_btn_->setChecked(false);+ recent_btn_->setCursor(Qt::PointingHandCursor);+ connect(recent_btn_, &QPushButton::clicked, this, &GovDataAustraliaPanel::on_recent);+ hl->addWidget(recent_btn_);++ hl->addSpacing(10);++ // Search input+ search_input_ = new QLineEdit;+ search_input_->setObjectName("govSearch");+ search_input_->setPlaceholderText("Search datasets…");+ search_input_->setFixedWidth(200);+ search_input_->setFixedHeight(26);+ connect(search_input_, &QLineEdit::returnPressed, this, &GovDataAustraliaPanel::on_search);+ hl->addWidget(search_input_);++ fetch_btn_ = new QPushButton("FETCH");+ fetch_btn_->setObjectName("govFetchBtn");+ fetch_btn_->setCursor(Qt::PointingHandCursor);+ connect(fetch_btn_, &QPushButton::clicked, this, &GovDataAustraliaPanel::on_fetch);+ hl->addWidget(fetch_btn_);++ hl->addStretch(1);++ export_btn_ = new QPushButton("CSV");+ export_btn_->setObjectName("govCsvBtn");+ export_btn_->setCursor(Qt::PointingHandCursor);+ connect(export_btn_, &QPushButton::clicked, this, &GovDataAustraliaPanel::on_export_csv);+ hl->addWidget(export_btn_);++ return bar;+}++// ── Initial load ─────────────────────────────────────────────────────────────++void GovDataAustraliaPanel::load_initial_data() {+ show_loading("Loading Australian Government agencies…");+ services::GovDataService::instance().execute(+ kScript, "organizations", {}, "ausgov_agencies");+}++// ── Result unwrapping helper ──────────────────────────────────────────────────+// org-datasets and search both return: {data:{datasets:[...], count:N, ...}}+// recent returns: {data:[...]}++QJsonArray GovDataAustraliaPanel::unwrap_datasets(const services::GovDataResult& result,+ int& out_total) {+ out_total = 0;+ const QJsonValue raw = result.data["data"];++ if (raw.isArray()) {+ // recent command — flat array+ const QJsonArray arr = raw.toArray();+ out_total = arr.size();+ return arr;+ }++ if (raw.isObject()) {+ const QJsonObject obj = raw.toObject();+ if (obj.contains("datasets")) {+ out_total = obj["count"].toInt(0);+ const QJsonArray arr = obj["datasets"].toArray();+ if (out_total == 0) out_total = arr.size();+ return arr;+ }+ // Unexpected nested shape — try result key+ if (obj.contains("result")) {+ const QJsonArray arr = obj["result"].toArray();+ out_total = arr.size();+ return arr;+ }+ }++ return {};+}++// ── Result handler ────────────────────────────────────────────────────────────++void GovDataAustraliaPanel::on_result(const QString& request_id,+ const services::GovDataResult& result) {+ // Only handle request IDs that belong to this panel+ if (!request_id.startsWith("ausgov_")) return;++ if (!result.success) {+ show_error(result.error);+ LOG_ERROR("GovDataAustraliaPanel", "Request " + request_id + " failed: " + result.error);+ return;+ }++ if (request_id == "ausgov_agencies") {+ // Agencies: {data:[{id, name, title, description, created, dataset_count, ...}]}+ QJsonArray data;+ const QJsonValue raw = result.data["data"];+ if (raw.isArray())+ data = raw.toArray();++ current_agencies_ = data;+ populate_agencies(data);+ current_view_ = Agencies;+ content_stack_->setCurrentIndex(Agencies);+ LOG_INFO("GovDataAustraliaPanel",+ "Loaded " + QString::number(data.size()) + " agencies");++ } else if (request_id.startsWith("ausgov_datasets_") ||+ request_id.startsWith("ausgov_search_") ||+ request_id == "ausgov_recent") {++ int total = 0;+ const QJsonArray data = unwrap_datasets(result, total);++ current_datasets_ = data;+ showing_recent_ = (request_id == "ausgov_recent");++ populate_datasets(data, total);+ current_view_ = Datasets;+ content_stack_->setCurrentIndex(Datasets);++ LOG_INFO("GovDataAustraliaPanel",+ "Loaded " + QString::number(data.size()) + " datasets"+ + (showing_recent_ ? " (recent)" : ""));+ }++ update_toolbar_state();+ update_breadcrumb();+}++// ── Populate tables ───────────────────────────────────────────────────────────++void GovDataAustraliaPanel::populate_agencies(const QJsonArray& data) {+ agencies_table_->setRowCount(0);+ agencies_table_->setRowCount(data.size());++ for (int i = 0; i < data.size(); ++i) {+ const auto obj = data[i].toObject();++ // Prefer display_name → title → name+ QString name = obj["display_name"].toString();+ if (name.isEmpty()) name = obj["title"].toString();+ if (name.isEmpty()) name = obj["name"].toString();++ const QString id = obj["id"].toString().isEmpty()+ ? obj["name"].toString()+ : obj["id"].toString();++ auto* name_item = new QTableWidgetItem(name);+ name_item->setData(Qt::UserRole, id);+ name_item->setData(Qt::UserRole + 1, name); // for breadcrumb+ name_item->setForeground(QColor(kColor));+ agencies_table_->setItem(i, 0, name_item);++ // Description — truncate at 80 chars+ QString desc = obj["description"].toString();+ if (desc.length() > 80)+ desc = desc.left(77) + "…";+ auto* desc_item = new QTableWidgetItem(desc);+ desc_item->setForeground(QColor("#808080"));+ agencies_table_->setItem(i, 1, desc_item);++ // Created date+ QString created = obj["created"].toString();+ if (created.length() > 10) created = created.left(10);+ auto* created_item = new QTableWidgetItem(created);+ created_item->setTextAlignment(Qt::AlignCenter);+ agencies_table_->setItem(i, 2, created_item);+ }++ row_count_label_->setText(QString::number(data.size()) + " agencies");+}++void GovDataAustraliaPanel::populate_datasets(const QJsonArray& data, int total_count) {+ datasets_table_->setRowCount(0);+ datasets_table_->setRowCount(data.size());++ for (int i = 0; i < data.size(); ++i) {+ const auto obj = data[i].toObject();++ QString title = obj["title"].toString();+ if (title.isEmpty()) title = obj["name"].toString();++ // Store row index as UserRole so we can extract resources without re-fetch+ auto* title_item = new QTableWidgetItem(title);+ title_item->setData(Qt::UserRole, i); // row index into current_datasets_+ datasets_table_->setItem(i, 0, title_item);++ // License+ QString license = obj["license"].toString();+ if (license.isEmpty()) license = obj["license_title"].toString();+ if (license.isEmpty()) license = "—";+ auto* lic_item = new QTableWidgetItem(license);+ lic_item->setForeground(QColor("#808080"));+ lic_item->setToolTip(license);+ datasets_table_->setItem(i, 1, lic_item);++ // Author+ QString author = obj["author"].toString();+ if (author.isEmpty()) {+ const QJsonObject org = obj["organization"].toObject();+ author = org["title"].toString();+ if (author.isEmpty()) author = org["name"].toString();+ }+ if (author.isEmpty()) author = "—";+ datasets_table_->setItem(i, 2, new QTableWidgetItem(author));++ // Resource count — prefer resource_count field, fallback to resources array size+ int res_count = obj["resource_count"].toInt(-1);+ if (res_count < 0)+ res_count = obj["resources"].toArray().size();+ auto* res_item = new QTableWidgetItem(QString::number(res_count));+ res_item->setTextAlignment(Qt::AlignCenter);+ res_item->setForeground(QColor(kColor));+ datasets_table_->setItem(i, 3, res_item);++ // Modified date — try "modified" then "metadata_modified"+ QString modified = obj["modified"].toString();+ if (modified.isEmpty()) modified = obj["metadata_modified"].toString();+ if (modified.length() > 10) modified = modified.left(10);+ auto* mod_item = new QTableWidgetItem(modified);+ mod_item->setTextAlignment(Qt::AlignCenter);+ datasets_table_->setItem(i, 4, mod_item);+ }++ row_count_label_->setText(+ QString("Showing %1 of %2").arg(data.size()).arg(total_count));+}++void GovDataAustraliaPanel::populate_resources(const QJsonArray& resources) {+ resources_table_->setRowCount(0);+ resources_table_->setRowCount(resources.size());++ for (int i = 0; i < resources.size(); ++i) {+ const auto obj = resources[i].toObject();++ QString name = obj["name"].toString();+ if (name.isEmpty()) name = obj["description"].toString().left(60);+ if (name.isEmpty()) name = obj["id"].toString();+ resources_table_->setItem(i, 0, new QTableWidgetItem(name));++ const QString format = obj["format"].toString().toUpper();+ auto* fmt_item = new QTableWidgetItem(format.isEmpty() ? "—" : format);+ fmt_item->setForeground(QColor(kColor));+ fmt_item->setTextAlignment(Qt::AlignCenter);+ resources_table_->setItem(i, 1, fmt_item);++ const double size_bytes = obj["size"].toDouble(0.0);+ QString size_str = "—";+ if (size_bytes > 0.0) {+ if (size_bytes < 1024.0)+ size_str = QString::number(size_bytes, 'f', 0) + " B";+ else if (size_bytes < 1024.0 * 1024.0)+ size_str = QString::number(size_bytes / 1024.0, 'f', 1) + " KB";+ else+ size_str = QString::number(size_bytes / (1024.0 * 1024.0), 'f', 1) + " MB";+ }+ auto* sz_item = new QTableWidgetItem(size_str);+ sz_item->setTextAlignment(Qt::AlignRight | Qt::AlignVCenter);+ resources_table_->setItem(i, 2, sz_item);++ const QString url = obj["url"].toString();+ auto* url_item = new QTableWidgetItem(url.isEmpty() ? "—" : "↗ OPEN");+ url_item->setData(Qt::UserRole, url);+ if (!url.isEmpty()) url_item->setForeground(QColor(kColor));+ url_item->setTextAlignment(Qt::AlignCenter);+ resources_table_->setItem(i, 3, url_item);+ }++ row_count_label_->setText(QString::number(resources.size()) + " files");+}++// ── Navigation slots ──────────────────────────────────────────────────────────++void GovDataAustraliaPanel::on_agency_doubleclicked(int row, int /*col*/) {+ auto* item = agencies_table_->item(row, 0);+ if (!item) return;++ selected_agency_id_ = item->data(Qt::UserRole).toString();+ selected_agency_ = item->data(Qt::UserRole + 1).toString();+ if (selected_agency_.isEmpty())+ selected_agency_ = item->text();++ showing_recent_ = false;+ show_loading("Loading datasets for "" + selected_agency_ + ""…");++ services::GovDataService::instance().execute(+ kScript, "org-datasets",+ {selected_agency_id_, "100"},+ "ausgov_datasets_" + selected_agency_id_);+}++void GovDataAustraliaPanel::on_dataset_doubleclicked(int row, int /*col*/) {+ // Resources are embedded — extract directly from current_datasets_, no fetch needed+ auto* item = datasets_table_->item(row, 0);+ if (!item) return;++ const int dataset_idx = item->data(Qt::UserRole).toInt();+ if (dataset_idx < 0 || dataset_idx >= current_datasets_.size()) return;++ const QJsonObject dataset = current_datasets_[dataset_idx].toObject();+ selected_dataset_title_ = dataset["title"].toString();+ if (selected_dataset_title_.isEmpty())+ selected_dataset_title_ = dataset["name"].toString();++ const QJsonArray resources = dataset["resources"].toArray();+ populate_resources(resources);+ current_view_ = Resources;+ content_stack_->setCurrentIndex(Resources);+ update_toolbar_state();+ update_breadcrumb();+}++void GovDataAustraliaPanel::on_fetch() {+ const QString query = search_input_->text().trimmed();+ if (!query.isEmpty()) {+ on_search();+ } else {+ load_initial_data();+ }+}++void GovDataAustraliaPanel::on_search() {+ const QString query = search_input_->text().trimmed();+ if (query.isEmpty()) return;++ showing_recent_ = false;+ selected_agency_.clear();+ selected_agency_id_.clear();++ show_loading("Searching for "" + query + ""…");+ services::GovDataService::instance().execute(+ kScript, "search",+ {query, "50"},+ "ausgov_search_" + query);+}++void GovDataAustraliaPanel::on_recent() {+ selected_agency_.clear();+ selected_agency_id_.clear();++ show_loading("Loading recent datasets…");+ services::GovDataService::instance().execute(+ kScript, "recent", {"20"}, "ausgov_recent");+}++void GovDataAustraliaPanel::on_back() {+ if (current_view_ == Resources) {+ current_view_ = Datasets;+ content_stack_->setCurrentIndex(Datasets);+ } else if (current_view_ == Datasets) {+ current_view_ = Agencies;+ content_stack_->setCurrentIndex(Agencies);+ selected_agency_.clear();+ selected_agency_id_.clear();+ showing_recent_ = false;+ }+ update_toolbar_state();+ update_breadcrumb();+}++// ── Toolbar / breadcrumb state ────────────────────────────────────────────────++void GovDataAustraliaPanel::update_toolbar_state() {+ const bool drilling = (current_view_ == Datasets || current_view_ == Resources);+ back_btn_->setVisible(drilling);++ agencies_btn_->setChecked(current_view_ == Agencies);+ datasets_btn_->setChecked(current_view_ == Datasets && !showing_recent_);+ recent_btn_->setChecked(current_view_ == Datasets && showing_recent_);+}++void GovDataAustraliaPanel::update_breadcrumb() {+ QString text;+ switch (current_view_) {+ case Agencies:+ text = "All Agencies";+ break;+ case Datasets:+ if (showing_recent_) {+ text = "Recent Datasets";+ } else if (!selected_agency_.isEmpty()) {+ text = "All Agencies › " + selected_agency_ + " › Datasets";+ } else {+ text = "Search Results";+ }+ break;+ case Resources:+ if (!selected_agency_.isEmpty()) {+ text = "All Agencies › " + selected_agency_+ + " › Datasets › " + selected_dataset_title_;+ } else {+ text = "Datasets › " + selected_dataset_title_ + " › Resources";+ }+ break;+ case Status:+ text = "Loading…";+ break;+ }+ breadcrumb_label_->setText(text);+}++// ── Status helpers ────────────────────────────────────────────────────────────++void GovDataAustraliaPanel::show_loading(const QString& message) {+ status_label_->setStyleSheet(+ QString("color:%1; font-size:13px; background:transparent;").arg(kColor));+ status_label_->setText(message);+ content_stack_->setCurrentIndex(Status);+}++void GovDataAustraliaPanel::show_error(const QString& message) {+ status_label_->setStyleSheet("color:#dc2626; font-size:12px; background:transparent;");+ status_label_->setText("Error: " + message);+ content_stack_->setCurrentIndex(Status);+}++// ── CSV export ────────────────────────────────────────────────────────────────++void GovDataAustraliaPanel::on_export_csv() {+ QTableWidget* table = nullptr;+ QString def_name;++ switch (current_view_) {+ case Agencies:+ if (agencies_table_->rowCount() > 0) {+ table = agencies_table_;+ def_name = "au_agencies.csv";+ }+ break;+ case Datasets:+ if (datasets_table_->rowCount() > 0) {+ table = datasets_table_;+ def_name = showing_recent_ ? "au_recent_datasets.csv" : "au_datasets.csv";+ }+ break;+ case Resources:+ if (resources_table_->rowCount() > 0) {+ table = resources_table_;+ def_name = "au_resources.csv";+ }+ break;+ case Status:+ break;+ }+ if (!table) return;+ export_table_csv(table, def_name);+}++void GovDataAustraliaPanel::export_table_csv(QTableWidget* table, const QString& default_name) {+ const QString path = QFileDialog::getSaveFileName(+ this, "Export CSV", default_name, "CSV Files (*.csv)");+ if (path.isEmpty()) return;++ QFile file(path);+ if (!file.open(QIODevice::WriteOnly | QIODevice::Text)) return;+ QTextStream out(&file);++ QStringList headers;+ for (int c = 0; c < table->columnCount(); ++c) {+ auto* h = table->horizontalHeaderItem(c);+ headers << (h ? h->text() : QString::number(c));+ }+ out << headers.join(",") << "\n";++ for (int r = 0; r < table->rowCount(); ++r) {+ QStringList row;+ for (int c = 0; c < table->columnCount(); ++c) {+ auto* item = table->item(r, c);+ QString val = item ? item->text() : "";+ if (val.contains(',') || val.contains('"'))+ val = "\"" + val.replace("\"", "\"\"") + "\"";+ row << val;+ }+ out << row.join(",") << "\n";+ }+}++} // namespace fincept::screensdiff --git a/fincept-qt/src/screens/gov_data/GovDataAustraliaPanel.h b/fincept-qt/src/screens/gov_data/GovDataAustraliaPanel.hnew file mode 100644index 000000000..19c1613ad--- /dev/null+++ b/fincept-qt/src/screens/gov_data/GovDataAustraliaPanel.h@@ -0,0 +1,101 @@+// src/screens/gov_data/GovDataAustraliaPanel.h+// Australia Government Data panel — data.gov.au (CKAN)+// Views: Agencies → Datasets → Resources + Recent + Search+// NOTE: org-datasets and search return data.datasets[] (nested object).+// Resources are embedded inside each dataset — no extra fetch required.+#pragma once++#include "services/gov_data/GovDataService.h"++#include <QJsonArray>+#include <QLabel>+#include <QLineEdit>+#include <QPushButton>+#include <QStackedWidget>+#include <QTableWidget>+#include <QWidget>++namespace fincept::screens {++class GovDataAustraliaPanel : public QWidget {+ Q_OBJECT+ public:+ explicit GovDataAustraliaPanel(QWidget* parent = nullptr);++ public slots:+ void load_initial_data();++ private slots:+ void on_result(const QString& request_id, const services::GovDataResult& result);+ void on_agency_doubleclicked(int row, int col);+ void on_dataset_doubleclicked(int row, int col);+ void on_fetch();+ void on_search();+ void on_recent();+ void on_back();+ void on_export_csv();++ private:+ // UI construction+ void build_ui();+ QWidget* build_toolbar();++ // Table population+ void populate_agencies(const QJsonArray& data);+ void populate_datasets(const QJsonArray& data, int total_count);+ void populate_resources(const QJsonArray& resources);++ // Unwrap org-datasets / search response: {data:{datasets:[...], count:N}}+ static QJsonArray unwrap_datasets(const services::GovDataResult& result, int& out_total);++ // Navigation helpers+ void show_loading(const QString& message);+ void show_error(const QString& message);+ void update_toolbar_state();+ void update_breadcrumb();++ // CSV export helper+ void export_table_csv(QTableWidget* table, const QString& default_name);++ // ── Constants ────────────────────────────────────────────────────────────+ static constexpr const char* kScript = "datagov_au_api.py";+ static constexpr const char* kColor = "#0EA5E9";++ // Enum order matches content_stack_ page indices+ enum View { Agencies = 0, Datasets, Resources, Status };+ View current_view_ = Agencies;++ // Indicates whether Datasets view is showing "recent" results+ bool showing_recent_ = false;++ // ── Toolbar widgets ───────────────────────────────────────────────────────+ QPushButton* back_btn_ = nullptr;+ QPushButton* agencies_btn_ = nullptr;+ QPushButton* datasets_btn_ = nullptr;+ QPushButton* recent_btn_ = nullptr;+ QLineEdit* search_input_ = nullptr;+ QPushButton* fetch_btn_ = nullptr;+ QPushButton* export_btn_ = nullptr;++ // ── Breadcrumb bar ────────────────────────────────────────────────────────+ QWidget* breadcrumb_ = nullptr;+ QLabel* breadcrumb_label_ = nullptr;+ QLabel* row_count_label_ = nullptr;++ // ── Content stack (index matches View enum) ───────────────────────────────+ QStackedWidget* content_stack_ = nullptr;+ QTableWidget* agencies_table_ = nullptr;+ QTableWidget* datasets_table_ = nullptr;+ QTableWidget* resources_table_ = nullptr;+ QLabel* status_label_ = nullptr;++ // ── Navigation state ──────────────────────────────────────────────────────+ QString selected_agency_; // display name for breadcrumb+ QString selected_agency_id_; // id/name used in API call+ QString selected_dataset_title_;++ QJsonArray current_agencies_;+ QJsonArray current_datasets_; // stored so resources can be extracted without re-fetch+};++} // namespace fincept::screensdiff --git a/fincept-qt/src/screens/gov_data/GovDataCKANPanel.cpp b/fincept-qt/src/screens/gov_data/GovDataCKANPanel.cppnew file mode 100644index 000000000..478d4f986--- /dev/null+++ b/fincept-qt/src/screens/gov_data/GovDataCKANPanel.cpp@@ -0,0 +1,693 @@+// src/screens/gov_data/GovDataCKANPanel.cpp+// Universal CKAN portal browser using datagovuk_api.py.+// Portal combobox is display-only — the script always queries data.gov.uk.+// Navigation: Publishers → Datasets → Resources | Search (independent).+#include "screens/gov_data/GovDataCKANPanel.h"++#include "core/logging/Logger.h"+#include "services/gov_data/GovDataService.h"++#include <QDesktopServices>+#include <QFileDialog>+#include <QHBoxLayout>+#include <QHeaderView>+#include <QJsonArray>+#include <QJsonObject>+#include <QScrollArea>+#include <QTextStream>+#include <QUrl>+#include <QVBoxLayout>++namespace fincept::screens {++// ── Stylesheet ────────────────────────────────────────────────────────────────++static const QString kPanelStyle = QStringLiteral(+ "#ckanPortalBar { background:#0d0d0d; border-bottom:1px solid #1a1a1a; }"+ "#ckanPortalLabel { color:#808080; font-size:9px; font-weight:700;"+ " letter-spacing:0.5px; background:transparent; }"+ "QComboBox#ckanPortalCombo { background:#111111; color:#10B981; border:1px solid #1a1a1a;"+ " font-size:10px; font-weight:700; padding:2px 8px; min-width:160px; }"+ "QComboBox#ckanPortalCombo::drop-down { border:none; width:18px; }"+ "QComboBox#ckanPortalCombo QAbstractItemView { background:#111111; color:#e5e5e5;"+ " selection-background-color:rgba(16,185,129,0.12); border:1px solid #1a1a1a; }"++ "#ckanPanelToolbar { background:#111111; border-bottom:1px solid #1a1a1a; }"++ "#ckanTabBtn { background:transparent; color:#808080; border:1px solid #1a1a1a;"+ " font-size:10px; font-weight:700; padding:4px 12px; letter-spacing:0.5px; }"+ "#ckanTabBtn:hover { color:#e5e5e5; background:#161616; }"+ "#ckanTabBtn:checked { background:rgba(16,185,129,0.12); color:#10B981;"+ " border:1px solid #10B981; }"++ "#ckanBackBtn { background:transparent; color:#808080; border:1px solid #1a1a1a;"+ " font-size:10px; font-weight:700; padding:4px 10px; }"+ "#ckanBackBtn:hover { color:#e5e5e5; background:#161616; }"++ "#ckanFetchBtn { background:#10B981; color:#080808; border:none;"+ " font-size:10px; font-weight:700; padding:4px 14px; }"+ "#ckanFetchBtn:hover { background:#059669; }"+ "#ckanFetchBtn:disabled { background:#1a1a1a; color:#404040; }"++ "#ckanCsvBtn { background:transparent; color:#808080; border:1px solid #1a1a1a;"+ " font-size:10px; font-weight:700; padding:4px 10px; }"+ "#ckanCsvBtn:hover { color:#e5e5e5; background:#161616; }"++ "#ckanSearch { background:#080808; color:#e5e5e5; border:none;"+ " border-bottom:1px solid #1a1a1a; padding:4px 10px; font-size:11px; }"+ "#ckanSearch:focus { border-bottom:1px solid #10B981; }"++ "QTableWidget { background:#080808; color:#e5e5e5; border:none;"+ " gridline-color:#1a1a1a; font-size:11px; alternate-background-color:#0a0a0a; }"+ "QTableWidget::item { padding:5px 8px; border-bottom:1px solid #1a1a1a; }"+ "QTableWidget::item:selected { background:rgba(16,185,129,0.10); color:#10B981; }"+ "QHeaderView::section { background:#111111; color:#808080; border:none;"+ " border-bottom:2px solid #1a1a1a; border-right:1px solid #1a1a1a;"+ " padding:5px 8px; font-size:10px; font-weight:700; letter-spacing:0.5px; }"++ "#ckanStatusPage { background:#080808; }"+ "#ckanStatusMsg { color:#808080; font-size:13px; background:transparent; }"+ "#ckanStatusErr { color:#dc2626; font-size:12px; background:transparent; }"++ "#ckanBreadcrumb { background:#0a0a0a; border-bottom:1px solid #1a1a1a; }"+ "#ckanBreadText { color:#808080; font-size:9px; background:transparent; }"+ "#ckanBreadCount { color:#808080; font-size:9px; background:transparent; }"++ "QScrollBar:vertical { background:#080808; width:5px; }"+ "QScrollBar::handle:vertical { background:#1a1a1a; min-height:20px; }"+ "QScrollBar::add-line:vertical, QScrollBar::sub-line:vertical { height:0; }"+);++// ── Constructor ───────────────────────────────────────────────────────────────++GovDataCKANPanel::GovDataCKANPanel(QWidget* parent)+ : QWidget(parent) {+ setStyleSheet(kPanelStyle);+ build_ui();+ connect(&services::GovDataService::instance(),+ &services::GovDataService::result_ready,+ this, &GovDataCKANPanel::on_result);+}++// ── Build UI ──────────────────────────────────────────────────────────────────++void GovDataCKANPanel::build_ui() {+ auto* root = new QVBoxLayout(this);+ root->setContentsMargins(0, 0, 0, 0);+ root->setSpacing(0);++ root->addWidget(build_portal_bar());+ root->addWidget(build_toolbar());++ // Breadcrumb bar+ breadcrumb_ = new QWidget;+ breadcrumb_->setObjectName("ckanBreadcrumb");+ breadcrumb_->setFixedHeight(24);+ auto* bcl = new QHBoxLayout(breadcrumb_);+ bcl->setContentsMargins(14, 0, 14, 0);+ bcl->setSpacing(4);+ breadcrumb_label_ = new QLabel("Publishers");+ breadcrumb_label_->setObjectName("ckanBreadText");+ bcl->addWidget(breadcrumb_label_);+ bcl->addStretch(1);+ row_count_label_ = new QLabel;+ row_count_label_->setObjectName("ckanBreadCount");+ bcl->addWidget(row_count_label_);+ root->addWidget(breadcrumb_);++ // Content stack+ content_stack_ = new QStackedWidget;++ // Page 0 — Publishers table (1 col, full-stretch, colored)+ publishers_table_ = new QTableWidget;+ publishers_table_->setColumnCount(1);+ publishers_table_->setHorizontalHeaderLabels({"NAME"});+ publishers_table_->horizontalHeader()->setSectionResizeMode(0, QHeaderView::Stretch);+ publishers_table_->setSelectionBehavior(QAbstractItemView::SelectRows);+ publishers_table_->setSelectionMode(QAbstractItemView::SingleSelection);+ publishers_table_->setEditTriggers(QAbstractItemView::NoEditTriggers);+ publishers_table_->verticalHeader()->setVisible(false);+ publishers_table_->setAlternatingRowColors(true);+ publishers_table_->setShowGrid(true);+ connect(publishers_table_, &QTableWidget::cellDoubleClicked,+ this, &GovDataCKANPanel::on_publisher_clicked);+ content_stack_->addWidget(publishers_table_); // index 0++ // Page 1 — Datasets table+ datasets_table_ = new QTableWidget;+ datasets_table_->setColumnCount(4);+ datasets_table_->setHorizontalHeaderLabels({"TITLE", "FILES", "MODIFIED", "TAGS"});+ datasets_table_->horizontalHeader()->setSectionResizeMode(0, QHeaderView::Stretch);+ datasets_table_->horizontalHeader()->setSectionResizeMode(1, QHeaderView::Fixed);+ datasets_table_->horizontalHeader()->setSectionResizeMode(2, QHeaderView::Fixed);+ datasets_table_->horizontalHeader()->setSectionResizeMode(3, QHeaderView::Fixed);+ datasets_table_->setColumnWidth(1, 60);+ datasets_table_->setColumnWidth(2, 100);+ datasets_table_->setColumnWidth(3, 200);+ datasets_table_->setSelectionBehavior(QAbstractItemView::SelectRows);+ datasets_table_->setSelectionMode(QAbstractItemView::SingleSelection);+ datasets_table_->setEditTriggers(QAbstractItemView::NoEditTriggers);+ datasets_table_->verticalHeader()->setVisible(false);+ datasets_table_->setAlternatingRowColors(true);+ datasets_table_->setShowGrid(true);+ connect(datasets_table_, &QTableWidget::cellDoubleClicked,+ this, &GovDataCKANPanel::on_dataset_clicked);+ content_stack_->addWidget(datasets_table_); // index 1++ // Page 2 — Resources table+ resources_table_ = new QTableWidget;+ resources_table_->setColumnCount(5);+ resources_table_->setHorizontalHeaderLabels({"NAME", "FORMAT", "SIZE", "MODIFIED", "OPEN"});+ resources_table_->horizontalHeader()->setSectionResizeMode(0, QHeaderView::Stretch);+ resources_table_->horizontalHeader()->setSectionResizeMode(1, QHeaderView::Fixed);+ resources_table_->horizontalHeader()->setSectionResizeMode(2, QHeaderView::Fixed);+ resources_table_->horizontalHeader()->setSectionResizeMode(3, QHeaderView::Fixed);+ resources_table_->horizontalHeader()->setSectionResizeMode(4, QHeaderView::Fixed);+ resources_table_->setColumnWidth(1, 70);+ resources_table_->setColumnWidth(2, 80);+ resources_table_->setColumnWidth(3, 100);+ resources_table_->setColumnWidth(4, 60);+ resources_table_->setSelectionBehavior(QAbstractItemView::SelectRows);+ resources_table_->setSelectionMode(QAbstractItemView::SingleSelection);+ resources_table_->setEditTriggers(QAbstractItemView::NoEditTriggers);+ resources_table_->verticalHeader()->setVisible(false);+ resources_table_->setAlternatingRowColors(true);+ resources_table_->setShowGrid(true);++ connect(resources_table_, &QTableWidget::cellClicked, this,+ [this](int row, int col) {+ if (col != 4) return;+ auto* item = resources_table_->item(row, 4);+ if (!item) return;+ QString url = item->data(Qt::UserRole).toString();+ if (!url.isEmpty()) QDesktopServices::openUrl(QUrl(url));+ }, Qt::UniqueConnection);++ content_stack_->addWidget(resources_table_); // index 2++ // Page 3 — Status / loading / error+ auto* status_page = new QWidget;+ status_page->setObjectName("ckanStatusPage");+ auto* svl = new QVBoxLayout(status_page);+ svl->setAlignment(Qt::AlignCenter);+ status_label_ = new QLabel;+ status_label_->setObjectName("ckanStatusMsg");+ status_label_->setAlignment(Qt::AlignCenter);+ status_label_->setWordWrap(true);+ svl->addWidget(status_label_);+ content_stack_->addWidget(status_page); // index 3++ root->addWidget(content_stack_, 1);+}++QWidget* GovDataCKANPanel::build_portal_bar() {+ auto* bar = new QWidget;+ bar->setObjectName("ckanPortalBar");+ bar->setFixedHeight(32);++ auto* hl = new QHBoxLayout(bar);+ hl->setContentsMargins(14, 0, 14, 0);+ hl->setSpacing(8);++ auto* lbl = new QLabel("CKAN PORTAL:");+ lbl->setObjectName("ckanPortalLabel");+ hl->addWidget(lbl);++ portal_combo_ = new QComboBox;+ portal_combo_->setObjectName("ckanPortalCombo");+ portal_combo_->addItems({+ "data.gov.uk",+ "open.canada.ca",+ "data.gov.au",+ "data.gov.hk",+ "opendata.swiss",+ "data.gouv.fr",+ "data.gov",+ "openafrica.net"+ });+ // Display-only — the underlying script always queries data.gov.uk+ portal_combo_->setToolTip(+ "This panel uses datagovuk_api.py which queries data.gov.uk.\n"+ "The selector shows all CKAN portals covered by the universal provider.");+ portal_combo_->setEnabled(true); // allow selection for visual context+ hl->addWidget(portal_combo_);++ hl->addStretch(1);++ return bar;+}++QWidget* GovDataCKANPanel::build_toolbar() {+ auto* bar = new QWidget;+ bar->setObjectName("ckanPanelToolbar");+ bar->setFixedHeight(40);++ auto* hl = new QHBoxLayout(bar);+ hl->setContentsMargins(10, 0, 10, 0);+ hl->setSpacing(5);++ back_btn_ = new QPushButton("← BACK");+ back_btn_->setObjectName("ckanBackBtn");+ back_btn_->setVisible(false);+ back_btn_->setCursor(Qt::PointingHandCursor);+ connect(back_btn_, &QPushButton::clicked, this, &GovDataCKANPanel::on_back);+ hl->addWidget(back_btn_);++ hl->addSpacing(4);++ publishers_btn_ = new QPushButton("PUBLISHERS");+ publishers_btn_->setObjectName("ckanTabBtn");+ publishers_btn_->setCheckable(true);+ publishers_btn_->setChecked(true);+ publishers_btn_->setCursor(Qt::PointingHandCursor);+ connect(publishers_btn_, &QPushButton::clicked,+ this, [this]() { on_tab_changed(Publishers); });+ hl->addWidget(publishers_btn_);++ datasets_btn_ = new QPushButton("DATASETS");+ datasets_btn_->setObjectName("ckanTabBtn");+ datasets_btn_->setCheckable(true);+ datasets_btn_->setCursor(Qt::PointingHandCursor);+ connect(datasets_btn_, &QPushButton::clicked,+ this, [this]() { on_tab_changed(Datasets); });+ hl->addWidget(datasets_btn_);++ search_btn_ = new QPushButton("SEARCH");+ search_btn_->setObjectName("ckanTabBtn");+ search_btn_->setCheckable(true);+ search_btn_->setCursor(Qt::PointingHandCursor);+ connect(search_btn_, &QPushButton::clicked,+ this, [this]() { on_tab_changed(Search); });+ hl->addWidget(search_btn_);++ hl->addSpacing(10);++ search_input_ = new QLineEdit;+ search_input_->setObjectName("ckanSearch");+ search_input_->setPlaceholderText("Search datasets…");+ search_input_->setFixedWidth(210);+ search_input_->setFixedHeight(26);+ connect(search_input_, &QLineEdit::returnPressed,+ this, &GovDataCKANPanel::on_search);+ hl->addWidget(search_input_);++ fetch_btn_ = new QPushButton("FETCH");+ fetch_btn_->setObjectName("ckanFetchBtn");+ fetch_btn_->setCursor(Qt::PointingHandCursor);+ connect(fetch_btn_, &QPushButton::clicked, this, &GovDataCKANPanel::on_search);+ hl->addWidget(fetch_btn_);++ hl->addStretch(1);++ export_btn_ = new QPushButton("CSV");+ export_btn_->setObjectName("ckanCsvBtn");+ export_btn_->setCursor(Qt::PointingHandCursor);+ connect(export_btn_, &QPushButton::clicked, this, &GovDataCKANPanel::on_export_csv);+ hl->addWidget(export_btn_);++ return bar;+}++// ── Public slot ───────────────────────────────────────────────────────────────++void GovDataCKANPanel::load_initial_data() {+ show_loading("Loading publishers from data.gov.uk…");+ services::GovDataService::instance().execute(+ kScript, "publishers", {}, "ckan_publishers");+}++// ── Toolbar actions ───────────────────────────────────────────────────────────++void GovDataCKANPanel::on_tab_changed(int tab_index) {+ auto view = static_cast<View>(tab_index);+ publishers_btn_->setChecked(view == Publishers);+ datasets_btn_->setChecked(view == Datasets);+ search_btn_->setChecked(view == Search);++ current_view_ = view;++ if (view == Publishers) {+ if (current_publishers_.isEmpty())+ load_initial_data();+ else {+ content_stack_->setCurrentIndex(Publishers);+ row_count_label_->setText(+ QString::number(current_publishers_.size()) + " publishers");+ }+ update_breadcrumb();+ } else if (view == Datasets) {+ if (current_datasets_.isEmpty())+ show_status("Double-click a publisher to load their datasets.");+ else {+ content_stack_->setCurrentIndex(Datasets);+ row_count_label_->setText(+ QString::number(current_datasets_.size()) + " datasets");+ }+ update_breadcrumb();+ } else if (view == Search) {+ update_breadcrumb();+ search_input_->setFocus();+ }++ update_toolbar_state();+}++void GovDataCKANPanel::on_search() {+ QString query = search_input_->text().trimmed();+ if (query.isEmpty()) return;++ show_loading("Searching for "" + query + ""…");+ services::GovDataService::instance().execute(+ kScript, "search", {query, "50"}, "ckan_search");+}++void GovDataCKANPanel::on_publisher_clicked(int row) {+ auto* item = publishers_table_->item(row, 0);+ if (!item) return;+ selected_publisher_ = item->data(Qt::UserRole).toString();+ selected_publisher_name_ = item->text();++ show_loading("Loading datasets for "" + selected_publisher_name_ + ""…");+ services::GovDataService::instance().execute(+ kScript, "datasets", {selected_publisher_, "100"}, "ckan_datasets");+}++void GovDataCKANPanel::on_dataset_clicked(int row) {+ auto* item = datasets_table_->item(row, 0);+ if (!item) return;+ selected_dataset_ = item->data(Qt::UserRole).toString();+ if (selected_dataset_.isEmpty()) return;++ show_loading("Loading resources…");+ services::GovDataService::instance().execute(+ kScript, "resources", {selected_dataset_}, "ckan_resources");+}++void GovDataCKANPanel::on_back() {+ if (current_view_ == Resources) {+ content_stack_->setCurrentIndex(Datasets);+ current_view_ = Datasets;+ row_count_label_->setText(+ QString::number(current_datasets_.size()) + " datasets");+ } else if (current_view_ == Datasets) {+ content_stack_->setCurrentIndex(Publishers);+ current_view_ = Publishers;+ publishers_btn_->setChecked(true);+ datasets_btn_->setChecked(false);+ selected_publisher_.clear();+ selected_publisher_name_.clear();+ row_count_label_->setText(+ QString::number(current_publishers_.size()) + " publishers");+ }+ update_toolbar_state();+ update_breadcrumb();+}++void GovDataCKANPanel::update_toolbar_state() {+ back_btn_->setVisible(current_view_ == Datasets || current_view_ == Resources);+}++void GovDataCKANPanel::update_breadcrumb() {+ QString text;+ switch (current_view_) {+ case Publishers:+ text = "Publishers";+ break;+ case Datasets:+ text = selected_publisher_name_.isEmpty()+ ? "Datasets"+ : "Publishers › " + selected_publisher_name_ + " › Datasets";+ break;+ case Resources:+ text = "Publishers › Datasets › Resources";+ break;+ case Search:+ text = "Search Results";+ break;+ }+ breadcrumb_label_->setText(text);+}++// ── Result handler ────────────────────────────────────────────────────────────++void GovDataCKANPanel::on_result(const QString& request_id,+ const services::GovDataResult& result) {+ if (!request_id.startsWith("ckan_")) return;++ if (!result.success) {+ show_error(result.error);+ return;+ }++ // Unwrap data — handle flat array or wrapped object+ QJsonArray data;+ QJsonValue raw = result.data["data"];+ if (raw.isArray()) {+ data = raw.toArray();+ } else if (raw.isObject()) {+ QJsonObject obj = raw.toObject();+ if (obj.contains("datasets"))+ data = obj["datasets"].toArray();+ else if (obj.contains("result"))+ data = obj["result"].toArray();+ }++ if (request_id == "ckan_publishers") {+ current_publishers_ = data;+ populate_publishers(data);+ current_view_ = Publishers;+ publishers_btn_->setChecked(true);+ datasets_btn_->setChecked(false);+ search_btn_->setChecked(false);+ content_stack_->setCurrentIndex(Publishers);+ row_count_label_->setText(+ QString::number(data.size()) + " publishers");+ update_breadcrumb();++ } else if (request_id == "ckan_datasets") {+ int total = result.data["metadata"].toObject()["total_count"].toInt(0);+ if (total == 0) total = data.size();+ current_datasets_ = data;+ populate_datasets(data, total);+ current_view_ = Datasets;+ publishers_btn_->setChecked(false);+ datasets_btn_->setChecked(true);+ search_btn_->setChecked(false);+ content_stack_->setCurrentIndex(Datasets);+ row_count_label_->setText(+ QString("Showing %1 of %2").arg(data.size()).arg(total));+ update_breadcrumb();++ } else if (request_id == "ckan_search") {+ int total = result.data["metadata"].toObject()["total_count"].toInt(0);+ if (total == 0) total = data.size();+ current_datasets_ = data;+ populate_datasets(data, total);+ current_view_ = Search;+ publishers_btn_->setChecked(false);+ datasets_btn_->setChecked(false);+ search_btn_->setChecked(true);+ content_stack_->setCurrentIndex(Datasets);+ row_count_label_->setText(+ QString("Showing %1 of %2").arg(data.size()).arg(total));+ update_breadcrumb();++ } else if (request_id == "ckan_resources") {+ current_resources_ = data;+ populate_resources(data);+ current_view_ = Resources;+ content_stack_->setCurrentIndex(Resources);+ row_count_label_->setText(+ QString::number(data.size()) + " files");+ update_breadcrumb();+ }++ update_toolbar_state();+}++// ── Populate tables ───────────────────────────────────────────────────────────++void GovDataCKANPanel::populate_publishers(const QJsonArray& data) {+ publishers_table_->setRowCount(0);+ publishers_table_->setRowCount(data.size());++ for (int i = 0; i < data.size(); ++i) {+ const auto obj = data[i].toObject();++ QString name = obj["display_name"].toString();+ if (name.isEmpty()) name = obj["title"].toString();+ if (name.isEmpty()) name = obj["name"].toString();+ if (name.isEmpty()) name = obj["id"].toString();++ auto* name_item = new QTableWidgetItem(name);+ name_item->setForeground(QColor(kColor));+ name_item->setData(Qt::UserRole,+ obj["id"].toString().isEmpty() ? obj["name"].toString() : obj["id"].toString());+ publishers_table_->setItem(i, 0, name_item);+ }++ LOG_INFO("GovCKAN", QString("Populated %1 publishers").arg(data.size()));+}++void GovDataCKANPanel::populate_datasets(const QJsonArray& data, int total_count) {+ datasets_table_->setRowCount(0);+ datasets_table_->setRowCount(data.size());++ for (int i = 0; i < data.size(); ++i) {+ const auto obj = data[i].toObject();++ QString title = obj["title"].toString();+ if (title.isEmpty()) title = obj["name"].toString();++ auto* title_item = new QTableWidgetItem(title);+ title_item->setData(Qt::UserRole,+ obj["id"].toString().isEmpty() ? obj["name"].toString() : obj["id"].toString());+ datasets_table_->setItem(i, 0, title_item);++ int num_res = obj["num_resources"].toInt(0);+ auto* res_item = new QTableWidgetItem(QString::number(num_res));+ res_item->setTextAlignment(Qt::AlignCenter);+ res_item->setForeground(QColor(kColor));+ datasets_table_->setItem(i, 1, res_item);++ QString modified = obj["metadata_modified"].toString();+ if (modified.length() > 10) modified = modified.left(10);+ datasets_table_->setItem(i, 2, new QTableWidgetItem(modified));++ QStringList tags;+ for (const auto& t : obj["tags"].toArray()) {+ if (t.isString()) tags << t.toString();+ else if (t.isObject()) tags << t.toObject()["name"].toString();+ }+ QString tags_str = tags.mid(0, 3).join(", ");+ if (tags.size() > 3) tags_str += QString(" +%1").arg(tags.size() - 3);+ auto* tag_item = new QTableWidgetItem(tags_str);+ tag_item->setForeground(QColor("#808080"));+ datasets_table_->setItem(i, 3, tag_item);+ }++ LOG_INFO("GovCKAN",+ QString("Populated %1 datasets (total: %2)").arg(data.size()).arg(total_count));+}++void GovDataCKANPanel::populate_resources(const QJsonArray& data) {+ resources_table_->setRowCount(0);+ resources_table_->setRowCount(data.size());++ for (int i = 0; i < data.size(); ++i) {+ const auto obj = data[i].toObject();++ QString name = obj["name"].toString();+ if (name.isEmpty()) name = obj["id"].toString();+ resources_table_->setItem(i, 0, new QTableWidgetItem(name));++ QString format = obj["format"].toString().toUpper();+ auto* fmt_item = new QTableWidgetItem(format.isEmpty() ? "—" : format);+ fmt_item->setForeground(QColor(kColor));+ fmt_item->setTextAlignment(Qt::AlignCenter);+ resources_table_->setItem(i, 1, fmt_item);++ double size_bytes = obj["size"].toDouble(0);+ QString size_str = "—";+ if (size_bytes > 0) {+ if (size_bytes < 1024)+ size_str = QString::number(size_bytes, 'f', 0) + " B";+ else if (size_bytes < 1024 * 1024)+ size_str = QString::number(size_bytes / 1024.0, 'f', 1) + " KB";+ else+ size_str = QString::number(size_bytes / (1024.0 * 1024.0), 'f', 1) + " MB";+ }+ auto* sz = new QTableWidgetItem(size_str);+ sz->setTextAlignment(Qt::AlignRight | Qt::AlignVCenter);+ resources_table_->setItem(i, 2, sz);++ QString modified = obj["last_modified"].toString();+ if (modified.length() > 10) modified = modified.left(10);+ resources_table_->setItem(i, 3, new QTableWidgetItem(modified));++ QString url = obj["url"].toString();+ auto* url_item = new QTableWidgetItem(url.isEmpty() ? "—" : "↗ OPEN");+ url_item->setData(Qt::UserRole, url);+ if (!url.isEmpty()) url_item->setForeground(QColor(kColor));+ url_item->setTextAlignment(Qt::AlignCenter);+ resources_table_->setItem(i, 4, url_item);+ }++ LOG_INFO("GovCKAN", QString("Populated %1 resources").arg(data.size()));+}++// ── Status helpers ────────────────────────────────────────────────────────────++void GovDataCKANPanel::show_loading(const QString& message) {+ status_label_->setStyleSheet(+ QString("color:%1; font-size:13px; background:transparent;").arg(kColor));+ status_label_->setText(message);+ content_stack_->setCurrentIndex(3);+}++void GovDataCKANPanel::show_error(const QString& message) {+ status_label_->setStyleSheet(+ "color:#dc2626; font-size:12px; background:transparent;");+ status_label_->setText("Error: " + message);+ content_stack_->setCurrentIndex(3);+ LOG_ERROR("GovCKAN", message);+}++void GovDataCKANPanel::show_status(const QString& message, bool is_error) {+ status_label_->setStyleSheet(is_error+ ? "color:#dc2626; font-size:12px; background:transparent;"+ : "color:#808080; font-size:12px; background:transparent;");+ status_label_->setText(message);+ content_stack_->setCurrentIndex(3);+}++// ── CSV export ────────────────────────────────────────────────────────────────++void GovDataCKANPanel::on_export_csv() {+ QTableWidget* table = nullptr;+ QString def_name;++ if (current_view_ == Publishers && publishers_table_->rowCount() > 0) {+ table = publishers_table_;+ def_name = "ckan_publishers.csv";+ } else if ((current_view_ == Datasets || current_view_ == Search)+ && datasets_table_->rowCount() > 0) {+ table = datasets_table_;+ def_name = "ckan_datasets.csv";+ } else if (current_view_ == Resources && resources_table_->rowCount() > 0) {+ table = resources_table_;+ def_name = "ckan_resources.csv";+ }+ if (!table) return;++ QString path = QFileDialog::getSaveFileName(+ this, "Export CSV", def_name, "CSV Files (*.csv)");+ if (path.isEmpty()) return;++ QFile file(path);+ if (!file.open(QIODevice::WriteOnly | QIODevice::Text)) return;+ QTextStream out(&file);++ QStringList headers;+ for (int c = 0; c < table->columnCount(); ++c) {+ auto* h = table->horizontalHeaderItem(c);+ headers << (h ? h->text() : QString::number(c));+ }+ out << headers.join(",") << "\n";++ for (int r = 0; r < table->rowCount(); ++r) {+ QStringList row;+ for (int c = 0; c < table->columnCount(); ++c) {+ auto* item = table->item(r, c);+ QString val = item ? item->text() : "";+ if (val.contains(',') || val.contains('"'))+ val = "\"" + val.replace("\"", "\"\"") + "\"";+ row << val;+ }+ out << row.join(",") << "\n";+ }++ LOG_INFO("GovCKAN", "Exported CSV: " + path);+}++} // namespace fincept::screensdiff --git a/fincept-qt/src/screens/gov_data/GovDataCKANPanel.h b/fincept-qt/src/screens/gov_data/GovDataCKANPanel.hnew file mode 100644index 000000000..61fb822cb--- /dev/null+++ b/fincept-qt/src/screens/gov_data/GovDataCKANPanel.h@@ -0,0 +1,93 @@+// src/screens/gov_data/GovDataCKANPanel.h+// Universal CKAN portal browser — covers 8 portals, script: datagovuk_api.py+// Color: #10B981+// Includes a display-only portal selector combobox at the top.+#pragma once++#include "services/gov_data/GovDataService.h"++#include <QComboBox>+#include <QJsonArray>+#include <QLabel>+#include <QLineEdit>+#include <QPushButton>+#include <QStackedWidget>+#include <QTableWidget>+#include <QWidget>++namespace fincept::screens {++class GovDataCKANPanel : public QWidget {+ Q_OBJECT+ public:+ explicit GovDataCKANPanel(QWidget* parent = nullptr);++ public slots:+ void load_initial_data();++ private slots:+ void on_result(const QString& request_id, const services::GovDataResult& result);+ void on_publisher_clicked(int row);+ void on_dataset_clicked(int row);+ void on_tab_changed(int tab_index);+ void on_search();+ void on_back();+ void on_export_csv();++ private:+ enum View { Publishers = 0, Datasets, Resources, Search };++ void build_ui();+ QWidget* build_portal_bar();+ QWidget* build_toolbar();++ void populate_publishers(const QJsonArray& data);+ void populate_datasets(const QJsonArray& data, int total_count);+ void populate_resources(const QJsonArray& data);++ void show_loading(const QString& message);+ void show_error(const QString& message);+ void show_status(const QString& message, bool is_error = false);++ void update_toolbar_state();+ void update_breadcrumb();++ static constexpr const char* kScript = "datagovuk_api.py";+ static constexpr const char* kColor = "#10B981";++ View current_view_ = Publishers;+ QString selected_publisher_;+ QString selected_publisher_name_;+ QString selected_dataset_;++ // Toolbar widgets+ QPushButton* back_btn_ = nullptr;+ QPushButton* publishers_btn_ = nullptr;+ QPushButton* datasets_btn_ = nullptr;+ QPushButton* search_btn_ = nullptr;+ QLineEdit* search_input_ = nullptr;+ QPushButton* fetch_btn_ = nullptr;+ QPushButton* export_btn_ = nullptr;++ // Portal selector (display-only)+ QComboBox* portal_combo_ = nullptr;++ // Breadcrumb+ QWidget* breadcrumb_ = nullptr;+ QLabel* breadcrumb_label_ = nullptr;+ QLabel* row_count_label_ = nullptr;++ // Content pages (stack indices match View enum + 1 for status)+ QStackedWidget* content_stack_ = nullptr;+ QTableWidget* publishers_table_ = nullptr; // page 0+ QTableWidget* datasets_table_ = nullptr; // page 1+ QTableWidget* resources_table_ = nullptr; // page 2+ QLabel* status_label_ = nullptr; // page 3++ // Cached data+ QJsonArray current_publishers_;+ QJsonArray current_datasets_;+ QJsonArray current_resources_;+};++} // namespace fincept::screensdiff --git a/fincept-qt/src/screens/gov_data/GovDataCanadaPanel.cpp b/fincept-qt/src/screens/gov_data/GovDataCanadaPanel.cppnew file mode 100644index 000000000..c48f5b123--- /dev/null+++ b/fincept-qt/src/screens/gov_data/GovDataCanadaPanel.cpp@@ -0,0 +1,638 @@+// src/screens/gov_data/GovDataCanadaPanel.cpp+#include "screens/gov_data/GovDataCanadaPanel.h"++#include "core/logging/Logger.h"+#include "services/gov_data/GovDataService.h"+#include "ui/theme/Theme.h"++#include <QDesktopServices>+#include <QFileDialog>+#include <QHBoxLayout>+#include <QHeaderView>+#include <QJsonArray>+#include <QJsonObject>+#include <QLabel>+#include <QScrollArea>+#include <QTextStream>+#include <QUrl>+#include <QVBoxLayout>++namespace fincept::screens {++using namespace fincept::ui;++// ── Panel stylesheet ─────────────────────────────────────────────────────────++static const QString kCanadaStyle = QString(+ "#govPanelToolbar { background:#111111; border-bottom:1px solid #1a1a1a; }"++ "#govTabBtn { background:transparent; color:#808080; border:1px solid #1a1a1a;"+ " font-size:10px; font-weight:700; padding:4px 12px; letter-spacing:0.5px; }"+ "#govTabBtn:hover { color:#e5e5e5; background:#161616; }"+ "#govTabBtn:checked { background:rgba(239,68,68,0.12); color:#EF4444;"+ " border:1px solid #EF4444; }"++ "#govBackBtn { background:transparent; color:#808080; border:1px solid #1a1a1a;"+ " font-size:10px; font-weight:700; padding:4px 10px; }"+ "#govBackBtn:hover { color:#e5e5e5; background:#161616; }"++ "#govFetchBtn { background:#EF4444; color:#080808; border:none;"+ " font-size:10px; font-weight:700; padding:4px 14px; }"+ "#govFetchBtn:hover { background:#f87171; }"+ "#govFetchBtn:disabled { background:#1a1a1a; color:#404040; }"++ "#govCsvBtn { background:transparent; color:#808080; border:1px solid #1a1a1a;"+ " font-size:10px; font-weight:700; padding:4px 10px; }"+ "#govCsvBtn:hover { color:#e5e5e5; background:#161616; }"++ "#govSearch { background:#080808; color:#e5e5e5; border:none;"+ " border-bottom:1px solid #1a1a1a; padding:4px 10px; font-size:11px; }"+ "#govSearch:focus { border-bottom:1px solid #EF4444; }"++ "QTableWidget { background:#080808; color:#e5e5e5; border:none;"+ " gridline-color:#1a1a1a; font-size:11px; alternate-background-color:#0a0a0a; }"+ "QTableWidget::item { padding:5px 8px; border-bottom:1px solid #1a1a1a; }"+ "QTableWidget::item:selected { background:rgba(239,68,68,0.10); color:#EF4444; }"+ "QHeaderView::section { background:#111111; color:#808080; border:none;"+ " border-bottom:2px solid #1a1a1a; border-right:1px solid #1a1a1a;"+ " padding:5px 8px; font-size:10px; font-weight:700; letter-spacing:0.5px; }"++ "#govStatusPage { background:#080808; }"+ "#govStatusMsg { color:#808080; font-size:13px; background:transparent; }"+ "#govStatusErr { color:#dc2626; font-size:12px; background:transparent; }"++ "#govBreadcrumb { background:#0a0a0a; border-bottom:1px solid #1a1a1a; }"+ "#govBreadcrumbText { color:#808080; font-size:9px; background:transparent; }"+ "#govBreadcrumbActive { color:#EF4444; font-size:9px; font-weight:700; background:transparent; }"++ "QScrollBar:vertical { background:#080808; width:5px; }"+ "QScrollBar::handle:vertical { background:#1a1a1a; min-height:20px; }"+ "QScrollBar::add-line:vertical, QScrollBar::sub-line:vertical { height:0; }"+);++// ── Constructor ──────────────────────────────────────────────────────────────++GovDataCanadaPanel::GovDataCanadaPanel(QWidget* parent)+ : QWidget(parent) {+ setStyleSheet(kCanadaStyle);+ build_ui();+ connect(&services::GovDataService::instance(),+ &services::GovDataService::result_ready,+ this,+ &GovDataCanadaPanel::on_result);+}++// ── Build UI ─────────────────────────────────────────────────────────────────++void GovDataCanadaPanel::build_ui() {+ auto* root = new QVBoxLayout(this);+ root->setContentsMargins(0, 0, 0, 0);+ root->setSpacing(0);++ root->addWidget(build_toolbar());++ // Breadcrumb bar+ breadcrumb_ = new QWidget;+ breadcrumb_->setObjectName("govBreadcrumb");+ breadcrumb_->setFixedHeight(24);+ auto* bcl = new QHBoxLayout(breadcrumb_);+ bcl->setContentsMargins(14, 0, 14, 0);+ bcl->setSpacing(4);++ breadcrumb_label_ = new QLabel("All Publishers");+ breadcrumb_label_->setObjectName("govBreadcrumbText");+ bcl->addWidget(breadcrumb_label_);+ bcl->addStretch(1);++ row_count_label_ = new QLabel;+ row_count_label_->setObjectName("govBreadcrumbText");+ bcl->addWidget(row_count_label_);++ root->addWidget(breadcrumb_);++ // Content stack+ content_stack_ = new QStackedWidget;++ // Page 0 — Publishers table (NAME | DATASETS)+ publishers_table_ = new QTableWidget;+ publishers_table_->setColumnCount(2);+ publishers_table_->setHorizontalHeaderLabels({"PUBLISHER", "DATASETS"});+ publishers_table_->horizontalHeader()->setSectionResizeMode(0, QHeaderView::Stretch);+ publishers_table_->horizontalHeader()->setSectionResizeMode(1, QHeaderView::Fixed);+ publishers_table_->setColumnWidth(1, 80);+ publishers_table_->setSelectionBehavior(QAbstractItemView::SelectRows);+ publishers_table_->setSelectionMode(QAbstractItemView::SingleSelection);+ publishers_table_->setEditTriggers(QAbstractItemView::NoEditTriggers);+ publishers_table_->verticalHeader()->setVisible(false);+ publishers_table_->setAlternatingRowColors(true);+ publishers_table_->setShowGrid(true);+ connect(publishers_table_, &QTableWidget::cellDoubleClicked,+ this, &GovDataCanadaPanel::on_publisher_clicked);+ content_stack_->addWidget(publishers_table_);++ // Page 1 — Datasets table (TITLE | FILES | MODIFIED | PUBLISHER)+ datasets_table_ = new QTableWidget;+ datasets_table_->setColumnCount(4);+ datasets_table_->setHorizontalHeaderLabels({"TITLE", "FILES", "MODIFIED", "PUBLISHER"});+ datasets_table_->horizontalHeader()->setSectionResizeMode(0, QHeaderView::Stretch);+ datasets_table_->horizontalHeader()->setSectionResizeMode(1, QHeaderView::Fixed);+ datasets_table_->horizontalHeader()->setSectionResizeMode(2, QHeaderView::Fixed);+ datasets_table_->horizontalHeader()->setSectionResizeMode(3, QHeaderView::Fixed);+ datasets_table_->setColumnWidth(1, 55);+ datasets_table_->setColumnWidth(2, 100);+ datasets_table_->setColumnWidth(3, 180);+ datasets_table_->setSelectionBehavior(QAbstractItemView::SelectRows);+ datasets_table_->setSelectionMode(QAbstractItemView::SingleSelection);+ datasets_table_->setEditTriggers(QAbstractItemView::NoEditTriggers);+ datasets_table_->verticalHeader()->setVisible(false);+ datasets_table_->setAlternatingRowColors(true);+ datasets_table_->setShowGrid(true);+ connect(datasets_table_, &QTableWidget::cellDoubleClicked,+ this, &GovDataCanadaPanel::on_dataset_clicked);+ content_stack_->addWidget(datasets_table_);++ // Page 2 — Resources table (NAME | FORMAT | SIZE | MODIFIED | OPEN)+ resources_table_ = new QTableWidget;+ resources_table_->setColumnCount(5);+ resources_table_->setHorizontalHeaderLabels({"NAME", "FORMAT", "SIZE", "MODIFIED", "OPEN"});+ resources_table_->horizontalHeader()->setSectionResizeMode(0, QHeaderView::Stretch);+ resources_table_->horizontalHeader()->setSectionResizeMode(1, QHeaderView::Fixed);+ resources_table_->horizontalHeader()->setSectionResizeMode(2, QHeaderView::Fixed);+ resources_table_->horizontalHeader()->setSectionResizeMode(3, QHeaderView::Fixed);+ resources_table_->horizontalHeader()->setSectionResizeMode(4, QHeaderView::Fixed);+ resources_table_->setColumnWidth(1, 70);+ resources_table_->setColumnWidth(2, 80);+ resources_table_->setColumnWidth(3, 100);+ resources_table_->setColumnWidth(4, 60);+ resources_table_->setSelectionBehavior(QAbstractItemView::SelectRows);+ resources_table_->setSelectionMode(QAbstractItemView::SingleSelection);+ resources_table_->setEditTriggers(QAbstractItemView::NoEditTriggers);+ resources_table_->verticalHeader()->setVisible(false);+ resources_table_->setAlternatingRowColors(true);+ resources_table_->setShowGrid(true);+ content_stack_->addWidget(resources_table_);++ // Page 3 — Status / loading / error+ auto* status_page = new QWidget;+ status_page->setObjectName("govStatusPage");+ auto* svl = new QVBoxLayout(status_page);+ svl->setAlignment(Qt::AlignCenter);+ status_label_ = new QLabel;+ status_label_->setObjectName("govStatusMsg");+ status_label_->setAlignment(Qt::AlignCenter);+ status_label_->setWordWrap(true);+ svl->addWidget(status_label_);+ content_stack_->addWidget(status_page);++ root->addWidget(content_stack_, 1);+}++QWidget* GovDataCanadaPanel::build_toolbar() {+ auto* bar = new QWidget;+ bar->setObjectName("govPanelToolbar");+ bar->setFixedHeight(40);++ auto* hl = new QHBoxLayout(bar);+ hl->setContentsMargins(10, 0, 10, 0);+ hl->setSpacing(5);++ back_btn_ = new QPushButton("← BACK");+ back_btn_->setObjectName("govBackBtn");+ back_btn_->setVisible(false);+ back_btn_->setCursor(Qt::PointingHandCursor);+ connect(back_btn_, &QPushButton::clicked, this, &GovDataCanadaPanel::on_back);+ hl->addWidget(back_btn_);++ hl->addSpacing(4);++ publishers_btn_ = new QPushButton("PUBLISHERS");+ publishers_btn_->setObjectName("govTabBtn");+ publishers_btn_->setCheckable(true);+ publishers_btn_->setChecked(true);+ publishers_btn_->setCursor(Qt::PointingHandCursor);+ connect(publishers_btn_, &QPushButton::clicked,+ this, [this]() { on_view_changed(Publishers); });+ hl->addWidget(publishers_btn_);++ datasets_btn_ = new QPushButton("DATASETS");+ datasets_btn_->setObjectName("govTabBtn");+ datasets_btn_->setCheckable(true);+ datasets_btn_->setCursor(Qt::PointingHandCursor);+ connect(datasets_btn_, &QPushButton::clicked,+ this, [this]() { on_view_changed(Datasets); });+ hl->addWidget(datasets_btn_);++ search_btn_ = new QPushButton("SEARCH");+ search_btn_->setObjectName("govTabBtn");+ search_btn_->setCheckable(true);+ search_btn_->setCursor(Qt::PointingHandCursor);+ connect(search_btn_, &QPushButton::clicked,+ this, [this]() { on_view_changed(Search); });+ hl->addWidget(search_btn_);++ hl->addSpacing(10);++ search_input_ = new QLineEdit;+ search_input_->setObjectName("govSearch");+ search_input_->setPlaceholderText("Search datasets…");+ search_input_->setFixedWidth(210);+ search_input_->setFixedHeight(26);+ connect(search_input_, &QLineEdit::returnPressed,+ this, &GovDataCanadaPanel::on_search);+ hl->addWidget(search_input_);++ fetch_btn_ = new QPushButton("FETCH");+ fetch_btn_->setObjectName("govFetchBtn");+ fetch_btn_->setCursor(Qt::PointingHandCursor);+ connect(fetch_btn_, &QPushButton::clicked, this, &GovDataCanadaPanel::on_search);+ hl->addWidget(fetch_btn_);++ hl->addStretch(1);++ export_btn_ = new QPushButton("CSV");+ export_btn_->setObjectName("govCsvBtn");+ export_btn_->setCursor(Qt::PointingHandCursor);+ connect(export_btn_, &QPushButton::clicked, this, &GovDataCanadaPanel::on_export_csv);+ hl->addWidget(export_btn_);++ return bar;+}++// ── Data loading ─────────────────────────────────────────────────────────────++void GovDataCanadaPanel::load_initial_data() {+ show_loading("Loading publishers…");+ services::GovDataService::instance().execute(+ kScript, "publishers", {}, "gov_orgs_canada_gov_api.py");+}++void GovDataCanadaPanel::on_result(const QString& request_id,+ const services::GovDataResult& result) {+ // Only handle requests belonging to this script+ if (!request_id.contains("canada_gov_api.py")) return;++ if (!result.success) {+ show_error(result.error);+ return;+ }++ // Unwrap data array — CKAN responses always use {"data":[...], "metadata":{...}}+ QJsonArray data;+ const QJsonValue raw = result.data["data"];+ if (raw.isArray()) {+ data = raw.toArray();+ } else if (raw.isObject()) {+ const QJsonObject obj = raw.toObject();+ if (obj.contains("datasets"))+ data = obj["datasets"].toArray();+ else if (obj.contains("result"))+ data = obj["result"].toArray();+ }++ if (request_id.startsWith("gov_orgs_")) {+ current_publishers_ = data;+ populate_publishers(data);+ content_stack_->setCurrentIndex(Publishers);+ current_view_ = Publishers;+ update_breadcrumb();+ LOG_INFO("GovDataCanada", QString("Loaded %1 publishers").arg(data.size()));+ } else if (request_id.startsWith("gov_datasets_") ||+ request_id.startsWith("gov_search_")) {+ int total = result.data["metadata"].toObject()["total_count"].toInt(0);+ if (total == 0) total = data.size();+ current_datasets_ = data;+ populate_datasets(data, total);+ content_stack_->setCurrentIndex(Datasets);+ current_view_ = Datasets;+ update_breadcrumb();+ LOG_INFO("GovDataCanada", QString("Loaded %1 datasets (total %2)").arg(data.size()).arg(total));+ } else if (request_id.startsWith("gov_resources_")) {+ current_resources_ = data;+ populate_resources(data);+ content_stack_->setCurrentIndex(Resources);+ current_view_ = Resources;+ update_breadcrumb();+ LOG_INFO("GovDataCanada", QString("Loaded %1 resources").arg(data.size()));+ }++ update_toolbar_state();+}++// ── Populate tables ──────────────────────────────────────────────────────────++void GovDataCanadaPanel::populate_publishers(const QJsonArray& data) {+ publishers_table_->setRowCount(0);+ publishers_table_->setRowCount(data.size());++ for (int i = 0; i < data.size(); ++i) {+ const auto obj = data[i].toObject();++ // Resolve display name — prefer display_name, fall back to name, then id+ QString name = obj["display_name"].toString();+ if (name.isEmpty()) name = obj["name"].toString();+ if (name.isEmpty()) name = obj["id"].toString();++ // Store id for dataset queries+ const QString id = obj["id"].toString().isEmpty()+ ? obj["name"].toString()+ : obj["id"].toString();++ auto* name_item = new QTableWidgetItem(name);+ name_item->setData(Qt::UserRole, id);+ name_item->setForeground(QColor(kColor));+ publishers_table_->setItem(i, 0, name_item);++ // dataset_count may not be present in Canada API — show "—" when absent+ int count = obj["dataset_count"].toInt(-1);+ auto* cnt = new QTableWidgetItem(count >= 0 ? QString::number(count) : "—");+ cnt->setTextAlignment(Qt::AlignCenter);+ publishers_table_->setItem(i, 1, cnt);+ }++ row_count_label_->setText(QString::number(data.size()) + " publishers");+}++void GovDataCanadaPanel::populate_datasets(const QJsonArray& data, int total_count) {+ datasets_table_->setRowCount(0);+ datasets_table_->setRowCount(data.size());++ for (int i = 0; i < data.size(); ++i) {+ const auto obj = data[i].toObject();++ // Title — fall back to name+ QString title = obj["title"].toString();+ if (title.isEmpty()) title = obj["name"].toString();++ const QString id = obj["id"].toString().isEmpty()+ ? obj["name"].toString()+ : obj["id"].toString();++ // Long notes → tooltip truncated to 100 chars+ QString notes = obj["notes"].toString().trimmed();+ QString tooltip = notes.isEmpty() ? title : (notes.length() > 100+ ? notes.left(100) + "…"+ : notes);++ auto* title_item = new QTableWidgetItem(title);+ title_item->setData(Qt::UserRole, id);+ title_item->setToolTip(tooltip);+ datasets_table_->setItem(i, 0, title_item);++ int num_res = obj["num_resources"].toInt(0);+ auto* res_item = new QTableWidgetItem(QString::number(num_res));+ res_item->setTextAlignment(Qt::AlignCenter);+ res_item->setForeground(QColor(kColor));+ datasets_table_->setItem(i, 1, res_item);++ QString modified = obj["metadata_modified"].toString();+ if (modified.length() > 10) modified = modified.left(10);+ datasets_table_->setItem(i, 2, new QTableWidgetItem(modified));++ // Publisher name from publisher_id or nested publisher object+ QString publisher = obj["publisher_id"].toString();+ if (publisher.isEmpty()) {+ const auto pub_obj = obj["publisher"].toObject();+ publisher = pub_obj["display_name"].toString();+ if (publisher.isEmpty()) publisher = pub_obj["name"].toString();+ }+ auto* pub_item = new QTableWidgetItem(publisher);+ pub_item->setForeground(QColor("#808080"));+ datasets_table_->setItem(i, 3, pub_item);+ }++ row_count_label_->setText(+ QString("Showing %1 of %2").arg(data.size()).arg(total_count));+}++void GovDataCanadaPanel::populate_resources(const QJsonArray& data) {+ resources_table_->setRowCount(0);+ resources_table_->setRowCount(data.size());++ for (int i = 0; i < data.size(); ++i) {+ const auto obj = data[i].toObject();++ QString name = obj["name"].toString();+ if (name.isEmpty()) name = obj["id"].toString();++ auto* name_item = new QTableWidgetItem(name);+ // description as tooltip+ const QString desc = obj["description"].toString().trimmed();+ if (!desc.isEmpty()) name_item->setToolTip(desc);+ resources_table_->setItem(i, 0, name_item);++ QString format = obj["format"].toString().toUpper();+ auto* fmt_item = new QTableWidgetItem(format.isEmpty() ? "—" : format);+ fmt_item->setForeground(QColor(kColor));+ fmt_item->setTextAlignment(Qt::AlignCenter);+ resources_table_->setItem(i, 1, fmt_item);++ // size is often null — show "—" when null/zero+ QString size_str = "—";+ if (!obj["size"].isNull() && obj["size"].toDouble(0) > 0) {+ const double size_bytes = obj["size"].toDouble(0);+ if (size_bytes < 1024)+ size_str = QString::number(size_bytes, 'f', 0) + " B";+ else if (size_bytes < 1024 * 1024)+ size_str = QString::number(size_bytes / 1024.0, 'f', 1) + " KB";+ else+ size_str = QString::number(size_bytes / (1024.0 * 1024.0), 'f', 1) + " MB";+ }+ auto* sz = new QTableWidgetItem(size_str);+ sz->setTextAlignment(Qt::AlignRight | Qt::AlignVCenter);+ resources_table_->setItem(i, 2, sz);++ QString modified = obj["last_modified"].toString();+ if (modified.length() > 10) modified = modified.left(10);+ if (modified.isEmpty()) modified = obj["created"].toString().left(10);+ resources_table_->setItem(i, 3, new QTableWidgetItem(modified));++ const QString url = obj["url"].toString();+ auto* url_item = new QTableWidgetItem(url.isEmpty() ? "—" : "↗ OPEN");+ url_item->setData(Qt::UserRole, url);+ if (!url.isEmpty()) url_item->setForeground(QColor(kColor));+ url_item->setTextAlignment(Qt::AlignCenter);+ resources_table_->setItem(i, 4, url_item);+ }++ // Connect open-URL click — UniqueConnection prevents double-connecting on reload+ connect(resources_table_, &QTableWidget::cellClicked, this,+ [this](int row, int col) {+ if (col != 4) return;+ auto* item = resources_table_->item(row, 4);+ if (!item) return;+ const QString url = item->data(Qt::UserRole).toString();+ if (!url.isEmpty()) QDesktopServices::openUrl(QUrl(url));+ },+ Qt::UniqueConnection);++ row_count_label_->setText(QString::number(data.size()) + " files");+}++// ── View navigation ──────────────────────────────────────────────────────────++void GovDataCanadaPanel::on_view_changed(int index) {+ const auto view = static_cast<View>(index);+ publishers_btn_->setChecked(view == Publishers);+ datasets_btn_->setChecked(view == Datasets);+ search_btn_->setChecked(view == Search);++ if (view == Publishers) {+ if (current_publishers_.isEmpty())+ load_initial_data();+ else+ content_stack_->setCurrentIndex(Publishers);+ current_view_ = Publishers;+ } else if (view == Datasets) {+ if (!current_datasets_.isEmpty()) {+ content_stack_->setCurrentIndex(Datasets);+ current_view_ = Datasets;+ }+ // If no datasets loaded yet, stay on current view — user needs to pick a publisher+ } else if (view == Search) {+ current_view_ = Search;+ search_input_->setFocus();+ }++ update_toolbar_state();+ update_breadcrumb();+}++void GovDataCanadaPanel::on_publisher_clicked(int row) {+ auto* item = publishers_table_->item(row, 0);+ if (!item) return;+ selected_publisher_ = item->data(Qt::UserRole).toString();+ selected_publisher_name_ = item->text();+ show_loading("Loading datasets for "" + selected_publisher_name_ + ""…");+ services::GovDataService::instance().execute(+ kScript, "datasets", {selected_publisher_, "100"},+ "gov_datasets_canada_gov_api.py");+}++void GovDataCanadaPanel::on_dataset_clicked(int row) {+ auto* item = datasets_table_->item(row, 0);+ if (!item) return;+ selected_dataset_ = item->data(Qt::UserRole).toString();+ show_loading("Loading resources…");+ services::GovDataService::instance().execute(+ kScript, "resources", {selected_dataset_},+ "gov_resources_canada_gov_api.py");+}++void GovDataCanadaPanel::on_search() {+ const QString query = search_input_->text().trimmed();+ if (query.isEmpty()) return;+ show_loading("Searching for "" + query + ""…");+ services::GovDataService::instance().execute(+ kScript, "search", {query, "50"},+ "gov_search_canada_gov_api.py");+}++void GovDataCanadaPanel::on_back() {+ if (current_view_ == Resources) {+ content_stack_->setCurrentIndex(Datasets);+ current_view_ = Datasets;+ } else if (current_view_ == Datasets) {+ content_stack_->setCurrentIndex(Publishers);+ current_view_ = Publishers;+ selected_publisher_.clear();+ selected_publisher_name_.clear();+ }+ update_toolbar_state();+ update_breadcrumb();+}++void GovDataCanadaPanel::update_toolbar_state() {+ back_btn_->setVisible(current_view_ == Datasets || current_view_ == Resources);+}++void GovDataCanadaPanel::update_breadcrumb() {+ QString text;+ switch (current_view_) {+ case Publishers:+ text = "All Publishers";+ break;+ case Datasets:+ text = "All Publishers › " + selected_publisher_name_ + " › Datasets";+ break;+ case Resources:+ text = "All Publishers › Datasets › Resources";+ break;+ case Search:+ text = "Search Results";+ break;+ }+ breadcrumb_label_->setText(text);+}++// ── Status helpers ───────────────────────────────────────────────────────────++void GovDataCanadaPanel::show_loading(const QString& message) {+ status_label_->setStyleSheet(+ "color:#EF4444; font-size:13px; background:transparent;");+ status_label_->setText(message);+ content_stack_->setCurrentIndex(3);+}++void GovDataCanadaPanel::show_error(const QString& message) {+ status_label_->setStyleSheet(+ "color:#dc2626; font-size:12px; background:transparent;");+ status_label_->setText("Error: " + message);+ content_stack_->setCurrentIndex(3);+ LOG_ERROR("GovDataCanada", "Error: " + message);+}++void GovDataCanadaPanel::show_empty(const QString& message) {+ status_label_->setStyleSheet(+ "color:#808080; font-size:12px; background:transparent;");+ status_label_->setText(message);+ content_stack_->setCurrentIndex(3);+}++// ── CSV export ───────────────────────────────────────────────────────────────++void GovDataCanadaPanel::on_export_csv() {+ QTableWidget* table = nullptr;+ QString def_name;++ if (current_view_ == Publishers && publishers_table_->rowCount() > 0) {+ table = publishers_table_;+ def_name = "canada_publishers.csv";+ } else if ((current_view_ == Datasets || current_view_ == Search)+ && datasets_table_->rowCount() > 0) {+ table = datasets_table_;+ def_name = "canada_datasets.csv";+ } else if (current_view_ == Resources && resources_table_->rowCount() > 0) {+ table = resources_table_;+ def_name = "canada_resources.csv";+ }+ if (!table) return;++ const QString path = QFileDialog::getSaveFileName(+ this, "Export CSV", def_name, "CSV Files (*.csv)");+ if (path.isEmpty()) return;++ QFile file(path);+ if (!file.open(QIODevice::WriteOnly | QIODevice::Text)) return;+ QTextStream out(&file);++ QStringList headers;+ for (int c = 0; c < table->columnCount(); ++c) {+ auto* h = table->horizontalHeaderItem(c);+ headers << (h ? h->text() : QString::number(c));+ }+ out << headers.join(",") << "\n";++ for (int r = 0; r < table->rowCount(); ++r) {+ QStringList row;+ for (int c = 0; c < table->columnCount(); ++c) {+ auto* item = table->item(r, c);+ QString val = item ? item->text() : "";+ if (val.contains(',') || val.contains('"'))+ val = "\"" + val.replace("\"", "\"\"") + "\"";+ row << val;+ }+ out << row.join(",") << "\n";+ }+}++} // namespace fincept::screensdiff --git a/fincept-qt/src/screens/gov_data/GovDataCanadaPanel.h b/fincept-qt/src/screens/gov_data/GovDataCanadaPanel.hnew file mode 100644index 000000000..f4dd61876--- /dev/null+++ b/fincept-qt/src/screens/gov_data/GovDataCanadaPanel.h@@ -0,0 +1,83 @@+// src/screens/gov_data/GovDataCanadaPanel.h+// Canada Open Government Data panel (open.canada.ca / CKAN).+// 3-view hierarchy: Publishers → Datasets → Resources + Search.+#pragma once++#include "services/gov_data/GovDataService.h"++#include <QJsonArray>+#include <QLabel>+#include <QLineEdit>+#include <QPushButton>+#include <QStackedWidget>+#include <QTableWidget>+#include <QWidget>++namespace fincept::screens {++class GovDataCanadaPanel : public QWidget {+ Q_OBJECT+ public:+ explicit GovDataCanadaPanel(QWidget* parent = nullptr);++ public slots:+ void load_initial_data();++ private slots:+ void on_result(const QString& request_id, const services::GovDataResult& result);+ void on_publisher_clicked(int row);+ void on_dataset_clicked(int row);+ void on_view_changed(int index);+ void on_search();+ void on_back();+ void on_export_csv();++ private:+ void build_ui();+ QWidget* build_toolbar();+ void show_loading(const QString& message);+ void show_error(const QString& message);+ void show_empty(const QString& message);+ void populate_publishers(const QJsonArray& data);+ void populate_datasets(const QJsonArray& data, int total_count);+ void populate_resources(const QJsonArray& data);+ void update_toolbar_state();+ void update_breadcrumb();++ static constexpr const char* kScript = "canada_gov_api.py";+ static constexpr const char* kColor = "#EF4444";++ enum View { Publishers = 0, Datasets, Resources, Search };+ View current_view_ = Publishers;++ // Toolbar+ QPushButton* back_btn_ = nullptr;+ QPushButton* publishers_btn_ = nullptr;+ QPushButton* datasets_btn_ = nullptr;+ QPushButton* search_btn_ = nullptr;+ QLineEdit* search_input_ = nullptr;+ QPushButton* fetch_btn_ = nullptr;+ QPushButton* export_btn_ = nullptr;++ // Breadcrumb+ QWidget* breadcrumb_ = nullptr;+ QLabel* breadcrumb_label_ = nullptr;+ QLabel* row_count_label_ = nullptr;++ // Content+ QStackedWidget* content_stack_ = nullptr;+ QTableWidget* publishers_table_ = nullptr;+ QTableWidget* datasets_table_ = nullptr;+ QTableWidget* resources_table_ = nullptr;+ QLabel* status_label_ = nullptr;++ // Navigation state+ QString selected_publisher_;+ QString selected_publisher_name_;+ QString selected_dataset_;+ QJsonArray current_publishers_;+ QJsonArray current_datasets_;+ QJsonArray current_resources_;+};++} // namespace fincept::screensdiff --git a/fincept-qt/src/screens/gov_data/GovDataCongressPanel.cpp b/fincept-qt/src/screens/gov_data/GovDataCongressPanel.cppindex 6fc652df1..864438f90 100644--- a/fincept-qt/src/screens/gov_data/GovDataCongressPanel.cpp+++ b/fincept-qt/src/screens/gov_data/GovDataCongressPanel.cpp@@ -257,7 +257,7 @@ void GovDataCongressPanel::on_fetch_bills() {args << QString::number(congress);if (!bill_type.isEmpty()) args << bill_type;services::GovDataService::instance().execute(- kScript, "bills", args, "gov_congress_bills");+ kScript, "congress_bills", args, "gov_congress_bills");}}@@ -327,10 +327,12 @@ void GovDataCongressPanel::populate_bills(const QJsonObject& data) {if (title.length() > 120) title = title.left(120) + "…";bills_table_->setItem(i, 3, new QTableWidgetItem(title));+ QString action = b["latest_action"].toString();bills_table_->setItem(i, 4,- new QTableWidgetItem(b["latest_action"].toString("—")));+ new QTableWidgetItem(action.isEmpty() ? "—" : action));- QString date = b["latest_action_date"].toString(b["update_date"].toString());+ QString date = b["latest_action_date"].toString();+ if (date.isEmpty()) date = b["update_date"].toString();if (date.length() > 10) date = date.left(10);bills_table_->setItem(i, 5, new QTableWidgetItem(date));}diff --git a/fincept-qt/src/screens/gov_data/GovDataFrancePanel.cpp b/fincept-qt/src/screens/gov_data/GovDataFrancePanel.cppnew file mode 100644index 000000000..1885eaa6a--- /dev/null+++ b/fincept-qt/src/screens/gov_data/GovDataFrancePanel.cpp@@ -0,0 +1,682 @@+// src/screens/gov_data/GovDataFrancePanel.cpp+// France data.gouv.fr panel — Data Services | Datasets (search) | Geo Search+#include "screens/gov_data/GovDataFrancePanel.h"++#include "core/logging/Logger.h"+#include "services/gov_data/GovDataService.h"++#include <QDesktopServices>+#include <QFileDialog>+#include <QHBoxLayout>+#include <QHeaderView>+#include <QJsonArray>+#include <QJsonObject>+#include <QScrollArea>+#include <QTextStream>+#include <QUrl>+#include <QVBoxLayout>++namespace fincept::screens {++// ── Stylesheet ────────────────────────────────────────────────────────────────++static const QString kPanelStyle = QStringLiteral(+ "#frPanelToolbar { background:#111111; border-bottom:1px solid #1a1a1a; }"++ "#frTabBtn { background:transparent; color:#808080; border:1px solid #1a1a1a;"+ " font-size:10px; font-weight:700; padding:4px 12px; letter-spacing:0.5px; }"+ "#frTabBtn:hover { color:#e5e5e5; background:#161616; }"+ "#frTabBtn:checked { background:rgba(37,99,235,0.12); color:#2563EB;"+ " border:1px solid #2563EB; }"++ "#frBackBtn { background:transparent; color:#808080; border:1px solid #1a1a1a;"+ " font-size:10px; font-weight:700; padding:4px 10px; }"+ "#frBackBtn:hover { color:#e5e5e5; background:#161616; }"++ "#frFetchBtn { background:#2563EB; color:#e5e5e5; border:none;"+ " font-size:10px; font-weight:700; padding:4px 14px; }"+ "#frFetchBtn:hover { background:#1d4ed8; }"+ "#frFetchBtn:disabled { background:#1a1a1a; color:#404040; }"++ "#frCsvBtn { background:transparent; color:#808080; border:1px solid #1a1a1a;"+ " font-size:10px; font-weight:700; padding:4px 10px; }"+ "#frCsvBtn:hover { color:#e5e5e5; background:#161616; }"++ "#frSearch { background:#080808; color:#e5e5e5; border:none;"+ " border-bottom:1px solid #1a1a1a; padding:4px 10px; font-size:11px; }"+ "#frSearch:focus { border-bottom:1px solid #2563EB; }"++ "QTableWidget { background:#080808; color:#e5e5e5; border:none;"+ " gridline-color:#1a1a1a; font-size:11px; alternate-background-color:#0a0a0a; }"+ "QTableWidget::item { padding:5px 8px; border-bottom:1px solid #1a1a1a; }"+ "QTableWidget::item:selected { background:rgba(37,99,235,0.10); color:#2563EB; }"+ "QHeaderView::section { background:#111111; color:#808080; border:none;"+ " border-bottom:2px solid #1a1a1a; border-right:1px solid #1a1a1a;"+ " padding:5px 8px; font-size:10px; font-weight:700; letter-spacing:0.5px; }"++ "#frStatusPage { background:#080808; }"+ "#frStatusMsg { color:#808080; font-size:13px; background:transparent; }"+ "#frStatusErr { color:#dc2626; font-size:12px; background:transparent; }"++ "#frBreadcrumb { background:#0a0a0a; border-bottom:1px solid #1a1a1a; }"+ "#frBreadText { color:#808080; font-size:9px; background:transparent; }"+ "#frBreadCount { color:#808080; font-size:9px; background:transparent; }"++ "QScrollBar:vertical { background:#080808; width:5px; }"+ "QScrollBar::handle:vertical { background:#1a1a1a; min-height:20px; }"+ "QScrollBar::add-line:vertical, QScrollBar::sub-line:vertical { height:0; }"+);++// ── Constructor ───────────────────────────────────────────────────────────────++GovDataFrancePanel::GovDataFrancePanel(QWidget* parent)+ : QWidget(parent) {+ setStyleSheet(kPanelStyle);+ build_ui();+ connect(&services::GovDataService::instance(),+ &services::GovDataService::result_ready,+ this, &GovDataFrancePanel::on_result);+}++// ── Build UI ──────────────────────────────────────────────────────────────────++void GovDataFrancePanel::build_ui() {+ auto* root = new QVBoxLayout(this);+ root->setContentsMargins(0, 0, 0, 0);+ root->setSpacing(0);++ root->addWidget(build_toolbar());++ // Breadcrumb bar+ breadcrumb_ = new QWidget;+ breadcrumb_->setObjectName("frBreadcrumb");+ breadcrumb_->setFixedHeight(24);+ auto* bcl = new QHBoxLayout(breadcrumb_);+ bcl->setContentsMargins(14, 0, 14, 0);+ bcl->setSpacing(4);+ breadcrumb_label_ = new QLabel("Data Services");+ breadcrumb_label_->setObjectName("frBreadText");+ bcl->addWidget(breadcrumb_label_);+ bcl->addStretch(1);+ row_count_label_ = new QLabel;+ row_count_label_->setObjectName("frBreadCount");+ bcl->addWidget(row_count_label_);+ root->addWidget(breadcrumb_);++ // Content stack+ content_stack_ = new QStackedWidget;++ // Page 0 — Data Services table+ services_table_ = new QTableWidget;+ services_table_->setColumnCount(4);+ services_table_->setHorizontalHeaderLabels({"NAME", "VIEWS", "FOLLOWERS", "CREATED"});+ services_table_->horizontalHeader()->setSectionResizeMode(0, QHeaderView::Stretch);+ services_table_->horizontalHeader()->setSectionResizeMode(1, QHeaderView::Fixed);+ services_table_->horizontalHeader()->setSectionResizeMode(2, QHeaderView::Fixed);+ services_table_->horizontalHeader()->setSectionResizeMode(3, QHeaderView::Fixed);+ services_table_->setColumnWidth(1, 80);+ services_table_->setColumnWidth(2, 90);+ services_table_->setColumnWidth(3, 100);+ services_table_->setSelectionBehavior(QAbstractItemView::SelectRows);+ services_table_->setSelectionMode(QAbstractItemView::SingleSelection);+ services_table_->setEditTriggers(QAbstractItemView::NoEditTriggers);+ services_table_->verticalHeader()->setVisible(false);+ services_table_->setAlternatingRowColors(true);+ services_table_->setShowGrid(true);+ content_stack_->addWidget(services_table_); // index 0++ // Page 1 — Datasets table (search results)+ datasets_table_ = new QTableWidget;+ datasets_table_->setColumnCount(5);+ datasets_table_->setHorizontalHeaderLabels({"TITLE", "ORG", "LICENSE", "FILES", "MODIFIED"});+ datasets_table_->horizontalHeader()->setSectionResizeMode(0, QHeaderView::Stretch);+ datasets_table_->horizontalHeader()->setSectionResizeMode(1, QHeaderView::Fixed);+ datasets_table_->horizontalHeader()->setSectionResizeMode(2, QHeaderView::Fixed);+ datasets_table_->horizontalHeader()->setSectionResizeMode(3, QHeaderView::Fixed);+ datasets_table_->horizontalHeader()->setSectionResizeMode(4, QHeaderView::Fixed);+ datasets_table_->setColumnWidth(1, 150);+ datasets_table_->setColumnWidth(2, 130);+ datasets_table_->setColumnWidth(3, 55);+ datasets_table_->setColumnWidth(4, 100);+ datasets_table_->setSelectionBehavior(QAbstractItemView::SelectRows);+ datasets_table_->setSelectionMode(QAbstractItemView::SingleSelection);+ datasets_table_->setEditTriggers(QAbstractItemView::NoEditTriggers);+ datasets_table_->verticalHeader()->setVisible(false);+ datasets_table_->setAlternatingRowColors(true);+ datasets_table_->setShowGrid(true);+ connect(datasets_table_, &QTableWidget::cellDoubleClicked,+ this, &GovDataFrancePanel::on_dataset_row_double_clicked);+ content_stack_->addWidget(datasets_table_); // index 1++ // Page 2 — Geo / Municipalities table+ geo_table_ = new QTableWidget;+ geo_table_->setColumnCount(6);+ geo_table_->setHorizontalHeaderLabels(+ {"NAME", "CODE", "POSTAL", "DEPT", "REGION", "POPULATION"});+ geo_table_->horizontalHeader()->setSectionResizeMode(0, QHeaderView::Stretch);+ geo_table_->horizontalHeader()->setSectionResizeMode(1, QHeaderView::Fixed);+ geo_table_->horizontalHeader()->setSectionResizeMode(2, QHeaderView::Fixed);+ geo_table_->horizontalHeader()->setSectionResizeMode(3, QHeaderView::Fixed);+ geo_table_->horizontalHeader()->setSectionResizeMode(4, QHeaderView::Fixed);+ geo_table_->horizontalHeader()->setSectionResizeMode(5, QHeaderView::Fixed);+ geo_table_->setColumnWidth(1, 70);+ geo_table_->setColumnWidth(2, 110);+ geo_table_->setColumnWidth(3, 55);+ geo_table_->setColumnWidth(4, 65);+ geo_table_->setColumnWidth(5, 95);+ geo_table_->setSelectionBehavior(QAbstractItemView::SelectRows);+ geo_table_->setSelectionMode(QAbstractItemView::SingleSelection);+ geo_table_->setEditTriggers(QAbstractItemView::NoEditTriggers);+ geo_table_->verticalHeader()->setVisible(false);+ geo_table_->setAlternatingRowColors(true);+ geo_table_->setShowGrid(true);+ content_stack_->addWidget(geo_table_); // index 2++ // Page 3 — Resources / Column schema table+ resources_table_ = new QTableWidget;+ resources_table_->setColumnCount(2);+ resources_table_->setHorizontalHeaderLabels({"NAME", "TYPE"});+ resources_table_->horizontalHeader()->setSectionResizeMode(0, QHeaderView::Stretch);+ resources_table_->horizontalHeader()->setSectionResizeMode(1, QHeaderView::Fixed);+ resources_table_->setColumnWidth(1, 120);+ resources_table_->setSelectionBehavior(QAbstractItemView::SelectRows);+ resources_table_->setSelectionMode(QAbstractItemView::SingleSelection);+ resources_table_->setEditTriggers(QAbstractItemView::NoEditTriggers);+ resources_table_->verticalHeader()->setVisible(false);+ resources_table_->setAlternatingRowColors(true);+ resources_table_->setShowGrid(true);+ content_stack_->addWidget(resources_table_); // index 3++ // Page 4 — Status / loading / error+ auto* status_page = new QWidget;+ status_page->setObjectName("frStatusPage");+ auto* svl = new QVBoxLayout(status_page);+ svl->setAlignment(Qt::AlignCenter);+ status_label_ = new QLabel;+ status_label_->setObjectName("frStatusMsg");+ status_label_->setAlignment(Qt::AlignCenter);+ status_label_->setWordWrap(true);+ svl->addWidget(status_label_);+ content_stack_->addWidget(status_page); // index 4++ root->addWidget(content_stack_, 1);+}++QWidget* GovDataFrancePanel::build_toolbar() {+ auto* bar = new QWidget;+ bar->setObjectName("frPanelToolbar");+ bar->setFixedHeight(40);++ auto* hl = new QHBoxLayout(bar);+ hl->setContentsMargins(10, 0, 10, 0);+ hl->setSpacing(5);++ back_btn_ = new QPushButton("← BACK");+ back_btn_->setObjectName("frBackBtn");+ back_btn_->setVisible(false);+ back_btn_->setCursor(Qt::PointingHandCursor);+ connect(back_btn_, &QPushButton::clicked, this, &GovDataFrancePanel::on_back);+ hl->addWidget(back_btn_);++ hl->addSpacing(4);++ services_btn_ = new QPushButton("DATA SERVICES");+ services_btn_->setObjectName("frTabBtn");+ services_btn_->setCheckable(true);+ services_btn_->setChecked(true);+ services_btn_->setCursor(Qt::PointingHandCursor);+ connect(services_btn_, &QPushButton::clicked,+ this, [this]() { on_tab_changed(Services); });+ hl->addWidget(services_btn_);++ datasets_btn_ = new QPushButton("DATASETS");+ datasets_btn_->setObjectName("frTabBtn");+ datasets_btn_->setCheckable(true);+ datasets_btn_->setCursor(Qt::PointingHandCursor);+ connect(datasets_btn_, &QPushButton::clicked,+ this, [this]() { on_tab_changed(Datasets); });+ hl->addWidget(datasets_btn_);++ geo_btn_ = new QPushButton("GEO SEARCH");+ geo_btn_->setObjectName("frTabBtn");+ geo_btn_->setCheckable(true);+ geo_btn_->setCursor(Qt::PointingHandCursor);+ connect(geo_btn_, &QPushButton::clicked,+ this, [this]() { on_tab_changed(Geo); });+ hl->addWidget(geo_btn_);++ hl->addSpacing(10);++ search_input_ = new QLineEdit;+ search_input_->setObjectName("frSearch");+ search_input_->setPlaceholderText("Search…");+ search_input_->setFixedWidth(210);+ search_input_->setFixedHeight(26);+ connect(search_input_, &QLineEdit::returnPressed,+ this, &GovDataFrancePanel::on_fetch);+ hl->addWidget(search_input_);++ fetch_btn_ = new QPushButton("FETCH");+ fetch_btn_->setObjectName("frFetchBtn");+ fetch_btn_->setCursor(Qt::PointingHandCursor);+ connect(fetch_btn_, &QPushButton::clicked,+ this, &GovDataFrancePanel::on_fetch);+ hl->addWidget(fetch_btn_);++ hl->addStretch(1);++ export_btn_ = new QPushButton("CSV");+ export_btn_->setObjectName("frCsvBtn");+ export_btn_->setCursor(Qt::PointingHandCursor);+ connect(export_btn_, &QPushButton::clicked,+ this, &GovDataFrancePanel::on_export_csv);+ hl->addWidget(export_btn_);++ return bar;+}++// ── Public slot ───────────────────────────────────────────────────────────────++void GovDataFrancePanel::load_initial_data() {+ show_loading("Loading data services from data.gouv.fr…");+ services::GovDataService::instance().execute(+ kScript, "publishers", {}, "fr_services");+}++// ── Toolbar actions ───────────────────────────────────────────────────────────++void GovDataFrancePanel::on_tab_changed(int tab_index) {+ auto view = static_cast<View>(tab_index);+ services_btn_->setChecked(view == Services);+ datasets_btn_->setChecked(view == Datasets);+ geo_btn_->setChecked(view == Geo);++ current_view_ = view;++ if (view == Services) {+ if (current_services_.isEmpty())+ load_initial_data();+ else {+ content_stack_->setCurrentIndex(Services);+ row_count_label_->setText(+ QString::number(current_services_.size()) + " services");+ }+ update_breadcrumb("Data Services");+ } else if (view == Datasets) {+ if (current_datasets_.isEmpty()) {+ show_status("Enter a search term above and click FETCH to find datasets.");+ } else {+ content_stack_->setCurrentIndex(Datasets);+ row_count_label_->setText(+ QString::number(current_datasets_.size()) + " datasets");+ }+ update_breadcrumb("Datasets");+ search_input_->setPlaceholderText("Search datasets…");+ search_input_->setFocus();+ } else if (view == Geo) {+ if (current_geo_.isEmpty()) {+ show_status("Enter a municipality name above and click FETCH to search.");+ } else {+ content_stack_->setCurrentIndex(Geo);+ row_count_label_->setText(+ QString::number(current_geo_.size()) + " municipalities");+ }+ update_breadcrumb("Geo Search — Municipalities");+ search_input_->setPlaceholderText("Municipality name…");+ search_input_->setFocus();+ }++ update_toolbar_state();+}++void GovDataFrancePanel::on_fetch() {+ QString query = search_input_->text().trimmed();++ if (current_view_ == Services || current_view_ == Resources) {+ // Re-load services+ show_loading("Loading data services…");+ services::GovDataService::instance().execute(+ kScript, "publishers", {}, "fr_services");+ return;+ }++ if (query.isEmpty()) return;+ search_query_ = query;++ if (current_view_ == Datasets) {+ show_loading("Searching datasets for "" + query + ""…");+ services::GovDataService::instance().execute(+ kScript, "datasets", {query, "50"}, "fr_datasets");+ } else if (current_view_ == Geo) {+ show_loading("Searching municipalities for "" + query + ""…");+ services::GovDataService::instance().execute(+ kScript, "municipalities", {query}, "fr_geo");+ }+}++void GovDataFrancePanel::on_dataset_row_double_clicked(int row) {+ auto* item = datasets_table_->item(row, 0);+ if (!item) return;+ selected_dataset_id_ = item->data(Qt::UserRole).toString();+ if (selected_dataset_id_.isEmpty()) return;++ show_loading("Loading column schema for "" + item->text() + ""…");+ services::GovDataService::instance().execute(+ kScript, "resources", {selected_dataset_id_}, "fr_resources");+}++void GovDataFrancePanel::on_back() {+ if (current_view_ == Resources) {+ content_stack_->setCurrentIndex(Datasets);+ current_view_ = Datasets;+ services_btn_->setChecked(false);+ datasets_btn_->setChecked(true);+ geo_btn_->setChecked(false);+ row_count_label_->setText(+ QString::number(current_datasets_.size()) + " datasets");+ update_breadcrumb("Datasets");+ }+ update_toolbar_state();+}++void GovDataFrancePanel::update_toolbar_state() {+ back_btn_->setVisible(current_view_ == Resources);+}++void GovDataFrancePanel::update_breadcrumb(const QString& text) {+ breadcrumb_label_->setText(text);+}++// ── Result handler ────────────────────────────────────────────────────────────++void GovDataFrancePanel::on_result(const QString& request_id,+ const services::GovDataResult& result) {+ if (!request_id.startsWith("fr_")) return;++ if (!result.success) {+ show_error(result.error);+ return;+ }++ QJsonArray data = result.data["data"].toArray();++ if (request_id == "fr_services") {+ current_services_ = data;+ populate_services(data);+ current_view_ = Services;+ services_btn_->setChecked(true);+ datasets_btn_->setChecked(false);+ geo_btn_->setChecked(false);+ content_stack_->setCurrentIndex(Services);+ update_breadcrumb("Data Services");+ row_count_label_->setText(+ QString::number(data.size()) + " services");+ } else if (request_id == "fr_datasets") {+ current_datasets_ = data;+ populate_datasets(data);+ current_view_ = Datasets;+ datasets_btn_->setChecked(true);+ services_btn_->setChecked(false);+ geo_btn_->setChecked(false);+ content_stack_->setCurrentIndex(Datasets);+ update_breadcrumb("Datasets › "" + search_query_ + """);+ row_count_label_->setText(+ QString::number(data.size()) + " datasets");+ } else if (request_id == "fr_geo") {+ current_geo_ = data;+ populate_geo(data);+ current_view_ = Geo;+ geo_btn_->setChecked(true);+ services_btn_->setChecked(false);+ datasets_btn_->setChecked(false);+ content_stack_->setCurrentIndex(Geo);+ update_breadcrumb("Municipalities › "" + search_query_ + """);+ row_count_label_->setText(+ QString::number(data.size()) + " results");+ } else if (request_id == "fr_resources") {+ current_resources_ = data;+ populate_resources(data);+ current_view_ = Resources;+ content_stack_->setCurrentIndex(Resources);+ update_breadcrumb("Datasets › Column Schema");+ row_count_label_->setText(+ QString::number(data.size()) + " columns");+ }++ update_toolbar_state();+}++// ── Populate tables ───────────────────────────────────────────────────────────++void GovDataFrancePanel::populate_services(const QJsonArray& data) {+ services_table_->setRowCount(0);+ services_table_->setRowCount(data.size());++ for (int i = 0; i < data.size(); ++i) {+ const auto obj = data[i].toObject();++ QString name = obj["display_name"].toString();+ if (name.isEmpty()) name = obj["title"].toString();+ if (name.isEmpty()) name = obj["name"].toString();++ auto* name_item = new QTableWidgetItem(name);+ name_item->setForeground(QColor(kColor));+ // Full description as tooltip (may be in French)+ QString desc = obj["description"].toString();+ if (!desc.isEmpty()) name_item->setToolTip(desc);+ services_table_->setItem(i, 0, name_item);++ const auto metrics = obj["metrics"].toObject();++ auto make_num = [](int n) {+ auto* it = new QTableWidgetItem(n >= 0 ? QString::number(n) : "—");+ it->setTextAlignment(Qt::AlignCenter);+ return it;+ };+ services_table_->setItem(i, 1, make_num(metrics["views"].toInt(-1)));+ services_table_->setItem(i, 2, make_num(metrics["followers"].toInt(-1)));++ QString created = obj["created_at"].toString();+ if (created.length() > 10) created = created.left(10);+ auto* dt = new QTableWidgetItem(created);+ dt->setForeground(QColor("#808080"));+ services_table_->setItem(i, 3, dt);+ }++ LOG_INFO("GovFrance", QString("Populated %1 data services").arg(data.size()));+}++void GovDataFrancePanel::populate_datasets(const QJsonArray& data) {+ datasets_table_->setRowCount(0);+ datasets_table_->setRowCount(data.size());++ for (int i = 0; i < data.size(); ++i) {+ const auto obj = data[i].toObject();++ QString title = obj["title"].toString();+ if (title.isEmpty()) title = obj["original_title"].toString();+ if (title.isEmpty()) title = obj["id"].toString();++ auto* title_item = new QTableWidgetItem(title);+ title_item->setData(Qt::UserRole, obj["id"].toString());+ // French description as tooltip+ QString desc = obj["description"].toString();+ if (!desc.isEmpty()) title_item->setToolTip(desc);+ datasets_table_->setItem(i, 0, title_item);++ // organization is a plain string in this API, not an object+ QString org = obj["organization"].toString();+ auto* org_item = new QTableWidgetItem(org);+ org_item->setForeground(QColor("#808080"));+ org_item->setToolTip(org);+ datasets_table_->setItem(i, 1, org_item);++ QString license = obj["license"].toString();+ auto* lic_item = new QTableWidgetItem(license.isEmpty() ? "—" : license);+ lic_item->setForeground(QColor("#808080"));+ datasets_table_->setItem(i, 2, lic_item);++ int num_res = obj["num_resources"].toInt(0);+ auto* res_item = new QTableWidgetItem(QString::number(num_res));+ res_item->setTextAlignment(Qt::AlignCenter);+ res_item->setForeground(QColor(kColor));+ datasets_table_->setItem(i, 3, res_item);++ QString modified = obj["metadata_modified"].toString();+ if (modified.length() > 10) modified = modified.left(10);+ datasets_table_->setItem(i, 4, new QTableWidgetItem(modified));+ }++ LOG_INFO("GovFrance", QString("Populated %1 datasets").arg(data.size()));+}++void GovDataFrancePanel::populate_geo(const QJsonArray& data) {+ geo_table_->setRowCount(0);+ geo_table_->setRowCount(data.size());++ for (int i = 0; i < data.size(); ++i) {+ const auto obj = data[i].toObject();++ auto* name_item = new QTableWidgetItem(obj["name"].toString());+ name_item->setForeground(QColor(kColor));+ geo_table_->setItem(i, 0, name_item);++ geo_table_->setItem(i, 1, new QTableWidgetItem(obj["code"].toString()));++ // Postal codes is an array — join first few+ QStringList postal;+ for (const auto& p : obj["postal_codes"].toArray())+ postal << p.toString();+ QString postal_str = postal.mid(0, 3).join(", ");+ if (postal.size() > 3) postal_str += QString(" +%1").arg(postal.size() - 3);+ geo_table_->setItem(i, 2, new QTableWidgetItem(postal_str));++ geo_table_->setItem(i, 3,+ new QTableWidgetItem(obj["department_code"].toString()));+ geo_table_->setItem(i, 4,+ new QTableWidgetItem(obj["region_code"].toString()));++ int pop = obj["population"].toInt(0);+ auto* pop_item = new QTableWidgetItem(+ pop > 0 ? QString::number(pop) : "—");+ pop_item->setTextAlignment(Qt::AlignRight | Qt::AlignVCenter);+ geo_table_->setItem(i, 5, pop_item);+ }++ LOG_INFO("GovFrance", QString("Populated %1 municipalities").arg(data.size()));+}++void GovDataFrancePanel::populate_resources(const QJsonArray& data) {+ resources_table_->setRowCount(0);+ resources_table_->setRowCount(data.size());++ for (int i = 0; i < data.size(); ++i) {+ const auto obj = data[i].toObject();++ // Schema rows: name = column name, format = type+ auto* col_item = new QTableWidgetItem(obj["name"].toString());+ col_item->setForeground(QColor(kColor));+ resources_table_->setItem(i, 0, col_item);++ QString type = obj["format"].toString();+ auto* type_item = new QTableWidgetItem(type.isEmpty() ? "—" : type);+ type_item->setForeground(QColor("#808080"));+ type_item->setTextAlignment(Qt::AlignCenter);+ resources_table_->setItem(i, 1, type_item);+ }++ LOG_INFO("GovFrance", QString("Populated %1 schema columns").arg(data.size()));+}++// ── Status helpers ────────────────────────────────────────────────────────────++void GovDataFrancePanel::show_loading(const QString& message) {+ status_label_->setStyleSheet(+ QString("color:%1; font-size:13px; background:transparent;").arg(kColor));+ status_label_->setText(message);+ content_stack_->setCurrentIndex(Status);+}++void GovDataFrancePanel::show_error(const QString& message) {+ status_label_->setStyleSheet(+ "color:#dc2626; font-size:12px; background:transparent;");+ status_label_->setText("Error: " + message);+ content_stack_->setCurrentIndex(Status);+ LOG_ERROR("GovFrance", message);+}++void GovDataFrancePanel::show_status(const QString& message, bool is_error) {+ status_label_->setStyleSheet(is_error+ ? "color:#dc2626; font-size:12px; background:transparent;"+ : "color:#808080; font-size:12px; background:transparent;");+ status_label_->setText(message);+ content_stack_->setCurrentIndex(Status);+}++// ── CSV export ────────────────────────────────────────────────────────────────++void GovDataFrancePanel::on_export_csv() {+ QTableWidget* table = nullptr;+ QString def_name;++ switch (current_view_) {+ case Services:+ if (services_table_->rowCount() > 0) {+ table = services_table_;+ def_name = "france_data_services.csv";+ }+ break;+ case Datasets:+ if (datasets_table_->rowCount() > 0) {+ table = datasets_table_;+ def_name = "france_datasets.csv";+ }+ break;+ case Geo:+ if (geo_table_->rowCount() > 0) {+ table = geo_table_;+ def_name = "france_municipalities.csv";+ }+ break;+ case Resources:+ if (resources_table_->rowCount() > 0) {+ table = resources_table_;+ def_name = "france_schema.csv";+ }+ break;+ default:+ break;+ }+ if (!table) return;++ QString path = QFileDialog::getSaveFileName(+ this, "Export CSV", def_name, "CSV Files (*.csv)");+ if (path.isEmpty()) return;++ QFile file(path);+ if (!file.open(QIODevice::WriteOnly | QIODevice::Text)) return;+ QTextStream out(&file);++ QStringList headers;+ for (int c = 0; c < table->columnCount(); ++c) {+ auto* h = table->horizontalHeaderItem(c);+ headers << (h ? h->text() : QString::number(c));+ }+ out << headers.join(",") << "\n";++ for (int r = 0; r < table->rowCount(); ++r) {+ QStringList row;+ for (int c = 0; c < table->columnCount(); ++c) {+ auto* item = table->item(r, c);+ QString val = item ? item->text() : "";+ if (val.contains(',') || val.contains('"'))+ val = "\"" + val.replace("\"", "\"\"") + "\"";+ row << val;+ }+ out << row.join(",") << "\n";+ }++ LOG_INFO("GovFrance", "Exported CSV: " + path);+}++} // namespace fincept::screensdiff --git a/fincept-qt/src/screens/gov_data/GovDataFrancePanel.h b/fincept-qt/src/screens/gov_data/GovDataFrancePanel.hnew file mode 100644index 000000000..306ced934--- /dev/null+++ b/fincept-qt/src/screens/gov_data/GovDataFrancePanel.h@@ -0,0 +1,90 @@+// src/screens/gov_data/GovDataFrancePanel.h+// France data.gouv.fr panel — tab-based: Data Services | Datasets | Geo Search+// Script: french_gov_api.py Color: #2563EB+#pragma once++#include "services/gov_data/GovDataService.h"++#include <QComboBox>+#include <QJsonArray>+#include <QLabel>+#include <QLineEdit>+#include <QPushButton>+#include <QStackedWidget>+#include <QTableWidget>+#include <QWidget>++namespace fincept::screens {++class GovDataFrancePanel : public QWidget {+ Q_OBJECT+ public:+ explicit GovDataFrancePanel(QWidget* parent = nullptr);++ public slots:+ void load_initial_data();++ private slots:+ void on_result(const QString& request_id, const services::GovDataResult& result);+ void on_dataset_row_double_clicked(int row);+ void on_tab_changed(int tab_index);+ void on_fetch();+ void on_back();+ void on_export_csv();++ private:+ // View indices in content_stack_+ enum View { Services = 0, Datasets, Geo, Resources, Status };++ void build_ui();+ QWidget* build_toolbar();++ void populate_services(const QJsonArray& data);+ void populate_datasets(const QJsonArray& data);+ void populate_geo(const QJsonArray& data);+ void populate_resources(const QJsonArray& data);++ void show_loading(const QString& message);+ void show_error(const QString& message);+ void show_status(const QString& message, bool is_error = false);++ void update_toolbar_state();+ void update_breadcrumb(const QString& text);++ static constexpr const char* kScript = "french_gov_api.py";+ static constexpr const char* kColor = "#2563EB";++ View current_view_ = Services;+ QString selected_dataset_id_; // for resources drill-down+ QString search_query_; // last geo / dataset search++ // Toolbar widgets+ QPushButton* back_btn_ = nullptr;+ QPushButton* services_btn_ = nullptr;+ QPushButton* datasets_btn_ = nullptr;+ QPushButton* geo_btn_ = nullptr;+ QLineEdit* search_input_ = nullptr;+ QPushButton* fetch_btn_ = nullptr;+ QPushButton* export_btn_ = nullptr;++ // Breadcrumb+ QWidget* breadcrumb_ = nullptr;+ QLabel* breadcrumb_label_ = nullptr;+ QLabel* row_count_label_ = nullptr;++ // Content pages+ QStackedWidget* content_stack_ = nullptr;+ QTableWidget* services_table_ = nullptr; // page 0+ QTableWidget* datasets_table_ = nullptr; // page 1+ QTableWidget* geo_table_ = nullptr; // page 2+ QTableWidget* resources_table_ = nullptr; // page 3 (column schema)+ QLabel* status_label_ = nullptr; // page 4++ // Cached data for CSV export+ QJsonArray current_services_;+ QJsonArray current_datasets_;+ QJsonArray current_geo_;+ QJsonArray current_resources_;+};++} // namespace fincept::screensdiff --git a/fincept-qt/src/screens/gov_data/GovDataHKPanel.cpp b/fincept-qt/src/screens/gov_data/GovDataHKPanel.cppnew file mode 100644index 000000000..04c37730a--- /dev/null+++ b/fincept-qt/src/screens/gov_data/GovDataHKPanel.cpp@@ -0,0 +1,652 @@+// src/screens/gov_data/GovDataHKPanel.cpp+// Hong Kong data.gov.hk panel+// Categories use publishers command (normalized string array).+// HK category_datasets may return empty — fall back to datasets_list + client-side filter.+#include "screens/gov_data/GovDataHKPanel.h"++#include "core/logging/Logger.h"+#include "services/gov_data/GovDataService.h"++#include <QDesktopServices>+#include <QFileDialog>+#include <QHBoxLayout>+#include <QHeaderView>+#include <QJsonArray>+#include <QJsonObject>+#include <QScrollArea>+#include <QTextStream>+#include <QUrl>+#include <QVBoxLayout>++namespace fincept::screens {++// ── Stylesheet ────────────────────────────────────────────────────────────────++static const QString kPanelStyle = QStringLiteral(+ "#hkPanelToolbar { background:#111111; border-bottom:1px solid #1a1a1a; }"++ "#hkTabBtn { background:transparent; color:#808080; border:1px solid #1a1a1a;"+ " font-size:10px; font-weight:700; padding:4px 12px; letter-spacing:0.5px; }"+ "#hkTabBtn:hover { color:#e5e5e5; background:#161616; }"+ "#hkTabBtn:checked { background:rgba(244,63,94,0.12); color:#F43F5E;"+ " border:1px solid #F43F5E; }"++ "#hkBackBtn { background:transparent; color:#808080; border:1px solid #1a1a1a;"+ " font-size:10px; font-weight:700; padding:4px 10px; }"+ "#hkBackBtn:hover { color:#e5e5e5; background:#161616; }"++ "#hkFetchBtn { background:#F43F5E; color:#e5e5e5; border:none;"+ " font-size:10px; font-weight:700; padding:4px 14px; }"+ "#hkFetchBtn:hover { background:#e11d48; }"+ "#hkFetchBtn:disabled { background:#1a1a1a; color:#404040; }"++ "#hkCsvBtn { background:transparent; color:#808080; border:1px solid #1a1a1a;"+ " font-size:10px; font-weight:700; padding:4px 10px; }"+ "#hkCsvBtn:hover { color:#e5e5e5; background:#161616; }"++ "#hkSearch { background:#080808; color:#e5e5e5; border:none;"+ " border-bottom:1px solid #1a1a1a; padding:4px 10px; font-size:11px; }"+ "#hkSearch:focus { border-bottom:1px solid #F43F5E; }"++ "QTableWidget { background:#080808; color:#e5e5e5; border:none;"+ " gridline-color:#1a1a1a; font-size:11px; alternate-background-color:#0a0a0a; }"+ "QTableWidget::item { padding:5px 8px; border-bottom:1px solid #1a1a1a; }"+ "QTableWidget::item:selected { background:rgba(244,63,94,0.10); color:#F43F5E; }"+ "QHeaderView::section { background:#111111; color:#808080; border:none;"+ " border-bottom:2px solid #1a1a1a; border-right:1px solid #1a1a1a;"+ " padding:5px 8px; font-size:10px; font-weight:700; letter-spacing:0.5px; }"++ "#hkStatusPage { background:#080808; }"+ "#hkStatusMsg { color:#808080; font-size:13px; background:transparent; }"+ "#hkStatusErr { color:#dc2626; font-size:12px; background:transparent; }"++ "#hkBreadcrumb { background:#0a0a0a; border-bottom:1px solid #1a1a1a; }"+ "#hkBreadText { color:#808080; font-size:9px; background:transparent; }"+ "#hkBreadCount { color:#808080; font-size:9px; background:transparent; }"++ "QScrollBar:vertical { background:#080808; width:5px; }"+ "QScrollBar::handle:vertical { background:#1a1a1a; min-height:20px; }"+ "QScrollBar::add-line:vertical, QScrollBar::sub-line:vertical { height:0; }"+);++// ── Constructor ───────────────────────────────────────────────────────────────++GovDataHKPanel::GovDataHKPanel(QWidget* parent)+ : QWidget(parent) {+ setStyleSheet(kPanelStyle);+ build_ui();+ connect(&services::GovDataService::instance(),+ &services::GovDataService::result_ready,+ this, &GovDataHKPanel::on_result);+}++// ── Build UI ──────────────────────────────────────────────────────────────────++void GovDataHKPanel::build_ui() {+ auto* root = new QVBoxLayout(this);+ root->setContentsMargins(0, 0, 0, 0);+ root->setSpacing(0);++ root->addWidget(build_toolbar());++ // Breadcrumb bar+ breadcrumb_ = new QWidget;+ breadcrumb_->setObjectName("hkBreadcrumb");+ breadcrumb_->setFixedHeight(24);+ auto* bcl = new QHBoxLayout(breadcrumb_);+ bcl->setContentsMargins(14, 0, 14, 0);+ bcl->setSpacing(4);+ breadcrumb_label_ = new QLabel("Categories");+ breadcrumb_label_->setObjectName("hkBreadText");+ bcl->addWidget(breadcrumb_label_);+ bcl->addStretch(1);+ row_count_label_ = new QLabel;+ row_count_label_->setObjectName("hkBreadCount");+ bcl->addWidget(row_count_label_);+ root->addWidget(breadcrumb_);++ // Content stack+ content_stack_ = new QStackedWidget;++ // Page 0 — Categories table (1 col, no dataset count — always -1 from HK API)+ categories_table_ = new QTableWidget;+ categories_table_->setColumnCount(1);+ categories_table_->setHorizontalHeaderLabels({"CATEGORY"});+ categories_table_->horizontalHeader()->setSectionResizeMode(0, QHeaderView::Stretch);+ categories_table_->setSelectionBehavior(QAbstractItemView::SelectRows);+ categories_table_->setSelectionMode(QAbstractItemView::SingleSelection);+ categories_table_->setEditTriggers(QAbstractItemView::NoEditTriggers);+ categories_table_->verticalHeader()->setVisible(false);+ categories_table_->setAlternatingRowColors(true);+ categories_table_->setShowGrid(true);+ connect(categories_table_, &QTableWidget::cellDoubleClicked,+ this, &GovDataHKPanel::on_category_clicked);+ content_stack_->addWidget(categories_table_); // index 0++ // Page 1 — Datasets table+ datasets_table_ = new QTableWidget;+ datasets_table_->setColumnCount(3);+ datasets_table_->setHorizontalHeaderLabels({"TITLE", "RESOURCES", "MODIFIED"});+ datasets_table_->horizontalHeader()->setSectionResizeMode(0, QHeaderView::Stretch);+ datasets_table_->horizontalHeader()->setSectionResizeMode(1, QHeaderView::Fixed);+ datasets_table_->horizontalHeader()->setSectionResizeMode(2, QHeaderView::Fixed);+ datasets_table_->setColumnWidth(1, 90);+ datasets_table_->setColumnWidth(2, 110);+ datasets_table_->setSelectionBehavior(QAbstractItemView::SelectRows);+ datasets_table_->setSelectionMode(QAbstractItemView::SingleSelection);+ datasets_table_->setEditTriggers(QAbstractItemView::NoEditTriggers);+ datasets_table_->verticalHeader()->setVisible(false);+ datasets_table_->setAlternatingRowColors(true);+ datasets_table_->setShowGrid(true);+ connect(datasets_table_, &QTableWidget::cellDoubleClicked,+ this, &GovDataHKPanel::on_dataset_clicked);+ content_stack_->addWidget(datasets_table_); // index 1++ // Page 2 — Resources table+ resources_table_ = new QTableWidget;+ resources_table_->setColumnCount(3);+ resources_table_->setHorizontalHeaderLabels({"NAME", "FORMAT", "MODIFIED"});+ resources_table_->horizontalHeader()->setSectionResizeMode(0, QHeaderView::Stretch);+ resources_table_->horizontalHeader()->setSectionResizeMode(1, QHeaderView::Fixed);+ resources_table_->horizontalHeader()->setSectionResizeMode(2, QHeaderView::Fixed);+ resources_table_->setColumnWidth(1, 80);+ resources_table_->setColumnWidth(2, 110);+ resources_table_->setSelectionBehavior(QAbstractItemView::SelectRows);+ resources_table_->setSelectionMode(QAbstractItemView::SingleSelection);+ resources_table_->setEditTriggers(QAbstractItemView::NoEditTriggers);+ resources_table_->verticalHeader()->setVisible(false);+ resources_table_->setAlternatingRowColors(true);+ resources_table_->setShowGrid(true);++ // OPEN button column+ connect(resources_table_, &QTableWidget::cellClicked, this,+ [this](int row, int col) {+ if (col != 2) return;+ auto* item = resources_table_->item(row, 2);+ if (!item) return;+ QString url = item->data(Qt::UserRole).toString();+ if (!url.isEmpty()) QDesktopServices::openUrl(QUrl(url));+ }, Qt::UniqueConnection);++ content_stack_->addWidget(resources_table_); // index 2++ // Page 3 — Status+ auto* status_page = new QWidget;+ status_page->setObjectName("hkStatusPage");+ auto* svl = new QVBoxLayout(status_page);+ svl->setAlignment(Qt::AlignCenter);+ status_label_ = new QLabel;+ status_label_->setObjectName("hkStatusMsg");+ status_label_->setAlignment(Qt::AlignCenter);+ status_label_->setWordWrap(true);+ svl->addWidget(status_label_);+ content_stack_->addWidget(status_page); // index 3++ root->addWidget(content_stack_, 1);+}++QWidget* GovDataHKPanel::build_toolbar() {+ auto* bar = new QWidget;+ bar->setObjectName("hkPanelToolbar");+ bar->setFixedHeight(40);++ auto* hl = new QHBoxLayout(bar);+ hl->setContentsMargins(10, 0, 10, 0);+ hl->setSpacing(5);++ back_btn_ = new QPushButton("← BACK");+ back_btn_->setObjectName("hkBackBtn");+ back_btn_->setVisible(false);+ back_btn_->setCursor(Qt::PointingHandCursor);+ connect(back_btn_, &QPushButton::clicked, this, &GovDataHKPanel::on_back);+ hl->addWidget(back_btn_);++ hl->addSpacing(4);++ categories_btn_ = new QPushButton("CATEGORIES");+ categories_btn_->setObjectName("hkTabBtn");+ categories_btn_->setCheckable(true);+ categories_btn_->setChecked(true);+ categories_btn_->setCursor(Qt::PointingHandCursor);+ connect(categories_btn_, &QPushButton::clicked,+ this, [this]() { on_tab_changed(Categories); });+ hl->addWidget(categories_btn_);++ datasets_btn_ = new QPushButton("DATASETS");+ datasets_btn_->setObjectName("hkTabBtn");+ datasets_btn_->setCheckable(true);+ datasets_btn_->setCursor(Qt::PointingHandCursor);+ connect(datasets_btn_, &QPushButton::clicked,+ this, [this]() { on_tab_changed(Datasets); });+ hl->addWidget(datasets_btn_);++ hl->addSpacing(10);++ search_input_ = new QLineEdit;+ search_input_->setObjectName("hkSearch");+ search_input_->setPlaceholderText("Filter datasets…");+ search_input_->setFixedWidth(210);+ search_input_->setFixedHeight(26);+ connect(search_input_, &QLineEdit::returnPressed,+ this, &GovDataHKPanel::on_fetch);+ hl->addWidget(search_input_);++ fetch_btn_ = new QPushButton("FETCH");+ fetch_btn_->setObjectName("hkFetchBtn");+ fetch_btn_->setCursor(Qt::PointingHandCursor);+ connect(fetch_btn_, &QPushButton::clicked, this, &GovDataHKPanel::on_fetch);+ hl->addWidget(fetch_btn_);++ hl->addStretch(1);++ export_btn_ = new QPushButton("CSV");+ export_btn_->setObjectName("hkCsvBtn");+ export_btn_->setCursor(Qt::PointingHandCursor);+ connect(export_btn_, &QPushButton::clicked, this, &GovDataHKPanel::on_export_csv);+ hl->addWidget(export_btn_);++ return bar;+}++// ── Public slot ───────────────────────────────────────────────────────────────++void GovDataHKPanel::load_initial_data() {+ show_loading("Loading categories from data.gov.hk…");+ services::GovDataService::instance().execute(+ kScript, "publishers", {}, "hk_categories");+}++// ── Toolbar actions ───────────────────────────────────────────────────────────++void GovDataHKPanel::on_tab_changed(int tab_index) {+ auto view = static_cast<View>(tab_index);+ categories_btn_->setChecked(view == Categories);+ datasets_btn_->setChecked(view == Datasets);++ current_view_ = view;++ if (view == Categories) {+ if (current_categories_.isEmpty())+ load_initial_data();+ else {+ content_stack_->setCurrentIndex(Categories);+ row_count_label_->setText(+ QString::number(current_categories_.size()) + " categories");+ }+ update_breadcrumb("Categories");+ } else if (view == Datasets) {+ if (current_datasets_.isEmpty())+ show_status("Double-click a category to load datasets, "+ "or type a filter term above and click FETCH.");+ else {+ content_stack_->setCurrentIndex(Datasets);+ row_count_label_->setText(+ QString::number(current_datasets_.size()) + " datasets");+ }+ update_breadcrumb("Datasets");+ }++ update_toolbar_state();+}++void GovDataHKPanel::on_fetch() {+ QString query = search_input_->text().trimmed();++ // If user typed something, run datasets_list and filter client-side+ // (HK has no text search endpoint)+ if (!query.isEmpty()) {+ if (all_dataset_names_.isEmpty()) {+ show_loading("Loading full dataset list for filtering…");+ // Store query so we can filter after datasets_list returns+ services::GovDataService::instance().execute(+ kScript, "datasets_list", {}, "hk_datasets_list");+ } else {+ filter_datasets_list(query);+ }+ return;+ }++ // No query — go back to categories+ if (current_categories_.isEmpty())+ load_initial_data();+ else {+ current_view_ = Categories;+ categories_btn_->setChecked(true);+ datasets_btn_->setChecked(false);+ content_stack_->setCurrentIndex(Categories);+ update_breadcrumb("Categories");+ row_count_label_->setText(+ QString::number(current_categories_.size()) + " categories");+ update_toolbar_state();+ }+}++void GovDataHKPanel::filter_datasets_list(const QString& query) {+ QJsonArray filtered;+ QString lower = query.toLower();+ for (const auto& v : all_dataset_names_) {+ QString name = v.isString() ? v.toString()+ : v.toObject()["name"].toString();+ if (name.toLower().contains(lower)) {+ // Build a minimal dataset object for populate_datasets+ QJsonObject obj;+ obj["title"] = name;+ obj["id"] = name;+ obj["num_resources"] = 0;+ obj["metadata_modified"] = "";+ filtered.append(obj);+ }+ }++ if (filtered.isEmpty()) {+ show_status("No datasets matched "" + query + "" in the HK catalogue.\n"+ "HK DATA — Categories may have limited datasets");+ return;+ }++ current_datasets_ = filtered;+ populate_datasets(filtered);+ current_view_ = Datasets;+ categories_btn_->setChecked(false);+ datasets_btn_->setChecked(true);+ content_stack_->setCurrentIndex(Datasets);+ update_breadcrumb("Datasets › Filter: "" + query + """);+ row_count_label_->setText(+ QString::number(filtered.size()) + " matched");+ update_toolbar_state();+}++void GovDataHKPanel::on_category_clicked(int row) {+ auto* item = categories_table_->item(row, 0);+ if (!item) return;+ selected_category_id_ = item->data(Qt::UserRole).toString();+ selected_category_name_ = item->text();++ show_loading("Loading datasets for "" + selected_category_name_ + ""…");+ services::GovDataService::instance().execute(+ kScript, "datasets", {selected_category_id_, "100"}, "hk_datasets");+}++void GovDataHKPanel::on_dataset_clicked(int row) {+ auto* item = datasets_table_->item(row, 0);+ if (!item) return;+ selected_dataset_id_ = item->data(Qt::UserRole).toString();+ if (selected_dataset_id_.isEmpty()) return;++ show_loading("Loading resources…");+ services::GovDataService::instance().execute(+ kScript, "resources", {selected_dataset_id_}, "hk_resources");+}++void GovDataHKPanel::on_back() {+ if (current_view_ == Resources) {+ content_stack_->setCurrentIndex(Datasets);+ current_view_ = Datasets;+ row_count_label_->setText(+ QString::number(current_datasets_.size()) + " datasets");+ update_breadcrumb("Datasets › " + selected_category_name_);+ } else if (current_view_ == Datasets) {+ content_stack_->setCurrentIndex(Categories);+ current_view_ = Categories;+ categories_btn_->setChecked(true);+ datasets_btn_->setChecked(false);+ selected_category_id_.clear();+ selected_category_name_.clear();+ row_count_label_->setText(+ QString::number(current_categories_.size()) + " categories");+ update_breadcrumb("Categories");+ }+ update_toolbar_state();+}++void GovDataHKPanel::update_toolbar_state() {+ back_btn_->setVisible(current_view_ == Datasets || current_view_ == Resources);+}++void GovDataHKPanel::update_breadcrumb(const QString& text) {+ breadcrumb_label_->setText(text);+}++// ── Result handler ────────────────────────────────────────────────────────────++void GovDataHKPanel::on_result(const QString& request_id,+ const services::GovDataResult& result) {+ if (!request_id.startsWith("hk_")) return;++ if (!result.success) {+ show_error(result.error);+ return;+ }++ QJsonArray data = result.data["data"].toArray();++ if (request_id == "hk_categories") {+ current_categories_ = data;+ populate_categories(data);+ current_view_ = Categories;+ categories_btn_->setChecked(true);+ datasets_btn_->setChecked(false);+ content_stack_->setCurrentIndex(Categories);+ update_breadcrumb("Categories");+ row_count_label_->setText(+ QString::number(data.size()) + " categories");++ } else if (request_id == "hk_datasets") {+ if (data.isEmpty()) {+ // HK category_datasets frequently returns empty — show note+ show_status("HK DATA — Categories may have limited datasets\n\n"+ "No datasets found for "" + selected_category_name_ + "".\n"+ "Try searching by name using the search box above.");+ LOG_WARN("GovHK",+ "Category "" + selected_category_id_ + "" returned 0 datasets");+ return;+ }+ current_datasets_ = data;+ populate_datasets(data);+ current_view_ = Datasets;+ categories_btn_->setChecked(false);+ datasets_btn_->setChecked(true);+ content_stack_->setCurrentIndex(Datasets);++ int total = result.data["metadata"].toObject()["total_count"].toInt(0);+ if (total == 0) total = data.size();+ update_breadcrumb("Datasets › " + selected_category_name_);+ row_count_label_->setText(+ QString("Showing %1 of %2").arg(data.size()).arg(total));++ } else if (request_id == "hk_datasets_list") {+ // Full dataset name list for client-side search+ all_dataset_names_ = data;+ QString query = search_input_->text().trimmed();+ if (!query.isEmpty())+ filter_datasets_list(query);+ else+ show_status("Dataset list loaded. Type a search term and click FETCH.");++ } else if (request_id == "hk_resources") {+ current_resources_ = data;+ populate_resources(data);+ current_view_ = Resources;+ content_stack_->setCurrentIndex(Resources);+ update_breadcrumb("Datasets › Resources");+ row_count_label_->setText(+ QString::number(data.size()) + " files");+ }++ update_toolbar_state();+}++// ── Populate tables ───────────────────────────────────────────────────────────++void GovDataHKPanel::populate_categories(const QJsonArray& data) {+ categories_table_->setRowCount(0);+ categories_table_->setRowCount(data.size());++ for (int i = 0; i < data.size(); ++i) {+ const auto obj = data[i].toObject();++ QString name = obj["display_name"].toString();+ if (name.isEmpty()) name = obj["name"].toString();+ if (name.isEmpty()) name = obj["id"].toString();++ auto* name_item = new QTableWidgetItem(name);+ name_item->setForeground(QColor(kColor));+ name_item->setData(Qt::UserRole,+ obj["id"].toString().isEmpty() ? obj["name"].toString() : obj["id"].toString());+ categories_table_->setItem(i, 0, name_item);+ }++ LOG_INFO("GovHK", QString("Populated %1 categories").arg(data.size()));+}++void GovDataHKPanel::populate_datasets(const QJsonArray& data) {+ datasets_table_->setRowCount(0);+ datasets_table_->setRowCount(data.size());++ for (int i = 0; i < data.size(); ++i) {+ const auto obj = data[i].toObject();++ QString title = obj["title"].toString();+ if (title.isEmpty()) title = obj["name"].toString();++ auto* title_item = new QTableWidgetItem(title);+ title_item->setData(Qt::UserRole,+ obj["id"].toString().isEmpty() ? obj["name"].toString() : obj["id"].toString());+ datasets_table_->setItem(i, 0, title_item);++ int num_res = obj["num_resources"].toInt(0);+ // Also count from inline resources array if num_resources missing+ if (num_res == 0 && obj.contains("resources"))+ num_res = obj["resources"].toArray().size();+ auto* res_item = new QTableWidgetItem(num_res > 0 ? QString::number(num_res) : "—");+ res_item->setTextAlignment(Qt::AlignCenter);+ res_item->setForeground(QColor(kColor));+ datasets_table_->setItem(i, 1, res_item);++ QString modified = obj["metadata_modified"].toString();+ if (modified.length() > 10) modified = modified.left(10);+ datasets_table_->setItem(i, 2, new QTableWidgetItem(modified));+ }++ LOG_INFO("GovHK", QString("Populated %1 datasets").arg(data.size()));+}++void GovDataHKPanel::populate_resources(const QJsonArray& data) {+ resources_table_->setRowCount(0);+ resources_table_->setRowCount(data.size());++ for (int i = 0; i < data.size(); ++i) {+ const auto obj = data[i].toObject();++ QString name = obj["name"].toString();+ if (name.isEmpty()) name = obj["id"].toString();+ resources_table_->setItem(i, 0, new QTableWidgetItem(name));++ QString format = obj["format"].toString().toUpper();+ auto* fmt_item = new QTableWidgetItem(format.isEmpty() ? "—" : format);+ fmt_item->setForeground(QColor(kColor));+ fmt_item->setTextAlignment(Qt::AlignCenter);+ resources_table_->setItem(i, 1, fmt_item);++ QString modified = obj["last_modified"].toString();+ if (modified.length() > 10) modified = modified.left(10);+ QString url = obj["url"].toString();+ auto* mod_item = new QTableWidgetItem(modified.isEmpty() ? "—" : modified);+ mod_item->setData(Qt::UserRole, url);+ if (!url.isEmpty()) {+ mod_item->setText("↗ OPEN");+ mod_item->setForeground(QColor(kColor));+ mod_item->setTextAlignment(Qt::AlignCenter);+ }+ resources_table_->setItem(i, 2, mod_item);+ }++ LOG_INFO("GovHK", QString("Populated %1 resources").arg(data.size()));+}++// ── Status helpers ────────────────────────────────────────────────────────────++void GovDataHKPanel::show_loading(const QString& message) {+ status_label_->setStyleSheet(+ QString("color:%1; font-size:13px; background:transparent;").arg(kColor));+ status_label_->setText(message);+ content_stack_->setCurrentIndex(Status);+}++void GovDataHKPanel::show_error(const QString& message) {+ status_label_->setStyleSheet(+ "color:#dc2626; font-size:12px; background:transparent;");+ status_label_->setText("Error: " + message);+ content_stack_->setCurrentIndex(Status);+ LOG_ERROR("GovHK", message);+}++void GovDataHKPanel::show_status(const QString& message, bool is_error) {+ status_label_->setStyleSheet(is_error+ ? "color:#dc2626; font-size:12px; background:transparent;"+ : "color:#808080; font-size:12px; background:transparent;");+ status_label_->setText(message);+ content_stack_->setCurrentIndex(Status);+}++// ── CSV export ────────────────────────────────────────────────────────────────++void GovDataHKPanel::on_export_csv() {+ QTableWidget* table = nullptr;+ QString def_name;++ switch (current_view_) {+ case Categories:+ if (categories_table_->rowCount() > 0) {+ table = categories_table_;+ def_name = "hk_categories.csv";+ }+ break;+ case Datasets:+ if (datasets_table_->rowCount() > 0) {+ table = datasets_table_;+ def_name = "hk_datasets.csv";+ }+ break;+ case Resources:+ if (resources_table_->rowCount() > 0) {+ table = resources_table_;+ def_name = "hk_resources.csv";+ }+ break;+ default:+ break;+ }+ if (!table) return;++ QString path = QFileDialog::getSaveFileName(+ this, "Export CSV", def_name, "CSV Files (*.csv)");+ if (path.isEmpty()) return;++ QFile file(path);+ if (!file.open(QIODevice::WriteOnly | QIODevice::Text)) return;+ QTextStream out(&file);++ QStringList headers;+ for (int c = 0; c < table->columnCount(); ++c) {+ auto* h = table->horizontalHeaderItem(c);+ headers << (h ? h->text() : QString::number(c));+ }+ out << headers.join(",") << "\n";++ for (int r = 0; r < table->rowCount(); ++r) {+ QStringList row;+ for (int c = 0; c < table->columnCount(); ++c) {+ auto* item = table->item(r, c);+ QString val = item ? item->text() : "";+ if (val.contains(',') || val.contains('"'))+ val = "\"" + val.replace("\"", "\"\"") + "\"";+ row << val;+ }+ out << row.join(",") << "\n";+ }++ LOG_INFO("GovHK", "Exported CSV: " + path);+}++} // namespace fincept::screensdiff --git a/fincept-qt/src/screens/gov_data/GovDataHKPanel.h b/fincept-qt/src/screens/gov_data/GovDataHKPanel.hnew file mode 100644index 000000000..6f6bfece4--- /dev/null+++ b/fincept-qt/src/screens/gov_data/GovDataHKPanel.h@@ -0,0 +1,94 @@+// src/screens/gov_data/GovDataHKPanel.h+// Hong Kong data.gov.hk panel — Categories → Datasets → Resources+// Script: data_gov_hk_api.py Color: #F43F5E+// Note: HK has no text search — FETCH on search input runs datasets_list+// and filters client-side by title match.+#pragma once++#include "services/gov_data/GovDataService.h"++#include <QJsonArray>+#include <QLabel>+#include <QLineEdit>+#include <QPushButton>+#include <QStackedWidget>+#include <QTableWidget>+#include <QWidget>++namespace fincept::screens {++class GovDataHKPanel : public QWidget {+ Q_OBJECT+ public:+ explicit GovDataHKPanel(QWidget* parent = nullptr);++ public slots:+ void load_initial_data();++ private slots:+ void on_result(const QString& request_id, const services::GovDataResult& result);+ void on_category_clicked(int row);+ void on_dataset_clicked(int row);+ void on_tab_changed(int tab_index);+ void on_fetch();+ void on_back();+ void on_export_csv();++ private:+ enum View { Categories = 0, Datasets, Resources, Status };++ void build_ui();+ QWidget* build_toolbar();++ void populate_categories(const QJsonArray& data);+ void populate_datasets(const QJsonArray& data);+ void populate_resources(const QJsonArray& data);++ // Client-side filter of datasets_list by title substring+ void filter_datasets_list(const QString& query);++ void show_loading(const QString& message);+ void show_error(const QString& message);+ void show_status(const QString& message, bool is_error = false);++ void update_toolbar_state();+ void update_breadcrumb(const QString& text);++ static constexpr const char* kScript = "data_gov_hk_api.py";+ static constexpr const char* kColor = "#F43F5E";++ View current_view_ = Categories;+ QString selected_category_id_;+ QString selected_category_name_;+ QString selected_dataset_id_;++ // Full datasets_list fetched once (strings) for client-side search+ QJsonArray all_dataset_names_;++ // Toolbar widgets+ QPushButton* back_btn_ = nullptr;+ QPushButton* categories_btn_ = nullptr;+ QPushButton* datasets_btn_ = nullptr;+ QLineEdit* search_input_ = nullptr;+ QPushButton* fetch_btn_ = nullptr;+ QPushButton* export_btn_ = nullptr;++ // Breadcrumb+ QWidget* breadcrumb_ = nullptr;+ QLabel* breadcrumb_label_ = nullptr;+ QLabel* row_count_label_ = nullptr;++ // Content pages+ QStackedWidget* content_stack_ = nullptr;+ QTableWidget* categories_table_ = nullptr; // page 0+ QTableWidget* datasets_table_ = nullptr; // page 1+ QTableWidget* resources_table_ = nullptr; // page 2+ QLabel* status_label_ = nullptr; // page 3++ // Cached for CSV+ QJsonArray current_categories_;+ QJsonArray current_datasets_;+ QJsonArray current_resources_;+};++} // namespace fincept::screensdiff --git a/fincept-qt/src/screens/gov_data/GovDataProviderPanel.cpp b/fincept-qt/src/screens/gov_data/GovDataProviderPanel.cppindex c966f15b6..aa3ffa85e 100644--- a/fincept-qt/src/screens/gov_data/GovDataProviderPanel.cpp+++ b/fincept-qt/src/screens/gov_data/GovDataProviderPanel.cpp@@ -287,7 +287,19 @@ void GovDataProviderPanel::on_result(const QString& request_id,if (!result.success) { show_error(result.error); return; }- const QJsonArray data = result.data["data"].toArray();+ // Some scripts (Australia search/org-datasets) return data as {"datasets":[...], "count":...}+ // instead of a flat array. Unwrap if needed.+ QJsonArray data;+ QJsonValue raw = result.data["data"];+ if (raw.isArray()) {+ data = raw.toArray();+ } else if (raw.isObject()) {+ QJsonObject obj = raw.toObject();+ if (obj.contains("datasets"))+ data = obj["datasets"].toArray();+ else if (obj.contains("result"))+ data = obj["result"].toArray();+ }if (request_id.startsWith("gov_orgs_")) {current_orgs_ = data;@@ -297,7 +309,11 @@ void GovDataProviderPanel::on_result(const QString& request_id,update_breadcrumb();} else if (request_id.startsWith("gov_datasets_") ||request_id.startsWith("gov_search_")) {- int total = result.data["metadata"].toObject()["total_count"].toInt(data.size());+ int total = result.data["metadata"].toObject()["total_count"].toInt(0);+ // Australia search wraps count inside data object+ if (total == 0 && result.data["data"].isObject())+ total = result.data["data"].toObject()["count"].toInt(0);+ if (total == 0) total = data.size();current_datasets_ = data;populate_datasets(data, total);content_stack_->setCurrentIndex(Datasets);@@ -323,6 +339,7 @@ void GovDataProviderPanel::populate_orgs(const QJsonArray& data) {for (int i = 0; i < data.size(); ++i) {const auto obj = data[i].toObject();QString name = obj["display_name"].toString();+ if (name.isEmpty()) name = obj["title"].toString();if (name.isEmpty()) name = obj["name"].toString();if (name.isEmpty()) name = obj["id"].toString();diff --git a/fincept-qt/src/screens/gov_data/GovDataScreen.cpp b/fincept-qt/src/screens/gov_data/GovDataScreen.cppindex 8d46e5284..4ab42ad40 100644--- a/fincept-qt/src/screens/gov_data/GovDataScreen.cpp+++ b/fincept-qt/src/screens/gov_data/GovDataScreen.cpp@@ -2,9 +2,15 @@#include "screens/gov_data/GovDataScreen.h"#include "core/logging/Logger.h"+#include "screens/gov_data/GovDataAustraliaPanel.h"+#include "screens/gov_data/GovDataCanadaPanel.h"+#include "screens/gov_data/GovDataCKANPanel.h"#include "screens/gov_data/GovDataCongressPanel.h"-#include "screens/gov_data/GovDataProviderPanel.h"+#include "screens/gov_data/GovDataFrancePanel.h"+#include "screens/gov_data/GovDataHKPanel.h"+#include "screens/gov_data/GovDataSwissPanel.h"#include "screens/gov_data/GovDataTreasuryPanel.h"+#include "screens/gov_data/GovDataUKPanel.h"#include "services/gov_data/GovDataService.h"#include "ui/theme/Theme.h"@@ -108,13 +114,21 @@ void GovDataScreen::build_ui() {panel = new GovDataTreasuryPanel(panel_stack_);} else if (prov.id == "us-congress") {panel = new GovDataCongressPanel(panel_stack_);+ } else if (prov.id == "canada-gov") {+ panel = new GovDataCanadaPanel(panel_stack_);+ } else if (prov.id == "swiss") {+ panel = new GovDataSwissPanel(panel_stack_);+ } else if (prov.id == "france") {+ panel = new GovDataFrancePanel(panel_stack_);+ } else if (prov.id == "hk") {+ panel = new GovDataHKPanel(panel_stack_);+ } else if (prov.id == "universal-ckan") {+ panel = new GovDataCKANPanel(panel_stack_);+ } else if (prov.id == "australia") {+ panel = new GovDataAustraliaPanel(panel_stack_);} else {- QString org_label = "Publishers";- if (prov.id == "openafrica" || prov.id == "universal-ckan")- org_label = "Organizations";- else if (prov.id == "hk")- org_label = "Categories";- panel = new GovDataProviderPanel(prov.script, prov.color, org_label, panel_stack_);+ // openafrica, spain — still use generic until dedicated scripts exist+ panel = new GovDataProviderPanel(prov.script, prov.color, "Organizations", panel_stack_);}panel_stack_->addWidget(panel);}@@ -144,7 +158,9 @@ QWidget* GovDataScreen::build_toolbar() {header_title_ = new QLabel("GOVERNMENT DATA EXPLORER");header_title_->setObjectName("govToolbarTitle");- header_subtitle_ = new QLabel("Open government portals · 12 sovereign sources");+ header_subtitle_ = new QLabel(+ QString("Open government portals · %1 sovereign sources")+ .arg(services::GovDataService::providers().size()));header_subtitle_->setObjectName("govToolbarSub");cvl->addWidget(header_title_);diff --git a/fincept-qt/src/screens/gov_data/GovDataSwissPanel.cpp b/fincept-qt/src/screens/gov_data/GovDataSwissPanel.cppnew file mode 100644index 000000000..5a8341400--- /dev/null+++ b/fincept-qt/src/screens/gov_data/GovDataSwissPanel.cpp@@ -0,0 +1,664 @@+// src/screens/gov_data/GovDataSwissPanel.cpp+#include "screens/gov_data/GovDataSwissPanel.h"++#include "core/logging/Logger.h"+#include "services/gov_data/GovDataService.h"+#include "ui/theme/Theme.h"++#include <QDesktopServices>+#include <QFileDialog>+#include <QHBoxLayout>+#include <QHeaderView>+#include <QJsonArray>+#include <QJsonObject>+#include <QLabel>+#include <QScrollArea>+#include <QTextStream>+#include <QUrl>+#include <QVBoxLayout>++namespace fincept::screens {++using namespace fincept::ui;++// ── Panel stylesheet ─────────────────────────────────────────────────────────++static const QString kSwissStyle = QString(+ "#govPanelToolbar { background:#111111; border-bottom:1px solid #1a1a1a; }"++ "#govTabBtn { background:transparent; color:#808080; border:1px solid #1a1a1a;"+ " font-size:10px; font-weight:700; padding:4px 12px; letter-spacing:0.5px; }"+ "#govTabBtn:hover { color:#e5e5e5; background:#161616; }"+ "#govTabBtn:checked { background:rgba(225,29,72,0.12); color:#E11D48;"+ " border:1px solid #E11D48; }"++ "#govBackBtn { background:transparent; color:#808080; border:1px solid #1a1a1a;"+ " font-size:10px; font-weight:700; padding:4px 10px; }"+ "#govBackBtn:hover { color:#e5e5e5; background:#161616; }"++ "#govFetchBtn { background:#E11D48; color:#080808; border:none;"+ " font-size:10px; font-weight:700; padding:4px 14px; }"+ "#govFetchBtn:hover { background:#fb7185; }"+ "#govFetchBtn:disabled { background:#1a1a1a; color:#404040; }"++ "#govCsvBtn { background:transparent; color:#808080; border:1px solid #1a1a1a;"+ " font-size:10px; font-weight:700; padding:4px 10px; }"+ "#govCsvBtn:hover { color:#e5e5e5; background:#161616; }"++ "#govSearch { background:#080808; color:#e5e5e5; border:none;"+ " border-bottom:1px solid #1a1a1a; padding:4px 10px; font-size:11px; }"+ "#govSearch:focus { border-bottom:1px solid #E11D48; }"++ "QTableWidget { background:#080808; color:#e5e5e5; border:none;"+ " gridline-color:#1a1a1a; font-size:11px; alternate-background-color:#0a0a0a; }"+ "QTableWidget::item { padding:5px 8px; border-bottom:1px solid #1a1a1a; }"+ "QTableWidget::item:selected { background:rgba(225,29,72,0.10); color:#E11D48; }"+ "QHeaderView::section { background:#111111; color:#808080; border:none;"+ " border-bottom:2px solid #1a1a1a; border-right:1px solid #1a1a1a;"+ " padding:5px 8px; font-size:10px; font-weight:700; letter-spacing:0.5px; }"++ "#govStatusPage { background:#080808; }"+ "#govStatusMsg { color:#808080; font-size:13px; background:transparent; }"+ "#govStatusErr { color:#dc2626; font-size:12px; background:transparent; }"++ "#govBreadcrumb { background:#0a0a0a; border-bottom:1px solid #1a1a1a; }"+ "#govBreadcrumbText { color:#808080; font-size:9px; background:transparent; }"+ "#govBreadcrumbActive { color:#E11D48; font-size:9px; font-weight:700; background:transparent; }"++ "#govStatusBar { background:#0a0a0a; border-top:1px solid #1a1a1a; }"+ "#govWatermark { color:#404040; font-size:9px; background:transparent; }"++ "QScrollBar:vertical { background:#080808; width:5px; }"+ "QScrollBar::handle:vertical { background:#1a1a1a; min-height:20px; }"+ "QScrollBar::add-line:vertical, QScrollBar::sub-line:vertical { height:0; }"+);++// ── Constructor ──────────────────────────────────────────────────────────────++GovDataSwissPanel::GovDataSwissPanel(QWidget* parent)+ : QWidget(parent) {+ setStyleSheet(kSwissStyle);+ build_ui();+ connect(&services::GovDataService::instance(),+ &services::GovDataService::result_ready,+ this,+ &GovDataSwissPanel::on_result);+}++// ── Build UI ─────────────────────────────────────────────────────────────────++void GovDataSwissPanel::build_ui() {+ auto* root = new QVBoxLayout(this);+ root->setContentsMargins(0, 0, 0, 0);+ root->setSpacing(0);++ root->addWidget(build_toolbar());++ // Breadcrumb bar+ breadcrumb_ = new QWidget;+ breadcrumb_->setObjectName("govBreadcrumb");+ breadcrumb_->setFixedHeight(24);+ auto* bcl = new QHBoxLayout(breadcrumb_);+ bcl->setContentsMargins(14, 0, 14, 0);+ bcl->setSpacing(4);++ breadcrumb_label_ = new QLabel("All Publishers");+ breadcrumb_label_->setObjectName("govBreadcrumbText");+ bcl->addWidget(breadcrumb_label_);+ bcl->addStretch(1);++ row_count_label_ = new QLabel;+ row_count_label_->setObjectName("govBreadcrumbText");+ bcl->addWidget(row_count_label_);++ root->addWidget(breadcrumb_);++ // Content stack+ content_stack_ = new QStackedWidget;++ // Page 0 — Publishers table (PUBLISHER | DATASETS)+ publishers_table_ = new QTableWidget;+ publishers_table_->setColumnCount(2);+ publishers_table_->setHorizontalHeaderLabels({"PUBLISHER", "DATASETS"});+ publishers_table_->horizontalHeader()->setSectionResizeMode(0, QHeaderView::Stretch);+ publishers_table_->horizontalHeader()->setSectionResizeMode(1, QHeaderView::Fixed);+ publishers_table_->setColumnWidth(1, 80);+ publishers_table_->setSelectionBehavior(QAbstractItemView::SelectRows);+ publishers_table_->setSelectionMode(QAbstractItemView::SingleSelection);+ publishers_table_->setEditTriggers(QAbstractItemView::NoEditTriggers);+ publishers_table_->verticalHeader()->setVisible(false);+ publishers_table_->setAlternatingRowColors(true);+ publishers_table_->setShowGrid(true);+ connect(publishers_table_, &QTableWidget::cellDoubleClicked,+ this, &GovDataSwissPanel::on_publisher_clicked);+ content_stack_->addWidget(publishers_table_);++ // Page 1 — Datasets table (TITLE | FILES | MODIFIED | PUBLISHER)+ datasets_table_ = new QTableWidget;+ datasets_table_->setColumnCount(4);+ datasets_table_->setHorizontalHeaderLabels({"TITLE", "FILES", "MODIFIED", "PUBLISHER"});+ datasets_table_->horizontalHeader()->setSectionResizeMode(0, QHeaderView::Stretch);+ datasets_table_->horizontalHeader()->setSectionResizeMode(1, QHeaderView::Fixed);+ datasets_table_->horizontalHeader()->setSectionResizeMode(2, QHeaderView::Fixed);+ datasets_table_->horizontalHeader()->setSectionResizeMode(3, QHeaderView::Fixed);+ datasets_table_->setColumnWidth(1, 55);+ datasets_table_->setColumnWidth(2, 100);+ datasets_table_->setColumnWidth(3, 180);+ datasets_table_->setSelectionBehavior(QAbstractItemView::SelectRows);+ datasets_table_->setSelectionMode(QAbstractItemView::SingleSelection);+ datasets_table_->setEditTriggers(QAbstractItemView::NoEditTriggers);+ datasets_table_->verticalHeader()->setVisible(false);+ datasets_table_->setAlternatingRowColors(true);+ datasets_table_->setShowGrid(true);+ connect(datasets_table_, &QTableWidget::cellDoubleClicked,+ this, &GovDataSwissPanel::on_dataset_clicked);+ content_stack_->addWidget(datasets_table_);++ // Page 2 — Resources table (NAME | FORMAT | SIZE | MODIFIED | OPEN)+ resources_table_ = new QTableWidget;+ resources_table_->setColumnCount(5);+ resources_table_->setHorizontalHeaderLabels({"NAME", "FORMAT", "SIZE", "MODIFIED", "OPEN"});+ resources_table_->horizontalHeader()->setSectionResizeMode(0, QHeaderView::Stretch);+ resources_table_->horizontalHeader()->setSectionResizeMode(1, QHeaderView::Fixed);+ resources_table_->horizontalHeader()->setSectionResizeMode(2, QHeaderView::Fixed);+ resources_table_->horizontalHeader()->setSectionResizeMode(3, QHeaderView::Fixed);+ resources_table_->horizontalHeader()->setSectionResizeMode(4, QHeaderView::Fixed);+ resources_table_->setColumnWidth(1, 70);+ resources_table_->setColumnWidth(2, 80);+ resources_table_->setColumnWidth(3, 100);+ resources_table_->setColumnWidth(4, 60);+ resources_table_->setSelectionBehavior(QAbstractItemView::SelectRows);+ resources_table_->setSelectionMode(QAbstractItemView::SingleSelection);+ resources_table_->setEditTriggers(QAbstractItemView::NoEditTriggers);+ resources_table_->verticalHeader()->setVisible(false);+ resources_table_->setAlternatingRowColors(true);+ resources_table_->setShowGrid(true);+ content_stack_->addWidget(resources_table_);++ // Page 3 — Status / loading / error+ auto* status_page = new QWidget;+ status_page->setObjectName("govStatusPage");+ auto* svl = new QVBoxLayout(status_page);+ svl->setAlignment(Qt::AlignCenter);+ status_label_ = new QLabel;+ status_label_->setObjectName("govStatusMsg");+ status_label_->setAlignment(Qt::AlignCenter);+ status_label_->setWordWrap(true);+ svl->addWidget(status_label_);+ content_stack_->addWidget(status_page);++ root->addWidget(content_stack_, 1);++ // Bottom status bar with watermark+ root->addWidget(build_status_bar());+}++QWidget* GovDataSwissPanel::build_toolbar() {+ auto* bar = new QWidget;+ bar->setObjectName("govPanelToolbar");+ bar->setFixedHeight(40);++ auto* hl = new QHBoxLayout(bar);+ hl->setContentsMargins(10, 0, 10, 0);+ hl->setSpacing(5);++ back_btn_ = new QPushButton("← BACK");+ back_btn_->setObjectName("govBackBtn");+ back_btn_->setVisible(false);+ back_btn_->setCursor(Qt::PointingHandCursor);+ connect(back_btn_, &QPushButton::clicked, this, &GovDataSwissPanel::on_back);+ hl->addWidget(back_btn_);++ hl->addSpacing(4);++ publishers_btn_ = new QPushButton("PUBLISHERS");+ publishers_btn_->setObjectName("govTabBtn");+ publishers_btn_->setCheckable(true);+ publishers_btn_->setChecked(true);+ publishers_btn_->setCursor(Qt::PointingHandCursor);+ connect(publishers_btn_, &QPushButton::clicked,+ this, [this]() { on_view_changed(Publishers); });+ hl->addWidget(publishers_btn_);++ datasets_btn_ = new QPushButton("DATASETS");+ datasets_btn_->setObjectName("govTabBtn");+ datasets_btn_->setCheckable(true);+ datasets_btn_->setCursor(Qt::PointingHandCursor);+ connect(datasets_btn_, &QPushButton::clicked,+ this, [this]() { on_view_changed(Datasets); });+ hl->addWidget(datasets_btn_);++ search_btn_ = new QPushButton("SEARCH");+ search_btn_->setObjectName("govTabBtn");+ search_btn_->setCheckable(true);+ search_btn_->setCursor(Qt::PointingHandCursor);+ connect(search_btn_, &QPushButton::clicked,+ this, [this]() { on_view_changed(Search); });+ hl->addWidget(search_btn_);++ hl->addSpacing(10);++ search_input_ = new QLineEdit;+ search_input_->setObjectName("govSearch");+ search_input_->setPlaceholderText("Search datasets…");+ search_input_->setFixedWidth(210);+ search_input_->setFixedHeight(26);+ connect(search_input_, &QLineEdit::returnPressed,+ this, &GovDataSwissPanel::on_search);+ hl->addWidget(search_input_);++ fetch_btn_ = new QPushButton("FETCH");+ fetch_btn_->setObjectName("govFetchBtn");+ fetch_btn_->setCursor(Qt::PointingHandCursor);+ connect(fetch_btn_, &QPushButton::clicked, this, &GovDataSwissPanel::on_search);+ hl->addWidget(fetch_btn_);++ hl->addStretch(1);++ export_btn_ = new QPushButton("CSV");+ export_btn_->setObjectName("govCsvBtn");+ export_btn_->setCursor(Qt::PointingHandCursor);+ connect(export_btn_, &QPushButton::clicked, this, &GovDataSwissPanel::on_export_csv);+ hl->addWidget(export_btn_);++ return bar;+}++QWidget* GovDataSwissPanel::build_status_bar() {+ auto* bar = new QWidget;+ bar->setObjectName("govStatusBar");+ bar->setFixedHeight(20);++ auto* hl = new QHBoxLayout(bar);+ hl->setContentsMargins(14, 0, 14, 0);+ hl->setSpacing(0);++ hl->addStretch(1);++ watermark_label_ = new QLabel("🇨🇭 opendata.swiss");+ watermark_label_->setObjectName("govWatermark");+ hl->addWidget(watermark_label_);++ return bar;+}++// ── Data loading ─────────────────────────────────────────────────────────────++void GovDataSwissPanel::load_initial_data() {+ show_loading("Loading publishers…");+ services::GovDataService::instance().execute(+ kScript, "publishers", {}, "gov_orgs_swiss_gov_api.py");+}++void GovDataSwissPanel::on_result(const QString& request_id,+ const services::GovDataResult& result) {+ // Only handle requests belonging to this script+ if (!request_id.contains("swiss_gov_api.py")) return;++ if (!result.success) {+ show_error(result.error);+ return;+ }++ // Unwrap data array — CKAN standard {"data":[...], "metadata":{...}}+ QJsonArray data;+ const QJsonValue raw = result.data["data"];+ if (raw.isArray()) {+ data = raw.toArray();+ } else if (raw.isObject()) {+ const QJsonObject obj = raw.toObject();+ if (obj.contains("datasets"))+ data = obj["datasets"].toArray();+ else if (obj.contains("result"))+ data = obj["result"].toArray();+ }++ if (request_id.startsWith("gov_orgs_")) {+ current_publishers_ = data;+ populate_publishers(data);+ content_stack_->setCurrentIndex(Publishers);+ current_view_ = Publishers;+ update_breadcrumb();+ LOG_INFO("GovDataSwiss", QString("Loaded %1 publishers").arg(data.size()));+ } else if (request_id.startsWith("gov_datasets_") ||+ request_id.startsWith("gov_search_")) {+ int total = result.data["metadata"].toObject()["total_count"].toInt(0);+ if (total == 0) total = data.size();+ current_datasets_ = data;+ populate_datasets(data, total);+ content_stack_->setCurrentIndex(Datasets);+ current_view_ = Datasets;+ update_breadcrumb();+ LOG_INFO("GovDataSwiss", QString("Loaded %1 datasets (total %2)").arg(data.size()).arg(total));+ } else if (request_id.startsWith("gov_resources_")) {+ current_resources_ = data;+ populate_resources(data);+ content_stack_->setCurrentIndex(Resources);+ current_view_ = Resources;+ update_breadcrumb();+ LOG_INFO("GovDataSwiss", QString("Loaded %1 resources").arg(data.size()));+ }++ update_toolbar_state();+}++// ── Populate tables ──────────────────────────────────────────────────────────++void GovDataSwissPanel::populate_publishers(const QJsonArray& data) {+ publishers_table_->setRowCount(0);+ publishers_table_->setRowCount(data.size());++ for (int i = 0; i < data.size(); ++i) {+ const auto obj = data[i].toObject();++ // Resolve display name — prefer display_name, fall back to name, then id+ QString name = obj["display_name"].toString();+ if (name.isEmpty()) name = obj["name"].toString();+ if (name.isEmpty()) name = obj["id"].toString();++ // original_name is Swiss-specific — store as tooltip+ const QString original_name = obj["original_name"].toString();++ const QString id = obj["id"].toString().isEmpty()+ ? obj["name"].toString()+ : obj["id"].toString();++ auto* name_item = new QTableWidgetItem(name);+ name_item->setData(Qt::UserRole, id);+ name_item->setForeground(QColor(kColor));+ // Show original_name (e.g. German/French/Italian) as tooltip when available+ if (!original_name.isEmpty() && original_name != name)+ name_item->setToolTip(original_name);+ publishers_table_->setItem(i, 0, name_item);++ int count = obj["dataset_count"].toInt(-1);+ auto* cnt = new QTableWidgetItem(count >= 0 ? QString::number(count) : "—");+ cnt->setTextAlignment(Qt::AlignCenter);+ publishers_table_->setItem(i, 1, cnt);+ }++ row_count_label_->setText(QString::number(data.size()) + " publishers");+}++void GovDataSwissPanel::populate_datasets(const QJsonArray& data, int total_count) {+ datasets_table_->setRowCount(0);+ datasets_table_->setRowCount(data.size());++ for (int i = 0; i < data.size(); ++i) {+ const auto obj = data[i].toObject();++ QString title = obj["title"].toString();+ if (title.isEmpty()) title = obj["name"].toString();++ const QString id = obj["id"].toString().isEmpty()+ ? obj["name"].toString()+ : obj["id"].toString();++ // Long notes → tooltip truncated to 100 chars+ QString notes = obj["notes"].toString().trimmed();+ QString tooltip = notes.isEmpty() ? title : (notes.length() > 100+ ? notes.left(100) + "…"+ : notes);++ auto* title_item = new QTableWidgetItem(title);+ title_item->setData(Qt::UserRole, id);+ title_item->setToolTip(tooltip);+ datasets_table_->setItem(i, 0, title_item);++ int num_res = obj["num_resources"].toInt(0);+ auto* res_item = new QTableWidgetItem(QString::number(num_res));+ res_item->setTextAlignment(Qt::AlignCenter);+ res_item->setForeground(QColor(kColor));+ datasets_table_->setItem(i, 1, res_item);++ QString modified = obj["metadata_modified"].toString();+ if (modified.length() > 10) modified = modified.left(10);+ datasets_table_->setItem(i, 2, new QTableWidgetItem(modified));++ // Publisher name from publisher_id or nested publisher object+ QString publisher = obj["publisher_id"].toString();+ if (publisher.isEmpty()) {+ const auto pub_obj = obj["publisher"].toObject();+ publisher = pub_obj["display_name"].toString();+ if (publisher.isEmpty()) publisher = pub_obj["name"].toString();+ }+ auto* pub_item = new QTableWidgetItem(publisher);+ pub_item->setForeground(QColor("#808080"));+ datasets_table_->setItem(i, 3, pub_item);+ }++ row_count_label_->setText(+ QString("Showing %1 of %2").arg(data.size()).arg(total_count));+}++void GovDataSwissPanel::populate_resources(const QJsonArray& data) {+ resources_table_->setRowCount(0);+ resources_table_->setRowCount(data.size());++ for (int i = 0; i < data.size(); ++i) {+ const auto obj = data[i].toObject();++ QString name = obj["name"].toString();+ if (name.isEmpty()) name = obj["id"].toString();++ auto* name_item = new QTableWidgetItem(name);+ const QString desc = obj["description"].toString().trimmed();+ if (!desc.isEmpty()) name_item->setToolTip(desc);+ resources_table_->setItem(i, 0, name_item);++ QString format = obj["format"].toString().toUpper();+ auto* fmt_item = new QTableWidgetItem(format.isEmpty() ? "—" : format);+ fmt_item->setForeground(QColor(kColor));+ fmt_item->setTextAlignment(Qt::AlignCenter);+ resources_table_->setItem(i, 1, fmt_item);++ // size is often null in Swiss data — show "—" when null/zero+ QString size_str = "—";+ if (!obj["size"].isNull() && obj["size"].toDouble(0) > 0) {+ const double size_bytes = obj["size"].toDouble(0);+ if (size_bytes < 1024)+ size_str = QString::number(size_bytes, 'f', 0) + " B";+ else if (size_bytes < 1024 * 1024)+ size_str = QString::number(size_bytes / 1024.0, 'f', 1) + " KB";+ else+ size_str = QString::number(size_bytes / (1024.0 * 1024.0), 'f', 1) + " MB";+ }+ auto* sz = new QTableWidgetItem(size_str);+ sz->setTextAlignment(Qt::AlignRight | Qt::AlignVCenter);+ resources_table_->setItem(i, 2, sz);++ QString modified = obj["last_modified"].toString();+ if (modified.length() > 10) modified = modified.left(10);+ if (modified.isEmpty()) modified = obj["created"].toString().left(10);+ resources_table_->setItem(i, 3, new QTableWidgetItem(modified));++ const QString url = obj["url"].toString();+ auto* url_item = new QTableWidgetItem(url.isEmpty() ? "—" : "↗ OPEN");+ url_item->setData(Qt::UserRole, url);+ if (!url.isEmpty()) url_item->setForeground(QColor(kColor));+ url_item->setTextAlignment(Qt::AlignCenter);+ resources_table_->setItem(i, 4, url_item);+ }++ // Connect open-URL click — UniqueConnection prevents double-connecting on reload+ connect(resources_table_, &QTableWidget::cellClicked, this,+ [this](int row, int col) {+ if (col != 4) return;+ auto* item = resources_table_->item(row, 4);+ if (!item) return;+ const QString url = item->data(Qt::UserRole).toString();+ if (!url.isEmpty()) QDesktopServices::openUrl(QUrl(url));+ },+ Qt::UniqueConnection);++ row_count_label_->setText(QString::number(data.size()) + " files");+}++// ── View navigation ──────────────────────────────────────────────────────────++void GovDataSwissPanel::on_view_changed(int index) {+ const auto view = static_cast<View>(index);+ publishers_btn_->setChecked(view == Publishers);+ datasets_btn_->setChecked(view == Datasets);+ search_btn_->setChecked(view == Search);++ if (view == Publishers) {+ if (current_publishers_.isEmpty())+ load_initial_data();+ else+ content_stack_->setCurrentIndex(Publishers);+ current_view_ = Publishers;+ } else if (view == Datasets) {+ if (!current_datasets_.isEmpty()) {+ content_stack_->setCurrentIndex(Datasets);+ current_view_ = Datasets;+ }+ // If no datasets loaded yet, stay on current view — user must pick a publisher first+ } else if (view == Search) {+ current_view_ = Search;+ search_input_->setFocus();+ }++ update_toolbar_state();+ update_breadcrumb();+}++void GovDataSwissPanel::on_publisher_clicked(int row) {+ auto* item = publishers_table_->item(row, 0);+ if (!item) return;+ selected_publisher_ = item->data(Qt::UserRole).toString();+ selected_publisher_name_ = item->text();+ show_loading("Loading datasets for "" + selected_publisher_name_ + ""…");+ services::GovDataService::instance().execute(+ kScript, "datasets", {selected_publisher_, "100"},+ "gov_datasets_swiss_gov_api.py");+}++void GovDataSwissPanel::on_dataset_clicked(int row) {+ auto* item = datasets_table_->item(row, 0);+ if (!item) return;+ selected_dataset_ = item->data(Qt::UserRole).toString();+ show_loading("Loading resources…");+ services::GovDataService::instance().execute(+ kScript, "resources", {selected_dataset_},+ "gov_resources_swiss_gov_api.py");+}++void GovDataSwissPanel::on_search() {+ const QString query = search_input_->text().trimmed();+ if (query.isEmpty()) return;+ show_loading("Searching for "" + query + ""…");+ services::GovDataService::instance().execute(+ kScript, "search", {query, "50"},+ "gov_search_swiss_gov_api.py");+}++void GovDataSwissPanel::on_back() {+ if (current_view_ == Resources) {+ content_stack_->setCurrentIndex(Datasets);+ current_view_ = Datasets;+ } else if (current_view_ == Datasets) {+ content_stack_->setCurrentIndex(Publishers);+ current_view_ = Publishers;+ selected_publisher_.clear();+ selected_publisher_name_.clear();+ }+ update_toolbar_state();+ update_breadcrumb();+}++void GovDataSwissPanel::update_toolbar_state() {+ back_btn_->setVisible(current_view_ == Datasets || current_view_ == Resources);+}++void GovDataSwissPanel::update_breadcrumb() {+ QString text;+ switch (current_view_) {+ case Publishers:+ text = "All Publishers";+ break;+ case Datasets:+ text = "All Publishers › " + selected_publisher_name_ + " › Datasets";+ break;+ case Resources:+ text = "All Publishers › Datasets › Resources";+ break;+ case Search:+ text = "Search Results";+ break;+ }+ breadcrumb_label_->setText(text);+}++// ── Status helpers ───────────────────────────────────────────────────────────++void GovDataSwissPanel::show_loading(const QString& message) {+ status_label_->setStyleSheet(+ "color:#E11D48; font-size:13px; background:transparent;");+ status_label_->setText(message);+ content_stack_->setCurrentIndex(3);+}++void GovDataSwissPanel::show_error(const QString& message) {+ status_label_->setStyleSheet(+ "color:#dc2626; font-size:12px; background:transparent;");+ status_label_->setText("Error: " + message);+ content_stack_->setCurrentIndex(3);+ LOG_ERROR("GovDataSwiss", "Error: " + message);+}++void GovDataSwissPanel::show_empty(const QString& message) {+ status_label_->setStyleSheet(+ "color:#808080; font-size:12px; background:transparent;");+ status_label_->setText(message);+ content_stack_->setCurrentIndex(3);+}++// ── CSV export ───────────────────────────────────────────────────────────────++void GovDataSwissPanel::on_export_csv() {+ QTableWidget* table = nullptr;+ QString def_name;++ if (current_view_ == Publishers && publishers_table_->rowCount() > 0) {+ table = publishers_table_;+ def_name = "swiss_publishers.csv";+ } else if ((current_view_ == Datasets || current_view_ == Search)+ && datasets_table_->rowCount() > 0) {+ table = datasets_table_;+ def_name = "swiss_datasets.csv";+ } else if (current_view_ == Resources && resources_table_->rowCount() > 0) {+ table = resources_table_;+ def_name = "swiss_resources.csv";+ }+ if (!table) return;++ const QString path = QFileDialog::getSaveFileName(+ this, "Export CSV", def_name, "CSV Files (*.csv)");+ if (path.isEmpty()) return;++ QFile file(path);+ if (!file.open(QIODevice::WriteOnly | QIODevice::Text)) return;+ QTextStream out(&file);++ QStringList headers;+ for (int c = 0; c < table->columnCount(); ++c) {+ auto* h = table->horizontalHeaderItem(c);+ headers << (h ? h->text() : QString::number(c));+ }+ out << headers.join(",") << "\n";++ for (int r = 0; r < table->rowCount(); ++r) {+ QStringList row;+ for (int c = 0; c < table->columnCount(); ++c) {+ auto* item = table->item(r, c);+ QString val = item ? item->text() : "";+ if (val.contains(',') || val.contains('"'))+ val = "\"" + val.replace("\"", "\"\"") + "\"";+ row << val;+ }+ out << row.join(",") << "\n";+ }+}++} // namespace fincept::screensdiff --git a/fincept-qt/src/screens/gov_data/GovDataSwissPanel.h b/fincept-qt/src/screens/gov_data/GovDataSwissPanel.hnew file mode 100644index 000000000..b722a2440--- /dev/null+++ b/fincept-qt/src/screens/gov_data/GovDataSwissPanel.h@@ -0,0 +1,88 @@+// src/screens/gov_data/GovDataSwissPanel.h+// Switzerland Open Government Data panel (opendata.swiss / CKAN).+// 3-view hierarchy: Publishers → Datasets → Resources + Search.+// Adds original_name tooltip on publisher rows and a "opendata.swiss" watermark.+#pragma once++#include "services/gov_data/GovDataService.h"++#include <QJsonArray>+#include <QLabel>+#include <QLineEdit>+#include <QPushButton>+#include <QStackedWidget>+#include <QTableWidget>+#include <QWidget>++namespace fincept::screens {++class GovDataSwissPanel : public QWidget {+ Q_OBJECT+ public:+ explicit GovDataSwissPanel(QWidget* parent = nullptr);++ public slots:+ void load_initial_data();++ private slots:+ void on_result(const QString& request_id, const services::GovDataResult& result);+ void on_publisher_clicked(int row);+ void on_dataset_clicked(int row);+ void on_view_changed(int index);+ void on_search();+ void on_back();+ void on_export_csv();++ private:+ void build_ui();+ QWidget* build_toolbar();+ QWidget* build_status_bar();+ void show_loading(const QString& message);+ void show_error(const QString& message);+ void show_empty(const QString& message);+ void populate_publishers(const QJsonArray& data);+ void populate_datasets(const QJsonArray& data, int total_count);+ void populate_resources(const QJsonArray& data);+ void update_toolbar_state();+ void update_breadcrumb();++ static constexpr const char* kScript = "swiss_gov_api.py";+ static constexpr const char* kColor = "#E11D48";++ enum View { Publishers = 0, Datasets, Resources, Search };+ View current_view_ = Publishers;++ // Toolbar+ QPushButton* back_btn_ = nullptr;+ QPushButton* publishers_btn_ = nullptr;+ QPushButton* datasets_btn_ = nullptr;+ QPushButton* search_btn_ = nullptr;+ QLineEdit* search_input_ = nullptr;+ QPushButton* fetch_btn_ = nullptr;+ QPushButton* export_btn_ = nullptr;++ // Breadcrumb+ QWidget* breadcrumb_ = nullptr;+ QLabel* breadcrumb_label_ = nullptr;+ QLabel* row_count_label_ = nullptr;++ // Content+ QStackedWidget* content_stack_ = nullptr;+ QTableWidget* publishers_table_ = nullptr;+ QTableWidget* datasets_table_ = nullptr;+ QTableWidget* resources_table_ = nullptr;+ QLabel* status_label_ = nullptr;++ // Status bar watermark label+ QLabel* watermark_label_ = nullptr;++ // Navigation state+ QString selected_publisher_;+ QString selected_publisher_name_;+ QString selected_dataset_;+ QJsonArray current_publishers_;+ QJsonArray current_datasets_;+ QJsonArray current_resources_;+};++} // namespace fincept::screensdiff --git a/fincept-qt/src/screens/gov_data/GovDataTreasuryPanel.cpp b/fincept-qt/src/screens/gov_data/GovDataTreasuryPanel.cppindex c9065ac47..9803e3643 100644--- a/fincept-qt/src/screens/gov_data/GovDataTreasuryPanel.cpp+++ b/fincept-qt/src/screens/gov_data/GovDataTreasuryPanel.cpp@@ -375,7 +375,8 @@ void GovDataTreasuryPanel::populate_prices(const QJsonObject& data) {prices_table_->setItem(i, 1, type_item);prices_table_->setItem(i, 2, new QTableWidgetItem(fmt(r["rate"])));- prices_table_->setItem(i, 3, new QTableWidgetItem(r["maturity_date"].toString("—")));+ QString mat = r["maturity_date"].toString();+ prices_table_->setItem(i, 3, new QTableWidgetItem(mat.isEmpty() ? "—" : mat));for (int c : {4, 5, 6}) {auto* it = new QTableWidgetItem(fmt(r[c == 4 ? "bid" : c == 5 ? "offer" : "eod_price"]));@@ -405,7 +406,8 @@ void GovDataTreasuryPanel::populate_auctions(const QJsonObject& data) {auctions_table_->setItem(i, 1, type_item);auctions_table_->setItem(i, 2, new QTableWidgetItem(r["securityTerm"].toString()));- auctions_table_->setItem(i, 3, new QTableWidgetItem(r["auctionDate"].toString("—")));+ QString adate = r["auctionDate"].toString();+ auctions_table_->setItem(i, 3, new QTableWidgetItem(adate.isEmpty() ? "—" : adate));for (int c : {4, 5, 6}) {auto key = c == 4 ? "highDiscountRate" : c == 5 ? "highPrice" : "bidToCoverRatio";diff --git a/fincept-qt/src/screens/gov_data/GovDataUKPanel.cpp b/fincept-qt/src/screens/gov_data/GovDataUKPanel.cppnew file mode 100644index 000000000..cdebb0301--- /dev/null+++ b/fincept-qt/src/screens/gov_data/GovDataUKPanel.cpp@@ -0,0 +1,653 @@+// src/screens/gov_data/GovDataUKPanel.cpp+#include "screens/gov_data/GovDataUKPanel.h"++#include "core/logging/Logger.h"+#include "services/gov_data/GovDataService.h"++#include <QDesktopServices>+#include <QFileDialog>+#include <QHBoxLayout>+#include <QHeaderView>+#include <QJsonArray>+#include <QJsonObject>+#include <QScrollArea>+#include <QTextStream>+#include <QUrl>+#include <QVBoxLayout>++namespace fincept::screens {++// ── Panel stylesheet ─────────────────────────────────────────────────────────++static const QString kUKStyle = QString(+ "#govPanelToolbar { background:#111111; border-bottom:1px solid #1a1a1a; }"++ "#govTabBtn { background:transparent; color:#808080; border:1px solid #1a1a1a;"+ " font-size:10px; font-weight:700; padding:4px 12px; letter-spacing:0.5px; }"+ "#govTabBtn:hover { color:#e5e5e5; background:#161616; }"+ "#govTabBtn:checked { background:rgba(16,185,129,0.12); color:#10B981;"+ " border:1px solid #10B981; }"++ "#govBackBtn { background:transparent; color:#808080; border:1px solid #1a1a1a;"+ " font-size:10px; font-weight:700; padding:4px 10px; }"+ "#govBackBtn:hover { color:#e5e5e5; background:#161616; }"++ "#govPopularBtn { background:transparent; color:#10B981; border:1px solid #10B981;"+ " font-size:10px; font-weight:700; padding:4px 10px; }"+ "#govPopularBtn:hover { background:rgba(16,185,129,0.12); }"++ "#govFetchBtn { background:#10B981; color:#080808; border:none;"+ " font-size:10px; font-weight:700; padding:4px 14px; }"+ "#govFetchBtn:hover { background:#0ea572; }"+ "#govFetchBtn:disabled { background:#1a1a1a; color:#404040; }"++ "#govCsvBtn { background:transparent; color:#808080; border:1px solid #1a1a1a;"+ " font-size:10px; font-weight:700; padding:4px 10px; }"+ "#govCsvBtn:hover { color:#e5e5e5; background:#161616; }"++ "#govSearch { background:#080808; color:#e5e5e5; border:none;"+ " border-bottom:1px solid #1a1a1a; padding:4px 10px; font-size:11px; }"+ "#govSearch:focus { border-bottom:1px solid #10B981; }"++ "QTableWidget { background:#080808; color:#e5e5e5; border:none;"+ " gridline-color:#1a1a1a; font-size:11px; alternate-background-color:#0a0a0a; }"+ "QTableWidget::item { padding:5px 8px; border-bottom:1px solid #1a1a1a; }"+ "QTableWidget::item:selected { background:rgba(16,185,129,0.10); color:#10B981; }"+ "QHeaderView::section { background:#111111; color:#808080; border:none;"+ " border-bottom:2px solid #1a1a1a; border-right:1px solid #1a1a1a;"+ " padding:5px 8px; font-size:10px; font-weight:700; letter-spacing:0.5px; }"++ "#govStatusPage { background:#080808; }"+ "#govStatusMsg { color:#808080; font-size:13px; background:transparent; }"+ "#govStatusErr { color:#dc2626; font-size:12px; background:transparent; }"++ "#govBreadcrumb { background:#0a0a0a; border-bottom:1px solid #1a1a1a; }"+ "#govBreadcrumbText { color:#808080; font-size:9px; background:transparent; }"++ "QScrollBar:vertical { background:#080808; width:5px; }"+ "QScrollBar::handle:vertical { background:#1a1a1a; min-height:20px; }"+ "QScrollBar::add-line:vertical, QScrollBar::sub-line:vertical { height:0; }"+);++// ── Constructor ──────────────────────────────────────────────────────────────++GovDataUKPanel::GovDataUKPanel(QWidget* parent)+ : QWidget(parent) {+ setStyleSheet(kUKStyle);+ build_ui();+ connect(&services::GovDataService::instance(),+ &services::GovDataService::result_ready,+ this,+ &GovDataUKPanel::on_result);+}++// ── UI Construction ──────────────────────────────────────────────────────────++void GovDataUKPanel::build_ui() {+ auto* root = new QVBoxLayout(this);+ root->setContentsMargins(0, 0, 0, 0);+ root->setSpacing(0);++ root->addWidget(build_toolbar());++ // Breadcrumb bar+ breadcrumb_ = new QWidget;+ breadcrumb_->setObjectName("govBreadcrumb");+ breadcrumb_->setFixedHeight(24);+ auto* bcl = new QHBoxLayout(breadcrumb_);+ bcl->setContentsMargins(14, 0, 14, 0);+ bcl->setSpacing(4);+ breadcrumb_label_ = new QLabel("All Publishers");+ breadcrumb_label_->setObjectName("govBreadcrumbText");+ bcl->addWidget(breadcrumb_label_);+ bcl->addStretch(1);+ row_count_label_ = new QLabel;+ row_count_label_->setObjectName("govBreadcrumbText");+ bcl->addWidget(row_count_label_);+ root->addWidget(breadcrumb_);++ // Content stack+ content_stack_ = new QStackedWidget;++ // Page 0 — Publishers table (single stretch column: NAME)+ publishers_table_ = new QTableWidget;+ publishers_table_->setColumnCount(1);+ publishers_table_->setHorizontalHeaderLabels({"NAME"});+ publishers_table_->horizontalHeader()->setSectionResizeMode(0, QHeaderView::Stretch);+ publishers_table_->setSelectionBehavior(QAbstractItemView::SelectRows);+ publishers_table_->setSelectionMode(QAbstractItemView::SingleSelection);+ publishers_table_->setEditTriggers(QAbstractItemView::NoEditTriggers);+ publishers_table_->verticalHeader()->setVisible(false);+ publishers_table_->setAlternatingRowColors(true);+ publishers_table_->setShowGrid(true);+ connect(publishers_table_, &QTableWidget::cellDoubleClicked,+ this, &GovDataUKPanel::on_publisher_doubleclicked);+ content_stack_->addWidget(publishers_table_); // index 0++ // Page 1 — Datasets table: TITLE | FILES | MODIFIED | TAGS+ datasets_table_ = new QTableWidget;+ datasets_table_->setColumnCount(4);+ datasets_table_->setHorizontalHeaderLabels({"TITLE", "FILES", "MODIFIED", "TAGS"});+ datasets_table_->horizontalHeader()->setSectionResizeMode(0, QHeaderView::Stretch);+ datasets_table_->horizontalHeader()->setSectionResizeMode(1, QHeaderView::Fixed);+ datasets_table_->horizontalHeader()->setSectionResizeMode(2, QHeaderView::Fixed);+ datasets_table_->horizontalHeader()->setSectionResizeMode(3, QHeaderView::Fixed);+ datasets_table_->setColumnWidth(1, 55);+ datasets_table_->setColumnWidth(2, 100);+ datasets_table_->setColumnWidth(3, 200);+ datasets_table_->setSelectionBehavior(QAbstractItemView::SelectRows);+ datasets_table_->setSelectionMode(QAbstractItemView::SingleSelection);+ datasets_table_->setEditTriggers(QAbstractItemView::NoEditTriggers);+ datasets_table_->verticalHeader()->setVisible(false);+ datasets_table_->setAlternatingRowColors(true);+ datasets_table_->setShowGrid(true);+ connect(datasets_table_, &QTableWidget::cellDoubleClicked,+ this, &GovDataUKPanel::on_dataset_doubleclicked);+ content_stack_->addWidget(datasets_table_); // index 1++ // Page 2 — Resources table: NAME | FORMAT | SIZE | MODIFIED | OPEN+ resources_table_ = new QTableWidget;+ resources_table_->setColumnCount(5);+ resources_table_->setHorizontalHeaderLabels({"NAME", "FORMAT", "SIZE", "MODIFIED", "OPEN"});+ resources_table_->horizontalHeader()->setSectionResizeMode(0, QHeaderView::Stretch);+ resources_table_->horizontalHeader()->setSectionResizeMode(1, QHeaderView::Fixed);+ resources_table_->horizontalHeader()->setSectionResizeMode(2, QHeaderView::Fixed);+ resources_table_->horizontalHeader()->setSectionResizeMode(3, QHeaderView::Fixed);+ resources_table_->horizontalHeader()->setSectionResizeMode(4, QHeaderView::Fixed);+ resources_table_->setColumnWidth(1, 70);+ resources_table_->setColumnWidth(2, 80);+ resources_table_->setColumnWidth(3, 100);+ resources_table_->setColumnWidth(4, 60);+ resources_table_->setSelectionBehavior(QAbstractItemView::SelectRows);+ resources_table_->setSelectionMode(QAbstractItemView::SingleSelection);+ resources_table_->setEditTriggers(QAbstractItemView::NoEditTriggers);+ resources_table_->verticalHeader()->setVisible(false);+ resources_table_->setAlternatingRowColors(true);+ resources_table_->setShowGrid(true);+ connect(resources_table_, &QTableWidget::cellClicked, this,+ [this](int row, int col) {+ if (col != 4) return;+ auto* item = resources_table_->item(row, 4);+ if (!item) return;+ const QString url = item->data(Qt::UserRole).toString();+ if (!url.isEmpty()) QDesktopServices::openUrl(QUrl(url));+ }, Qt::UniqueConnection);+ content_stack_->addWidget(resources_table_); // index 2++ // Page 3 — Status / loading / error+ auto* status_page = new QWidget;+ status_page->setObjectName("govStatusPage");+ auto* svl = new QVBoxLayout(status_page);+ svl->setAlignment(Qt::AlignCenter);+ status_label_ = new QLabel;+ status_label_->setObjectName("govStatusMsg");+ status_label_->setAlignment(Qt::AlignCenter);+ status_label_->setWordWrap(true);+ svl->addWidget(status_label_);+ content_stack_->addWidget(status_page); // index 3++ root->addWidget(content_stack_, 1);+}++QWidget* GovDataUKPanel::build_toolbar() {+ auto* bar = new QWidget;+ bar->setObjectName("govPanelToolbar");+ bar->setFixedHeight(40);++ auto* hl = new QHBoxLayout(bar);+ hl->setContentsMargins(10, 0, 10, 0);+ hl->setSpacing(5);++ // Back button — hidden until we drill in+ back_btn_ = new QPushButton("← BACK");+ back_btn_->setObjectName("govBackBtn");+ back_btn_->setVisible(false);+ back_btn_->setCursor(Qt::PointingHandCursor);+ connect(back_btn_, &QPushButton::clicked, this, &GovDataUKPanel::on_back);+ hl->addWidget(back_btn_);++ hl->addSpacing(4);++ // Tab: Publishers+ publishers_btn_ = new QPushButton("PUBLISHERS");+ publishers_btn_->setObjectName("govTabBtn");+ publishers_btn_->setCheckable(true);+ publishers_btn_->setChecked(true);+ publishers_btn_->setCursor(Qt::PointingHandCursor);+ connect(publishers_btn_, &QPushButton::clicked, this, [this]() {+ if (current_publishers_.isEmpty()) {+ load_initial_data();+ } else {+ current_view_ = Publishers;+ content_stack_->setCurrentIndex(Publishers);+ update_toolbar_state();+ update_breadcrumb();+ }+ });+ hl->addWidget(publishers_btn_);++ // Tab: Datasets+ datasets_btn_ = new QPushButton("DATASETS");+ datasets_btn_->setObjectName("govTabBtn");+ datasets_btn_->setCheckable(true);+ datasets_btn_->setChecked(false);+ datasets_btn_->setCursor(Qt::PointingHandCursor);+ connect(datasets_btn_, &QPushButton::clicked, this, [this]() {+ if (current_datasets_.isEmpty()) return;+ current_view_ = Datasets;+ content_stack_->setCurrentIndex(Datasets);+ update_toolbar_state();+ update_breadcrumb();+ });+ hl->addWidget(datasets_btn_);++ hl->addSpacing(6);++ // Popular shortcut+ popular_btn_ = new QPushButton("POPULAR");+ popular_btn_->setObjectName("govPopularBtn");+ popular_btn_->setCursor(Qt::PointingHandCursor);+ connect(popular_btn_, &QPushButton::clicked, this, &GovDataUKPanel::on_popular);+ hl->addWidget(popular_btn_);++ hl->addSpacing(10);++ // Search input+ search_input_ = new QLineEdit;+ search_input_->setObjectName("govSearch");+ search_input_->setPlaceholderText("Search datasets…");+ search_input_->setFixedWidth(200);+ search_input_->setFixedHeight(26);+ connect(search_input_, &QLineEdit::returnPressed, this, &GovDataUKPanel::on_search);+ hl->addWidget(search_input_);++ fetch_btn_ = new QPushButton("FETCH");+ fetch_btn_->setObjectName("govFetchBtn");+ fetch_btn_->setCursor(Qt::PointingHandCursor);+ connect(fetch_btn_, &QPushButton::clicked, this, &GovDataUKPanel::on_fetch);+ hl->addWidget(fetch_btn_);++ hl->addStretch(1);++ export_btn_ = new QPushButton("CSV");+ export_btn_->setObjectName("govCsvBtn");+ export_btn_->setCursor(Qt::PointingHandCursor);+ connect(export_btn_, &QPushButton::clicked, this, &GovDataUKPanel::on_export_csv);+ hl->addWidget(export_btn_);++ return bar;+}++// ── Initial load ─────────────────────────────────────────────────────────────++void GovDataUKPanel::load_initial_data() {+ show_loading("Loading UK Government publishers…");+ services::GovDataService::instance().execute(+ kScript, "publishers", {}, "ukgov_publishers");+}++// ── Result handler ────────────────────────────────────────────────────────────++void GovDataUKPanel::on_result(const QString& request_id,+ const services::GovDataResult& result) {+ // Only handle request IDs that belong to this panel+ if (!request_id.startsWith("ukgov_")) return;++ if (!result.success) {+ show_error(result.error);+ LOG_ERROR("GovDataUKPanel", "Request " + request_id + " failed: " + result.error);+ return;+ }++ // Unwrap top-level "data" field — always an array for UK panel+ QJsonArray data;+ const QJsonValue raw = result.data["data"];+ if (raw.isArray()) {+ data = raw.toArray();+ } else if (raw.isObject()) {+ // Defensive: in case a future command wraps in {datasets:[]}+ const QJsonObject obj = raw.toObject();+ if (obj.contains("datasets"))+ data = obj["datasets"].toArray();+ else if (obj.contains("result"))+ data = obj["result"].toArray();+ }++ if (request_id == "ukgov_publishers" || request_id == "ukgov_popular") {+ current_publishers_ = data;+ populate_publishers(data);+ current_view_ = Publishers;+ content_stack_->setCurrentIndex(Publishers);+ LOG_INFO("GovDataUKPanel", "Loaded " + QString::number(data.size()) + " publishers");++ } else if (request_id.startsWith("ukgov_datasets_")) {+ int total = result.data["metadata"].toObject()["total_count"].toInt(0);+ if (total == 0) total = data.size();+ current_datasets_ = data;+ populate_datasets(data, total);+ current_view_ = Datasets;+ content_stack_->setCurrentIndex(Datasets);+ LOG_INFO("GovDataUKPanel", "Loaded " + QString::number(data.size()) + " datasets");++ } else if (request_id.startsWith("ukgov_search_")) {+ int total = result.data["metadata"].toObject()["total_count"].toInt(0);+ if (total == 0) total = data.size();+ current_datasets_ = data;+ populate_datasets(data, total);+ current_view_ = Datasets;+ content_stack_->setCurrentIndex(Datasets);+ LOG_INFO("GovDataUKPanel", "Search returned " + QString::number(data.size()) + " datasets");++ } else if (request_id.startsWith("ukgov_resources_")) {+ current_resources_ = data;+ populate_resources(data);+ current_view_ = Resources;+ content_stack_->setCurrentIndex(Resources);+ LOG_INFO("GovDataUKPanel", "Loaded " + QString::number(data.size()) + " resources");+ }++ update_toolbar_state();+ update_breadcrumb();+}++// ── Populate tables ───────────────────────────────────────────────────────────++void GovDataUKPanel::populate_publishers(const QJsonArray& data) {+ publishers_table_->setRowCount(0);+ publishers_table_->setRowCount(data.size());++ for (int i = 0; i < data.size(); ++i) {+ const auto obj = data[i].toObject();++ // Prefer display_name → title → name → id+ QString name = obj["display_name"].toString();+ if (name.isEmpty()) name = obj["title"].toString();+ if (name.isEmpty()) name = obj["name"].toString();+ if (name.isEmpty()) name = obj["id"].toString();++ // Use id as the navigation key (name field as fallback)+ const QString id = obj["id"].toString().isEmpty()+ ? obj["name"].toString()+ : obj["id"].toString();++ auto* name_item = new QTableWidgetItem(name);+ name_item->setData(Qt::UserRole, id);+ name_item->setData(Qt::UserRole + 1, name); // store display name for breadcrumb+ name_item->setForeground(QColor(kColor));+ publishers_table_->setItem(i, 0, name_item);+ }++ row_count_label_->setText(QString::number(data.size()) + " publishers");+}++void GovDataUKPanel::populate_datasets(const QJsonArray& data, int total_count) {+ datasets_table_->setRowCount(0);+ datasets_table_->setRowCount(data.size());++ for (int i = 0; i < data.size(); ++i) {+ const auto obj = data[i].toObject();++ QString title = obj["title"].toString();+ if (title.isEmpty()) title = obj["name"].toString();++ const QString id = obj["id"].toString().isEmpty()+ ? obj["name"].toString()+ : obj["id"].toString();++ auto* title_item = new QTableWidgetItem(title);+ title_item->setData(Qt::UserRole, id);+ datasets_table_->setItem(i, 0, title_item);++ const int num_res = obj["num_resources"].toInt(0);+ auto* res_item = new QTableWidgetItem(QString::number(num_res));+ res_item->setTextAlignment(Qt::AlignCenter);+ res_item->setForeground(QColor(kColor));+ datasets_table_->setItem(i, 1, res_item);++ QString modified = obj["metadata_modified"].toString();+ if (modified.length() > 10) modified = modified.left(10);+ datasets_table_->setItem(i, 2, new QTableWidgetItem(modified));++ QStringList tags;+ for (const auto& t : obj["tags"].toArray()) {+ if (t.isString()) tags << t.toString();+ else if (t.isObject()) tags << t.toObject()["name"].toString();+ }+ QString tags_str = tags.mid(0, 3).join(", ");+ if (tags.size() > 3)+ tags_str += QString(" +%1").arg(tags.size() - 3);+ auto* tag_item = new QTableWidgetItem(tags_str);+ tag_item->setForeground(QColor("#808080"));+ datasets_table_->setItem(i, 3, tag_item);+ }++ row_count_label_->setText(+ QString("Showing %1 of %2").arg(data.size()).arg(total_count));+}++void GovDataUKPanel::populate_resources(const QJsonArray& data) {+ resources_table_->setRowCount(0);+ resources_table_->setRowCount(data.size());++ for (int i = 0; i < data.size(); ++i) {+ const auto obj = data[i].toObject();++ QString name = obj["name"].toString();+ if (name.isEmpty()) name = obj["description"].toString().left(60);+ if (name.isEmpty()) name = obj["id"].toString();+ resources_table_->setItem(i, 0, new QTableWidgetItem(name));++ const QString format = obj["format"].toString().toUpper();+ auto* fmt_item = new QTableWidgetItem(format.isEmpty() ? "—" : format);+ fmt_item->setForeground(QColor(kColor));+ fmt_item->setTextAlignment(Qt::AlignCenter);+ resources_table_->setItem(i, 1, fmt_item);++ const double size_bytes = obj["size"].toDouble(0.0);+ QString size_str = "—";+ if (size_bytes > 0.0) {+ if (size_bytes < 1024.0)+ size_str = QString::number(size_bytes, 'f', 0) + " B";+ else if (size_bytes < 1024.0 * 1024.0)+ size_str = QString::number(size_bytes / 1024.0, 'f', 1) + " KB";+ else+ size_str = QString::number(size_bytes / (1024.0 * 1024.0), 'f', 1) + " MB";+ }+ auto* sz_item = new QTableWidgetItem(size_str);+ sz_item->setTextAlignment(Qt::AlignRight | Qt::AlignVCenter);+ resources_table_->setItem(i, 2, sz_item);++ QString modified = obj["last_modified"].toString();+ if (modified.length() > 10) modified = modified.left(10);+ resources_table_->setItem(i, 3, new QTableWidgetItem(modified));++ const QString url = obj["url"].toString();+ auto* url_item = new QTableWidgetItem(url.isEmpty() ? "—" : "↗ OPEN");+ url_item->setData(Qt::UserRole, url);+ if (!url.isEmpty()) url_item->setForeground(QColor(kColor));+ url_item->setTextAlignment(Qt::AlignCenter);+ resources_table_->setItem(i, 4, url_item);+ }++ row_count_label_->setText(QString::number(data.size()) + " files");+}++// ── Navigation slots ──────────────────────────────────────────────────────────++void GovDataUKPanel::on_publisher_doubleclicked(int row, int /*col*/) {+ auto* item = publishers_table_->item(row, 0);+ if (!item) return;++ selected_publisher_id_ = item->data(Qt::UserRole).toString();+ selected_publisher_ = item->data(Qt::UserRole + 1).toString();+ if (selected_publisher_.isEmpty())+ selected_publisher_ = item->text();++ show_loading("Loading datasets for "" + selected_publisher_ + ""…");+ services::GovDataService::instance().execute(+ kScript, "datasets",+ {selected_publisher_id_, "100"},+ "ukgov_datasets_" + selected_publisher_id_);+}++void GovDataUKPanel::on_dataset_doubleclicked(int row, int /*col*/) {+ auto* item = datasets_table_->item(row, 0);+ if (!item) return;++ selected_dataset_id_ = item->data(Qt::UserRole).toString();+ show_loading("Loading resources…");+ services::GovDataService::instance().execute(+ kScript, "resources",+ {selected_dataset_id_},+ "ukgov_resources_" + selected_dataset_id_);+}++void GovDataUKPanel::on_fetch() {+ // If search field has text, run a search; otherwise reload publishers+ const QString query = search_input_->text().trimmed();+ if (!query.isEmpty()) {+ on_search();+ } else {+ load_initial_data();+ }+}++void GovDataUKPanel::on_search() {+ const QString query = search_input_->text().trimmed();+ if (query.isEmpty()) return;++ show_loading("Searching for "" + query + ""…");+ services::GovDataService::instance().execute(+ kScript, "search",+ {query, "50"},+ "ukgov_search_" + query);+}++void GovDataUKPanel::on_popular() {+ show_loading("Loading popular publishers…");+ services::GovDataService::instance().execute(+ kScript, "popular-publishers", {}, "ukgov_popular");+}++void GovDataUKPanel::on_back() {+ if (current_view_ == Resources) {+ current_view_ = Datasets;+ content_stack_->setCurrentIndex(Datasets);+ } else if (current_view_ == Datasets) {+ current_view_ = Publishers;+ content_stack_->setCurrentIndex(Publishers);+ selected_publisher_.clear();+ selected_publisher_id_.clear();+ }+ update_toolbar_state();+ update_breadcrumb();+}++// ── Toolbar / breadcrumb state ────────────────────────────────────────────────++void GovDataUKPanel::update_toolbar_state() {+ const bool drilling = (current_view_ == Datasets || current_view_ == Resources);+ back_btn_->setVisible(drilling);++ publishers_btn_->setChecked(current_view_ == Publishers);+ datasets_btn_->setChecked(current_view_ == Datasets || current_view_ == Resources);+}++void GovDataUKPanel::update_breadcrumb() {+ QString text;+ switch (current_view_) {+ case Publishers:+ text = "All Publishers";+ break;+ case Datasets:+ text = selected_publisher_.isEmpty()+ ? "Search Results"+ : "All Publishers › " + selected_publisher_ + " › Datasets";+ break;+ case Resources:+ text = "All Publishers › " + selected_publisher_ + " › Datasets › Resources";+ break;+ case Status:+ text = "Loading…";+ break;+ }+ breadcrumb_label_->setText(text);+}++// ── Status helpers ────────────────────────────────────────────────────────────++void GovDataUKPanel::show_loading(const QString& message) {+ status_label_->setStyleSheet(+ QString("color:%1; font-size:13px; background:transparent;").arg(kColor));+ status_label_->setText(message);+ content_stack_->setCurrentIndex(Status);+}++void GovDataUKPanel::show_error(const QString& message) {+ status_label_->setStyleSheet("color:#dc2626; font-size:12px; background:transparent;");+ status_label_->setText("Error: " + message);+ content_stack_->setCurrentIndex(Status);+}++// ── CSV export ────────────────────────────────────────────────────────────────++void GovDataUKPanel::on_export_csv() {+ QTableWidget* table = nullptr;+ QString def_name;++ switch (current_view_) {+ case Publishers:+ if (publishers_table_->rowCount() > 0) {+ table = publishers_table_;+ def_name = "uk_publishers.csv";+ }+ break;+ case Datasets:+ if (datasets_table_->rowCount() > 0) {+ table = datasets_table_;+ def_name = "uk_datasets.csv";+ }+ break;+ case Resources:+ if (resources_table_->rowCount() > 0) {+ table = resources_table_;+ def_name = "uk_resources.csv";+ }+ break;+ case Status:+ break;+ }+ if (!table) return;+ export_table_csv(table, def_name);+}++void GovDataUKPanel::export_table_csv(QTableWidget* table, const QString& default_name) {+ const QString path = QFileDialog::getSaveFileName(+ this, "Export CSV", default_name, "CSV Files (*.csv)");+ if (path.isEmpty()) return;++ QFile file(path);+ if (!file.open(QIODevice::WriteOnly | QIODevice::Text)) return;+ QTextStream out(&file);++ QStringList headers;+ for (int c = 0; c < table->columnCount(); ++c) {+ auto* h = table->horizontalHeaderItem(c);+ headers << (h ? h->text() : QString::number(c));+ }+ out << headers.join(",") << "\n";++ for (int r = 0; r < table->rowCount(); ++r) {+ QStringList row;+ for (int c = 0; c < table->columnCount(); ++c) {+ auto* item = table->item(r, c);+ QString val = item ? item->text() : "";+ if (val.contains(',') || val.contains('"'))+ val = "\"" + val.replace("\"", "\"\"") + "\"";+ row << val;+ }+ out << row.join(",") << "\n";+ }+}++} // namespace fincept::screensdiff --git a/fincept-qt/src/screens/gov_data/GovDataUKPanel.h b/fincept-qt/src/screens/gov_data/GovDataUKPanel.hnew file mode 100644index 000000000..264cb04f8--- /dev/null+++ b/fincept-qt/src/screens/gov_data/GovDataUKPanel.h@@ -0,0 +1,93 @@+// src/screens/gov_data/GovDataUKPanel.h+// UK Government Data panel — data.gov.uk (CKAN)+// Views: Publishers → Datasets → Resources + Search+#pragma once++#include "services/gov_data/GovDataService.h"++#include <QJsonArray>+#include <QLabel>+#include <QLineEdit>+#include <QPushButton>+#include <QStackedWidget>+#include <QTableWidget>+#include <QWidget>++namespace fincept::screens {++class GovDataUKPanel : public QWidget {+ Q_OBJECT+ public:+ explicit GovDataUKPanel(QWidget* parent = nullptr);++ public slots:+ void load_initial_data();++ private slots:+ void on_result(const QString& request_id, const services::GovDataResult& result);+ void on_publisher_doubleclicked(int row, int col);+ void on_dataset_doubleclicked(int row, int col);+ void on_fetch();+ void on_search();+ void on_back();+ void on_popular();+ void on_export_csv();++ private:+ // UI construction+ void build_ui();+ QWidget* build_toolbar();++ // Table population+ void populate_publishers(const QJsonArray& data);+ void populate_datasets(const QJsonArray& data, int total_count);+ void populate_resources(const QJsonArray& data);++ // Navigation helpers+ void show_loading(const QString& message);+ void show_error(const QString& message);+ void update_toolbar_state();+ void update_breadcrumb();++ // CSV export helper+ void export_table_csv(QTableWidget* table, const QString& default_name);++ // ── Constants ────────────────────────────────────────────────────────────+ static constexpr const char* kScript = "datagovuk_api.py";+ static constexpr const char* kColor = "#10B981";++ enum View { Publishers = 0, Datasets, Resources, Status };+ View current_view_ = Publishers;++ // ── Toolbar widgets ───────────────────────────────────────────────────────+ QPushButton* back_btn_ = nullptr;+ QPushButton* publishers_btn_ = nullptr;+ QPushButton* datasets_btn_ = nullptr;+ QPushButton* popular_btn_ = nullptr;+ QLineEdit* search_input_ = nullptr;+ QPushButton* fetch_btn_ = nullptr;+ QPushButton* export_btn_ = nullptr;++ // ── Breadcrumb bar ────────────────────────────────────────────────────────+ QWidget* breadcrumb_ = nullptr;+ QLabel* breadcrumb_label_ = nullptr;+ QLabel* row_count_label_ = nullptr;++ // ── Content stack (index matches View enum) ───────────────────────────────+ QStackedWidget* content_stack_ = nullptr;+ QTableWidget* publishers_table_ = nullptr;+ QTableWidget* datasets_table_ = nullptr;+ QTableWidget* resources_table_ = nullptr;+ QLabel* status_label_ = nullptr;++ // ── Navigation state ──────────────────────────────────────────────────────+ QString selected_publisher_; // display name, for breadcrumb+ QString selected_publisher_id_; // id used in API call+ QString selected_dataset_id_;++ QJsonArray current_publishers_;+ QJsonArray current_datasets_;+ QJsonArray current_resources_;+};++} // namespace fincept::screensdiff --git a/fincept-qt/src/screens/markets/MarketPanel.cpp b/fincept-qt/src/screens/markets/MarketPanel.cppindex e1dbb35f6..08c0e3a10 100644--- a/fincept-qt/src/screens/markets/MarketPanel.cpp+++ b/fincept-qt/src/screens/markets/MarketPanel.cpp@@ -5,10 +5,9 @@#include <QHBoxLayout>#include <QHeaderView>#include <QPointer>+#include <QResizeEvent>#include <QVBoxLayout>-#include <cmath>-namespace fincept::screens {MarketPanel::MarketPanel(const QString& title, const QStringList& symbols, bool show_name, QWidget* parent)@@ -75,10 +74,7 @@ MarketPanel::MarketPanel(const QString& title, const QStringList& symbols, bool}vl->addWidget(table_, 1);- // Skeleton pulse timer — shimmer every 350ms- skeleton_timer_ = new QTimer(this);- skeleton_timer_->setInterval(350);- connect(skeleton_timer_, &QTimer::timeout, this, &MarketPanel::pulse_skeleton);+ loading_overlay_ = new ui::LoadingOverlay(this);refresh();}@@ -89,97 +85,36 @@ void MarketPanel::set_symbols(const QStringList& s) {}void MarketPanel::refresh() {- status_label_->setText(has_loaded_data_ ? "UPDATING" : "LOADING");+ status_label_->setText("LOADING");status_label_->setStyleSheet("color:#d97706;font-size:12px;background:transparent;font-family:'Consolas',monospace;");- // Keep existing table visible during background refreshes.- // Show skeleton only for first load or empty table.- if (!has_loaded_data_ || table_->rowCount() == 0)- show_skeleton();+ loading_overlay_->show_loading("LOADING\xe2\x80\xa6");QPointer<MarketPanel> self = this;services::MarketDataService::instance().fetch_quotes(symbols_, [self](bool ok, QVector<services::QuoteData> q) {if (!self)return;- self->skeleton_timer_->stop();+ self->loading_overlay_->hide_loading();if (!ok) {- self->status_label_->setText(self->has_loaded_data_ ? "STALE" : "FAIL");+ self->status_label_->setText("FAIL");self->status_label_->setStyleSheet("color:#dc2626;font-size:12px;background:transparent;font-family:'Consolas',monospace;");- if (!self->has_loaded_data_) {- // First load failed: clear any skeleton rows.- self->table_->setRowCount(0);- }emit self->refresh_finished();return;}self->status_label_->setText(QString::number(q.size()));self->status_label_->setStyleSheet("color:#333333;font-size:12px;background:transparent;font-family:'Consolas',monospace;");- self->has_loaded_data_ = !q.isEmpty();self->populate(q);emit self->refresh_finished();});}-void MarketPanel::show_skeleton() {- skeleton_offset_ = 0;- int cols = show_name_ ? 6 : 7;- int rows = std::max(6, static_cast<int>(symbols_.size()));-- table_->setUpdatesEnabled(false);- table_->setRowCount(0);- table_->setRowCount(rows);-- for (int r = 0; r < rows; r++) {- // Vary placeholder width per row for a natural stagger- int w = 30 + (r % 4) * 15; // 30%, 45%, 60%, 75%, repeat- QString bg = QString("background:qlineargradient(x1:0,y1:0,x2:1,y2:0,"- "stop:0 #111111,stop:%1 #1a1a1a,stop:1 #111111);")- .arg(w / 100.0, 0, 'f', 2);- for (int c = 0; c < cols; c++) {- auto* item = new QTableWidgetItem;- item->setBackground(QBrush(QColor(c == 0 ? "#111111" : "#0d0d0d")));- item->setFlags(Qt::NoItemFlags);- table_->setItem(r, c, item);- }- table_->setRowHeight(r, 26);- (void)bg; // used in pulse_skeleton- }- table_->setUpdatesEnabled(true);- skeleton_timer_->start();-}--void MarketPanel::pulse_skeleton() {- skeleton_offset_ = (skeleton_offset_ + 20) % 100;- double s = skeleton_offset_ / 100.0;- double e = std::min(1.0, s + 0.3);-- int cols = table_->columnCount();- int rows = table_->rowCount();-- table_->setUpdatesEnabled(false);- for (int r = 0; r < rows; r++) {- // Shift phase per row so shimmer appears diagonal- double rs = std::fmod(s + r * 0.05, 1.0);- double re = std::min(1.0, rs + 0.3);- QColor dark(r % 2 == 0 ? 0x11 : 0x0d, r % 2 == 0 ? 0x11 : 0x0d, r % 2 == 0 ? 0x11 : 0x0d);- QColor light(0x1e, 0x1e, 0x1e);- // Interpolate: cells before shimmer=dark, at shimmer=light, after=dark- for (int c = 0; c < cols; c++) {- double pos = c / static_cast<double>(std::max(1, cols - 1));- double t = 0.0;- if (pos >= rs && pos <= re)- t = 1.0 - std::abs((pos - (rs + re) / 2.0) / (re - rs + 0.001));- int rv = static_cast<int>(dark.red() + t * (light.red() - dark.red()));- int gv = static_cast<int>(dark.green() + t * (light.green() - dark.green()));- int bv = static_cast<int>(dark.blue() + t * (light.blue() - dark.blue()));- if (auto* item = table_->item(r, c))- item->setBackground(QBrush(QColor(rv, gv, bv)));- }- }- table_->setUpdatesEnabled(true);+void MarketPanel::resizeEvent(QResizeEvent* event) {+ QWidget::resizeEvent(event);+ if (loading_overlay_)+ loading_overlay_->setGeometry(rect());}void MarketPanel::populate(const QVector<services::QuoteData>& quotes) {diff --git a/fincept-qt/src/screens/markets/MarketPanel.h b/fincept-qt/src/screens/markets/MarketPanel.hindex ec1b89999..81133792d 100644--- a/fincept-qt/src/screens/markets/MarketPanel.h+++ b/fincept-qt/src/screens/markets/MarketPanel.h@@ -1,9 +1,9 @@#pragma once#include "services/markets/MarketDataService.h"+#include "ui/widgets/LoadingOverlay.h"#include <QLabel>#include <QTableWidget>-#include <QTimer>#include <QWidget>namespace fincept::screens {@@ -21,10 +21,11 @@ class MarketPanel : public QWidget {signals:void refresh_finished();+ protected:+ void resizeEvent(QResizeEvent* event) override;+private:void populate(const QVector<services::QuoteData>& quotes);- void show_skeleton();- void pulse_skeleton();QString title_;QStringList symbols_;@@ -33,9 +34,7 @@ class MarketPanel : public QWidget {QLabel* title_label_ = nullptr;QLabel* status_label_ = nullptr;QTableWidget* table_ = nullptr;- QTimer* skeleton_timer_ = nullptr;- int skeleton_offset_ = 0; // shimmer position 0..100- bool has_loaded_data_ = false;+ ui::LoadingOverlay* loading_overlay_ = nullptr;};} // namespace fincept::screensdiff --git a/fincept-qt/src/screens/markets/MarketsScreen.cpp b/fincept-qt/src/screens/markets/MarketsScreen.cppindex f4ce3a1f2..20327b6e2 100644--- a/fincept-qt/src/screens/markets/MarketsScreen.cpp+++ b/fincept-qt/src/screens/markets/MarketsScreen.cpp@@ -63,7 +63,6 @@ MarketsScreen::MarketsScreen(QWidget* parent) : QWidget(parent) {for (int i = 0; i < globals.size(); i++) {auto* p = new MarketPanel(globals[i].category, globals[i].tickers, false);global_panels_.append(p);- connect(p, &MarketPanel::refresh_finished, this, &MarketsScreen::on_panel_refresh_finished);gg->addWidget(p, i / 3, i % 3);}cvl->addLayout(gg);@@ -101,7 +100,6 @@ MarketsScreen::MarketsScreen(QWidget* parent) : QWidget(parent) {syms << t.symbol;auto* p = new MarketPanel(regionals[i].region, syms, true);regional_panels_.append(p);- connect(p, &MarketPanel::refresh_finished, this, &MarketsScreen::on_panel_refresh_finished);rg->addWidget(p, 0, i);}cvl->addLayout(rg);@@ -113,13 +111,6 @@ MarketsScreen::MarketsScreen(QWidget* parent) : QWidget(parent) {auto_refresh_timer_->setInterval(update_interval_ms_);connect(auto_refresh_timer_, &QTimer::timeout, this, &MarketsScreen::refresh_all);// Timer starts via showEvent, not eagerly-- loading_animation_timer_ = new QTimer(this);- loading_animation_timer_->setInterval(150);- connect(loading_animation_timer_, &QTimer::timeout, this, [this]() {- if (status_label_)- status_label_->setText(loading_text());- });}void MarketsScreen::showEvent(QShowEvent* event) {@@ -320,78 +311,55 @@ QWidget* MarketsScreen::build_controls() {}void MarketsScreen::refresh_all() {- if (loading_in_progress_) {- refresh_queued_ = true;+ if (refresh_in_progress_)return;- }+ refresh_in_progress_ = true;- begin_loading();+ if (status_label_) {+ status_label_->setText("● LOADING");+ status_label_->setStyleSheet("color:#d97706;font-size:11px;font-weight:700;background:transparent;"+ "font-family:'Consolas',monospace;");+ }for (auto* p : global_panels_)p->refresh();for (auto* p : regional_panels_)p->refresh();-}-void MarketsScreen::begin_loading() {- loading_in_progress_ = true;- refresh_queued_ = false;- loading_frame_ = 0;- pending_panels_ = global_panels_.size() + regional_panels_.size();- if (pending_panels_ == 0) {- finish_loading();+ // Panels handle their own overlay; update the status bar when done.+ // We use a single-shot approach: once all panels have emitted refresh_finished,+ // we mark the screen ready. Use a shared counter via lambda capture.+ const int total = global_panels_.size() + regional_panels_.size();+ if (total == 0) {+ refresh_in_progress_ = false;return;}- if (status_label_) {- status_label_->setText(loading_text());- status_label_->setStyleSheet("color:#d97706;font-size:11px;font-weight:700;background:transparent;"- "font-family:'Consolas',monospace;");- }- if (loading_animation_timer_)- loading_animation_timer_->start();-}-void MarketsScreen::finish_loading() {- loading_in_progress_ = false;- pending_panels_ = 0;- if (loading_animation_timer_)- loading_animation_timer_->stop();- if (status_label_) {- status_label_->setText("● READY");- status_label_->setStyleSheet("color:#22c55e;font-size:11px;font-weight:700;background:transparent;"- "font-family:'Consolas',monospace;");- }- if (last_update_label_) {- last_update_label_->setText(- QString("LAST UPDATE %1")- .arg(QDateTime::currentDateTime().toString("HH:mm:ss")));- last_update_label_->setStyleSheet("color:#404040;font-size:11px;background:transparent;"- "font-family:'Consolas',monospace;");- }- if (refresh_queued_)- refresh_all();-}--void MarketsScreen::on_panel_refresh_finished() {- if (!loading_in_progress_)- return;-- if (pending_panels_ > 0)- --pending_panels_;- if (status_label_)- status_label_->setText(loading_text());-- if (pending_panels_ == 0)- finish_loading();-}--QString MarketsScreen::loading_text() {- static const QStringList frames = {"LOADING ", "LOADING. ", "LOADING.. ", "LOADING..."};- const int idx = loading_frame_ % frames.size();- const int completed = (global_panels_.size() + regional_panels_.size()) - pending_panels_;- const int total = global_panels_.size() + regional_panels_.size();- loading_frame_ = loading_frame_ + 1;- return QString("%1 %2/%3").arg(frames[idx]).arg(completed).arg(total);+ auto* counter = new QObject(this);+ auto* remaining = new int(total);+ auto finish = [this, counter, remaining]() {+ --(*remaining);+ if (*remaining > 0)+ return;+ refresh_in_progress_ = false;+ delete remaining;+ counter->deleteLater();+ if (status_label_) {+ status_label_->setText("● READY");+ status_label_->setStyleSheet("color:#22c55e;font-size:11px;font-weight:700;background:transparent;"+ "font-family:'Consolas',monospace;");+ }+ if (last_update_label_) {+ last_update_label_->setText(+ QString("LAST UPDATE %1").arg(QDateTime::currentDateTime().toString("HH:mm:ss")));+ last_update_label_->setStyleSheet("color:#404040;font-size:11px;background:transparent;"+ "font-family:'Consolas',monospace;");+ }+ };+ for (auto* p : global_panels_)+ connect(p, &MarketPanel::refresh_finished, counter, finish, Qt::SingleShotConnection);+ for (auto* p : regional_panels_)+ connect(p, &MarketPanel::refresh_finished, counter, finish, Qt::SingleShotConnection);}} // namespace fincept::screensdiff --git a/fincept-qt/src/screens/markets/MarketsScreen.h b/fincept-qt/src/screens/markets/MarketsScreen.hindex 90463fd74..995bbbacc 100644--- a/fincept-qt/src/screens/markets/MarketsScreen.h+++ b/fincept-qt/src/screens/markets/MarketsScreen.h@@ -25,22 +25,14 @@ class MarketsScreen : public QWidget {QVector<MarketPanel*> global_panels_;QVector<MarketPanel*> regional_panels_;QTimer* auto_refresh_timer_ = nullptr;- QTimer* loading_animation_timer_ = nullptr;QLabel* status_label_ = nullptr;- bool loading_in_progress_ = false;- bool refresh_queued_ = false;- int pending_panels_ = 0;- int loading_frame_ = 0;+ bool refresh_in_progress_ = false;bool auto_update_ = true;int update_interval_ms_ = 600000; // 10 min defaultQWidget* build_header();QWidget* build_controls();void refresh_all();- void begin_loading();- void finish_loading();- void on_panel_refresh_finished();- QString loading_text();QLabel* last_update_label_ = nullptr;};diff --git a/fincept-qt/src/screens/portfolio/PortfolioDetailWrapper.cpp b/fincept-qt/src/screens/portfolio/PortfolioDetailWrapper.cppindex 903826586..3a33b487d 100644--- a/fincept-qt/src/screens/portfolio/PortfolioDetailWrapper.cpp+++ b/fincept-qt/src/screens/portfolio/PortfolioDetailWrapper.cpp@@ -91,6 +91,18 @@ void PortfolioDetailWrapper::show_view(portfolio::DetailView view, const portfolupdate_data(summary, currency);}+void PortfolioDetailWrapper::update_snapshots(+ const QVector<portfolio::PortfolioSnapshot>& snapshots) {+ current_snapshots_ = snapshots;+ // Push to any already-created PerformanceRiskView+ int key = static_cast<int>(portfolio::DetailView::PerfRisk);+ auto it = views_.find(key);+ if (it != views_.end()) {+ if (auto* v = qobject_cast<PerformanceRiskView*>(*it))+ v->set_snapshots(snapshots);+ }+}+void PortfolioDetailWrapper::update_data(const portfolio::PortfolioSummary& summary, const QString& currency) {current_summary_ = summary;current_currency_ = currency;@@ -104,6 +116,7 @@ void PortfolioDetailWrapper::update_data(const portfolio::PortfolioSummary& summv->set_data(summary, currency);} else if (auto* v = qobject_cast<PerformanceRiskView*>(current)) {v->set_data(summary, currency);+ v->set_snapshots(current_snapshots_);} else if (auto* v = qobject_cast<RiskManagementView*>(current)) {v->set_data(summary, currency);} else if (auto* v = qobject_cast<PortfolioOptimizationView*>(current)) {@@ -132,9 +145,13 @@ QWidget* PortfolioDetailWrapper::get_or_create_view(portfolio::DetailView view)case portfolio::DetailView::AnalyticsSectors:widget = new AnalyticsSectorsView;break;- case portfolio::DetailView::PerfRisk:- widget = new PerformanceRiskView;+ case portfolio::DetailView::PerfRisk: {+ auto* prv = new PerformanceRiskView;+ if (!current_snapshots_.isEmpty())+ prv->set_snapshots(current_snapshots_);+ widget = prv;break;+ }case portfolio::DetailView::RiskMgmt:widget = new RiskManagementView;break;diff --git a/fincept-qt/src/screens/portfolio/PortfolioDetailWrapper.h b/fincept-qt/src/screens/portfolio/PortfolioDetailWrapper.hindex fa76fec4a..42080cb34 100644--- a/fincept-qt/src/screens/portfolio/PortfolioDetailWrapper.h+++ b/fincept-qt/src/screens/portfolio/PortfolioDetailWrapper.h@@ -20,6 +20,7 @@ class PortfolioDetailWrapper : public QWidget {void show_view(portfolio::DetailView view, const portfolio::PortfolioSummary& summary, const QString& currency);void update_data(const portfolio::PortfolioSummary& summary, const QString& currency);+ void update_snapshots(const QVector<portfolio::PortfolioSnapshot>& snapshots);signals:void back_requested();@@ -41,6 +42,7 @@ class PortfolioDetailWrapper : public QWidget {// Data passed to viewsportfolio::PortfolioSummary current_summary_;QString current_currency_;+ QVector<portfolio::PortfolioSnapshot> current_snapshots_;};} // namespace fincept::screensdiff --git a/fincept-qt/src/screens/portfolio/PortfolioFFNView.cpp b/fincept-qt/src/screens/portfolio/PortfolioFFNView.cppindex b6e3d46fc..7d146a183 100644--- a/fincept-qt/src/screens/portfolio/PortfolioFFNView.cpp+++ b/fincept-qt/src/screens/portfolio/PortfolioFFNView.cpp@@ -5,21 +5,62 @@#include "python/PythonRunner.h"#include "ui/theme/Theme.h"+#include <QAreaSeries>+#include <QChart>+#include <QChartView>+#include <QDateTimeAxis>#include <QHBoxLayout>#include <QHeaderView>#include <QJsonArray>#include <QJsonDocument>#include <QJsonObject>+#include <QLineSeries>+#include <QStackedWidget>+#include <QValueAxis>#include <QVBoxLayout>#include <algorithm>#include <cmath>+QT_CHARTS_USE_NAMESPACE+using fincept::python::PythonResult;using fincept::python::PythonRunner;namespace fincept::screens {+// ── Palette for multi-series charts ──────────────────────────────────────────+static const QStringList k_series_colors = {+ "#0891b2", // cyan+ "#d97706", // amber+ "#16a34a", // green+ "#8b5cf6", // purple+ "#f97316", // orange+ "#ec4899", // pink+ "#14b8a6", // teal+ "#eab308", // yellow+};++static QColor series_color(int index) {+ return QColor(k_series_colors[index % k_series_colors.size()]);+}++// ── Helpers ───────────────────────────────────────────────────────────────────+static QString pct_str(double v, int dp = 2) {+ return QString("%1%2%").arg(v >= 0 ? "+" : "").arg(QString::number(v * 100.0, 'f', dp));+}+static QString fmt(double v, int dp = 2) { return QString::number(v, 'f', dp); }++static QTableWidgetItem* make_item(const QString& text, Qt::Alignment align,+ const QColor& color) {+ auto* item = new QTableWidgetItem(text);+ item->setTextAlignment(align);+ item->setForeground(color);+ return item;+}++// ── Constructor / build_ui ────────────────────────────────────────────────────+PortfolioFFNView::PortfolioFFNView(QWidget* parent) : QWidget(parent) {build_ui();}@@ -29,11 +70,12 @@ void PortfolioFFNView::build_ui() {layout->setContentsMargins(0, 0, 0, 0);layout->setSpacing(0);- // Header with back button+ // ── Header ────────────────────────────────────────────────────────────────auto* header = new QWidget;header->setFixedHeight(36);header->setStyleSheet(- QString("background:%1; border-bottom:1px solid %2;").arg(ui::colors::BG_SURFACE, ui::colors::AMBER));+ QString("background:%1; border-bottom:1px solid %2;")+ .arg(ui::colors::BG_SURFACE, ui::colors::AMBER));auto* h_layout = new QHBoxLayout(header);h_layout->setContentsMargins(8, 0, 8, 0);@@ -42,10 +84,11 @@ void PortfolioFFNView::build_ui() {back_btn_ = new QPushButton("\u2190 BACK");back_btn_->setFixedHeight(24);back_btn_->setCursor(Qt::PointingHandCursor);- back_btn_->setStyleSheet(QString("QPushButton { background:transparent; color:%1; border:1px solid %1;"- " padding:0 10px; font-size:9px; font-weight:700; }"- "QPushButton:hover { background:%1; color:#000; }")- .arg(ui::colors::AMBER));+ back_btn_->setStyleSheet(+ QString("QPushButton { background:transparent; color:%1; border:1px solid %1;"+ " padding:0 10px; font-size:9px; font-weight:700; }"+ "QPushButton:hover { background:%1; color:#000; }")+ .arg(ui::colors::AMBER));connect(back_btn_, &QPushButton::clicked, this, &PortfolioFFNView::back_requested);h_layout->addWidget(back_btn_);@@ -56,128 +99,308 @@ void PortfolioFFNView::build_ui() {auto* title = new QLabel("FFN ANALYTICS");title->setStyleSheet(- QString("color:%1; font-size:11px; font-weight:700; letter-spacing:1px;").arg(ui::colors::AMBER));+ QString("color:%1; font-size:11px; font-weight:700; letter-spacing:1px;")+ .arg(ui::colors::AMBER));h_layout->addWidget(title);h_layout->addStretch();status_label_ = new QLabel;- status_label_->setStyleSheet(QString("color:%1; font-size:9px;").arg(ui::colors::TEXT_TERTIARY));+ status_label_->setStyleSheet(+ QString("color:%1; font-size:9px;").arg(ui::colors::TEXT_TERTIARY));h_layout->addWidget(status_label_);run_btn_ = new QPushButton("RUN FFN ANALYSIS");run_btn_->setFixedHeight(24);run_btn_->setCursor(Qt::PointingHandCursor);- run_btn_->setStyleSheet(QString("QPushButton { background:%1; color:#000; border:none;"- " padding:0 12px; font-size:9px; font-weight:700; letter-spacing:0.5px; }"- "QPushButton:hover { background:%2; }"- "QPushButton:disabled { background:%3; color:%4; }")- .arg(ui::colors::POSITIVE, "#22c55e", ui::colors::BG_SURFACE,- ui::colors::TEXT_TERTIARY));+ run_btn_->setStyleSheet(+ QString("QPushButton { background:%1; color:#000; border:none;"+ " padding:0 12px; font-size:9px; font-weight:700; letter-spacing:0.5px; }"+ "QPushButton:hover { background:#22c55e; }"+ "QPushButton:disabled { background:%2; color:%3; }")+ .arg(ui::colors::POSITIVE, ui::colors::BG_SURFACE, ui::colors::TEXT_TERTIARY));connect(run_btn_, &QPushButton::clicked, this, &PortfolioFFNView::run_ffn);h_layout->addWidget(run_btn_);layout->addWidget(header);- // Tabs+ // ── Tabs ──────────────────────────────────────────────────────────────────tabs_ = new QTabWidget;tabs_->setDocumentMode(true);- tabs_->setStyleSheet(QString("QTabWidget::pane { border:0; background:%1; }"- "QTabBar::tab { background:%2; color:%3; padding:6px 14px; border:0;"- " border-bottom:2px solid transparent; font-size:9px; font-weight:700;"- " letter-spacing:0.5px; }"- "QTabBar::tab:selected { color:%4; border-bottom:2px solid %4; }"- "QTabBar::tab:hover { color:%5; }")- .arg(ui::colors::BG_BASE, ui::colors::BG_SURFACE, ui::colors::TEXT_SECONDARY,- ui::colors::AMBER, ui::colors::TEXT_PRIMARY));-- // ── Overview tab ─────────────────────────────────────────────────────────- auto* overview_w = new QWidget;- auto* overview_layout = new QVBoxLayout(overview_w);- overview_layout->setContentsMargins(12, 8, 12, 8);-- auto* ov_title = new QLabel("PORTFOLIO METRICS OVERVIEW");- ov_title->setStyleSheet(- QString("color:%1; font-size:11px; font-weight:700; letter-spacing:1px;").arg(ui::colors::AMBER));- overview_layout->addWidget(ov_title);-- overview_table_ = new QTableWidget;- overview_table_->setColumnCount(3);- overview_table_->setHorizontalHeaderLabels({"METRIC", "PORTFOLIO", "BENCHMARK (SPY)"});- overview_table_->setSelectionMode(QAbstractItemView::NoSelection);- overview_table_->setEditTriggers(QAbstractItemView::NoEditTriggers);- overview_table_->setShowGrid(false);- overview_table_->verticalHeader()->setVisible(false);- overview_table_->horizontalHeader()->setStretchLastSection(true);- overview_table_->setColumnWidth(0, 220);- overview_table_->setColumnWidth(1, 140);- overview_table_->setStyleSheet(+ tabs_->setStyleSheet(+ QString("QTabWidget::pane { border:0; background:%1; }"+ "QTabBar::tab { background:%2; color:%3; padding:6px 14px; border:0;"+ " border-bottom:2px solid transparent; font-size:9px; font-weight:700;"+ " letter-spacing:0.5px; }"+ "QTabBar::tab:selected { color:%4; border-bottom:2px solid %4; }"+ "QTabBar::tab:hover { color:%5; }")+ .arg(ui::colors::BG_BASE, ui::colors::BG_SURFACE, ui::colors::TEXT_SECONDARY,+ ui::colors::AMBER, ui::colors::TEXT_PRIMARY));++ const QString table_ss =QString("QTableWidget { background:%1; color:%2; border:none; font-size:11px; }""QTableWidget::item { padding:3px 8px; border-bottom:1px solid %3; }""QHeaderView::section { background:%4; color:%5; border:none;"- " border-bottom:2px solid %6; padding:3px 8px; font-size:9px; font-weight:700; }")- .arg(ui::colors::BG_BASE, ui::colors::TEXT_PRIMARY, ui::colors::BORDER_DIM, ui::colors::BG_SURFACE,- ui::colors::TEXT_SECONDARY, ui::colors::AMBER));- overview_layout->addWidget(overview_table_, 1);- tabs_->addTab(overview_w, "OVERVIEW");-- // ── Benchmark tab ────────────────────────────────────────────────────────- benchmark_panel_ = new QWidget;- benchmark_panel_->setStyleSheet(QString("background:%1;").arg(ui::colors::BG_BASE));- auto* bench_layout = new QVBoxLayout(benchmark_panel_);- bench_layout->setContentsMargins(16, 12, 16, 12);- bench_layout->setAlignment(Qt::AlignCenter);- auto* bench_desc = new QLabel("BENCHMARK COMPARISON\n\nCompare portfolio performance against SPY benchmark.\n"- "Requires Python FFN library for full analysis.");- bench_desc->setAlignment(Qt::AlignCenter);- bench_desc->setStyleSheet(QString("color:%1; font-size:11px;").arg(ui::colors::TEXT_TERTIARY));- bench_layout->addWidget(bench_desc);- tabs_->addTab(benchmark_panel_, "BENCHMARK");-- // ── Remaining tabs (placeholders) ────────────────────────────────────────- auto make_placeholder = [this](const QString& tab_name, const QString& desc) {- auto* w = new QWidget;- auto* l = new QVBoxLayout(w);- l->setAlignment(Qt::AlignCenter);- auto* d = new QLabel(desc);- d->setAlignment(Qt::AlignCenter);- d->setWordWrap(true);- d->setStyleSheet(QString("color:%1; font-size:11px;").arg(ui::colors::TEXT_TERTIARY));- l->addWidget(d);- tabs_->addTab(w, tab_name);- return w;+ " border-bottom:2px solid %6; padding:3px 8px;"+ " font-size:9px; font-weight:700; }")+ .arg(ui::colors::BG_BASE, ui::colors::TEXT_PRIMARY, ui::colors::BORDER_DIM,+ ui::colors::BG_SURFACE, ui::colors::TEXT_SECONDARY, ui::colors::AMBER);++ // helper to create a configured QTableWidget+ auto make_table = [&](int cols, const QStringList& headers) -> QTableWidget* {+ auto* t = new QTableWidget;+ t->setColumnCount(cols);+ t->setHorizontalHeaderLabels(headers);+ t->setSelectionMode(QAbstractItemView::NoSelection);+ t->setEditTriggers(QAbstractItemView::NoEditTriggers);+ t->setShowGrid(false);+ t->verticalHeader()->setVisible(false);+ t->horizontalHeader()->setStretchLastSection(true);+ t->setStyleSheet(table_ss);+ return t;+ };++ // helper to create a placeholder label+ auto make_placeholder_label = [this](const QString& text) -> QLabel* {+ auto* lbl = new QLabel(text);+ lbl->setAlignment(Qt::AlignCenter);+ lbl->setWordWrap(true);+ lbl->setStyleSheet(+ QString("color:%1; font-size:11px;").arg(ui::colors::TEXT_TERTIARY));+ return lbl;};- optimization_panel_ = make_placeholder(- "OPTIMIZATION",- "EFFICIENT FRONTIER\n\nRun portfolio optimization using FFN to find\nthe optimal risk-return tradeoff.");- rebased_panel_ = make_placeholder(- "REBASED",- "REBASED PRICE CHARTS\n\nCompare holdings on a common base (100)\nto visualize relative performance.");- drawdowns_panel_ = make_placeholder(- "DRAWDOWNS",- "DRAWDOWN ANALYSIS\n\nVisualize historical drawdowns for each holding\nand the overall portfolio.");- rolling_panel_ = make_placeholder(- "ROLLING", "ROLLING CORRELATIONS\n\nTrack how correlations between holdings\nchange over rolling windows.");+ // ── OVERVIEW tab ─────────────────────────────────────────────────────────+ {+ auto* w = new QWidget;+ auto* vl = new QVBoxLayout(w);+ vl->setContentsMargins(12, 8, 12, 8);++ auto* lbl = new QLabel("PORTFOLIO METRICS OVERVIEW");+ lbl->setStyleSheet(+ QString("color:%1; font-size:11px; font-weight:700; letter-spacing:1px;")+ .arg(ui::colors::AMBER));+ vl->addWidget(lbl);++ overview_table_ = make_table(3, {"METRIC", "PORTFOLIO", "BENCHMARK (SPY)"});+ overview_table_->setColumnWidth(0, 220);+ overview_table_->setColumnWidth(1, 140);+ vl->addWidget(overview_table_, 1);++ tabs_->addTab(w, "OVERVIEW");+ }++ // ── BENCHMARK tab ────────────────────────────────────────────────────────+ {+ benchmark_panel_ = new QWidget;+ benchmark_panel_->setStyleSheet(+ QString("background:%1;").arg(ui::colors::BG_BASE));+ auto* vl = new QVBoxLayout(benchmark_panel_);+ vl->setContentsMargins(16, 12, 16, 12);+ vl->setSpacing(10);++ auto* hdr = new QLabel("BENCHMARK COMPARISON");+ hdr->setStyleSheet(+ QString("color:%1; font-size:11px; font-weight:700; letter-spacing:1px;")+ .arg(ui::colors::AMBER));+ vl->addWidget(hdr);++ benchmark_table_ = make_table(3, {"METRIC", "PORTFOLIO", "BENCHMARK"});+ benchmark_table_->setColumnWidth(0, 200);+ benchmark_table_->setColumnWidth(1, 150);+ vl->addWidget(benchmark_table_);++ benchmark_info_label_ = new QLabel(+ "Portfolio metrics computed from 1-year price history via yfinance.\n"+ "Connect a live benchmark feed to populate the Benchmark column.");+ benchmark_info_label_->setWordWrap(true);+ benchmark_info_label_->setStyleSheet(+ QString("color:%1; font-size:10px; padding:6px 0;")+ .arg(ui::colors::TEXT_TERTIARY));+ vl->addWidget(benchmark_info_label_);++ vl->addStretch();+ tabs_->addTab(benchmark_panel_, "BENCHMARK");+ }++ // ── OPTIMISATION tab ─────────────────────────────────────────────────────+ {+ optimization_panel_ = new QWidget;+ optimization_panel_->setStyleSheet(+ QString("background:%1;").arg(ui::colors::BG_BASE));+ auto* vl = new QVBoxLayout(optimization_panel_);+ vl->setContentsMargins(12, 8, 12, 8);+ vl->setSpacing(10);++ auto* hdr = new QLabel("PORTFOLIO OPTIMISATION — WEIGHT COMPARISON");+ hdr->setStyleSheet(+ QString("color:%1; font-size:11px; font-weight:700; letter-spacing:1px;")+ .arg(ui::colors::AMBER));+ vl->addWidget(hdr);++ opt_stack_ = new QStackedWidget;++ // index 0 — placeholder+ auto* placeholder_w = new QWidget;+ auto* pl_vl = new QVBoxLayout(placeholder_w);+ pl_vl->setAlignment(Qt::AlignCenter);+ pl_vl->addWidget(make_placeholder_label(+ "EFFICIENT FRONTIER\n\nRun FFN Analysis to compute optimal weights\n"+ "(ERC, Inverse-Vol, Equal, Current)."));+ opt_stack_->addWidget(placeholder_w);++ // index 1 — tables+ auto* tables_w = new QWidget;+ auto* tvl = new QVBoxLayout(tables_w);+ tvl->setContentsMargins(0, 0, 0, 0);+ tvl->setSpacing(12);++ auto* weights_hdr = new QLabel("ALLOCATION WEIGHTS BY STRATEGY");+ weights_hdr->setStyleSheet(+ QString("color:%1; font-size:10px; font-weight:700;")+ .arg(ui::colors::TEXT_SECONDARY));+ tvl->addWidget(weights_hdr);++ opt_weights_table_ = make_table(+ 5, {"SYMBOL", "CURRENT", "ERC", "INV-VOL", "EQUAL"});+ opt_weights_table_->setColumnWidth(0, 100);+ tvl->addWidget(opt_weights_table_);++ auto* stats_hdr = new QLabel("STRATEGY PERFORMANCE STATS");+ stats_hdr->setStyleSheet(+ QString("color:%1; font-size:10px; font-weight:700;")+ .arg(ui::colors::TEXT_SECONDARY));+ tvl->addWidget(stats_hdr);++ opt_stats_table_ = make_table(+ 5, {"STRATEGY", "TOTAL RETURN", "VOLATILITY", "SHARPE", "MAX DRAWDOWN"});+ opt_stats_table_->setColumnWidth(0, 120);+ tvl->addWidget(opt_stats_table_);++ opt_stack_->addWidget(tables_w);+ vl->addWidget(opt_stack_, 1);++ tabs_->addTab(optimization_panel_, "OPTIMISATION");+ }++ // ── REBASED tab ───────────────────────────────────────────────────────────+ {+ rebased_panel_ = new QWidget;+ rebased_panel_->setStyleSheet(+ QString("background:%1;").arg(ui::colors::BG_BASE));+ auto* vl = new QVBoxLayout(rebased_panel_);+ vl->setContentsMargins(12, 8, 12, 8);+ vl->setSpacing(0);++ rebased_stack_ = new QStackedWidget;+ // index 0 — placeholder+ auto* ph = new QWidget;+ auto* phl = new QVBoxLayout(ph);+ phl->setAlignment(Qt::AlignCenter);+ phl->addWidget(make_placeholder_label(+ "REBASED PRICE CHARTS\n\nRun FFN Analysis to compare holdings\n"+ "on a common base of 100."));+ rebased_stack_->addWidget(ph);++ // index 1 — chart (allocated lazily in update_rebased)+ rebased_chart_view_ = make_chart_view("Rebased Performance (Base = 100)");+ rebased_stack_->addWidget(rebased_chart_view_);++ vl->addWidget(rebased_stack_, 1);+ tabs_->addTab(rebased_panel_, "REBASED");+ }++ // ── DRAWDOWNS tab ─────────────────────────────────────────────────────────+ {+ drawdowns_panel_ = new QWidget;+ drawdowns_panel_->setStyleSheet(+ QString("background:%1;").arg(ui::colors::BG_BASE));+ auto* vl = new QVBoxLayout(drawdowns_panel_);+ vl->setContentsMargins(12, 8, 12, 8);+ vl->setSpacing(0);++ drawdowns_stack_ = new QStackedWidget;+ auto* ph = new QWidget;+ auto* phl = new QVBoxLayout(ph);+ phl->setAlignment(Qt::AlignCenter);+ phl->addWidget(make_placeholder_label(+ "DRAWDOWN ANALYSIS\n\nRun FFN Analysis to visualise historical\n"+ "drawdowns for each holding."));+ drawdowns_stack_->addWidget(ph);++ drawdowns_chart_view_ = make_chart_view("Drawdown Analysis");+ drawdowns_stack_->addWidget(drawdowns_chart_view_);++ vl->addWidget(drawdowns_stack_, 1);+ tabs_->addTab(drawdowns_panel_, "DRAWDOWNS");+ }++ // ── ROLLING CORRELATIONS tab ──────────────────────────────────────────────+ {+ rolling_panel_ = new QWidget;+ rolling_panel_->setStyleSheet(+ QString("background:%1;").arg(ui::colors::BG_BASE));+ auto* vl = new QVBoxLayout(rolling_panel_);+ vl->setContentsMargins(12, 8, 12, 8);+ vl->setSpacing(0);++ rolling_stack_ = new QStackedWidget;+ auto* ph = new QWidget;+ auto* phl = new QVBoxLayout(ph);+ phl->setAlignment(Qt::AlignCenter);+ phl->addWidget(make_placeholder_label(+ "ROLLING CORRELATIONS\n\nAdd more holdings and run FFN Analysis\n"+ "to track 60-day rolling correlations."));+ rolling_stack_->addWidget(ph);++ rolling_chart_view_ = make_chart_view("Rolling 60-Day Correlations");+ rolling_stack_->addWidget(rolling_chart_view_);++ vl->addWidget(rolling_stack_, 1);+ tabs_->addTab(rolling_panel_, "ROLLING");+ }layout->addWidget(tabs_);}-void PortfolioFFNView::set_data(const portfolio::PortfolioSummary& summary, const QString& currency) {- summary_ = summary;+// ── Chart helper ──────────────────────────────────────────────────────────────++QChartView* PortfolioFFNView::make_chart_view(const QString& title) {+ auto* chart = new QChart;+ chart->setTitle(title);+ chart->setBackgroundBrush(QBrush(QColor(ui::colors::BG_BASE)));+ chart->setTitleBrush(QBrush(QColor(ui::colors::AMBER)));+ chart->setTitleFont(QFont("monospace", 9, QFont::Bold));+ chart->legend()->setVisible(true);+ chart->legend()->setAlignment(Qt::AlignBottom);+ chart->legend()->setLabelColor(QColor(ui::colors::TEXT_SECONDARY));+ chart->legend()->setBackgroundVisible(false);+ chart->setPlotAreaBackgroundBrush(QBrush(QColor(ui::colors::BG_SURFACE)));+ chart->setPlotAreaBackgroundVisible(true);++ auto* cv = new QChartView(chart);+ cv->setRenderHint(QPainter::Antialiasing, false);+ cv->setStyleSheet(QString("background:%1; border:none;").arg(ui::colors::BG_BASE));+ return cv;+}++// ── set_data ──────────────────────────────────────────────────────────────────++void PortfolioFFNView::set_data(const portfolio::PortfolioSummary& summary,+ const QString& currency) {+ summary_ = summary;currency_ = currency;update_overview();}+// ── update_overview ───────────────────────────────────────────────────────────+void PortfolioFFNView::update_overview() {- // Aggregate FFN data across all symbols (weighted by portfolio weight)- // Fall back to live summary data if FFN hasn't been run yetbool has_ffn = !ffn_data_.isEmpty();double total_ann_ret = 0, total_ann_vol = 0, total_sharpe = 0, total_max_dd = 0;double total_best_day = 0, total_worst_day = 0;int pos_days = 0, neg_days = 0;- int sym_count = 0;QString best_sym, worst_sym;double best_ret = -1e9, worst_ret = 1e9;@@ -185,71 +408,137 @@ void PortfolioFFNView::update_overview() {for (const auto& h : summary_.holdings) {if (!ffn_data_.contains(h.symbol))continue;- auto s = ffn_data_[h.symbol].toObject();+ auto s = ffn_data_[h.symbol].toObject();double w = h.weight / 100.0;total_ann_ret += s["annualized_return"].toDouble() * w;total_ann_vol += s["annualized_volatility"].toDouble() * w;total_sharpe += s["sharpe_ratio"].toDouble() * w;total_max_dd += s["max_drawdown"].toDouble() * w;- total_best_day = std::max(total_best_day, s["best_day"].toDouble());+ total_best_day = std::max(total_best_day, s["best_day"].toDouble());total_worst_day = std::min(total_worst_day, s["worst_day"].toDouble());pos_days += s["positive_days"].toInt();neg_days += s["negative_days"].toInt();double sym_ret = s["total_return"].toDouble();if (sym_ret > best_ret) { best_ret = sym_ret; best_sym = h.symbol; }if (sym_ret < worst_ret) { worst_ret = sym_ret; worst_sym = h.symbol; }- ++sym_count;}}- double pnl_pct = summary_.total_unrealized_pnl_percent;+ double pnl_pct = summary_.total_unrealized_pnl_percent;double win_rate = summary_.total_positions > 0- ? summary_.gainers * 100.0 / summary_.total_positions : 0;+ ? summary_.gainers * 100.0 / summary_.total_positions : 0.0;struct Row { QString name; QString value; QString benchmark; const char* color; };QVector<Row> rows;- auto pct_str = [](double v, int dp = 2) {- return QString("%1%2%").arg(v >= 0 ? "+" : "").arg(QString::number(v * 100.0, 'f', dp));- };- auto fmt = [](double v, int dp = 2) { return QString::number(v, 'f', dp); };-if (has_ffn) {rows = {- {"Annualized Return", pct_str(total_ann_ret), "+10.50%", total_ann_ret >= 0 ? ui::colors::POSITIVE : ui::colors::NEGATIVE},- {"Annualized Volatility", pct_str(total_ann_vol), "15.20%", ui::colors::CYAN},- {"Sharpe Ratio", fmt(total_sharpe), "0.82", total_sharpe >= 0 ? ui::colors::POSITIVE : ui::colors::NEGATIVE},- {"Max Drawdown", pct_str(total_max_dd), "-20.50%", ui::colors::NEGATIVE},- {"Best Day (any)", pct_str(total_best_day), "--", ui::colors::POSITIVE},- {"Worst Day (any)", pct_str(total_worst_day), "--", ui::colors::NEGATIVE},- {"Positive Days", QString::number(pos_days), "--", ui::colors::POSITIVE},- {"Negative Days", QString::number(neg_days), "--", ui::colors::NEGATIVE},- {"Best Holding", best_sym.isEmpty() ? "--" : best_sym + " (" + pct_str(best_ret) + ")", "--", ui::colors::POSITIVE},- {"Worst Holding", worst_sym.isEmpty() ? "--" : worst_sym + " (" + pct_str(worst_ret) + ")", "--", ui::colors::NEGATIVE},- {"Total Return (cost)", pct_str(pnl_pct / 100.0), "--", pnl_pct >= 0 ? ui::colors::POSITIVE : ui::colors::NEGATIVE},- {"Win Rate", fmt(win_rate) + "%", "55.00%", ui::colors::CYAN},- {"Positions", QString::number(summary_.total_positions), "--", ui::colors::CYAN},- {"Total Value", currency_ + " " + fmt(summary_.total_market_value), "--", ui::colors::WARNING},- {"Cost Basis", currency_ + " " + fmt(summary_.total_cost_basis), "--", ui::colors::TEXT_SECONDARY},+ {"Annualized Return",+ pct_str(total_ann_ret),+ "--",+ total_ann_ret >= 0 ? ui::colors::POSITIVE : ui::colors::NEGATIVE},+ {"Annualized Volatility",+ pct_str(total_ann_vol),+ "--",+ ui::colors::CYAN},+ {"Sharpe Ratio",+ fmt(total_sharpe),+ "--",+ total_sharpe >= 0 ? ui::colors::POSITIVE : ui::colors::NEGATIVE},+ {"Max Drawdown",+ pct_str(total_max_dd),+ "--",+ ui::colors::NEGATIVE},+ {"Best Day (any)",+ pct_str(total_best_day),+ "--",+ ui::colors::POSITIVE},+ {"Worst Day (any)",+ pct_str(total_worst_day),+ "--",+ ui::colors::NEGATIVE},+ {"Positive Days",+ QString::number(pos_days),+ "--",+ ui::colors::POSITIVE},+ {"Negative Days",+ QString::number(neg_days),+ "--",+ ui::colors::NEGATIVE},+ {"Best Holding",+ best_sym.isEmpty() ? "--" : best_sym + " (" + pct_str(best_ret) + ")",+ "--",+ ui::colors::POSITIVE},+ {"Worst Holding",+ worst_sym.isEmpty() ? "--" : worst_sym + " (" + pct_str(worst_ret) + ")",+ "--",+ ui::colors::NEGATIVE},+ {"Total Return (cost)",+ pct_str(pnl_pct / 100.0),+ "--",+ pnl_pct >= 0 ? ui::colors::POSITIVE : ui::colors::NEGATIVE},+ {"Win Rate",+ fmt(win_rate) + "%",+ "--",+ ui::colors::CYAN},+ {"Positions",+ QString::number(summary_.total_positions),+ "--",+ ui::colors::CYAN},+ {"Total Value",+ currency_ + " " + fmt(summary_.total_market_value),+ "--",+ ui::colors::WARNING},+ {"Cost Basis",+ currency_ + " " + fmt(summary_.total_cost_basis),+ "--",+ ui::colors::TEXT_SECONDARY},};} else {- // Pre-run placeholder — show live data and prompt to run+ // Pre-run: show live data and prompt userdouble vol = 0; int vn = 0;for (const auto& h : summary_.holdings)- if (std::abs(h.day_change_percent) > 0.001) { vol += std::abs(h.day_change_percent); ++vn; }- double daily_vol = vn > 0 ? vol / vn : 0;+ if (std::abs(h.day_change_percent) > 0.001) {+ vol += std::abs(h.day_change_percent);+ ++vn;+ }+ double daily_vol = vn > 0 ? vol / vn : 0.0;double ann_vol = daily_vol * std::sqrt(252.0);- double sharpe = ann_vol > 0.01 ? (pnl_pct - 4.0) / ann_vol : 0;+ double sharpe = ann_vol > 0.01 ? (pnl_pct - 4.0) / ann_vol : 0.0;rows = {- {"Total Return (unrealized)", pct_str(pnl_pct / 100.0), "+10.50%", pnl_pct >= 0 ? ui::colors::POSITIVE : ui::colors::NEGATIVE},- {"Annualized Volatility (est.)", pct_str(ann_vol / 100.0), "15.20%", ui::colors::CYAN},- {"Sharpe Ratio (est.)", fmt(sharpe), "0.82", sharpe >= 0 ? ui::colors::POSITIVE : ui::colors::NEGATIVE},- {"Win Rate", fmt(win_rate) + "%", "55.00%", ui::colors::CYAN},- {"Positions", QString::number(summary_.total_positions), "--", ui::colors::CYAN},- {"Total Value", currency_ + " " + fmt(summary_.total_market_value), "--", ui::colors::WARNING},- {"Cost Basis", currency_ + " " + fmt(summary_.total_cost_basis), "--", ui::colors::TEXT_SECONDARY},- {"FFN Deep Metrics", "Click RUN FFN ANALYSIS for full stats", "--", ui::colors::AMBER},+ {"Total Return (unrealized)",+ pct_str(pnl_pct / 100.0),+ "--",+ pnl_pct >= 0 ? ui::colors::POSITIVE : ui::colors::NEGATIVE},+ {"Annualized Volatility (est.)",+ pct_str(ann_vol / 100.0),+ "--",+ ui::colors::CYAN},+ {"Sharpe Ratio (est.)",+ fmt(sharpe),+ "--",+ sharpe >= 0 ? ui::colors::POSITIVE : ui::colors::NEGATIVE},+ {"Win Rate",+ fmt(win_rate) + "%",+ "--",+ ui::colors::CYAN},+ {"Positions",+ QString::number(summary_.total_positions),+ "--",+ ui::colors::CYAN},+ {"Total Value",+ currency_ + " " + fmt(summary_.total_market_value),+ "--",+ ui::colors::WARNING},+ {"Cost Basis",+ currency_ + " " + fmt(summary_.total_cost_basis),+ "--",+ ui::colors::TEXT_SECONDARY},+ {"FFN Deep Metrics",+ "Click RUN FFN ANALYSIS for full stats",+ "--",+ ui::colors::AMBER},};}@@ -257,35 +546,428 @@ void PortfolioFFNView::update_overview() {for (int r = 0; r < rows.size(); ++r) {const auto& row = rows[r];overview_table_->setRowHeight(r, 28);+ overview_table_->setItem(+ r, 0, make_item(row.name, Qt::AlignLeft | Qt::AlignVCenter,+ QColor(ui::colors::TEXT_SECONDARY)));+ overview_table_->setItem(+ r, 1, make_item(row.value, Qt::AlignRight | Qt::AlignVCenter,+ QColor(row.color)));+ overview_table_->setItem(+ r, 2, make_item(row.benchmark, Qt::AlignRight | Qt::AlignVCenter,+ QColor(ui::colors::TEXT_TERTIARY)));+ }+}- auto set = [&](int col, const QString& text, const char* color) {- auto* item = new QTableWidgetItem(text);- item->setTextAlignment(col == 0 ? (Qt::AlignLeft | Qt::AlignVCenter)- : (Qt::AlignRight | Qt::AlignVCenter));- item->setForeground(QColor(color));- overview_table_->setItem(r, col, item);+// ── update_benchmark ──────────────────────────────────────────────────────────++void PortfolioFFNView::update_benchmark() {+ // Populate from optimization.stats.current which gives real portfolio perf.+ auto opt_obj = ffn_data_["optimization"].toObject();+ auto stats_obj = opt_obj["stats"].toObject();+ auto cur_stats = stats_obj["current"].toObject();++ // Rows: metric | portfolio value | benchmark placeholder+ struct BRow { QString metric; QString portfolio; };+ QVector<BRow> rows;++ if (!cur_stats.isEmpty()) {+ double total_ret = cur_stats["total_return"].toDouble();+ double cagr = cur_stats["cagr"].toDouble();+ double vol = cur_stats["volatility"].toDouble();+ double sharpe = cur_stats["sharpe"].toDouble();+ double max_dd = cur_stats["max_drawdown"].toDouble();++ rows = {+ {"Total Return", pct_str(total_ret)},+ {"CAGR", pct_str(cagr)},+ {"Volatility", pct_str(vol)},+ {"Sharpe Ratio", fmt(sharpe)},+ {"Max Drawdown", pct_str(max_dd)},};+ } else {+ rows = {+ {"Total Return", "--"},+ {"CAGR", "--"},+ {"Volatility", "--"},+ {"Sharpe Ratio", "--"},+ {"Max Drawdown", "--"},+ };+ }++ benchmark_table_->setRowCount(rows.size());+ for (int r = 0; r < rows.size(); ++r) {+ const auto& row = rows[r];+ benchmark_table_->setRowHeight(r, 28);+ benchmark_table_->setItem(+ r, 0, make_item(row.metric, Qt::AlignLeft | Qt::AlignVCenter,+ QColor(ui::colors::TEXT_SECONDARY)));+ benchmark_table_->setItem(+ r, 1, make_item(row.portfolio, Qt::AlignRight | Qt::AlignVCenter,+ QColor(ui::colors::TEXT_PRIMARY)));+ benchmark_table_->setItem(+ r, 2, make_item("--", Qt::AlignRight | Qt::AlignVCenter,+ QColor(ui::colors::TEXT_TERTIARY)));+ }+}++// ── update_optimization ───────────────────────────────────────────────────────++void PortfolioFFNView::update_optimization() {+ auto opt_obj = ffn_data_["optimization"].toObject();+ if (opt_obj.isEmpty()) {+ opt_stack_->setCurrentIndex(0);+ return;+ }++ auto erc_obj = opt_obj["erc"].toObject();+ auto inv_obj = opt_obj["inv_vol"].toObject();+ auto equal_obj = opt_obj["equal"].toObject();+ auto current_obj = opt_obj["current"].toObject();+ auto stats_obj = opt_obj["stats"].toObject();++ // Collect symbols from the current weights object+ QStringList syms = current_obj.keys();+ syms.sort();- set(0, row.name, ui::colors::TEXT_SECONDARY);- set(1, row.value, row.color);- set(2, row.benchmark, ui::colors::TEXT_TERTIARY);+ // ── Weights table ─────────────────────────────────────────────────────────+ opt_weights_table_->setRowCount(syms.size());+ for (int r = 0; r < syms.size(); ++r) {+ const QString& sym = syms[r];+ opt_weights_table_->setRowHeight(r, 28);++ auto pct = [](double v) { return fmt(v * 100.0, 1) + "%"; };++ opt_weights_table_->setItem(+ r, 0, make_item(sym, Qt::AlignLeft | Qt::AlignVCenter,+ QColor(ui::colors::AMBER)));+ opt_weights_table_->setItem(+ r, 1, make_item(pct(current_obj[sym].toDouble()),+ Qt::AlignRight | Qt::AlignVCenter, QColor(ui::colors::CYAN)));+ opt_weights_table_->setItem(+ r, 2, make_item(pct(erc_obj[sym].toDouble()),+ Qt::AlignRight | Qt::AlignVCenter, QColor(ui::colors::TEXT_PRIMARY)));+ opt_weights_table_->setItem(+ r, 3, make_item(pct(inv_obj[sym].toDouble()),+ Qt::AlignRight | Qt::AlignVCenter, QColor(ui::colors::TEXT_PRIMARY)));+ opt_weights_table_->setItem(+ r, 4, make_item(pct(equal_obj[sym].toDouble()),+ Qt::AlignRight | Qt::AlignVCenter, QColor(ui::colors::TEXT_PRIMARY)));+ }++ // ── Stats table ───────────────────────────────────────────────────────────+ const QStringList strategy_keys = {"current", "erc", "inv_vol", "equal"};+ const QStringList strategy_names = {"CURRENT", "ERC", "INV-VOL", "EQUAL"};+ opt_stats_table_->setRowCount(strategy_keys.size());++ for (int r = 0; r < strategy_keys.size(); ++r) {+ const QString& key = strategy_keys[r];+ const QString& name = strategy_names[r];+ auto s = stats_obj[key].toObject();+ opt_stats_table_->setRowHeight(r, 28);++ double tr = s["total_return"].toDouble();+ double vol = s["volatility"].toDouble();+ double sh = s["sharpe"].toDouble();+ double dd = s["max_drawdown"].toDouble();++ opt_stats_table_->setItem(+ r, 0, make_item(name, Qt::AlignLeft | Qt::AlignVCenter,+ QColor(ui::colors::AMBER)));+ opt_stats_table_->setItem(+ r, 1, make_item(pct_str(tr),+ Qt::AlignRight | Qt::AlignVCenter,+ QColor(tr >= 0 ? ui::colors::POSITIVE : ui::colors::NEGATIVE)));+ opt_stats_table_->setItem(+ r, 2, make_item(pct_str(vol),+ Qt::AlignRight | Qt::AlignVCenter, QColor(ui::colors::CYAN)));+ opt_stats_table_->setItem(+ r, 3, make_item(fmt(sh),+ Qt::AlignRight | Qt::AlignVCenter,+ QColor(sh >= 0 ? ui::colors::POSITIVE : ui::colors::NEGATIVE)));+ opt_stats_table_->setItem(+ r, 4, make_item(pct_str(dd),+ Qt::AlignRight | Qt::AlignVCenter, QColor(ui::colors::NEGATIVE)));+ }++ opt_stack_->setCurrentIndex(1);+}++// ── update_rebased ────────────────────────────────────────────────────────────++void PortfolioFFNView::update_rebased() {+ auto rebased_obj = ffn_data_["rebased"].toObject();+ if (rebased_obj.isEmpty()) {+ rebased_stack_->setCurrentIndex(0);+ return;+ }++ QChart* chart = rebased_chart_view_->chart();+ chart->removeAllSeries();+ // Remove old axes+ const auto old_axes = chart->axes();+ for (auto* ax : old_axes)+ chart->removeAxis(ax);++ auto* x_axis = new QDateTimeAxis;+ x_axis->setFormat("MMM yy");+ x_axis->setTitleText("Date");+ x_axis->setLabelsColor(QColor(ui::colors::TEXT_SECONDARY));+ x_axis->setTitleBrush(QBrush(QColor(ui::colors::TEXT_TERTIARY)));+ x_axis->setGridLineColor(QColor(ui::colors::BORDER_DIM));+ x_axis->setLinePenColor(QColor(ui::colors::BORDER_MED));++ auto* y_axis = new QValueAxis;+ y_axis->setTitleText("Value (Base = 100)");+ y_axis->setLabelsColor(QColor(ui::colors::TEXT_SECONDARY));+ y_axis->setTitleBrush(QBrush(QColor(ui::colors::TEXT_TERTIARY)));+ y_axis->setGridLineColor(QColor(ui::colors::BORDER_DIM));+ y_axis->setLinePenColor(QColor(ui::colors::BORDER_MED));++ chart->addAxis(x_axis, Qt::AlignBottom);+ chart->addAxis(y_axis, Qt::AlignLeft);++ int color_idx = 0;+ QStringList syms = rebased_obj.keys();+ syms.sort();++ double y_min = 1e9, y_max = -1e9;+ qint64 x_min = std::numeric_limits<qint64>::max();+ qint64 x_max = std::numeric_limits<qint64>::min();++ for (const QString& sym : syms) {+ auto date_map = rebased_obj[sym].toObject();+ if (date_map.isEmpty())+ continue;++ auto* series = new QLineSeries;+ series->setName(sym);+ QColor col = series_color(color_idx++);+ series->setColor(col);+ series->setPen(QPen(col, 1.5));++ QStringList dates = date_map.keys();+ dates.sort();+ for (const QString& d : dates) {+ QDateTime dt = QDateTime::fromString(d, "yyyy-MM-dd");+ if (!dt.isValid())+ continue;+ double v = date_map[d].toDouble();+ qint64 ms = dt.toMSecsSinceEpoch();+ series->append(ms, v);+ x_min = std::min(x_min, ms);+ x_max = std::max(x_max, ms);+ y_min = std::min(y_min, v);+ y_max = std::max(y_max, v);+ }++ chart->addSeries(series);+ series->attachAxis(x_axis);+ series->attachAxis(y_axis);}++ if (x_min < x_max) {+ x_axis->setRange(QDateTime::fromMSecsSinceEpoch(x_min),+ QDateTime::fromMSecsSinceEpoch(x_max));+ }+ if (y_min < y_max) {+ double pad = (y_max - y_min) * 0.05;+ y_axis->setRange(y_min - pad, y_max + pad);+ }++ rebased_stack_->setCurrentIndex(1);}+// ── update_drawdowns ──────────────────────────────────────────────────────────++void PortfolioFFNView::update_drawdowns() {+ auto dd_obj = ffn_data_["drawdown_series"].toObject();+ if (dd_obj.isEmpty()) {+ drawdowns_stack_->setCurrentIndex(0);+ return;+ }++ QChart* chart = drawdowns_chart_view_->chart();+ chart->removeAllSeries();+ const auto old_axes = chart->axes();+ for (auto* ax : old_axes)+ chart->removeAxis(ax);++ auto* x_axis = new QDateTimeAxis;+ x_axis->setFormat("MMM yy");+ x_axis->setLabelsColor(QColor(ui::colors::TEXT_SECONDARY));+ x_axis->setTitleBrush(QBrush(QColor(ui::colors::TEXT_TERTIARY)));+ x_axis->setGridLineColor(QColor(ui::colors::BORDER_DIM));+ x_axis->setLinePenColor(QColor(ui::colors::BORDER_MED));++ auto* y_axis = new QValueAxis;+ y_axis->setTitleText("Drawdown");+ y_axis->setLabelsColor(QColor(ui::colors::TEXT_SECONDARY));+ y_axis->setTitleBrush(QBrush(QColor(ui::colors::TEXT_TERTIARY)));+ y_axis->setGridLineColor(QColor(ui::colors::BORDER_DIM));+ y_axis->setLinePenColor(QColor(ui::colors::BORDER_MED));++ auto* label_format_axis = y_axis;+ Q_UNUSED(label_format_axis);++ chart->addAxis(x_axis, Qt::AlignBottom);+ chart->addAxis(y_axis, Qt::AlignLeft);++ int color_idx = 0;+ QStringList syms = dd_obj.keys();+ syms.sort();++ double y_min = 0.0;+ qint64 x_min = std::numeric_limits<qint64>::max();+ qint64 x_max = std::numeric_limits<qint64>::min();++ for (const QString& sym : syms) {+ auto date_map = dd_obj[sym].toObject();+ if (date_map.isEmpty())+ continue;++ // Upper boundary line at 0+ auto* upper = new QLineSeries;+ // Drawdown line (actual values, negative fractions)+ auto* lower = new QLineSeries;+ lower->setName(sym);++ QColor col = series_color(color_idx++);++ QStringList dates = date_map.keys();+ dates.sort();+ for (const QString& d : dates) {+ QDateTime dt = QDateTime::fromString(d, "yyyy-MM-dd");+ if (!dt.isValid())+ continue;+ double v = date_map[d].toDouble();+ qint64 ms = dt.toMSecsSinceEpoch();+ upper->append(ms, 0.0);+ lower->append(ms, v * 100.0); // convert fraction to percent+ x_min = std::min(x_min, ms);+ x_max = std::max(x_max, ms);+ y_min = std::min(y_min, v * 100.0);+ }++ auto* area = new QAreaSeries(upper, lower);+ area->setName(sym);+ QColor fill_col = col;+ fill_col.setAlpha(60);+ area->setBrush(fill_col);+ area->setPen(QPen(col, 1.2));++ chart->addSeries(area);+ area->attachAxis(x_axis);+ area->attachAxis(y_axis);+ }++ if (x_min < x_max) {+ x_axis->setRange(QDateTime::fromMSecsSinceEpoch(x_min),+ QDateTime::fromMSecsSinceEpoch(x_max));+ }+ double pad = std::abs(y_min) * 0.05;+ y_axis->setRange(y_min - pad, 2.0);++ drawdowns_stack_->setCurrentIndex(1);+}++// ── update_rolling ────────────────────────────────────────────────────────────++void PortfolioFFNView::update_rolling() {+ auto rc_obj = ffn_data_["rolling_corr"].toObject();+ if (rc_obj.isEmpty()) {+ rolling_stack_->setCurrentIndex(0);+ return;+ }++ QChart* chart = rolling_chart_view_->chart();+ chart->removeAllSeries();+ const auto old_axes = chart->axes();+ for (auto* ax : old_axes)+ chart->removeAxis(ax);++ auto* x_axis = new QDateTimeAxis;+ x_axis->setFormat("MMM yy");+ x_axis->setLabelsColor(QColor(ui::colors::TEXT_SECONDARY));+ x_axis->setTitleBrush(QBrush(QColor(ui::colors::TEXT_TERTIARY)));+ x_axis->setGridLineColor(QColor(ui::colors::BORDER_DIM));+ x_axis->setLinePenColor(QColor(ui::colors::BORDER_MED));++ auto* y_axis = new QValueAxis;+ y_axis->setTitleText("Correlation");+ y_axis->setRange(-1.0, 1.0);+ y_axis->setLabelsColor(QColor(ui::colors::TEXT_SECONDARY));+ y_axis->setTitleBrush(QBrush(QColor(ui::colors::TEXT_TERTIARY)));+ y_axis->setGridLineColor(QColor(ui::colors::BORDER_DIM));+ y_axis->setLinePenColor(QColor(ui::colors::BORDER_MED));++ chart->addAxis(x_axis, Qt::AlignBottom);+ chart->addAxis(y_axis, Qt::AlignLeft);++ int color_idx = 0;+ QStringList pairs = rc_obj.keys();+ pairs.sort();++ qint64 x_min = std::numeric_limits<qint64>::max();+ qint64 x_max = std::numeric_limits<qint64>::min();++ for (const QString& pair : pairs) {+ auto date_map = rc_obj[pair].toObject();+ if (date_map.isEmpty())+ continue;++ auto* series = new QLineSeries;+ series->setName(pair);+ QColor col = series_color(color_idx++);+ series->setColor(col);+ series->setPen(QPen(col, 1.5));++ QStringList dates = date_map.keys();+ dates.sort();+ for (const QString& d : dates) {+ QDateTime dt = QDateTime::fromString(d, "yyyy-MM-dd");+ if (!dt.isValid())+ continue;+ double v = date_map[d].toDouble();+ qint64 ms = dt.toMSecsSinceEpoch();+ series->append(ms, v);+ x_min = std::min(x_min, ms);+ x_max = std::max(x_max, ms);+ }++ chart->addSeries(series);+ series->attachAxis(x_axis);+ series->attachAxis(y_axis);+ }++ if (x_min < x_max) {+ x_axis->setRange(QDateTime::fromMSecsSinceEpoch(x_min),+ QDateTime::fromMSecsSinceEpoch(x_max));+ }++ rolling_stack_->setCurrentIndex(1);+}++// ── run_ffn ───────────────────────────────────────────────────────────────────+void PortfolioFFNView::run_ffn() {if (summary_.holdings.isEmpty())return;run_btn_->setEnabled(false);status_label_->setText("Running FFN analysis...");- status_label_->setStyleSheet(QString("color:%1; font-size:9px;").arg(ui::colors::AMBER));+ status_label_->setStyleSheet(+ QString("color:%1; font-size:9px;").arg(ui::colors::AMBER));QStringList symbols;- for (const auto& h : summary_.holdings)+ QJsonObject weights_obj;+ for (const auto& h : summary_.holdings) {symbols.append(h.symbol);+ weights_obj[h.symbol] = h.weight / 100.0;+ }QJsonObject args;args["symbols"] = QJsonArray::fromStringList(symbols);+ args["weights"] = weights_obj;QString args_str = QJsonDocument(args).toJson(QJsonDocument::Compact);QPointer<PortfolioFFNView> self = this;@@ -295,6 +977,7 @@ void PortfolioFFNView::run_ffn() {QMetaObject::invokeMethod(self, [self, result]() {if (!self)return;+self->run_btn_->setEnabled(true);if (!result.success || result.output.trimmed().isEmpty()) {@@ -310,15 +993,38 @@ void PortfolioFFNView::run_ffn() {self->status_label_->setText("FFN returned invalid JSON");self->status_label_->setStyleSheet(QString("color:%1; font-size:9px;").arg(ui::colors::NEGATIVE));+ LOG_ERROR("FFNView", "FFN JSON parse failed");return;}self->ffn_data_ = doc.object();++ // Count only per-symbol keys (exclude the section keys)+ static const QStringList k_section_keys = {+ "rebased", "drawdown_series", "rolling_corr", "optimization", "error"+ };+ int sym_count = 0;+ for (const auto& k : self->ffn_data_.keys())+ if (!k_section_keys.contains(k))+ ++sym_count;+self->status_label_->setText(- QString("FFN complete — %1 symbols").arg(self->ffn_data_.keys().size()));+ QString("FFN complete — %1 symbol%2")+ .arg(sym_count)+ .arg(sym_count != 1 ? "s" : ""));self->status_label_->setStyleSheet(QString("color:%1; font-size:9px;").arg(ui::colors::POSITIVE));++ LOG_INFO("FFNView",+ QString("FFN analysis complete for %1 symbol(s)").arg(sym_count));+self->update_overview();+ self->update_benchmark();+ self->update_optimization();+ self->update_rebased();+ self->update_drawdowns();+ self->update_rolling();+}, Qt::QueuedConnection);});}diff --git a/fincept-qt/src/screens/portfolio/PortfolioFFNView.h b/fincept-qt/src/screens/portfolio/PortfolioFFNView.hindex 9df758ae4..aac88c204 100644--- a/fincept-qt/src/screens/portfolio/PortfolioFFNView.h+++ b/fincept-qt/src/screens/portfolio/PortfolioFFNView.h@@ -2,18 +2,26 @@#pragma once#include "screens/portfolio/PortfolioTypes.h"+#include <QAreaSeries>+#include <QChart>#include <QChartView>+#include <QDateTimeAxis>#include <QJsonObject>#include <QLabel>+#include <QLineSeries>#include <QPointer>#include <QPushButton>+#include <QStackedWidget>#include <QTabWidget>#include <QTableWidget>+#include <QValueAxis>#include <QWidget>+QT_CHARTS_USE_NAMESPACE+namespace fincept::screens {-/// FFN (Full Financial Networks) analytics view with 6 sub-tabs.+/// FFN (Financial Functions) analytics view with 6 sub-tabs./// Uses Python ffn library via PythonRunner for calculations.class PortfolioFFNView : public QWidget {Q_OBJECT@@ -27,30 +35,60 @@ class PortfolioFFNView : public QWidget {private:void build_ui();++ // Per-tab update methodsvoid update_overview();+ void update_benchmark();+ void update_optimization();+ void update_rebased();+ void update_drawdowns();+ void update_rolling();+void run_ffn();+ /// Creates a dark-themed QChartView with an amber title.+ QChartView* make_chart_view(const QString& title);++ // ── Header ────────────────────────────────────────────────────────────────+ QPushButton* back_btn_ = nullptr;+ QPushButton* run_btn_ = nullptr;+ QLabel* status_label_ = nullptr;++ // ── Tab container ─────────────────────────────────────────────────────────QTabWidget* tabs_ = nullptr;- // Overview tab+ // ── Overview tab ──────────────────────────────────────────────────────────QTableWidget* overview_table_ = nullptr;- // Benchmark tab- QWidget* benchmark_panel_ = nullptr;+ // ── Benchmark tab ─────────────────────────────────────────────────────────+ QWidget* benchmark_panel_ = nullptr;+ QTableWidget* benchmark_table_ = nullptr;+ QLabel* benchmark_info_label_ = nullptr;- // Other tabs- QWidget* optimization_panel_ = nullptr;- QWidget* rebased_panel_ = nullptr;- QWidget* drawdowns_panel_ = nullptr;- QWidget* rolling_panel_ = nullptr;+ // ── Optimisation tab ──────────────────────────────────────────────────────+ QWidget* optimization_panel_ = nullptr;+ QStackedWidget* opt_stack_ = nullptr; // 0=placeholder, 1=tables+ QTableWidget* opt_weights_table_ = nullptr;+ QTableWidget* opt_stats_table_ = nullptr;- // Header widgets- QPushButton* back_btn_ = nullptr;- QPushButton* run_btn_ = nullptr;- QLabel* status_label_ = nullptr;+ // ── Rebased tab ───────────────────────────────────────────────────────────+ QWidget* rebased_panel_ = nullptr;+ QStackedWidget* rebased_stack_ = nullptr; // 0=placeholder, 1=chart+ QChartView* rebased_chart_view_ = nullptr;++ // ── Drawdowns tab ─────────────────────────────────────────────────────────+ QWidget* drawdowns_panel_ = nullptr;+ QStackedWidget* drawdowns_stack_ = nullptr;+ QChartView* drawdowns_chart_view_ = nullptr;++ // ── Rolling correlations tab ──────────────────────────────────────────────+ QWidget* rolling_panel_ = nullptr;+ QStackedWidget* rolling_stack_ = nullptr;+ QChartView* rolling_chart_view_ = nullptr;+ // ── State ─────────────────────────────────────────────────────────────────portfolio::PortfolioSummary summary_;- QString currency_;+ QString currency_;QJsonObject ffn_data_;};diff --git a/fincept-qt/src/screens/portfolio/PortfolioHeatmap.cpp b/fincept-qt/src/screens/portfolio/PortfolioHeatmap.cppindex 3c80e855f..279459d16 100644--- a/fincept-qt/src/screens/portfolio/PortfolioHeatmap.cpp+++ b/fincept-qt/src/screens/portfolio/PortfolioHeatmap.cpp@@ -207,16 +207,26 @@ QColor PortfolioHeatmap::block_color(const portfolio::HoldingWithQuote& h) const}if (mode_ == portfolio::HeatmapMode::Weight) {- // Amber gradient by weight- int alpha = static_cast<int>(std::min(val / 50.0, 1.0) * 180) + 30;- return QColor(217, 119, 6, alpha); // amber+ // Amber: darker base, brighter at higher weights+ double t = std::min(val / 40.0, 1.0);+ int r = static_cast<int>(100 + t * 117); // 100 → 217+ int g = static_cast<int>(50 + t * 69); // 50 → 119+ int b = static_cast<int>(6);+ return QColor(r, g, b);}- // Green/Red gradient by value- double intensity = std::min(std::abs(val) / 10.0, 1.0);- int alpha = static_cast<int>(intensity * 160) + 40;- return val >= 0 ? QColor(22, 163, 74, alpha) // green- : QColor(220, 38, 38, alpha); // red+ // Green/Red: solid colors, brightness scales with magnitude+ double intensity = std::min(std::abs(val) / 20.0, 1.0); // saturates at ±20%+ if (val >= 0) {+ // Dark green → bright green+ int g = static_cast<int>(80 + intensity * 123); // 80 → 203+ int r = static_cast<int>(intensity * 22);+ return QColor(r, g, static_cast<int>(intensity * 30));+ } else {+ // Dark red → bright red+ int r = static_cast<int>(100 + intensity * 120); // 100 → 220+ return QColor(r, static_cast<int>(intensity * 20), static_cast<int>(intensity * 20));+ }}void PortfolioHeatmap::rebuild_blocks() {@@ -248,13 +258,13 @@ void PortfolioHeatmap::rebuild_blocks() {QString border_style = selected ? QString("border:2px solid %1;").arg(ui::colors::AMBER): QString("border:1px solid %1;").arg(ui::colors::BORDER_DIM);- block->setStyleSheet(QString("QPushButton { background:rgba(%1,%2,%3,%4); %5"- " text-align:left; padding:4px 6px; }"- "QPushButton:hover { border-color:%6; }")+ block->setStyleSheet(QString("QPushButton { background:rgb(%1,%2,%3); %4"+ " text-align:left; padding:4px 6px;"+ " color:#ffffff; font-size:9px; font-weight:700; }"+ "QPushButton:hover { border-color:%5; }").arg(bg.red()).arg(bg.green()).arg(bg.blue())- .arg(bg.alpha()).arg(border_style, ui::colors::AMBER));// Contentdiff --git a/fincept-qt/src/screens/portfolio/PortfolioPerfChart.cpp b/fincept-qt/src/screens/portfolio/PortfolioPerfChart.cppindex 2f334dac8..a31585c49 100644--- a/fincept-qt/src/screens/portfolio/PortfolioPerfChart.cpp+++ b/fincept-qt/src/screens/portfolio/PortfolioPerfChart.cpp@@ -110,6 +110,11 @@ void PortfolioPerfChart::set_summary(const portfolio::PortfolioSummary& summary)update_chart();}+void PortfolioPerfChart::set_snapshots(const QVector<portfolio::PortfolioSnapshot>& snapshots) {+ snapshots_ = snapshots;+ update_chart();+}+void PortfolioPerfChart::set_currency(const QString& currency) {currency_ = currency;}@@ -129,7 +134,6 @@ void PortfolioPerfChart::update_chart() {auto* chart = chart_view_->chart();chart->removeAllSeries();- // Remove and delete old axes (removeAxis doesn't delete)const auto old_axes = chart->axes();for (auto* axis : old_axes) {chart->removeAxis(axis);@@ -143,59 +147,122 @@ void PortfolioPerfChart::update_chart() {return;}- // Build a simple value series: cost basis -> current value- // Real historical data would come from snapshots; for now use a synthetic curve- auto* line = new QLineSeries;+ // ── Determine cutoff date from selected period ────────────────────────────+ QDate cutoff = QDate::currentDate();+ if (current_period_ == "1D") cutoff = cutoff.addDays(-1);+ else if (current_period_ == "1W") cutoff = cutoff.addDays(-7);+ else if (current_period_ == "1M") cutoff = cutoff.addMonths(-1);+ else if (current_period_ == "3M") cutoff = cutoff.addMonths(-3);+ else if (current_period_ == "YTD") cutoff = QDate(QDate::currentDate().year(), 1, 1);+ else if (current_period_ == "1Y") cutoff = cutoff.addYears(-1);+ else cutoff = cutoff.addYears(-10); // ALL++ // ── Filter snapshots by period ────────────────────────────────────────────+ QVector<portfolio::PortfolioSnapshot> filtered;+ for (const auto& s : snapshots_) {+ QDate d = QDate::fromString(s.snapshot_date.left(10), Qt::ISODate);+ if (d.isValid() && d >= cutoff)+ filtered.append(s);+ }++ // Sort ascending by date+ std::sort(filtered.begin(), filtered.end(), [](const auto& a, const auto& b) {+ return a.snapshot_date < b.snapshot_date;+ });++ // ── Build chart series ────────────────────────────────────────────────────+ auto* line = new QLineSeries;auto* area_upper = new QLineSeries;+ auto* area_lower = new QLineSeries;- double cost = summary_.total_cost_basis;- double current = summary_.total_market_value;- int points = 30; // synthetic data points-- QDateTime now = QDateTime::currentDateTime();- for (int i = 0; i < points; ++i) {- double t = static_cast<double>(i) / (points - 1);- double val = cost + (current - cost) * t;- // Add a bit of variation- double noise = (i % 3 == 0) ? -0.005 : (i % 3 == 1) ? 0.003 : 0;- val *= (1.0 + noise);-- qint64 ms = now.addDays(-(points - 1 - i)).toMSecsSinceEpoch();- line->append(ms, val);- area_upper->append(ms, val);+ double first_val = 0;+ double last_val = summary_.total_market_value;+ double min_val = last_val;+ double max_val = last_val;++ if (filtered.size() >= 2) {+ // Real snapshot data+ first_val = filtered.first().total_value;+ for (const auto& s : filtered) {+ QDateTime dt = QDateTime::fromString(s.snapshot_date.left(10), Qt::ISODate);+ if (!dt.isValid())+ dt = QDateTime::currentDateTime();+ qint64 ms = dt.toMSecsSinceEpoch();+ line->append(ms, s.total_value);+ area_upper->append(ms, s.total_value);+ area_lower->append(ms, first_val); // baseline = starting value+ min_val = std::min(min_val, s.total_value);+ max_val = std::max(max_val, s.total_value);+ }+ // Append current live value at now+ qint64 now_ms = QDateTime::currentDateTime().toMSecsSinceEpoch();+ line->append(now_ms, last_val);+ area_upper->append(now_ms, last_val);+ area_lower->append(now_ms, first_val);+ min_val = std::min(min_val, last_val);+ max_val = std::max(max_val, last_val);+ } else {+ // Fallback: synthesise from cost → current over period days+ double cost = summary_.total_cost_basis;+ first_val = cost;+ int days = cutoff.daysTo(QDate::currentDate());+ if (days < 2) days = 30;+ int pts = std::min(days, 60);+ QDateTime now = QDateTime::currentDateTime();+ for (int i = 0; i < pts; ++i) {+ double t = static_cast<double>(i) / (pts - 1);+ double val = cost + (last_val - cost) * t;+ double noise = (i % 5 == 0) ? -0.004 : (i % 5 == 2) ? 0.003 : 0;+ val *= (1.0 + noise);+ qint64 ms = now.addDays(-(pts - 1 - i)).toMSecsSinceEpoch();+ line->append(ms, val);+ area_upper->append(ms, val);+ area_lower->append(ms, cost);+ min_val = std::min(min_val, val);+ max_val = std::max(max_val, val);+ }}- QColor lc = chart_color();+ // ── Period P&L from the series endpoints ─────────────────────────────────+ double period_pnl = last_val - first_val;+ double period_pnl_pct = (first_val > 0) ? (period_pnl / first_val) * 100.0 : 0;++ QColor lc = period_pnl >= 0 ? QColor(ui::colors::POSITIVE) : QColor(ui::colors::NEGATIVE);QPen pen(lc, 2);line->setPen(pen);- // Area fill- auto* area_lower = new QLineSeries;- for (int i = 0; i < points; ++i) {- area_lower->append(line->at(i).x(), 0);- }-auto* area = new QAreaSeries(area_upper, area_lower);QColor fill = lc;- fill.setAlpha(30);+ fill.setAlpha(35);area->setBrush(fill);area->setPen(Qt::NoPen);chart->addSeries(area);chart->addSeries(line);- // Axes+ // ── Axes ──────────────────────────────────────────────────────────────────auto* x_axis = new QDateTimeAxis;- x_axis->setFormat("MMM dd");+ if (current_period_ == "1D" || current_period_ == "1W")+ x_axis->setFormat("MMM dd");+ else if (current_period_ == "ALL" || current_period_ == "1Y")+ x_axis->setFormat("MMM yy");+ else+ x_axis->setFormat("dd MMM");+ x_axis->setTickCount(5);x_axis->setLabelsColor(QColor(ui::colors::TEXT_TERTIARY));x_axis->setGridLineColor(QColor(ui::colors::BORDER_DIM));- x_axis->setLinePenColor(QColor(ui::colors::BORDER_DIM));+ x_axis->setLinePen(QPen(QColor(ui::colors::BORDER_DIM)));+ x_axis->setLabelsFont(QFont("monospace", 7));+ double padding = std::max((max_val - min_val) * 0.08, max_val * 0.01);auto* y_axis = new QValueAxis;+ y_axis->setRange(min_val - padding, max_val + padding);y_axis->setLabelFormat("%.0f");+ y_axis->setTickCount(4);y_axis->setLabelsColor(QColor(ui::colors::TEXT_TERTIARY));y_axis->setGridLineColor(QColor(ui::colors::BORDER_DIM));- y_axis->setLinePenColor(QColor(ui::colors::BORDER_DIM));+ y_axis->setLinePen(QPen(QColor(ui::colors::BORDER_DIM)));+ y_axis->setLabelsFont(QFont("monospace", 7));chart->addAxis(x_axis, Qt::AlignBottom);chart->addAxis(y_axis, Qt::AlignLeft);@@ -204,19 +271,28 @@ void PortfolioPerfChart::update_chart() {area->attachAxis(x_axis);area->attachAxis(y_axis);- // Update info labels- double pnl_pct = summary_.total_unrealized_pnl_percent;- const char* pnl_color = pnl_pct >= 0 ? ui::colors::POSITIVE : ui::colors::NEGATIVE;+ // ── Info labels ───────────────────────────────────────────────────────────+ const char* pnl_color = period_pnl_pct >= 0 ? ui::colors::POSITIVE : ui::colors::NEGATIVE;period_change_label_->setText(- QString("PERIOD %1%2%").arg(pnl_pct >= 0 ? "+" : "").arg(QString::number(pnl_pct, 'f', 2)));- period_change_label_->setStyleSheet(QString("color:%1; font-size:11px; font-weight:600;").arg(pnl_color));+ QString("%1 %2%3%")+ .arg(current_period_)+ .arg(period_pnl_pct >= 0 ? "+" : "")+ .arg(QString::number(period_pnl_pct, 'f', 2)));+ period_change_label_->setStyleSheet(+ QString("color:%1; font-size:11px; font-weight:600;").arg(pnl_color));+ double total_pnl_pct = summary_.total_unrealized_pnl_percent;+ const char* total_color = total_pnl_pct >= 0 ? ui::colors::POSITIVE : ui::colors::NEGATIVE;total_return_label_->setText(- QString("TOTAL RETURN %1%2%").arg(pnl_pct >= 0 ? "+" : "").arg(QString::number(pnl_pct, 'f', 2)));- total_return_label_->setStyleSheet(QString("color:%1; font-size:14px; font-weight:700;").arg(pnl_color));+ QString("TOTAL %1%2%")+ .arg(total_pnl_pct >= 0 ? "+" : "")+ .arg(QString::number(total_pnl_pct, 'f', 2)));+ total_return_label_->setStyleSheet(+ QString("color:%1; font-size:14px; font-weight:700;").arg(total_color));- nav_label_->setText(QString("NAV %1 %2").arg(currency_).arg(QString::number(summary_.total_market_value, 'f', 2)));+ nav_label_->setText(+ QString("NAV %1 %2").arg(currency_).arg(QString::number(last_val, 'f', 2)));}} // namespace fincept::screensdiff --git a/fincept-qt/src/screens/portfolio/PortfolioPerfChart.h b/fincept-qt/src/screens/portfolio/PortfolioPerfChart.hindex 221df8374..2c0890fd6 100644--- a/fincept-qt/src/screens/portfolio/PortfolioPerfChart.h+++ b/fincept-qt/src/screens/portfolio/PortfolioPerfChart.h@@ -16,6 +16,7 @@ class PortfolioPerfChart : public QWidget {explicit PortfolioPerfChart(QWidget* parent = nullptr);void set_summary(const portfolio::PortfolioSummary& summary);+ void set_snapshots(const QVector<portfolio::PortfolioSnapshot>& snapshots);void set_currency(const QString& currency);private:@@ -38,6 +39,7 @@ class PortfolioPerfChart : public QWidget {// Dataportfolio::PortfolioSummary summary_;+ QVector<portfolio::PortfolioSnapshot> snapshots_;QString currency_ = "USD";};diff --git a/fincept-qt/src/screens/portfolio/PortfolioScreen.cpp b/fincept-qt/src/screens/portfolio/PortfolioScreen.cppindex d26aa6c7a..7eb8fed9d 100644--- a/fincept-qt/src/screens/portfolio/PortfolioScreen.cpp+++ b/fincept-qt/src/screens/portfolio/PortfolioScreen.cpp@@ -41,6 +41,7 @@ PortfolioScreen::PortfolioScreen(QWidget* parent) : QWidget(parent) {connect(&svc, &services::PortfolioService::portfolio_deleted, this, &PortfolioScreen::on_portfolio_deleted);connect(&svc, &services::PortfolioService::asset_added, this, &PortfolioScreen::on_asset_changed);connect(&svc, &services::PortfolioService::asset_sold, this, &PortfolioScreen::on_asset_changed);+ connect(&svc, &services::PortfolioService::snapshots_loaded, this, &PortfolioScreen::on_snapshots_loaded);// Refresh timer (P3: only set interval, don't start)refresh_timer_ = new QTimer(this);@@ -386,6 +387,9 @@ void PortfolioScreen::on_summary_loaded(portfolio::PortfolioSummary summary) {// Trigger metrics computationservices::PortfolioService::instance().compute_metrics(summary);++ // Load performance history for the chart+ services::PortfolioService::instance().load_snapshots(summary.portfolio.id);}void PortfolioScreen::on_summary_error(QString portfolio_id, QString error) {@@ -403,6 +407,16 @@ void PortfolioScreen::on_metrics_computed(portfolio::ComputedMetrics metrics) {heatmap_->set_metrics(metrics);}+void PortfolioScreen::on_snapshots_loaded(QString portfolio_id,+ QVector<portfolio::PortfolioSnapshot> snapshots) {+ if (portfolio_id != selected_id_)+ return;+ if (perf_chart_)+ perf_chart_->set_snapshots(snapshots);+ if (detail_wrapper_)+ detail_wrapper_->update_snapshots(snapshots);+}+void PortfolioScreen::on_portfolio_created(portfolio::Portfolio portfolio) {// Auto-select the newly created portfolioon_portfolio_selected(portfolio.id);diff --git a/fincept-qt/src/screens/portfolio/PortfolioScreen.h b/fincept-qt/src/screens/portfolio/PortfolioScreen.hindex 0c4dde33d..8502e1853 100644--- a/fincept-qt/src/screens/portfolio/PortfolioScreen.h+++ b/fincept-qt/src/screens/portfolio/PortfolioScreen.h@@ -38,6 +38,7 @@ class PortfolioScreen : public QWidget {void on_summary_loaded(portfolio::PortfolioSummary summary);void on_summary_error(QString portfolio_id, QString error);void on_metrics_computed(portfolio::ComputedMetrics metrics);+ void on_snapshots_loaded(QString portfolio_id, QVector<portfolio::PortfolioSnapshot> snapshots);void on_portfolio_created(portfolio::Portfolio portfolio);void on_portfolio_deleted(QString id);void on_asset_changed(QString portfolio_id);diff --git a/fincept-qt/src/screens/portfolio/PortfolioSectorPanel.cpp b/fincept-qt/src/screens/portfolio/PortfolioSectorPanel.cppindex f039a461b..11a64a9f2 100644--- a/fincept-qt/src/screens/portfolio/PortfolioSectorPanel.cpp+++ b/fincept-qt/src/screens/portfolio/PortfolioSectorPanel.cpp@@ -11,63 +11,220 @@#include <algorithm>#include <cmath>+#include <numeric>namespace fincept::screens {-// 16 sector colors matching Tauri palette+// 16 sector colorsstatic const QColor kSectorColors[] = {- QColor("#0891b2"), // Technology / Cyan- QColor("#16a34a"), // Healthcare / Green- QColor("#d97706"), // Financial Services / Orange- QColor("#ca8a04"), // Energy / Gold- QColor("#9333ea"), // Consumer Cyclical / Purple- QColor("#84cc16"), // Real Estate / Lime- QColor("#0d9488"), // Utilities / Teal- QColor("#f97316"), // Cryptocurrency / Orange- QColor("#60a5fa"), // Communication / Light Blue- QColor("#f43f5e"), // Consumer Defensive / Rose- QColor("#a78bfa"), // Industrials / Violet- QColor("#fbbf24"), // Basic Materials / Amber- QColor("#2dd4bf"), // Bonds / Teal Light- QColor("#fb923c"), // Commodities / Orange Light- QColor("#818cf8"), // Other / Indigo- QColor("#e879f9"), // Unknown / Fuchsia+ QColor("#0891b2"), // Technology+ QColor("#16a34a"), // Healthcare+ QColor("#d97706"), // Financial Services+ QColor("#ca8a04"), // Energy+ QColor("#9333ea"), // Consumer Cyclical+ QColor("#84cc16"), // Real Estate+ QColor("#0d9488"), // Utilities+ QColor("#f97316"), // Cryptocurrency+ QColor("#60a5fa"), // Communication+ QColor("#f43f5e"), // Consumer Defensive+ QColor("#a78bfa"), // Industrials+ QColor("#fbbf24"), // Basic Materials+ QColor("#2dd4bf"), // Bonds / Fixed Income+ QColor("#fb923c"), // Commodities+ QColor("#818cf8"), // ETF / Index+ QColor("#e879f9"), // Unknown};QColor PortfolioSectorPanel::sector_color(int index) {return kSectorColors[index % 16];}-// Simple sector inference from symbol (placeholder — real mapping would use a service)-QString PortfolioSectorPanel::infer_sector(const QString& symbol) {+QString PortfolioSectorPanel::infer_sector(const QString& sym) {+ const QString s = sym.toUpper();++ // ── Exact symbol map (300+ common tickers) ───────────────────────────────static const QHash<QString, QString> known = {- {"AAPL", "Technology"},- {"MSFT", "Technology"},- {"GOOGL", "Technology"},- {"AMZN", "Technology"},- {"NVDA", "Technology"},- {"META", "Technology"},- {"TSLA", "Consumer Cyclical"},- {"JPM", "Financial Services"},- {"JNJ", "Healthcare"},- {"UNH", "Healthcare"},- {"PFE", "Healthcare"},- {"XOM", "Energy"},- {"CVX", "Energy"},- {"BRK-B", "Financial Services"},- {"V", "Financial Services"},- {"MA", "Financial Services"},- {"WMT", "Consumer Defensive"},- {"PG", "Consumer Defensive"},- {"DIS", "Communication"},- {"NFLX", "Communication"},- {"SPY", "US Equity"},- {"QQQ", "US Equity"},- {"BTC-USD", "Cryptocurrency"},- {"ETH-USD", "Cryptocurrency"},+ // Technology+ {"AAPL","Technology"},{"MSFT","Technology"},{"GOOGL","Technology"},{"GOOG","Technology"},+ {"AMZN","Technology"},{"NVDA","Technology"},{"META","Technology"},{"AVGO","Technology"},+ {"ORCL","Technology"},{"CRM","Technology"},{"ADBE","Technology"},{"CSCO","Technology"},+ {"AMD","Technology"},{"INTC","Technology"},{"QCOM","Technology"},{"TXN","Technology"},+ {"IBM","Technology"},{"AMAT","Technology"},{"MU","Technology"},{"LRCX","Technology"},+ {"KLAC","Technology"},{"SNPS","Technology"},{"CDNS","Technology"},{"ADI","Technology"},+ {"MCHP","Technology"},{"NXPI","Technology"},{"STX","Technology"},{"WDC","Technology"},+ {"HPQ","Technology"},{"DELL","Technology"},{"ACN","Technology"},{"INTU","Technology"},+ {"NOW","Technology"},{"SNOW","Technology"},{"DDOG","Technology"},{"ZS","Technology"},+ {"CRWD","Technology"},{"PANW","Technology"},{"FTNT","Technology"},{"NET","Technology"},+ {"OKTA","Technology"},{"MDB","Technology"},{"TEAM","Technology"},{"ATLASSIAN","Technology"},+ {"SHOP","Technology"},{"UBER","Technology"},{"LYFT","Technology"},{"ABNB","Technology"},+ {"PLTR","Technology"},{"RBLX","Technology"},{"U","Technology"},{"TWLO","Technology"},+ {"ZM","Technology"},{"DOCUSIGN","Technology"},{"COIN","Technology"},{"HOOD","Technology"},+ {"APP","Technology"},{"APPF","Technology"},{"GTLB","Technology"},{"PATH","Technology"},+ // Communication+ {"NFLX","Communication"},{"DIS","Communication"},{"CMCSA","Communication"},+ {"T","Communication"},{"VZ","Communication"},{"TMUS","Communication"},+ {"CHTR","Communication"},{"WBD","Communication"},{"PARA","Communication"},+ {"FOXA","Communication"},{"FOX","Communication"},{"MTCH","Communication"},+ {"PINS","Communication"},{"SNAP","Communication"},{"RDDT","Communication"},+ {"SPOT","Communication"},{"LYV","Communication"},{"WMG","Communication"},+ // Consumer Cyclical+ {"TSLA","Consumer Cyclical"},{"AMZN","Consumer Cyclical"},+ {"HD","Consumer Cyclical"},{"LOW","Consumer Cyclical"},{"TGT","Consumer Cyclical"},+ {"BKNG","Consumer Cyclical"},{"MAR","Consumer Cyclical"},{"HLT","Consumer Cyclical"},+ {"GM","Consumer Cyclical"},{"F","Consumer Cyclical"},{"STLA","Consumer Cyclical"},+ {"NKE","Consumer Cyclical"},{"SBUX","Consumer Cyclical"},{"MCD","Consumer Cyclical"},+ {"YUM","Consumer Cyclical"},{"CMG","Consumer Cyclical"},{"DPZ","Consumer Cyclical"},+ {"ROST","Consumer Cyclical"},{"TJX","Consumer Cyclical"},{"EBAY","Consumer Cyclical"},+ {"ETSY","Consumer Cyclical"},{"W","Consumer Cyclical"},{"RH","Consumer Cyclical"},+ {"DHI","Consumer Cyclical"},{"LEN","Consumer Cyclical"},{"PHM","Consumer Cyclical"},+ {"TOL","Consumer Cyclical"},{"MGM","Consumer Cyclical"},{"WYNN","Consumer Cyclical"},+ {"LVS","Consumer Cyclical"},{"CCL","Consumer Cyclical"},{"RCL","Consumer Cyclical"},+ {"NCLH","Consumer Cyclical"},{"UAL","Consumer Cyclical"},{"DAL","Consumer Cyclical"},+ {"AAL","Consumer Cyclical"},{"LUV","Consumer Cyclical"},{"EXPE","Consumer Cyclical"},+ // Consumer Defensive+ {"WMT","Consumer Defensive"},{"PG","Consumer Defensive"},{"KO","Consumer Defensive"},+ {"PEP","Consumer Defensive"},{"COST","Consumer Defensive"},{"PM","Consumer Defensive"},+ {"MO","Consumer Defensive"},{"MDLZ","Consumer Defensive"},{"KHC","Consumer Defensive"},+ {"GIS","Consumer Defensive"},{"K","Consumer Defensive"},{"CPB","Consumer Defensive"},+ {"SJM","Consumer Defensive"},{"HSY","Consumer Defensive"},{"CAG","Consumer Defensive"},+ {"CL","Consumer Defensive"},{"CHD","Consumer Defensive"},{"KMB","Consumer Defensive"},+ {"EL","Consumer Defensive"},{"ULTA","Consumer Defensive"},+ // Healthcare+ {"JNJ","Healthcare"},{"UNH","Healthcare"},{"LLY","Healthcare"},{"ABBV","Healthcare"},+ {"MRK","Healthcare"},{"PFE","Healthcare"},{"TMO","Healthcare"},{"ABT","Healthcare"},+ {"DHR","Healthcare"},{"BMY","Healthcare"},{"AMGN","Healthcare"},{"GILD","Healthcare"},+ {"ISRG","Healthcare"},{"SYK","Healthcare"},{"BSX","Healthcare"},{"MDT","Healthcare"},+ {"BDX","Healthcare"},{"EW","Healthcare"},{"DXCM","Healthcare"},{"ALGN","Healthcare"},+ {"HCA","Healthcare"},{"HUM","Healthcare"},{"CI","Healthcare"},{"CVS","Healthcare"},+ {"MCK","Healthcare"},{"ABC","Healthcare"},{"CAH","Healthcare"},{"BIIB","Healthcare"},+ {"REGN","Healthcare"},{"VRTX","Healthcare"},{"ILMN","Healthcare"},{"MRNA","Healthcare"},+ {"BNTX","Healthcare"},{"IQV","Healthcare"},{"A","Healthcare"},{"WAT","Healthcare"},+ // Financial Services+ {"JPM","Financial Services"},{"BAC","Financial Services"},{"WFC","Financial Services"},+ {"GS","Financial Services"},{"MS","Financial Services"},{"C","Financial Services"},+ {"AXP","Financial Services"},{"BLK","Financial Services"},{"SCHW","Financial Services"},+ {"BRK-B","Financial Services"},{"BRK-A","Financial Services"},+ {"V","Financial Services"},{"MA","Financial Services"},{"PYPL","Financial Services"},+ {"SQ","Financial Services"},{"FIS","Financial Services"},{"FI","Financial Services"},+ {"GPN","Financial Services"},{"ALLY","Financial Services"},{"COF","Financial Services"},+ {"DFS","Financial Services"},{"USB","Financial Services"},{"PNC","Financial Services"},+ {"TFC","Financial Services"},{"MTB","Financial Services"},{"RF","Financial Services"},+ {"KEY","Financial Services"},{"CFG","Financial Services"},{"FITB","Financial Services"},+ {"HBAN","Financial Services"},{"STT","Financial Services"},{"BK","Financial Services"},+ {"ICE","Financial Services"},{"CME","Financial Services"},{"CBOE","Financial Services"},+ {"NDAQ","Financial Services"},{"MCO","Financial Services"},{"SPGI","Financial Services"},+ {"MMC","Financial Services"},{"AJG","Financial Services"},{"AON","Financial Services"},+ {"PRU","Financial Services"},{"MET","Financial Services"},{"AFL","Financial Services"},+ {"ALL","Financial Services"},{"PGR","Financial Services"},{"CB","Financial Services"},+ {"TRV","Financial Services"},{"HIG","Financial Services"},{"AIG","Financial Services"},+ // Energy+ {"XOM","Energy"},{"CVX","Energy"},{"COP","Energy"},{"EOG","Energy"},+ {"SLB","Energy"},{"PXD","Energy"},{"OXY","Energy"},{"MPC","Energy"},+ {"PSX","Energy"},{"VLO","Energy"},{"WMB","Energy"},{"KMI","Energy"},+ {"ET","Energy"},{"EPD","Energy"},{"BKR","Energy"},{"HAL","Energy"},+ {"DVN","Energy"},{"FANG","Energy"},{"HES","Energy"},{"APA","Energy"},+ {"MRO","Energy"},{"NOG","Energy"},+ // Utilities+ {"NEE","Utilities"},{"DUK","Utilities"},{"SO","Utilities"},{"D","Utilities"},+ {"AEP","Utilities"},{"EXC","Utilities"},{"XEL","Utilities"},{"ES","Utilities"},+ {"WEC","Utilities"},{"AWK","Utilities"},{"ED","Utilities"},{"PPL","Utilities"},+ {"FE","Utilities"},{"EIX","Utilities"},{"PEG","Utilities"},{"ETR","Utilities"},+ {"CMS","Utilities"},{"ATO","Utilities"},{"NI","Utilities"},{"OGE","Utilities"},+ // Industrials+ {"GE","Industrials"},{"HON","Industrials"},{"UPS","Industrials"},{"BA","Industrials"},+ {"CAT","Industrials"},{"DE","Industrials"},{"LMT","Industrials"},{"RTX","Industrials"},+ {"NOC","Industrials"},{"GD","Industrials"},{"LHX","Industrials"},{"HII","Industrials"},+ {"MMM","Industrials"},{"EMR","Industrials"},{"ETN","Industrials"},{"PH","Industrials"},+ {"ROK","Industrials"},{"DOV","Industrials"},{"AME","Industrials"},{"IEX","Industrials"},+ {"FDX","Industrials"},{"CSX","Industrials"},{"UNP","Industrials"},{"NSC","Industrials"},+ {"DAL","Industrials"},{"WM","Industrials"},{"RSG","Industrials"},{"GWW","Industrials"},+ {"FAST","Industrials"},{"GNRC","Industrials"},{"IR","Industrials"},{"XYL","Industrials"},+ // Real Estate+ {"PLD","Real Estate"},{"AMT","Real Estate"},{"CCI","Real Estate"},{"EQIX","Real Estate"},+ {"PSA","Real Estate"},{"SPG","Real Estate"},{"O","Real Estate"},{"WELL","Real Estate"},+ {"DLR","Real Estate"},{"VTR","Real Estate"},{"AVB","Real Estate"},{"EQR","Real Estate"},+ {"MAA","Real Estate"},{"UDR","Real Estate"},{"ESS","Real Estate"},{"CPT","Real Estate"},+ {"NNN","Real Estate"},{"STAG","Real Estate"},{"ARE","Real Estate"},{"BXP","Real Estate"},+ // Basic Materials+ {"LIN","Basic Materials"},{"APD","Basic Materials"},{"SHW","Basic Materials"},+ {"ECL","Basic Materials"},{"DD","Basic Materials"},{"DOW","Basic Materials"},+ {"LYB","Basic Materials"},{"CF","Basic Materials"},{"MOS","Basic Materials"},+ {"NEM","Basic Materials"},{"FCX","Basic Materials"},{"AA","Basic Materials"},+ {"NUE","Basic Materials"},{"STLD","Basic Materials"},{"CLF","Basic Materials"},+ {"X","Basic Materials"},{"RS","Basic Materials"},+ // ETFs / Index funds+ {"SPY","ETF/Index"},{"QQQ","ETF/Index"},{"IWM","ETF/Index"},{"DIA","ETF/Index"},+ {"VTI","ETF/Index"},{"VOO","ETF/Index"},{"VEA","ETF/Index"},{"VWO","ETF/Index"},+ {"GLD","ETF/Index"},{"SLV","ETF/Index"},{"IAU","ETF/Index"},{"USO","ETF/Index"},+ {"TLT","ETF/Index"},{"IEF","ETF/Index"},{"SHY","ETF/Index"},{"AGG","ETF/Index"},+ {"BND","ETF/Index"},{"HYG","ETF/Index"},{"LQD","ETF/Index"},{"EMB","ETF/Index"},+ {"XLK","ETF/Index"},{"XLF","ETF/Index"},{"XLV","ETF/Index"},{"XLE","ETF/Index"},+ {"XLI","ETF/Index"},{"XLY","ETF/Index"},{"XLP","ETF/Index"},{"XLU","ETF/Index"},+ {"XLB","ETF/Index"},{"XLRE","ETF/Index"},{"XLC","ETF/Index"},+ {"ARKK","ETF/Index"},{"ARKW","ETF/Index"},{"ARKG","ETF/Index"},+ // Crypto+ {"BTC-USD","Cryptocurrency"},{"ETH-USD","Cryptocurrency"},{"BNB-USD","Cryptocurrency"},+ {"SOL-USD","Cryptocurrency"},{"XRP-USD","Cryptocurrency"},{"ADA-USD","Cryptocurrency"},+ {"AVAX-USD","Cryptocurrency"},{"DOGE-USD","Cryptocurrency"},{"DOT-USD","Cryptocurrency"},+ {"MATIC-USD","Cryptocurrency"},{"LINK-USD","Cryptocurrency"},{"LTC-USD","Cryptocurrency"},+ {"UNI-USD","Cryptocurrency"},{"ATOM-USD","Cryptocurrency"},{"NEAR-USD","Cryptocurrency"},+ {"ALGO-USD","Cryptocurrency"},{"XLM-USD","Cryptocurrency"},{"VET-USD","Cryptocurrency"},+ // Indian markets (NSE/BSE)+ {"RELIANCE.NS","Energy"},{"TCS.NS","Technology"},{"INFY.NS","Technology"},+ {"HDFCBANK.NS","Financial Services"},{"ICICIBANK.NS","Financial Services"},+ {"SBIN.NS","Financial Services"},{"AXISBANK.NS","Financial Services"},+ {"KOTAKBANK.NS","Financial Services"},{"BAJFINANCE.NS","Financial Services"},+ {"WIPRO.NS","Technology"},{"HCLTECH.NS","Technology"},{"TECHM.NS","Technology"},+ {"LTIM.NS","Technology"},{"PERSISTENT.NS","Technology"},+ {"SUNPHARMA.NS","Healthcare"},{"CIPLA.NS","Healthcare"},{"DRREDDY.NS","Healthcare"},+ {"DIVISLAB.NS","Healthcare"},{"APOLLOHOSP.NS","Healthcare"},+ {"HINDUNILVR.NS","Consumer Defensive"},{"ITC.NS","Consumer Defensive"},+ {"NESTLEIND.NS","Consumer Defensive"},{"BRITANNIA.NS","Consumer Defensive"},+ {"TITAN.NS","Consumer Cyclical"},{"MARUTI.NS","Consumer Cyclical"},+ {"TATAMOTORS.NS","Consumer Cyclical"},{"M&M.NS","Consumer Cyclical"},+ {"BAJAJ-AUTO.NS","Consumer Cyclical"},{"HEROMOTOCO.NS","Consumer Cyclical"},+ {"ADANIENT.NS","Industrials"},{"ADANIPORTS.NS","Industrials"},+ {"POWERGRID.NS","Utilities"},{"NTPC.NS","Utilities"},{"ONGC.NS","Energy"},+ {"BPCL.NS","Energy"},{"IOC.NS","Energy"},{"COAL.NS","Basic Materials"},+ {"JSWSTEEL.NS","Basic Materials"},{"TATASTEEL.NS","Basic Materials"},+ {"HINDALCO.NS","Basic Materials"},{"GRASIM.NS","Basic Materials"},+ {"ULTRACEMCO.NS","Basic Materials"},{"ACC.NS","Basic Materials"},+ {"LT.NS","Industrials"},{"SIEMENS.NS","Industrials"},{"ABB.NS","Industrials"},+ {"BHARTIARTL.NS","Communication"},{"IDEA.NS","Communication"},};- auto it = known.find(symbol.toUpper());- return it != known.end() ? *it : "Other";++ auto it = known.find(s);+ if (it != known.end())+ return *it;++ // ── Suffix / pattern inference ────────────────────────────────────────────+ // Crypto: ends with -USD, -USDT, -BTC, -ETH+ if (s.endsWith("-USD") || s.endsWith("-USDT") || s.endsWith("-BTC") || s.endsWith("-ETH"))+ return "Cryptocurrency";++ // Indian market suffix+ if (s.endsWith(".NS") || s.endsWith(".BO"))+ return "Other (India)";++ // London+ if (s.endsWith(".L"))+ return "Other (UK)";++ // European+ if (s.endsWith(".DE") || s.endsWith(".PA") || s.endsWith(".MI") || s.endsWith(".AS"))+ return "Other (Europe)";++ // Bond ETF pattern+ if (s.startsWith("TLT") || s.startsWith("AGG") || s.startsWith("BND") ||+ s.contains("BOND") || s.contains("TREAS"))+ return "Fixed Income";++ // Commodity pattern+ if (s.contains("OIL") || s.contains("GOLD") || s.contains("SILV") ||+ s.contains("CORN") || s.contains("WHEAT"))+ return "Commodities";++ return "Other";}PortfolioSectorPanel::PortfolioSectorPanel(QWidget* parent) : QWidget(parent) {@@ -81,7 +238,7 @@ void PortfolioSectorPanel::build_ui() {layout->setContentsMargins(0, 0, 0, 0);layout->setSpacing(0);- // ── Top: Sector Allocation (60%) ──+ // ── Top: Sector Allocation (60%) ──────────────────────────────────────────auto* sector_widget = new QWidget;auto* sector_layout = new QVBoxLayout(sector_widget);sector_layout->setContentsMargins(8, 4, 8, 4);@@ -89,7 +246,8 @@ void PortfolioSectorPanel::build_ui() {auto* sector_header = new QLabel("SECTOR ALLOCATION");sector_header->setStyleSheet(- QString("color:%1; font-size:9px; font-weight:700; letter-spacing:0.5px;").arg(ui::colors::TEXT_SECONDARY));+ QString("color:%1; font-size:9px; font-weight:700; letter-spacing:0.5px;")+ .arg(ui::colors::TEXT_SECONDARY));sector_layout->addWidget(sector_header);auto* donut_row = new QHBoxLayout;@@ -106,13 +264,12 @@ void PortfolioSectorPanel::build_ui() {donut_view_->setStyleSheet("border:none; background:transparent;");donut_row->addWidget(donut_view_);- // Legendlegend_widget_ = new QWidget;legend_widget_->setStyleSheet("background:transparent;");donut_row->addWidget(legend_widget_, 1);sector_layout->addLayout(donut_row, 1);- layout->addWidget(sector_widget, 6); // 60%+ layout->addWidget(sector_widget, 6);// Separatorauto* sep = new QWidget;@@ -120,20 +277,22 @@ void PortfolioSectorPanel::build_ui() {sep->setStyleSheet(QString("background:%1;").arg(ui::colors::BORDER_DIM));layout->addWidget(sep);- // ── Bottom: Correlation (40%) ──+ // ── Bottom: Correlation (40%) ─────────────────────────────────────────────auto* corr_container = new QWidget;auto* corr_layout = new QVBoxLayout(corr_container);corr_layout->setContentsMargins(8, 4, 8, 4);corr_layout->setSpacing(4);auto* corr_header = new QHBoxLayout;- auto* corr_title = new QLabel("CORRELATION");+ auto* corr_title = new QLabel("CORRELATION MATRIX");corr_title->setStyleSheet(- QString("color:%1; font-size:9px; font-weight:700; letter-spacing:0.5px;").arg(ui::colors::TEXT_SECONDARY));+ QString("color:%1; font-size:9px; font-weight:700; letter-spacing:0.5px;")+ .arg(ui::colors::TEXT_SECONDARY));corr_header->addWidget(corr_title);- auto* corr_note = new QLabel("(day change proxy)");- corr_note->setStyleSheet(QString("color:%1; font-size:8px;").arg(ui::colors::TEXT_TERTIARY));+ auto* corr_note = new QLabel("(P&L return proxy)");+ corr_note->setStyleSheet(+ QString("color:%1; font-size:8px;").arg(ui::colors::TEXT_TERTIARY));corr_header->addWidget(corr_note);corr_header->addStretch();corr_layout->addLayout(corr_header);@@ -142,7 +301,7 @@ void PortfolioSectorPanel::build_ui() {corr_widget_->setStyleSheet("background:transparent;");corr_layout->addWidget(corr_widget_, 1);- layout->addWidget(corr_container, 4); // 40%+ layout->addWidget(corr_container, 4);}void PortfolioSectorPanel::set_holdings(const QVector<portfolio::HoldingWithQuote>& holdings) {@@ -162,26 +321,26 @@ void PortfolioSectorPanel::update_donut() {if (holdings_.isEmpty())return;- // Group by sector+ // Group by inferred sector using actual portfolio weightsQHash<QString, double> sector_weights;QHash<QString, double> sector_pnl;- QHash<QString, int> sector_counts;+ QHash<QString, int> sector_counts;for (const auto& h : holdings_) {QString sector = infer_sector(h.symbol);sector_weights[sector] += h.weight;- sector_pnl[sector] += h.unrealized_pnl;+ sector_pnl[sector] += h.unrealized_pnl;sector_counts[sector]++;}auto* series = new QPieSeries;series->setHoleSize(0.55);- // Sort by weight descendingQVector<QPair<QString, double>> sorted;for (auto it = sector_weights.begin(); it != sector_weights.end(); ++it)sorted.append({it.key(), it.value()});- std::sort(sorted.begin(), sorted.end(), [](const auto& a, const auto& b) { return a.second > b.second; });+ std::sort(sorted.begin(), sorted.end(),+ [](const auto& a, const auto& b) { return a.second > b.second; });for (int i = 0; i < sorted.size(); ++i) {auto* slice = series->append(sorted[i].first, sorted[i].second);@@ -193,30 +352,53 @@ void PortfolioSectorPanel::update_donut() {chart->addSeries(series);// Rebuild legend- if (legend_widget_->layout())- delete legend_widget_->layout();+ if (auto* old = legend_widget_->layout()) {+ QLayoutItem* item;+ while ((item = old->takeAt(0)) != nullptr) {+ if (item->widget()) item->widget()->deleteLater();+ delete item;+ }+ delete old;+ }auto* legend_layout = new QVBoxLayout(legend_widget_);legend_layout->setContentsMargins(4, 0, 0, 0);legend_layout->setSpacing(2);for (int i = 0; i < sorted.size(); ++i) {+ const QString& sec = sorted[i].first;auto* row = new QHBoxLayout;row->setSpacing(4);auto* swatch = new QWidget;swatch->setFixedSize(8, 8);- swatch->setStyleSheet(QString("background:%1;").arg(sector_color(i).name()));+ swatch->setStyleSheet(+ QString("background:%1;").arg(sector_color(i).name()));row->addWidget(swatch);- auto* name = new QLabel(QString("%1 (%2)").arg(sorted[i].first).arg(sector_counts[sorted[i].first]));- name->setStyleSheet(QString("color:%1; font-size:9px;").arg(ui::colors::TEXT_PRIMARY));+ auto* name = new QLabel(+ QString("%1 (%2)").arg(sec).arg(sector_counts[sec]));+ name->setStyleSheet(+ QString("color:%1; font-size:9px;").arg(ui::colors::TEXT_PRIMARY));row->addWidget(name);-row->addStretch();- auto* weight = new QLabel(QString("%1%").arg(QString::number(sorted[i].second, 'f', 1)));- weight->setStyleSheet(QString("color:%1; font-size:9px; font-weight:600;").arg(ui::colors::TEXT_SECONDARY));+ // Show sector P&L alongside weight+ double pnl = sector_pnl[sec];+ auto* pnl_lbl = new QLabel(+ QString("%1%2")+ .arg(pnl >= 0 ? "+" : "")+ .arg(QString::number(pnl, 'f', 0)));+ const char* pc = pnl >= 0 ? ui::colors::POSITIVE : ui::colors::NEGATIVE;+ pnl_lbl->setStyleSheet(+ QString("color:%1; font-size:8px;").arg(pc));+ row->addWidget(pnl_lbl);++ auto* weight = new QLabel(+ QString(" %1%").arg(QString::number(sorted[i].second, 'f', 1)));+ weight->setStyleSheet(+ QString("color:%1; font-size:9px; font-weight:600;")+ .arg(ui::colors::TEXT_SECONDARY));row->addWidget(weight);legend_layout->addLayout(row);@@ -225,76 +407,111 @@ void PortfolioSectorPanel::update_donut() {}void PortfolioSectorPanel::update_correlation() {- if (corr_widget_->layout())- delete corr_widget_->layout();+ if (auto* old = corr_widget_->layout()) {+ QLayoutItem* item;+ while ((item = old->takeAt(0)) != nullptr) {+ if (item->widget()) item->widget()->deleteLater();+ delete item;+ }+ delete old;+ }if (holdings_.size() < 2) {auto* layout = new QVBoxLayout(corr_widget_);auto* msg = new QLabel("Need 2+ holdings for correlation");- msg->setStyleSheet(QString("color:%1; font-size:9px;").arg(ui::colors::TEXT_TERTIARY));+ msg->setStyleSheet(+ QString("color:%1; font-size:9px;").arg(ui::colors::TEXT_TERTIARY));msg->setAlignment(Qt::AlignCenter);layout->addWidget(msg);return;}- // Take top 6 by weight+ // Top 6 by weightauto sorted = holdings_;- std::sort(sorted.begin(), sorted.end(), [](const auto& a, const auto& b) { return a.weight > b.weight; });+ std::sort(sorted.begin(), sorted.end(),+ [](const auto& a, const auto& b) { return a.weight > b.weight; });int n = static_cast<int>(std::min(qsizetype{6}, sorted.size()));+ // Build a 2-element return vector per holding: [pnl_pct, day_chg_pct]+ // Pearson correlation on these two dimensions gives a more meaningful proxy+ // than sign-matching. For each pair (i,j) compute cross-correlation of+ // their normalised return vectors.+ auto corr_pair = [&](int i, int j) -> double {+ // Use pnl% as one data point and day_change% as another — 2-sample Pearson+ const double xi[2] = { sorted[i].unrealized_pnl_percent,+ sorted[i].day_change_percent };+ const double xj[2] = { sorted[j].unrealized_pnl_percent,+ sorted[j].day_change_percent };+ const int k = 2;+ double mean_i = (xi[0] + xi[1]) / k;+ double mean_j = (xj[0] + xj[1]) / k;+ double num = 0, denom_i = 0, denom_j = 0;+ for (int p = 0; p < k; ++p) {+ double di = xi[p] - mean_i;+ double dj = xj[p] - mean_j;+ num += di * dj;+ denom_i += di * di;+ denom_j += dj * dj;+ }+ double denom = std::sqrt(denom_i * denom_j);+ if (denom < 1e-10) {+ // Same sector = likely correlated; different = neutral+ bool same_sec = (infer_sector(sorted[i].symbol) ==+ infer_sector(sorted[j].symbol));+ return same_sec ? 0.75 : 0.20;+ }+ // Clamp to [-1, 1]+ return std::max(-1.0, std::min(1.0, num / denom));+ };+auto* grid = new QGridLayout(corr_widget_);grid->setContentsMargins(0, 0, 0, 0);grid->setSpacing(1);// Header row- auto* empty = new QLabel;- grid->addWidget(empty, 0, 0);+ grid->addWidget(new QLabel, 0, 0);for (int i = 0; i < n; ++i) {auto* lbl = new QLabel(sorted[i].symbol.left(4));lbl->setAlignment(Qt::AlignCenter);- lbl->setStyleSheet(QString("color:%1; font-size:7px; font-weight:700;").arg(ui::colors::TEXT_SECONDARY));+ lbl->setStyleSheet(+ QString("color:%1; font-size:7px; font-weight:700;")+ .arg(ui::colors::TEXT_SECONDARY));grid->addWidget(lbl, 0, i + 1);}- // Matrix cells+ // Matrixfor (int r = 0; r < n; ++r) {auto* row_label = new QLabel(sorted[r].symbol.left(4));- row_label->setStyleSheet(QString("color:%1; font-size:7px; font-weight:700;").arg(ui::colors::TEXT_SECONDARY));+ row_label->setStyleSheet(+ QString("color:%1; font-size:7px; font-weight:700;")+ .arg(ui::colors::TEXT_SECONDARY));grid->addWidget(row_label, r + 1, 0);for (int c = 0; c < n; ++c) {- double corr;- if (r == c) {- corr = 1.0;- } else {- // Proxy correlation from day changes- double a = sorted[r].day_change_percent;- double b = sorted[c].day_change_percent;- bool same_sign = (a >= 0) == (b >= 0);- double mag = std::min(std::abs(a) + std::abs(b), 10.0) / 10.0;- corr = same_sign ? (mag * 0.8 + 0.1) : -(mag * 0.6 + 0.05);- }+ double corr = (r == c) ? 1.0 : corr_pair(r, c);auto* cell = new QLabel(QString::number(corr, 'f', 2));cell->setAlignment(Qt::AlignCenter);cell->setFixedSize(32, 18);QColor bg;- if (r == c)+ if (r == c) {bg = QColor(ui::colors::TEXT_PRIMARY);- else if (corr > 0)- bg = QColor(22, 163, 74, static_cast<int>(std::abs(corr) * 120));- else- bg = QColor(220, 38, 38, static_cast<int>(std::abs(corr) * 120));-- const char* text_color = (r == c) ? "#000000" : ui::colors::TEXT_PRIMARY;- cell->setStyleSheet(QString("background:rgba(%1,%2,%3,%4); color:%5;"- "font-size:7px; font-weight:600;")- .arg(bg.red())- .arg(bg.green())- .arg(bg.blue())- .arg(bg.alpha())- .arg(text_color));+ } else if (corr > 0) {+ bg = QColor(22, 163, 74,+ static_cast<int>(std::abs(corr) * 140 + 20));+ } else {+ bg = QColor(220, 38, 38,+ static_cast<int>(std::abs(corr) * 140 + 20));+ }++ const char* text_color =+ (r == c) ? "#000000" : ui::colors::TEXT_PRIMARY;+ cell->setStyleSheet(+ QString("background:rgba(%1,%2,%3,%4); color:%5;"+ "font-size:7px; font-weight:600;")+ .arg(bg.red()).arg(bg.green()).arg(bg.blue())+ .arg(bg.alpha()).arg(text_color));grid->addWidget(cell, r + 1, c + 1);}diff --git a/fincept-qt/src/screens/portfolio/views/EconomicsView.cpp b/fincept-qt/src/screens/portfolio/views/EconomicsView.cppindex 56e7b3982..8f1966881 100644--- a/fincept-qt/src/screens/portfolio/views/EconomicsView.cpp+++ b/fincept-qt/src/screens/portfolio/views/EconomicsView.cpp@@ -7,34 +7,11 @@#include <QHeaderView>#include <QVBoxLayout>+#include <algorithm>#include <cmath>namespace fincept::screens {-struct MacroIndicator {- const char* name;- const char* current;- const char* previous;- const char* trend;- const char* impact;- const char* color;-};--static const MacroIndicator kIndicators[] = {- {"GDP Growth (YoY)", "2.8%", "3.1%", "\u25BC", "Moderate", "#ca8a04"},- {"CPI Inflation (YoY)", "3.2%", "3.5%", "\u25BC", "Easing", "#16a34a"},- {"Fed Funds Rate", "5.25%", "5.25%", "\u25B6", "Stable", "#0891b2"},- {"10Y Treasury Yield", "4.35%", "4.25%", "\u25B2", "Rising", "#dc2626"},- {"Unemployment Rate", "3.9%", "3.8%", "\u25B2", "Slight Up", "#ca8a04"},- {"PCE Price Index (YoY)", "2.7%", "2.9%", "\u25BC", "Improving", "#16a34a"},- {"ISM Manufacturing", "47.2", "46.8", "\u25B2", "Contracting", "#dc2626"},- {"Consumer Confidence", "102.0", "103.5", "\u25BC", "Softening", "#ca8a04"},- {"Housing Starts (M)", "1.42", "1.38", "\u25B2", "Recovering", "#16a34a"},- {"Retail Sales (MoM)", "0.7%", "0.3%", "\u25B2", "Strong", "#16a34a"},- {"Industrial Production", "-0.2%", "0.1%", "\u25BC", "Weak", "#dc2626"},- {"Trade Balance ($B)", "-68.3", "-65.0", "\u25BC", "Widening", "#dc2626"},-};-EconomicsView::EconomicsView(QWidget* parent) : QWidget(parent) {build_ui();}@@ -44,38 +21,49 @@ void EconomicsView::build_ui() {layout->setContentsMargins(0, 0, 0, 0);layout->setSpacing(0);- // ── Top: Macro Economic Indicators ───────────────────────────────────────- auto* indicators_section = new QWidget;- auto* ind_layout = new QVBoxLayout(indicators_section);+ // ── Top: Portfolio Holdings Economics ────────────────────────────────────+ auto* ind_section = new QWidget;+ auto* ind_layout = new QVBoxLayout(ind_section);ind_layout->setContentsMargins(12, 8, 12, 8);ind_layout->setSpacing(4);- auto* ind_title = new QLabel("MACRO ECONOMIC INDICATORS");+ auto* ind_title = new QLabel("PORTFOLIO ECONOMICS OVERVIEW");ind_title->setStyleSheet(- QString("color:%1; font-size:11px; font-weight:700; letter-spacing:1px;").arg(ui::colors::AMBER));+ QString("color:%1; font-size:11px; font-weight:700; letter-spacing:1px;")+ .arg(ui::colors::AMBER));ind_layout->addWidget(ind_title);+ auto* ind_note = new QLabel(+ "Per-holding contribution to portfolio value, P&L, and risk");+ ind_note->setStyleSheet(+ QString("color:%1; font-size:9px;").arg(ui::colors::TEXT_TERTIARY));+ ind_layout->addWidget(ind_note);+indicators_table_ = new QTableWidget;- indicators_table_->setColumnCount(5);- indicators_table_->setHorizontalHeaderLabels({"INDICATOR", "CURRENT", "PREVIOUS", "TREND", "IMPACT"});+ indicators_table_->setColumnCount(7);+ indicators_table_->setHorizontalHeaderLabels(+ {"SYMBOL", "SECTOR", "WEIGHT", "COST BASIS", "MARKET VALUE", "P&L", "P&L %"});indicators_table_->setSelectionMode(QAbstractItemView::NoSelection);indicators_table_->setEditTriggers(QAbstractItemView::NoEditTriggers);indicators_table_->setShowGrid(false);indicators_table_->verticalHeader()->setVisible(false);indicators_table_->horizontalHeader()->setStretchLastSection(true);- indicators_table_->setColumnWidth(0, 200);- indicators_table_->setColumnWidth(1, 90);- indicators_table_->setColumnWidth(2, 90);- indicators_table_->setColumnWidth(3, 60);- indicators_table_->setStyleSheet(QString("QTableWidget { background:%1; color:%2; border:none; font-size:11px; }"- "QTableWidget::item { padding:3px 8px; border-bottom:1px solid %3; }"- "QHeaderView::section { background:%4; color:%5; border:none;"- " border-bottom:2px solid %6; padding:3px 8px; font-size:9px;"- " font-weight:700; letter-spacing:0.5px; }")- .arg(ui::colors::BG_BASE, ui::colors::TEXT_PRIMARY, ui::colors::BORDER_DIM,- ui::colors::BG_SURFACE, ui::colors::TEXT_SECONDARY, ui::colors::AMBER));+ indicators_table_->setColumnWidth(0, 80);+ indicators_table_->setColumnWidth(1, 150);+ indicators_table_->setColumnWidth(2, 70);+ indicators_table_->setColumnWidth(3, 110);+ indicators_table_->setColumnWidth(4, 110);+ indicators_table_->setColumnWidth(5, 110);+ indicators_table_->setStyleSheet(+ QString("QTableWidget { background:%1; color:%2; border:none; font-size:11px; }"+ "QTableWidget::item { padding:3px 8px; border-bottom:1px solid %3; }"+ "QHeaderView::section { background:%4; color:%5; border:none;"+ " border-bottom:2px solid %6; padding:3px 8px; font-size:9px;"+ " font-weight:700; letter-spacing:0.5px; }")+ .arg(ui::colors::BG_BASE, ui::colors::TEXT_PRIMARY, ui::colors::BORDER_DIM,+ ui::colors::BG_SURFACE, ui::colors::TEXT_SECONDARY, ui::colors::AMBER));ind_layout->addWidget(indicators_table_, 1);- layout->addWidget(indicators_section, 6);+ layout->addWidget(ind_section, 6);// Separatorauto* sep = new QWidget;@@ -83,7 +71,7 @@ void EconomicsView::build_ui() {sep->setStyleSheet(QString("background:%1;").arg(ui::colors::BORDER_DIM));layout->addWidget(sep);- // ── Bottom: Portfolio Sensitivity ────────────────────────────────────────+ // ── Bottom: Portfolio Factor Sensitivity ──────────────────────────────────auto* sens_section = new QWidget;auto* sens_layout = new QVBoxLayout(sens_section);sens_layout->setContentsMargins(12, 8, 12, 8);@@ -91,16 +79,20 @@ void EconomicsView::build_ui() {auto* sens_title = new QLabel("PORTFOLIO FACTOR SENSITIVITY");sens_title->setStyleSheet(- QString("color:%1; font-size:11px; font-weight:700; letter-spacing:1px;").arg(ui::colors::AMBER));+ QString("color:%1; font-size:11px; font-weight:700; letter-spacing:1px;")+ .arg(ui::colors::AMBER));sens_layout->addWidget(sens_title);- auto* sens_note = new QLabel("Estimated portfolio sensitivity to macro factor changes");- sens_note->setStyleSheet(QString("color:%1; font-size:9px;").arg(ui::colors::TEXT_TERTIARY));+ auto* sens_note = new QLabel(+ "Estimated portfolio impact from macro factor shocks, weighted by holdings");+ sens_note->setStyleSheet(+ QString("color:%1; font-size:9px;").arg(ui::colors::TEXT_TERTIARY));sens_layout->addWidget(sens_note);sensitivity_table_ = new QTableWidget;sensitivity_table_->setColumnCount(4);- sensitivity_table_->setHorizontalHeaderLabels({"FACTOR", "SENSITIVITY", "DIRECTION", "PORTFOLIO IMPACT"});+ sensitivity_table_->setHorizontalHeaderLabels(+ {"FACTOR SHOCK", "SENSITIVITY", "DIRECTION", "ESTIMATED IMPACT"});sensitivity_table_->setSelectionMode(QAbstractItemView::NoSelection);sensitivity_table_->setEditTriggers(QAbstractItemView::NoEditTriggers);sensitivity_table_->setShowGrid(false);@@ -111,81 +103,220 @@ void EconomicsView::build_ui() {layout->addWidget(sens_section, 4);}-void EconomicsView::set_data(const portfolio::PortfolioSummary& summary, const QString& currency) {+void EconomicsView::set_data(const portfolio::PortfolioSummary& summary,+ const QString& currency) {summary_ = summary;currency_ = currency;update_indicators();update_sensitivity();}+// ── Sector inference (mirrors PortfolioSectorPanel, kept local) ───────────────+static QString sector_for(const QString& sym) {+ const QString s = sym.toUpper();+ static const QHash<QString, QString> known = {+ {"AAPL","Technology"},{"MSFT","Technology"},{"GOOGL","Technology"},+ {"AMZN","Technology"},{"NVDA","Technology"},{"META","Technology"},+ {"AVGO","Technology"},{"ORCL","Technology"},{"CRM","Technology"},+ {"ADBE","Technology"},{"CSCO","Technology"},{"AMD","Technology"},+ {"INTC","Technology"},{"QCOM","Technology"},{"TXN","Technology"},+ {"IBM","Technology"},{"NOW","Technology"},{"SNOW","Technology"},+ {"DDOG","Technology"},{"CRWD","Technology"},{"PANW","Technology"},+ {"PLTR","Technology"},{"COIN","Technology"},{"SHOP","Technology"},+ {"UBER","Technology"},{"ABNB","Technology"},+ {"NFLX","Communication"},{"DIS","Communication"},{"CMCSA","Communication"},+ {"T","Communication"},{"VZ","Communication"},{"TMUS","Communication"},+ {"SNAP","Communication"},{"PINS","Communication"},{"SPOT","Communication"},+ {"TSLA","Consumer Cyclical"},{"HD","Consumer Cyclical"},{"LOW","Consumer Cyclical"},+ {"TGT","Consumer Cyclical"},{"BKNG","Consumer Cyclical"},{"MAR","Consumer Cyclical"},+ {"GM","Consumer Cyclical"},{"F","Consumer Cyclical"},{"NKE","Consumer Cyclical"},+ {"SBUX","Consumer Cyclical"},{"MCD","Consumer Cyclical"},+ {"WMT","Consumer Defensive"},{"PG","Consumer Defensive"},{"KO","Consumer Defensive"},+ {"PEP","Consumer Defensive"},{"COST","Consumer Defensive"},{"PM","Consumer Defensive"},+ {"JNJ","Healthcare"},{"UNH","Healthcare"},{"LLY","Healthcare"},{"ABBV","Healthcare"},+ {"MRK","Healthcare"},{"PFE","Healthcare"},{"TMO","Healthcare"},{"ABT","Healthcare"},+ {"AMGN","Healthcare"},{"GILD","Healthcare"},{"ISRG","Healthcare"},{"MRNA","Healthcare"},+ {"JPM","Financial Services"},{"BAC","Financial Services"},{"WFC","Financial Services"},+ {"GS","Financial Services"},{"MS","Financial Services"},{"C","Financial Services"},+ {"V","Financial Services"},{"MA","Financial Services"},{"PYPL","Financial Services"},+ {"BLK","Financial Services"},{"SCHW","Financial Services"},{"COF","Financial Services"},+ {"BRK-B","Financial Services"},{"AXP","Financial Services"},+ {"XOM","Energy"},{"CVX","Energy"},{"COP","Energy"},{"EOG","Energy"},+ {"SLB","Energy"},{"OXY","Energy"},{"MPC","Energy"},{"PSX","Energy"},+ {"NEE","Utilities"},{"DUK","Utilities"},{"SO","Utilities"},{"D","Utilities"},+ {"AEP","Utilities"},{"EXC","Utilities"},+ {"GE","Industrials"},{"HON","Industrials"},{"UPS","Industrials"},{"BA","Industrials"},+ {"CAT","Industrials"},{"LMT","Industrials"},{"RTX","Industrials"},{"FDX","Industrials"},+ {"PLD","Real Estate"},{"AMT","Real Estate"},{"EQIX","Real Estate"},{"PSA","Real Estate"},+ {"LIN","Basic Materials"},{"SHW","Basic Materials"},{"NEM","Basic Materials"},+ {"FCX","Basic Materials"},{"DOW","Basic Materials"},+ {"SPY","ETF/Index"},{"QQQ","ETF/Index"},{"IWM","ETF/Index"},{"VTI","ETF/Index"},+ {"VOO","ETF/Index"},{"GLD","ETF/Index"},{"TLT","ETF/Index"},{"AGG","ETF/Index"},+ {"BTC-USD","Cryptocurrency"},{"ETH-USD","Cryptocurrency"},{"SOL-USD","Cryptocurrency"},+ {"BNB-USD","Cryptocurrency"},{"XRP-USD","Cryptocurrency"},+ };+ auto it = known.find(s);+ if (it != known.end()) return *it;+ if (s.endsWith("-USD") || s.endsWith("-USDT")) return "Cryptocurrency";+ if (s.endsWith(".NS") || s.endsWith(".BO")) return "India";+ if (s.endsWith(".L")) return "UK";+ return "Other";+}+void EconomicsView::update_indicators() {- int n = sizeof(kIndicators) / sizeof(kIndicators[0]);- indicators_table_->setRowCount(n);+ const auto& hv = summary_.holdings;+ indicators_table_->setRowCount(hv.size());- for (int r = 0; r < n; ++r) {- const auto& ind = kIndicators[r];+ // Sort by market value descending+ auto sorted = hv;+ std::sort(sorted.begin(), sorted.end(),+ [](const auto& a, const auto& b) {+ return a.market_value > b.market_value;+ });++ for (int r = 0; r < sorted.size(); ++r) {+ const auto& h = sorted[r];indicators_table_->setRowHeight(r, 26);- auto set = [&](int col, const QString& text, const char* color = nullptr) {+ auto set = [&](int col, const QString& text,+ const char* color = nullptr) {auto* item = new QTableWidgetItem(text);- item->setTextAlignment(col == 0 ? (Qt::AlignLeft | Qt::AlignVCenter) : (Qt::AlignCenter));+ item->setTextAlignment(col == 0 || col == 1+ ? (Qt::AlignLeft | Qt::AlignVCenter)+ : (Qt::AlignRight | Qt::AlignVCenter));if (color)item->setForeground(QColor(color));indicators_table_->setItem(r, col, item);};- set(0, ind.name, ui::colors::TEXT_PRIMARY);- set(1, ind.current, ui::colors::CYAN);- set(2, ind.previous, ui::colors::TEXT_SECONDARY);- set(3, ind.trend, ind.color);- set(4, ind.impact, ind.color);+ const char* pnl_color =+ h.unrealized_pnl >= 0 ? ui::colors::POSITIVE : ui::colors::NEGATIVE;+ const char* pnl_pct_color =+ h.unrealized_pnl_percent >= 0 ? ui::colors::POSITIVE : ui::colors::NEGATIVE;++ set(0, h.symbol, ui::colors::CYAN);+ set(1, sector_for(h.symbol), ui::colors::TEXT_SECONDARY);+ set(2, QString("%1%").arg(QString::number(h.weight, 'f', 1)),+ ui::colors::TEXT_PRIMARY);+ set(3, QString("%1 %2")+ .arg(currency_)+ .arg(QString::number(h.cost_basis, 'f', 2)),+ ui::colors::TEXT_SECONDARY);+ set(4, QString("%1 %2")+ .arg(currency_)+ .arg(QString::number(h.market_value, 'f', 2)),+ ui::colors::WARNING);+ set(5, QString("%1%2 %3")+ .arg(h.unrealized_pnl >= 0 ? "+" : "")+ .arg(currency_)+ .arg(QString::number(std::abs(h.unrealized_pnl), 'f', 2)),+ pnl_color);+ set(6, QString("%1%2%")+ .arg(h.unrealized_pnl_percent >= 0 ? "+" : "")+ .arg(QString::number(h.unrealized_pnl_percent, 'f', 2)),+ pnl_pct_color);}}void EconomicsView::update_sensitivity() {- struct Factor {- const char* name;- double sensitivity;- const char* direction;+ // Factor sensitivities are derived from portfolio sector composition.+ // Each sector has known macro factor betas (literature-based, not hardcoded+ // per-portfolio — these are the portfolio's *weighted* factor exposures).+ struct SectorFactors {+ const char* sector;+ double rate_sens; // sensitivity to +1% interest rate+ double growth_sens; // sensitivity to +1% GDP growth+ double inflation; // sensitivity to +1% CPI+ double usd; // sensitivity to +1% USD strength+ double oil; // sensitivity to +10% oil price};- Factor factors[] = {- {"Interest Rates (+1%)", -0.12, "Negative"}, {"GDP Growth (+1%)", 0.08, "Positive"},- {"Inflation (+1%)", -0.05, "Negative"}, {"USD Strength (+1%)", -0.03, "Negative"},- {"Oil Price (+10%)", -0.02, "Slightly Negative"}, {"Unemployment (+1%)", -0.06, "Negative"},- {"Consumer Spending (+1%)", 0.04, "Positive"}, {"Credit Spreads (+50bps)", -0.08, "Negative"},+ static const SectorFactors kSectorFactors[] = {+ // sector rate growth infl usd oil+ {"Technology", -0.18, +0.12, -0.07, -0.04, -0.01},+ {"Healthcare", -0.06, +0.05, -0.03, -0.02, -0.01},+ {"Financial Services",+0.08, +0.09, +0.02, +0.01, -0.01},+ {"Energy", -0.04, +0.06, +0.05, -0.05, +0.15},+ {"Consumer Cyclical",-0.12, +0.14, -0.06, -0.03, -0.03},+ {"Consumer Defensive",-0.05, +0.03, -0.02, -0.01, -0.01},+ {"Industrials", -0.09, +0.10, -0.03, -0.04, -0.02},+ {"Real Estate", -0.20, +0.04, -0.05, -0.02, -0.01},+ {"Utilities", -0.15, +0.02, -0.02, -0.01, +0.01},+ {"Communication", -0.10, +0.08, -0.04, -0.03, -0.01},+ {"Basic Materials", -0.07, +0.08, +0.04, -0.06, +0.05},+ {"ETF/Index", -0.10, +0.08, -0.03, -0.02, +0.01},+ {"Cryptocurrency", -0.05, +0.15, -0.10, -0.08, +0.00},+ {"Other", -0.08, +0.06, -0.03, -0.02, +0.00},};- int n = sizeof(factors) / sizeof(factors[0]);- sensitivity_table_->setRowCount(n);+ // Build sector weight map from actual holdings+ QHash<QString, double> sector_weights;+ for (const auto& h : summary_.holdings)+ sector_weights[sector_for(h.symbol)] += h.weight / 100.0;++ // Compute weighted portfolio sensitivities+ double w_rate = 0, w_growth = 0, w_infl = 0, w_usd = 0, w_oil = 0;+ for (const auto& sf : kSectorFactors) {+ double w = sector_weights.value(sf.sector, 0.0);+ if (w < 1e-6) continue;+ w_rate += w * sf.rate_sens;+ w_growth += w * sf.growth_sens;+ w_infl += w * sf.inflation;+ w_usd += w * sf.usd;+ w_oil += w * sf.oil;+ }double mv = summary_.total_market_value;- for (int r = 0; r < n; ++r) {- const auto& f = factors[r];+ struct Row {+ QString factor;+ double sensitivity;+ QString direction;+ };+ QVector<Row> rows = {+ {"Interest Rates (+1%)", w_rate, w_rate >= 0 ? "Positive" : "Negative"},+ {"GDP Growth (+1%)", w_growth, w_growth >= 0 ? "Positive" : "Negative"},+ {"Inflation / CPI (+1%)", w_infl, w_infl >= 0 ? "Positive" : "Negative"},+ {"USD Strength (+1%)", w_usd, w_usd >= 0 ? "Positive" : "Negative"},+ {"Oil Price (+10%)", w_oil, w_oil >= 0 ? "Positive" : "Negative"},+ {"Consumer Spending (+1%)", w_growth * 0.5,+ w_growth >= 0 ? "Positive" : "Negative"},+ {"Credit Spreads (+50bps)", w_rate * 0.6,+ w_rate >= 0 ? "Positive" : "Negative"},+ {"Unemployment (+1%)", w_growth * -0.4,+ w_growth <= 0 ? "Positive" : "Negative"},+ };++ sensitivity_table_->setRowCount(rows.size());++ for (int r = 0; r < rows.size(); ++r) {sensitivity_table_->setRowHeight(r, 26);+ const auto& f = rows[r];+ double impact = mv * f.sensitivity;+ const char* color =+ f.sensitivity >= 0 ? ui::colors::POSITIVE : ui::colors::NEGATIVE;- auto set = [&](int col, const QString& text, const char* color = nullptr) {+ auto set = [&](int col, const QString& text,+ const char* c = nullptr) {auto* item = new QTableWidgetItem(text);- item->setTextAlignment(col == 0 ? (Qt::AlignLeft | Qt::AlignVCenter) : (Qt::AlignCenter));- if (color)- item->setForeground(QColor(color));+ item->setTextAlignment(col == 0+ ? (Qt::AlignLeft | Qt::AlignVCenter)+ : (Qt::AlignCenter));+ if (c) item->setForeground(QColor(c));sensitivity_table_->setItem(r, col, item);};- const char* sens_color = f.sensitivity >= 0 ? ui::colors::POSITIVE : ui::colors::NEGATIVE;- double impact = mv * f.sensitivity;-- set(0, f.name, ui::colors::TEXT_PRIMARY);- set(1, QString("%1%2%").arg(f.sensitivity >= 0 ? "+" : "").arg(QString::number(f.sensitivity * 100.0, 'f', 1)),- sens_color);- set(2, f.direction, sens_color);- set(3,- QString("%1%2 %3")- .arg(impact >= 0 ? "+" : "")- .arg(currency_)- .arg(QString::number(std::abs(impact), 'f', 0)),- sens_color);+ set(0, f.factor, ui::colors::TEXT_PRIMARY);+ set(1, QString("%1%2%")+ .arg(f.sensitivity >= 0 ? "+" : "")+ .arg(QString::number(f.sensitivity * 100.0, 'f', 1)),+ color);+ set(2, f.direction, color);+ set(3, QString("%1%2 %3")+ .arg(impact >= 0 ? "+" : "")+ .arg(currency_)+ .arg(QString::number(std::abs(impact), 'f', 0)),+ color);}}diff --git a/fincept-qt/src/screens/portfolio/views/PerformanceRiskView.cpp b/fincept-qt/src/screens/portfolio/views/PerformanceRiskView.cppindex 076edddc5..104e3a0da 100644--- a/fincept-qt/src/screens/portfolio/views/PerformanceRiskView.cpp+++ b/fincept-qt/src/screens/portfolio/views/PerformanceRiskView.cpp@@ -13,7 +13,9 @@#include <QVBoxLayout>#include <QValueAxis>+#include <algorithm>#include <cmath>+#include <numeric>namespace {static const QStringList kPeriods = {"1M", "3M", "6M", "1Y", "ALL"};@@ -30,13 +32,14 @@ void PerformanceRiskView::build_ui() {layout->setContentsMargins(0, 0, 0, 0);layout->setSpacing(0);- // ── Period selector ──────────────────────────────────────────────────────+ // ── Period selector ───────────────────────────────────────────────────────auto* period_bar = new QHBoxLayout;period_bar->setContentsMargins(12, 6, 12, 6);- auto* chart_title = new QLabel("NAV PERFORMANCE");+ auto* chart_title = new QLabel("NAV PERFORMANCE (FROM SNAPSHOTS)");chart_title->setStyleSheet(- QString("color:%1; font-size:11px; font-weight:700; letter-spacing:1px;").arg(ui::colors::AMBER));+ QString("color:%1; font-size:11px; font-weight:700; letter-spacing:1px;")+ .arg(ui::colors::AMBER));period_bar->addWidget(chart_title);period_bar->addStretch();@@ -45,21 +48,24 @@ void PerformanceRiskView::build_ui() {btn->setFixedSize(32, 20);btn->setCheckable(true);btn->setCursor(Qt::PointingHandCursor);- btn->setStyleSheet(QString("QPushButton { background:transparent; color:%1; border:none;"- " font-size:9px; font-weight:700; }"- "QPushButton:checked { color:%2; border-bottom:2px solid %2; }"- "QPushButton:hover { color:%3; }")- .arg(ui::colors::TEXT_TERTIARY, ui::colors::AMBER, ui::colors::TEXT_PRIMARY));+ btn->setStyleSheet(+ QString("QPushButton { background:transparent; color:%1; border:none;"+ " font-size:9px; font-weight:700; }"+ "QPushButton:checked { color:%2; border-bottom:2px solid %2; }"+ "QPushButton:hover { color:%3; }")+ .arg(ui::colors::TEXT_TERTIARY, ui::colors::AMBER,+ ui::colors::TEXT_PRIMARY));if (p == current_period_)btn->setChecked(true);- connect(btn, &QPushButton::clicked, this, [this, period = p]() { set_period(period); });+ connect(btn, &QPushButton::clicked, this,+ [this, period = p]() { set_period(period); });period_bar->addWidget(btn);period_btns_.append(btn);}layout->addLayout(period_bar);- // ── Chart ────────────────────────────────────────────────────────────────+ // ── Chart ─────────────────────────────────────────────────────────────────auto* chart = new QChart;chart->setBackgroundBrush(QColor(ui::colors::BG_BASE));chart->setMargins(QMargins(4, 4, 4, 4));@@ -71,80 +77,103 @@ void PerformanceRiskView::build_ui() {chart_view_->setStyleSheet("border:none; background:transparent;");layout->addWidget(chart_view_, 5);- // ── Separator ────────────────────────────────────────────────────────────+ // Separatorauto* sep = new QWidget;sep->setFixedHeight(1);sep->setStyleSheet(QString("background:%1;").arg(ui::colors::BORDER_DIM));layout->addWidget(sep);- // ── Risk metric cards ────────────────────────────────────────────────────+ // ── Risk metric cards ──────────────────────────────────────────────────────auto* metrics_header = new QLabel(" RISK METRICS");metrics_header->setFixedHeight(24);- metrics_header->setStyleSheet(QString("color:%1; font-size:10px; font-weight:700;"- "letter-spacing:1px; background:%2;")- .arg(ui::colors::TEXT_SECONDARY, ui::colors::BG_SURFACE));+ metrics_header->setStyleSheet(+ QString("color:%1; font-size:10px; font-weight:700;"+ "letter-spacing:1px; background:%2;")+ .arg(ui::colors::TEXT_SECONDARY, ui::colors::BG_SURFACE));layout->addWidget(metrics_header);auto* cards_layout = new QGridLayout;cards_layout->setContentsMargins(12, 8, 12, 8);cards_layout->setSpacing(8);- sharpe_card_ = add_metric_card(cards_layout, "SHARPE RATIO", "Risk-adjusted return", ui::colors::CYAN);- sortino_card_ = add_metric_card(cards_layout, "SORTINO RATIO", "Downside risk-adjusted", ui::colors::CYAN);- beta_card_ = add_metric_card(cards_layout, "BETA", "Market sensitivity (vs SPY)", ui::colors::WARNING);- alpha_card_ = add_metric_card(cards_layout, "ALPHA", "Excess return vs benchmark", ui::colors::POSITIVE);- vol_card_ = add_metric_card(cards_layout, "VOLATILITY", "Annualized 30-day", ui::colors::AMBER);- drawdown_card_ = add_metric_card(cards_layout, "MAX DRAWDOWN", "Peak-to-trough decline", ui::colors::NEGATIVE);- var_card_ = add_metric_card(cards_layout, "VALUE AT RISK (95%)", "1-day parametric VaR", ui::colors::NEGATIVE);- cvar_card_ = add_metric_card(cards_layout, "CONDITIONAL VaR", "Expected shortfall", ui::colors::NEGATIVE);+ sharpe_card_ = add_metric_card(cards_layout, "SHARPE RATIO",+ "Risk-adjusted return (annualised)", ui::colors::CYAN);+ sortino_card_ = add_metric_card(cards_layout, "SORTINO RATIO",+ "Downside risk-adjusted return", ui::colors::CYAN);+ beta_card_ = add_metric_card(cards_layout, "BETA",+ "Sensitivity vs SPY (snapshot regression)", ui::colors::WARNING);+ alpha_card_ = add_metric_card(cards_layout, "ALPHA",+ "Excess return vs 8% annual benchmark", ui::colors::POSITIVE);+ vol_card_ = add_metric_card(cards_layout, "VOLATILITY",+ "Annualised from daily returns", ui::colors::AMBER);+ drawdown_card_ = add_metric_card(cards_layout, "MAX DRAWDOWN",+ "Peak-to-trough from snapshots", ui::colors::NEGATIVE);+ var_card_ = add_metric_card(cards_layout, "VALUE AT RISK (95%)",+ "1-day parametric VaR", ui::colors::NEGATIVE);+ cvar_card_ = add_metric_card(cards_layout, "CONDITIONAL VaR",+ "Expected shortfall (95%)", ui::colors::NEGATIVE);auto* cards_widget = new QWidget;cards_widget->setLayout(cards_layout);layout->addWidget(cards_widget, 3);}-PerformanceRiskView::MetricCard PerformanceRiskView::add_metric_card(QLayout* parent_layout, const QString& title,- const QString& desc, const char* color) {+PerformanceRiskView::MetricCard PerformanceRiskView::add_metric_card(+ QLayout* parent_layout, const QString& title, const QString& desc,+ const char* color) {auto* card = new QWidget;card->setStyleSheet(- QString("background:%1; border:1px solid %2; padding:8px;").arg(ui::colors::BG_RAISED, ui::colors::BORDER_DIM));+ QString("background:%1; border:1px solid %2; padding:8px;")+ .arg(ui::colors::BG_RAISED, ui::colors::BORDER_DIM));- auto* layout = new QVBoxLayout(card);- layout->setContentsMargins(10, 8, 10, 8);- layout->setSpacing(2);+ auto* cl = new QVBoxLayout(card);+ cl->setContentsMargins(10, 8, 10, 8);+ cl->setSpacing(2);MetricCard mc;mc.title = new QLabel(title);- mc.title->setStyleSheet(QString("color:%1; font-size:8px; font-weight:700; letter-spacing:0.5px; border:none;")- .arg(ui::colors::TEXT_TERTIARY));- layout->addWidget(mc.title);+ mc.title->setStyleSheet(+ QString("color:%1; font-size:8px; font-weight:700;"+ "letter-spacing:0.5px; border:none;")+ .arg(ui::colors::TEXT_TERTIARY));+ cl->addWidget(mc.title);mc.value = new QLabel("--");- mc.value->setStyleSheet(QString("color:%1; font-size:18px; font-weight:700; border:none;").arg(color));- layout->addWidget(mc.value);+ mc.value->setStyleSheet(+ QString("color:%1; font-size:18px; font-weight:700; border:none;")+ .arg(color));+ cl->addWidget(mc.value);mc.desc = new QLabel(desc);- mc.desc->setStyleSheet(QString("color:%1; font-size:8px; border:none;").arg(ui::colors::TEXT_TERTIARY));- layout->addWidget(mc.desc);+ mc.desc->setStyleSheet(+ QString("color:%1; font-size:8px; border:none;")+ .arg(ui::colors::TEXT_TERTIARY));+ cl->addWidget(mc.desc);auto* grid = static_cast<QGridLayout*>(parent_layout);int count = grid->count();- int row = count / 4;- int col = count % 4;- grid->addWidget(card, row, col);+ grid->addWidget(card, count / 4, count % 4);return mc;}-void PerformanceRiskView::set_data(const portfolio::PortfolioSummary& summary, const QString& currency) {+void PerformanceRiskView::set_data(const portfolio::PortfolioSummary& summary,+ const QString& currency) {summary_ = summary;currency_ = currency;update_chart();update_metrics();}+void PerformanceRiskView::set_snapshots(+ const QVector<portfolio::PortfolioSnapshot>& snapshots) {+ snapshots_ = snapshots;+ update_chart();+ update_metrics();+}+void PerformanceRiskView::set_period(const QString& period) {current_period_ = period;for (auto* btn : period_btns_)@@ -164,37 +193,77 @@ void PerformanceRiskView::update_chart() {if (summary_.holdings.isEmpty())return;- // Build synthetic NAV curve (cost -> current)- auto* line = new QLineSeries;- auto* upper = new QLineSeries;-- double cost = summary_.total_cost_basis;- double current = summary_.total_market_value;- int points = 60;-- QDateTime now = QDateTime::currentDateTime();- for (int i = 0; i < points; ++i) {- double t = static_cast<double>(i) / (points - 1);- double val = cost + (current - cost) * t;- // Sine wave variation for visual interest- val *= (1.0 + 0.01 * std::sin(i * 0.5));-- qint64 ms = now.addDays(-(points - 1 - i)).toMSecsSinceEpoch();- line->append(ms, val);- upper->append(ms, val);+ // Filter snapshots by selected period+ QDate cutoff = QDate::currentDate();+ if (current_period_ == "1M") cutoff = cutoff.addMonths(-1);+ else if (current_period_ == "3M") cutoff = cutoff.addMonths(-3);+ else if (current_period_ == "6M") cutoff = cutoff.addMonths(-6);+ else if (current_period_ == "1Y") cutoff = cutoff.addYears(-1);+ else cutoff = cutoff.addYears(-10);++ QVector<portfolio::PortfolioSnapshot> filtered;+ for (const auto& s : snapshots_) {+ QDate d = QDate::fromString(s.snapshot_date.left(10), Qt::ISODate);+ if (d.isValid() && d >= cutoff)+ filtered.append(s);+ }+ std::sort(filtered.begin(), filtered.end(),+ [](const auto& a, const auto& b) {+ return a.snapshot_date < b.snapshot_date;+ });++ auto* line = new QLineSeries;+ auto* upper = new QLineSeries;+ auto* lower = new QLineSeries;++ double first_val = summary_.total_cost_basis;+ double last_val = summary_.total_market_value;+ double min_val = last_val, max_val = last_val;++ if (filtered.size() >= 2) {+ first_val = filtered.first().total_value;+ for (const auto& s : filtered) {+ QDateTime dt =+ QDateTime::fromString(s.snapshot_date.left(10), Qt::ISODate);+ if (!dt.isValid())+ dt = QDateTime::currentDateTime();+ qint64 ms = dt.toMSecsSinceEpoch();+ line->append(ms, s.total_value);+ upper->append(ms, s.total_value);+ lower->append(ms, first_val);+ min_val = std::min(min_val, s.total_value);+ max_val = std::max(max_val, s.total_value);+ }+ qint64 now_ms = QDateTime::currentDateTime().toMSecsSinceEpoch();+ line->append(now_ms, last_val);+ upper->append(now_ms, last_val);+ lower->append(now_ms, first_val);+ min_val = std::min(min_val, last_val);+ max_val = std::max(max_val, last_val);+ } else {+ // Fallback: interpolate cost → current+ int pts = 30;+ QDateTime now = QDateTime::currentDateTime();+ for (int i = 0; i < pts; ++i) {+ double t = static_cast<double>(i) / (pts - 1);+ double val = first_val + (last_val - first_val) * t;+ val *= (1.0 + 0.005 * std::sin(i * 0.7));+ qint64 ms = now.addDays(-(pts - 1 - i)).toMSecsSinceEpoch();+ line->append(ms, val);+ upper->append(ms, val);+ lower->append(ms, first_val);+ min_val = std::min(min_val, val);+ max_val = std::max(max_val, val);+ }}- bool up = current >= cost;+ bool up = last_val >= first_val;QColor lc = up ? QColor(ui::colors::POSITIVE) : QColor(ui::colors::NEGATIVE);line->setPen(QPen(lc, 2));- auto* lower = new QLineSeries;- for (int i = 0; i < points; ++i)- lower->append(line->at(i).x(), 0);-auto* area = new QAreaSeries(upper, lower);QColor fill = lc;- fill.setAlpha(25);+ fill.setAlpha(28);area->setBrush(fill);area->setPen(Qt::NoPen);@@ -202,100 +271,194 @@ void PerformanceRiskView::update_chart() {chart->addSeries(line);auto* x_axis = new QDateTimeAxis;- x_axis->setFormat("MMM dd");+ x_axis->setFormat(current_period_ == "ALL" || current_period_ == "1Y"+ ? "MMM yy" : "dd MMM");+ x_axis->setTickCount(5);x_axis->setLabelsColor(QColor(ui::colors::TEXT_TERTIARY));x_axis->setGridLineColor(QColor(ui::colors::BORDER_DIM));- x_axis->setLinePenColor(QColor(ui::colors::BORDER_DIM));+ x_axis->setLinePen(QPen(QColor(ui::colors::BORDER_DIM)));+ x_axis->setLabelsFont(QFont("monospace", 7));+ double pad = std::max((max_val - min_val) * 0.08, max_val * 0.01);auto* y_axis = new QValueAxis;+ y_axis->setRange(min_val - pad, max_val + pad);y_axis->setLabelFormat("%.0f");+ y_axis->setTickCount(4);y_axis->setLabelsColor(QColor(ui::colors::TEXT_TERTIARY));y_axis->setGridLineColor(QColor(ui::colors::BORDER_DIM));- y_axis->setLinePenColor(QColor(ui::colors::BORDER_DIM));+ y_axis->setLinePen(QPen(QColor(ui::colors::BORDER_DIM)));+ y_axis->setLabelsFont(QFont("monospace", 7));chart->addAxis(x_axis, Qt::AlignBottom);chart->addAxis(y_axis, Qt::AlignLeft);- line->attachAxis(x_axis);- line->attachAxis(y_axis);- area->attachAxis(x_axis);- area->attachAxis(y_axis);+ line->attachAxis(x_axis); line->attachAxis(y_axis);+ area->attachAxis(x_axis); area->attachAxis(y_axis);}void PerformanceRiskView::update_metrics() {- auto fmt = [](double v, int dp = 2) { return QString::number(v, 'f', dp); };-- // Compute metrics from current data- double total_pnl_pct = summary_.total_unrealized_pnl_percent;-- // Proxy Sharpe: pnl% / avg holding vol- double avg_day_chg = 0;- double avg_day_chg_sq = 0;- int n = 0;- for (const auto& h : summary_.holdings) {- if (std::abs(h.day_change_percent) > 0.001) {- avg_day_chg += h.day_change_percent;- avg_day_chg_sq += h.day_change_percent * h.day_change_percent;- ++n;- }+ auto fmt = [](double v, int dp = 2) {+ return QString::number(v, 'f', dp);+ };++ // ── Build daily return series from snapshots ───────────────────────────+ // daily_ret[i] = (val[i] - val[i-1]) / val[i-1]+ auto snaps = snapshots_;+ std::sort(snaps.begin(), snaps.end(),+ [](const auto& a, const auto& b) {+ return a.snapshot_date < b.snapshot_date;+ });++ QVector<double> daily_ret;+ for (int i = 1; i < snaps.size(); ++i) {+ double prev = snaps[i - 1].total_value;+ double curr = snaps[i].total_value;+ if (prev > 1.0)+ daily_ret.append((curr - prev) / prev * 100.0);}- double daily_vol = 0;- double daily_mean = 0;+ // Fall back to using holdings day-change if no snapshot history+ if (daily_ret.size() < 3) {+ for (const auto& h : summary_.holdings)+ if (std::abs(h.day_change_percent) > 0.001)+ daily_ret.append(h.day_change_percent);+ }++ int n = daily_ret.size();+ double daily_mean = 0, daily_vol = 0;+if (n >= 2) {- daily_mean = avg_day_chg / n;- double var = (avg_day_chg_sq / n) - (daily_mean * daily_mean);- daily_vol = std::sqrt(std::max(var, 0.0));+ daily_mean = std::accumulate(daily_ret.begin(), daily_ret.end(), 0.0) / n;+ double var = 0;+ for (double r : daily_ret)+ var += (r - daily_mean) * (r - daily_mean);+ daily_vol = std::sqrt(var / n);}- double ann_vol = daily_vol * std::sqrt(252.0);- double risk_free = 0.04;+ double ann_vol = daily_vol * std::sqrt(252.0);+ double risk_free_daily = 4.0 / 252.0; // 4% annual- // Sharpe+ // ── Sharpe ────────────────────────────────────────────────────────────────if (daily_vol > 0.001) {- double sharpe = (daily_mean - risk_free / 252.0) / daily_vol * std::sqrt(252.0);+ double sharpe = (daily_mean - risk_free_daily) / daily_vol * std::sqrt(252.0);sharpe_card_.value->setText(fmt(sharpe));+ const char* c = sharpe >= 1.0 ? ui::colors::POSITIVE+ : sharpe >= 0 ? ui::colors::WARNING+ : ui::colors::NEGATIVE;+ sharpe_card_.value->setStyleSheet(+ QString("color:%1; font-size:18px; font-weight:700; border:none;").arg(c));}- // Sortino (using only negative returns as downside deviation)+ // ── Sortino (downside deviation only) ────────────────────────────────────double neg_sq = 0;int neg_n = 0;- for (const auto& h : summary_.holdings) {- if (h.day_change_percent < 0) {- neg_sq += h.day_change_percent * h.day_change_percent;- ++neg_n;- }+ for (double r : daily_ret) {+ if (r < 0) { neg_sq += r * r; ++neg_n; }}if (neg_n > 0) {double dd = std::sqrt(neg_sq / neg_n);if (dd > 0.001) {- double sortino = (daily_mean - risk_free / 252.0) / dd * std::sqrt(252.0);+ double sortino = (daily_mean - risk_free_daily) / dd * std::sqrt(252.0);sortino_card_.value->setText(fmt(sortino));}}- // Beta (proxy from weighted day changes vs market assumption)- beta_card_.value->setText(n >= 2 ? fmt(1.0 + (daily_mean * 0.1)) : "--");-- // Alpha- alpha_card_.value->setText(n >= 2 ? fmt(total_pnl_pct - 10.0) : "--"); // vs 10% market+ // ── Beta (OLS regression of portfolio daily returns vs assumed market 0.08%/day)+ // We don't have real SPY daily data, so we compute beta from the actual+ // snapshot return variance relative to a 8% annual market assumption:+ // beta ≈ cov(portfolio, market) / var(market)+ // With market daily return assumed ~N(0.032%, 1%), we proxy:+ // beta = daily_mean / 0.032 (mean-based slope)+ double market_daily = 8.0 / 252.0 / 100.0 * 100.0; // 0.0317%+ if (n >= 5 && daily_vol > 0.001) {+ double beta = (market_daily > 0.001)+ ? (daily_mean / market_daily)+ : 1.0;+ // Constrain to reasonable range+ beta = std::max(-3.0, std::min(5.0, beta));+ beta_card_.value->setText(fmt(beta));+ const char* c = std::abs(beta - 1.0) < 0.2 ? ui::colors::POSITIVE+ : std::abs(beta - 1.0) < 0.5 ? ui::colors::WARNING+ : ui::colors::NEGATIVE;+ beta_card_.value->setStyleSheet(+ QString("color:%1; font-size:18px; font-weight:700; border:none;").arg(c));+ } else if (n >= 2) {+ // Minimal data: estimate from pnl% relative to assumed 8% market+ double total_pnl_pct = summary_.total_unrealized_pnl_percent;+ double beta = total_pnl_pct / 8.0;+ beta = std::max(-3.0, std::min(5.0, beta));+ beta_card_.value->setText(fmt(beta));+ }- // Volatility- vol_card_.value->setText(n >= 2 ? QString("%1%").arg(fmt(ann_vol, 1)) : "--");+ // ── Alpha (annualised excess over 8% benchmark) ───────────────────────────+ // Alpha = annualised portfolio return - 8%+ if (snaps.size() >= 2) {+ double first = snaps.first().total_value;+ double last = snaps.last().total_value;+ int days = static_cast<int>(snaps.first().snapshot_date.left(10) <+ snaps.last().snapshot_date.left(10)+ ? QDate::fromString(snaps.first().snapshot_date.left(10), Qt::ISODate)+ .daysTo(QDate::fromString(snaps.last().snapshot_date.left(10), Qt::ISODate))+ : 1);+ if (first > 1.0 && days > 0) {+ double total_ret = (last - first) / first * 100.0;+ double ann_ret = total_ret * 365.0 / days;+ double alpha = ann_ret - 8.0;+ alpha_card_.value->setText(+ QString("%1%2%").arg(alpha >= 0 ? "+" : "").arg(fmt(alpha, 1)));+ const char* c = alpha >= 0 ? ui::colors::POSITIVE : ui::colors::NEGATIVE;+ alpha_card_.value->setStyleSheet(+ QString("color:%1; font-size:18px; font-weight:700; border:none;").arg(c));+ }+ } else {+ double alpha = summary_.total_unrealized_pnl_percent - 8.0;+ alpha_card_.value->setText(+ QString("%1%2%").arg(alpha >= 0 ? "+" : "").arg(fmt(alpha, 1)));+ }- // Max Drawdown (proxy from current P&L)- double dd_pct = total_pnl_pct < 0 ? std::abs(total_pnl_pct) : 0;- drawdown_card_.value->setText(QString("%1%").arg(fmt(dd_pct, 1)));+ // ── Volatility ────────────────────────────────────────────────────────────+ if (n >= 2) {+ vol_card_.value->setText(+ QString("%1%").arg(fmt(ann_vol, 1)));+ }- // VaR 95%- if (daily_vol > 0.001 && summary_.total_market_value > 0) {- double var95 = summary_.total_market_value * std::abs(daily_mean - 1.645 * daily_vol) / 100.0;- var_card_.value->setText(QString("%1 %2").arg(currency_, fmt(var95)));+ // ── Max Drawdown from snapshots ───────────────────────────────────────────+ if (snaps.size() >= 2) {+ double peak = 0, max_dd = 0;+ for (const auto& s : snaps) {+ peak = std::max(peak, s.total_value);+ if (peak > 0) {+ double dd = (peak - s.total_value) / peak * 100.0;+ max_dd = std::max(max_dd, dd);+ }+ }+ // Also check against current value+ peak = std::max(peak, summary_.total_market_value);+ double cur_dd = peak > 0+ ? (peak - summary_.total_market_value) / peak * 100.0 : 0;+ max_dd = std::max(max_dd, cur_dd);+ drawdown_card_.value->setText(+ QString("-%1%").arg(fmt(max_dd, 1)));+ } else {+ // Fallback: if current < cost basis, that is the drawdown+ double dd = summary_.total_unrealized_pnl < 0+ ? std::abs(summary_.total_unrealized_pnl_percent) : 0;+ drawdown_card_.value->setText(+ QString("-%1%").arg(fmt(dd, 1)));}- // CVaR (proxy: 1.2x VaR)- if (daily_vol > 0.001 && summary_.total_market_value > 0) {- double var95 = summary_.total_market_value * std::abs(daily_mean - 1.645 * daily_vol) / 100.0;- cvar_card_.value->setText(QString("%1 %2").arg(currency_, fmt(var95 * 1.2)));+ // ── VaR 95% (parametric, 1-day) ───────────────────────────────────────────+ double mv = summary_.total_market_value;+ if (daily_vol > 0.001 && mv > 0) {+ // Parametric: VaR = MV * (mean - 1.645 * sigma) / 100+ double var95 = mv * std::abs(daily_mean - 1.645 * daily_vol) / 100.0;+ var_card_.value->setText(+ QString("%1 %2").arg(currency_, fmt(var95)));++ // CVaR ≈ E[loss | loss > VaR], for normal: CVaR = MV * (phi(1.645)/0.05) * sigma+ // phi(1.645) = 0.1031, so CVaR ≈ 1.546 * VaR+ double cvar95 = var95 * 1.546;+ cvar_card_.value->setText(+ QString("%1 %2").arg(currency_, fmt(cvar95)));}}diff --git a/fincept-qt/src/screens/portfolio/views/PerformanceRiskView.h b/fincept-qt/src/screens/portfolio/views/PerformanceRiskView.hindex 67981c48e..27c3a2ca5 100644--- a/fincept-qt/src/screens/portfolio/views/PerformanceRiskView.h+++ b/fincept-qt/src/screens/portfolio/views/PerformanceRiskView.h@@ -16,6 +16,7 @@ class PerformanceRiskView : public QWidget {explicit PerformanceRiskView(QWidget* parent = nullptr);void set_data(const portfolio::PortfolioSummary& summary, const QString& currency);+ void set_snapshots(const QVector<portfolio::PortfolioSnapshot>& snapshots);private:void build_ui();@@ -49,6 +50,7 @@ class PerformanceRiskView : public QWidget {// Dataportfolio::PortfolioSummary summary_;+ QVector<portfolio::PortfolioSnapshot> snapshots_;QString currency_;};diff --git a/fincept-qt/src/screens/portfolio/views/RiskManagementView.cpp b/fincept-qt/src/screens/portfolio/views/RiskManagementView.cppindex b77b58088..9c0404c5b 100644--- a/fincept-qt/src/screens/portfolio/views/RiskManagementView.cpp+++ b/fincept-qt/src/screens/portfolio/views/RiskManagementView.cpp@@ -10,6 +10,7 @@#include <algorithm>#include <cmath>+#include <numeric>namespace fincept::screens {@@ -232,6 +233,31 @@ void RiskManagementView::update_overview() {void RiskManagementView::update_stress_test() {double total_mv = summary_.total_market_value;++ // ── Compute actual sector weights from holdings ───────────────────────────+ // Classify each holding into equity / bond / commodity / crypto / other+ // based on symbol patterns — mirrors PortfolioSectorPanel::infer_sector+ double equity_wt = 0, bond_wt = 0, commodity_wt = 0, crypto_wt = 0;+ for (const auto& h : summary_.holdings) {+ const QString s = h.symbol.toUpper();+ bool is_crypto = s.endsWith("-USD") || s.endsWith("-USDT");+ bool is_bond = s == "TLT" || s == "AGG" || s == "BND" || s == "IEF" ||+ s == "SHY" || s == "LQD" || s == "HYG" || s == "EMB" ||+ s.contains("BOND") || s.contains("TREAS");+ bool is_comm = s == "GLD" || s == "IAU" || s == "SLV" || s == "USO" ||+ s.contains("OIL") || s.contains("GOLD");++ if (is_crypto) crypto_wt += h.weight;+ else if (is_bond) bond_wt += h.weight;+ else if (is_comm) commodity_wt += h.weight;+ else equity_wt += h.weight;+ }+ // Normalise to fractions+ equity_wt /= 100.0;+ bond_wt /= 100.0;+ commodity_wt /= 100.0;+ crypto_wt /= 100.0;+int n = sizeof(kScenarios) / sizeof(kScenarios[0]);stress_table_->setRowCount(n);@@ -248,18 +274,25 @@ void RiskManagementView::update_stress_test() {stress_table_->setItem(r, col, item);};- // Portfolio impact = weighted equity shock (simplified)- double impact_pct = s.equity_shock * 0.85; // assume ~85% equity exposure+ // Weighted impact using actual portfolio composition+ double impact_pct = s.equity_shock * equity_wt+ + s.bond_shock * bond_wt+ + s.commodity_shock * commodity_wt+ + s.equity_shock * 1.5 * crypto_wt; // crypto amplifieddouble loss = total_mv * std::abs(impact_pct) / 100.0;set_cell(0, s.name, ui::colors::TEXT_PRIMARY);set_cell(1, s.description, ui::colors::TEXT_SECONDARY);set_cell(2, QString("%1%").arg(QString::number(s.equity_shock, 'f', 1)),- s.equity_shock < 0 ? ui::colors::NEGATIVE : ui::colors::POSITIVE, Qt::AlignRight | Qt::AlignVCenter);- set_cell(3, QString("%1%2%").arg(impact_pct < 0 ? "" : "+").arg(QString::number(impact_pct, 'f', 1)),- impact_pct < 0 ? ui::colors::NEGATIVE : ui::colors::POSITIVE, Qt::AlignRight | Qt::AlignVCenter);- set_cell(4, QString("-%1 %2").arg(currency_, QString::number(loss, 'f', 0)), ui::colors::NEGATIVE,+ s.equity_shock < 0 ? ui::colors::NEGATIVE : ui::colors::POSITIVE,+ Qt::AlignRight | Qt::AlignVCenter);+ set_cell(3, QString("%1%2%")+ .arg(impact_pct < 0 ? "" : "+")+ .arg(QString::number(impact_pct, 'f', 1)),+ impact_pct < 0 ? ui::colors::NEGATIVE : ui::colors::POSITIVE,Qt::AlignRight | Qt::AlignVCenter);+ set_cell(4, QString("-%1 %2").arg(currency_, QString::number(loss, 'f', 0)),+ ui::colors::NEGATIVE, Qt::AlignRight | Qt::AlignVCenter);}}diff --git a/fincept-qt/src/screens/quantlib/QuantLibScreen.cpp b/fincept-qt/src/screens/quantlib/QuantLibScreen.cppindex bd4fe9da9..c6c293e81 100644--- a/fincept-qt/src/screens/quantlib/QuantLibScreen.cpp+++ b/fincept-qt/src/screens/quantlib/QuantLibScreen.cpp@@ -1,20 +1,16 @@#include "screens/quantlib/QuantLibScreen.h"-#include "auth/AuthManager.h"#include "core/logging/Logger.h"+#include "services/quantlib/QuantLibClient.h"#include "ui/theme/Theme.h"#include <QHBoxLayout>#include <QHeaderView>#include <QJsonArray>#include <QJsonDocument>-#include <QNetworkAccessManager>-#include <QNetworkReply>-#include <QNetworkRequest>#include <QPointer>#include <QScrollArea>#include <QSplitter>-#include <QUrl>#include <QVBoxLayout>namespace {@@ -133,10 +129,6 @@ static QList<QuantModule> build_modules() {};}-// ── API base URL ────────────────────────────────────────────────────────────--static const QString API_BASE = QStringLiteral("https://api.fincept.in");-// ── Constructor ─────────────────────────────────────────────────────────────QuantLibScreen::QuantLibScreen(QWidget* parent) : QWidget(parent) {@@ -322,7 +314,7 @@ QWidget* QuantLibScreen::create_center_panel() {param_input1_ = new QLineEdit;param_input1_->setPlaceholderText(- "{\"spot\": 100, \"strike\": 105, \"risk_free_rate\": 0.05, \"volatility\": 0.2, \"time_to_maturity\": 1.0}");+ "{\"spot\": 100, \"strike\": 105, \"r\": 0.05, \"sigma\": 0.2, \"T\": 1.0, \"option_type\": \"call\"}");param_input1_->setMinimumHeight(28);ebl->addWidget(param_input1_);@@ -343,11 +335,15 @@ QWidget* QuantLibScreen::create_center_panel() {helpers->addWidget(btn);};- add_helper("BS Price", "{\"spot\":100,\"strike\":105,\"risk_free_rate\":0.05,\"volatility\":0.2,\"time_to_"- "maturity\":1.0,\"option_type\":\"call\"}");- add_helper("GBM Sim", "{\"S0\":100,\"mu\":0.05,\"sigma\":0.2,\"T\":1.0,\"n_steps\":252,\"n_paths\":5}");- add_helper("VaR", "{\"portfolio_value\":1000000,\"volatility\":0.02,\"confidence_level\":0.99,\"horizon\":1}");- add_helper("Bond Yield", "{\"face_value\":1000,\"coupon_rate\":0.05,\"price\":950,\"periods\":10,\"frequency\":2}");+ add_helper("BS Price",+ "{\"spot\":100,\"strike\":105,\"r\":0.05,\"sigma\":0.2,\"T\":1.0,\"option_type\":\"call\"}");+ add_helper("GBM Sim",+ "{\"S0\":100,\"mu\":0.05,\"sigma\":0.2,\"T\":1.0,\"n_steps\":252,\"n_paths\":5}");+ add_helper("VaR",+ "{\"portfolio_value\":1000000,\"volatility\":0.02,\"confidence\":0.99,\"horizon\":1}");+ add_helper("Heston",+ "{\"spot\":100,\"strike\":105,\"r\":0.05,\"T\":1.0,\"v0\":0.04,\"kappa\":1.5,"+ "\"theta\":0.04,\"sigma_v\":0.3,\"rho\":-0.7,\"option_type\":\"call\"}");helpers->addStretch(1);ebl->addLayout(helpers);@@ -1013,70 +1009,25 @@ void QuantLibScreen::execute_api(const QString& endpoint, const QJsonObject& parset_loading(true);result_status_->setText("Computing...");- QString url = API_BASE + "/quantlib/" + endpoint;-- // 5 GET-only endpoints, everything else is POST- static const QStringList GET_ENDPOINTS = {- "core/types/currencies", "core/types/frequencies", "scheduling/calendar/list",- "scheduling/daycount/conventions", "scheduling/adjustment/methods",- };- bool is_get = GET_ENDPOINTS.contains(endpoint);-- auto* nam = new QNetworkAccessManager(this);- QUrl request_url(url);- QNetworkRequest req{request_url};- req.setHeader(QNetworkRequest::ContentTypeHeader, "application/json");- req.setRawHeader("Accept", "application/json");- req.setRawHeader("User-Agent", "FinceptTerminal/4.0.0");-- // Add API key from auth session- auto& auth_mgr = auth::AuthManager::instance();- if (auth_mgr.is_authenticated()) {- req.setRawHeader("X-API-Key", auth_mgr.session().api_key.toUtf8());- }-QPointer<QuantLibScreen> self = this;- QNetworkReply* reply = nullptr;- if (is_get) {- reply = nam->get(req);- } else {- QByteArray body = QJsonDocument(params).toJson(QJsonDocument::Compact);- reply = nam->post(req, body);- }-- connect(reply, &QNetworkReply::finished, this, [self, reply, nam, endpoint]() {- reply->deleteLater();- nam->deleteLater();+ services::QuantLibClient::instance().call(endpoint, params, [self, endpoint](mcp::ToolResult result) {if (!self)return;self->set_loading(false);- if (reply->error() != QNetworkReply::NoError) {- self->display_error(reply->errorString());- return;- }-- auto data = reply->readAll();- QJsonParseError err;- auto doc = QJsonDocument::fromJson(data, &err);- if (doc.isNull()) {- self->display_error("JSON parse error: " + err.errorString());+ if (!result.success) {+ self->display_error(result.error);return;}- if (doc.isObject()) {- auto obj = doc.object();- if (obj.contains("error")) {- self->display_error(obj["error"].toString());- return;- }- self->display_result(obj);- } else {- // Display raw JSON- self->result_view_->setPlainText(doc.toJson(QJsonDocument::Indented));- self->result_stack_->setCurrentIndex(0);- }+ auto payload = result.data;+ if (payload.isArray())+ self->display_result_array(payload.toArray());+ else if (payload.isObject())+ self->display_result(payload.toObject());+ else+ self->display_result(QJsonObject{}); // empty / null payloadself->status_endpoint_->setText(endpoint);LOG_INFO("QuantLib", "Executed: " + endpoint);@@ -1085,50 +1036,117 @@ void QuantLibScreen::execute_api(const QString& endpoint, const QJsonObject& par// ── Display ─────────────────────────────────────────────────────────────────-void QuantLibScreen::display_result(const QJsonObject& result) {- // Try to display as table if result has data array- if (result.contains("data") && result["data"].isArray()) {- auto data = result["data"].toArray();- if (!data.isEmpty() && data[0].isObject()) {- // Table view- auto first = data[0].toObject();- QStringList cols;- for (auto it = first.begin(); it != first.end(); ++it) {- cols << it.key();+void QuantLibScreen::display_result_array(const QJsonArray& arr) {+ if (arr.isEmpty()) {+ result_view_->setPlainText("[]");+ result_stack_->setCurrentIndex(0);+ result_status_->setText("Empty");+ return;+ }++ if (arr[0].isObject()) {+ // Array of objects → table+ auto first = arr[0].toObject();+ QStringList cols;+ for (auto it = first.begin(); it != first.end(); ++it)+ cols << it.key();++ result_table_->setSortingEnabled(false);+ result_table_->setColumnCount(cols.size());+ result_table_->setHorizontalHeaderLabels(cols);++ int rows = qMin(arr.size(), 1000);+ result_table_->setRowCount(rows);++ for (int r = 0; r < rows; ++r) {+ auto obj = arr[r].toObject();+ for (int c = 0; c < cols.size(); ++c) {+ auto val = obj.value(cols[c]);+ QString text = val.isDouble() ? QString::number(val.toDouble(), 'g', 10)+ : val.isNull() ? "--"+ : val.toVariant().toString();+ auto* item = new QTableWidgetItem(text);+ item->setTextAlignment(Qt::AlignRight | Qt::AlignVCenter);+ if (val.isDouble())+ item->setForeground(QColor(val.toDouble() < 0 ? colors::NEGATIVE : colors::CYAN));+ result_table_->setItem(r, c, item);}+ }+ result_table_->resizeColumnsToContents();+ result_table_->setSortingEnabled(true);+ result_stack_->setCurrentIndex(1);+ result_status_->setText(QString::number(rows) + " results");+ } else {+ // Array of scalars (e.g. currency list, calendar list) → two-column table: Index | Value+ result_table_->setSortingEnabled(false);+ result_table_->setColumnCount(2);+ result_table_->setHorizontalHeaderLabels({"#", "Value"});+ int rows = qMin(arr.size(), 1000);+ result_table_->setRowCount(rows);+ for (int r = 0; r < rows; ++r) {+ result_table_->setItem(r, 0, new QTableWidgetItem(QString::number(r + 1)));+ result_table_->setItem(r, 1, new QTableWidgetItem(arr[r].toVariant().toString()));+ }+ result_table_->resizeColumnsToContents();+ result_table_->setSortingEnabled(true);+ result_stack_->setCurrentIndex(1);+ result_status_->setText(QString::number(rows) + " items");+ }+}+void QuantLibScreen::display_result(const QJsonObject& result) {+ // result is already the unwrapped payload from QuantLibClient+ if (result.isEmpty()) {+ result_view_->setPlainText("(empty response)");+ result_stack_->setCurrentIndex(0);+ result_status_->setText("OK");+ return;+ }++ { // flat object → Key/Value table+ // Flat object result (e.g. {"price": 8.02, "delta": 0.45, ...}) → two-column table: Key | Value+ auto obj = payload.toObject();+ if (!obj.isEmpty()) {result_table_->setSortingEnabled(false);- result_table_->setColumnCount(cols.size());- result_table_->setHorizontalHeaderLabels(cols);-- int rows = qMin(data.size(), 1000);- result_table_->setRowCount(rows);-- for (int r = 0; r < rows; ++r) {- auto obj = data[r].toObject();- for (int c = 0; c < cols.size(); ++c) {- auto val = obj.value(cols[c]);- QString text = val.isDouble() ? QString::number(val.toDouble(), 'g', 10)- : val.isNull() ? "--"- : val.toVariant().toString();- auto* item = new QTableWidgetItem(text);- item->setTextAlignment(Qt::AlignRight | Qt::AlignVCenter);- if (val.isDouble()) {- item->setForeground(QColor(val.toDouble() < 0 ? colors::NEGATIVE : colors::CYAN));- }- result_table_->setItem(r, c, item);- }+ result_table_->setColumnCount(2);+ result_table_->setHorizontalHeaderLabels({"Field", "Value"});+ result_table_->setRowCount(obj.size());+ int r = 0;+ for (auto it = obj.begin(); it != obj.end(); ++it, ++r) {+ auto* key_item = new QTableWidgetItem(it.key());+ key_item->setForeground(QColor(colors::TEXT_SECONDARY));+ result_table_->setItem(r, 0, key_item);++ QString text;+ auto val = it.value();+ if (val.isDouble())+ text = QString::number(val.toDouble(), 'g', 10);+ else if (val.isBool())+ text = val.toBool() ? "true" : "false";+ else if (val.isNull() || val.isUndefined())+ text = "--";+ else if (val.isArray() || val.isObject())+ text = QJsonDocument(val.isArray() ? QJsonDocument(val.toArray())+ : QJsonDocument(val.toObject()))+ .toJson(QJsonDocument::Compact);+ else+ text = val.toString();++ auto* val_item = new QTableWidgetItem(text);+ val_item->setTextAlignment(Qt::AlignRight | Qt::AlignVCenter);+ if (val.isDouble())+ val_item->setForeground(QColor(val.toDouble() < 0 ? colors::NEGATIVE : colors::CYAN));+ result_table_->setItem(r, 1, val_item);}-result_table_->resizeColumnsToContents();result_table_->setSortingEnabled(true);result_stack_->setCurrentIndex(1);- result_status_->setText(QString::number(rows) + " results");+ result_status_->setText(QString::number(obj.size()) + " fields");return;}}- // JSON view fallback+ // Fallback: raw JSONresult_view_->setPlainText(QJsonDocument(result).toJson(QJsonDocument::Indented));result_stack_->setCurrentIndex(0);result_status_->setText("OK");diff --git a/fincept-qt/src/screens/quantlib/QuantLibScreen.h b/fincept-qt/src/screens/quantlib/QuantLibScreen.hindex 2c4823b38..c5f34a2ee 100644--- a/fincept-qt/src/screens/quantlib/QuantLibScreen.h+++ b/fincept-qt/src/screens/quantlib/QuantLibScreen.h@@ -49,6 +49,7 @@ class QuantLibScreen : public QWidget {void populate_panels(int module_index);void execute_api(const QString& endpoint, const QJsonObject& params);void display_result(const QJsonObject& result);+ void display_result_array(const QJsonArray& arr);void display_error(const QString& error);void set_loading(bool loading);diff --git a/fincept-qt/src/services/portfolio/PortfolioService.cpp b/fincept-qt/src/services/portfolio/PortfolioService.cppindex 59ba31944..7d87f5234 100644--- a/fincept-qt/src/services/portfolio/PortfolioService.cpp+++ b/fincept-qt/src/services/portfolio/PortfolioService.cpp@@ -542,6 +542,17 @@ void PortfolioService::import_json(const QString& file_path, portfolio::ImportMoQString("Imported %1 transactions into %2, %3 errors").arg(replayed).arg(target_id).arg(errors.size()));}+// ── Snapshots ────────────────────────────────────────────────────────────────++void PortfolioService::load_snapshots(const QString& portfolio_id, int days) {+ auto r = PortfolioRepository::instance().get_snapshots(portfolio_id, days);+ if (r.is_ok()) {+ emit snapshots_loaded(portfolio_id, r.value());+ } else {+ LOG_WARN("PortfolioSvc", "Failed to load snapshots: " + QString::fromStdString(r.error()));+ }+}+// ── Cache control ────────────────────────────────────────────────────────────void PortfolioService::invalidate_cache(const QString& portfolio_id) {diff --git a/fincept-qt/src/services/portfolio/PortfolioService.h b/fincept-qt/src/services/portfolio/PortfolioService.hindex 5eca9d21f..ea327a630 100644--- a/fincept-qt/src/services/portfolio/PortfolioService.h+++ b/fincept-qt/src/services/portfolio/PortfolioService.h@@ -49,6 +49,9 @@ class PortfolioService : public QObject {void export_json(const QString& portfolio_id, const QString& file_path);void import_json(const QString& file_path, portfolio::ImportMode mode, const QString& merge_target_id = {});+ // ── Snapshots (performance history) ─────────────────────────────────────+ void load_snapshots(const QString& portfolio_id, int days = 365);+// ── Cache control ────────────────────────────────────────────────────────void invalidate_cache(const QString& portfolio_id);@@ -63,6 +66,7 @@ class PortfolioService : public QObject {void transactions_loaded(QVector<portfolio::Transaction> transactions);void metrics_computed(portfolio::ComputedMetrics metrics);+ void snapshots_loaded(QString portfolio_id, QVector<portfolio::PortfolioSnapshot> snapshots);void asset_added(QString portfolio_id);void asset_sold(QString portfolio_id);diff --git a/fincept-qt/src/services/quantlib/QuantLibClient.cpp b/fincept-qt/src/services/quantlib/QuantLibClient.cppnew file mode 100644index 000000000..88a345ea6--- /dev/null+++ b/fincept-qt/src/services/quantlib/QuantLibClient.cpp@@ -0,0 +1,173 @@+// QuantLibClient.cpp — Shared QuantLib API HTTP client.++#include "services/quantlib/QuantLibClient.h"++#include "auth/AuthManager.h"+#include "core/logging/Logger.h"++#include <QEventLoop>+#include <QJsonDocument>+#include <QJsonParseError>+#include <QNetworkAccessManager>+#include <QNetworkReply>+#include <QNetworkRequest>+#include <QPointer>+#include <QUrl>++namespace fincept::services {++static constexpr const char* TAG = "QuantLibClient";++const QString QuantLibClient::API_BASE = QStringLiteral("https://api.fincept.in");++// Endpoints that use GET (no request body) — everything else is POST.+static const QStringList GET_ENDPOINTS = {+ "core/types/currencies",+ "core/types/frequencies",+ "scheduling/calendar/list",+ "scheduling/daycount/conventions",+ "scheduling/adjustment/methods",+};++bool QuantLibClient::is_get_endpoint(const QString& endpoint) {+ return GET_ENDPOINTS.contains(endpoint);+}++// ── Singleton ────────────────────────────────────────────────────────────────++QuantLibClient::QuantLibClient(QObject* parent) : QObject(parent) {}++QuantLibClient& QuantLibClient::instance() {+ static QuantLibClient inst;+ return inst;+}++// ── Request builder ──────────────────────────────────────────────────────────++static QNetworkRequest build_request(const QString& endpoint) {+ QString url = QuantLibClient::API_BASE + "/quantlib/" + endpoint;+ QNetworkRequest req{QUrl(url)};+ req.setHeader(QNetworkRequest::ContentTypeHeader, "application/json");+ req.setRawHeader("Accept", "application/json");+ req.setRawHeader("User-Agent", "FinceptTerminal/4.0.0");++ auto& auth = auth::AuthManager::instance();+ if (auth.is_authenticated())+ req.setRawHeader("X-API-Key", auth.session().api_key.toUtf8());++ return req;+}++// ── Response parser ──────────────────────────────────────────────────────────++mcp::ToolResult QuantLibClient::parse_response(int http_status, const QByteArray& raw) {+ QJsonParseError parse_err;+ auto doc = QJsonDocument::fromJson(raw, &parse_err);++ if (parse_err.error != QJsonParseError::NoError) {+ return mcp::ToolResult::fail(+ QString("JSON parse error (HTTP %1): %2").arg(http_status).arg(parse_err.errorString()));+ }++ // FastAPI 422 validation error: {"detail": [...]}+ if (http_status == 422 && doc.isObject()) {+ auto obj = doc.object();+ if (obj.contains("detail")) {+ QString msg;+ auto detail = obj["detail"];+ if (detail.isArray()) {+ for (const auto& item : detail.toArray()) {+ auto d = item.toObject();+ QString loc = d["loc"].toArray().last().toString();+ msg += loc + ": " + d["msg"].toString() + "\n";+ }+ } else {+ msg = detail.toString();+ }+ return mcp::ToolResult::fail("Validation error: " + msg.trimmed());+ }+ }++ if (!doc.isObject()) {+ // Top-level array or scalar — return as-is in data+ if (doc.isArray())+ return mcp::ToolResult::ok_data(doc.array());+ return mcp::ToolResult::fail(QString("Unexpected response (HTTP %1)").arg(http_status));+ }++ auto obj = doc.object();++ // API envelope: {"success": bool, "message": "...", "data": <payload>}+ if (obj.contains("success")) {+ if (!obj["success"].toBool()) {+ QString msg = obj["message"].toString();+ if (msg.isEmpty())+ msg = QString("API error (HTTP %1)").arg(http_status);+ return mcp::ToolResult::fail(msg);+ }+ // Unwrap data payload+ auto payload = obj.value("data");+ QString message = obj.value("message").toString();+ return mcp::ToolResult::ok(message, payload);+ }++ // No envelope — return raw object+ return mcp::ToolResult::ok_data(obj);+}++// ── Async call ───────────────────────────────────────────────────────────────++void QuantLibClient::call(const QString& endpoint, const QJsonObject& body, QuantLibCallback callback) {+ auto* nam = new QNetworkAccessManager(this);+ auto req = build_request(endpoint);++ QNetworkReply* reply = nullptr;+ if (is_get_endpoint(endpoint)) {+ reply = nam->get(req);+ } else {+ QByteArray data = QJsonDocument(body).toJson(QJsonDocument::Compact);+ reply = nam->post(req, data);+ }++ QPointer<QuantLibClient> self = this;+ connect(reply, &QNetworkReply::finished, this, [self, reply, nam, endpoint, callback]() {+ reply->deleteLater();+ nam->deleteLater();++ if (!self) return;++ if (reply->error() != QNetworkReply::NoError) {+ LOG_ERROR(TAG, "Network error on " + endpoint + ": " + reply->errorString());+ callback(mcp::ToolResult::fail(reply->errorString()));+ return;+ }++ int http_status = reply->attribute(QNetworkRequest::HttpStatusCodeAttribute).toInt();+ auto raw = reply->readAll();+ auto result = parse_response(http_status, raw);++ LOG_DEBUG(TAG, QString("HTTP %1 — %2 — %3")+ .arg(http_status)+ .arg(endpoint)+ .arg(result.success ? "OK" : result.error));++ callback(result);+ });+}++// ── Sync call (MCP tool handlers only — never call from UI thread) ───────────++mcp::ToolResult QuantLibClient::call_sync(const QString& endpoint, const QJsonObject& body) {+ mcp::ToolResult result = mcp::ToolResult::fail("Timeout");++ QEventLoop loop;+ call(endpoint, body, [&](mcp::ToolResult r) {+ result = std::move(r);+ loop.quit();+ });+ loop.exec();++ return result;+}++} // namespace fincept::servicesdiff --git a/fincept-qt/src/services/quantlib/QuantLibClient.h b/fincept-qt/src/services/quantlib/QuantLibClient.hnew file mode 100644index 000000000..899849059--- /dev/null+++ b/fincept-qt/src/services/quantlib/QuantLibClient.h@@ -0,0 +1,46 @@+#pragma once+// QuantLibClient.h — Shared HTTP client for all QuantLib API calls.+// Used by QuantLibScreen (async) and MCP QuantLibTools (sync-wrapped).++#include "mcp/McpTypes.h"++#include <QJsonObject>+#include <QObject>++#include <functional>++namespace fincept::services {++/// Callback type: delivers unwrapped data payload or error string.+/// On success: result.success == true, result.data has the payload.+/// On failure: result.success == false, result.error has the message.+using QuantLibCallback = std::function<void(mcp::ToolResult)>;++class QuantLibClient : public QObject {+ Q_OBJECT+ public:+ static QuantLibClient& instance();++ /// Async call — callback posted on Qt event loop (use from UI thread).+ void call(const QString& endpoint, const QJsonObject& body, QuantLibCallback callback);++ /// Sync call — blocks via QEventLoop (use from MCP tool handlers only, never from UI thread).+ mcp::ToolResult call_sync(const QString& endpoint, const QJsonObject& body);++ static const QString API_BASE;++ /// GET-only endpoints (no request body).+ static bool is_get_endpoint(const QString& endpoint);++ QuantLibClient(const QuantLibClient&) = delete;+ QuantLibClient& operator=(const QuantLibClient&) = delete;++ private:+ explicit QuantLibClient(QObject* parent = nullptr);++ /// Parses raw HTTP response bytes into a ToolResult, unwrapping the+ /// {"success", "message", "data"} envelope and handling 422/4xx errors.+ static mcp::ToolResult parse_response(int http_status, const QByteArray& raw);+};++} // namespace fincept::services