@@ -631,7 +645,7 @@ function HourlyGenerationSheet({ hourly }: { hourly: HourlyData }) {
className="w-full flex items-center gap-2 py-1.5 hover:bg-accent/40 rounded px-2 text-left font-medium"
>
{isYearExpanded ? "▼" : "▶"}
-
Y{year}
+
{fyLabel}
{hasSolar &&
{Math.round(solarYr).toLocaleString()} MWh}
{hasWind &&
{Math.round(windYr).toLocaleString()} MWh}
@@ -644,6 +658,7 @@ function HourlyGenerationSheet({ hourly }: { hourly: HourlyData }) {
const solarMo = hasSolar ? computeMonthTotal(year, month, true) : 0;
const windMo = hasWind ? computeMonthTotal(year, month, false) : 0;
const daysInMonth = MONTH_DAYS[month - 1];
+ const monthLabel = getMonthLabel(month, i);
return (
@@ -652,7 +667,7 @@ function HourlyGenerationSheet({ hourly }: { hourly: HourlyData }) {
className="w-full flex items-center gap-2 py-1 hover:bg-accent/30 rounded px-2 text-left"
>
{isMonthExpanded ? "▼" : "▶"}
- M{month}
+ {monthLabel}
{hasSolar && {Math.round(solarMo).toLocaleString()} MWh}
{hasWind && {Math.round(windMo).toLocaleString()} MWh}
@@ -672,7 +687,7 @@ function HourlyGenerationSheet({ hourly }: { hourly: HourlyData }) {
className="w-full flex items-center gap-2 py-0.5 hover:bg-accent/20 rounded px-2 text-left"
>
{isDayExpanded ? "▼" : "▶"}
- D{day}
+ {monthLabel} {day}
{hasSolar && {Math.round(solarDy).toLocaleString()}}
{hasWind && {Math.round(windDy).toLocaleString()}}
@@ -797,9 +812,10 @@ interface Props {
kpis: KpiSummary;
debtScheduleJson: string | null;
activeSheet: string;
+ codYear?: number;
}
-export function WorkbookView({ scenarioId, kpis, debtScheduleJson, activeSheet }: Props) {
+export function WorkbookView({ scenarioId, kpis, debtScheduleJson, activeSheet, codYear }: Props) {
const { data: stmts } = useQuery({
queryKey: ["statements", scenarioId],
queryFn: () => getStatements(scenarioId),
@@ -847,7 +863,7 @@ export function WorkbookView({ scenarioId, kpis, debtScheduleJson, activeSheet }
)}
{activeSheet === "irr" && }
{activeSheet === "generation" && (stmts?.solar_hourly || stmts?.wind_hourly ? (
-
+
) : generation.length > 0 ? (
) : (