Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 9 additions & 3 deletions src/app/propagation/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -156,23 +156,29 @@ export default function PropagationPage() {
<div className="grid grid-cols-1 md:grid-cols-3 gap-4">
<div className="text-center">
<div className="text-2xl font-bold text-blue-600">
{data.solar_activity.solar_flux_index.toFixed(1)}
{(typeof data.solar_activity.solar_flux_index === 'number'
? data.solar_activity.solar_flux_index
: parseFloat(data.solar_activity.solar_flux_index)).toFixed(1)}
</div>
<div className="text-sm text-muted-foreground">
Solar Flux Index (SFI)
</div>
</div>
<div className="text-center">
<div className="text-2xl font-bold text-orange-600">
{data.solar_activity.a_index.toFixed(1)}
{(typeof data.solar_activity.a_index === 'number'
? data.solar_activity.a_index
: parseFloat(data.solar_activity.a_index)).toFixed(1)}
</div>
<div className="text-sm text-muted-foreground">
A-Index (Daily)
</div>
</div>
<div className="text-center">
<div className="text-2xl font-bold text-purple-600">
{data.solar_activity.k_index.toFixed(1)}
{(typeof data.solar_activity.k_index === 'number'
? data.solar_activity.k_index
: parseFloat(data.solar_activity.k_index)).toFixed(1)}
</div>
<div className="text-sm text-muted-foreground">
K-Index (3-hour)
Expand Down
46 changes: 43 additions & 3 deletions src/models/Propagation.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,20 @@
import { query } from '@/lib/db';
import { SolarActivity, PropagationForecast, BandCondition, PropagationAlert } from '@/types/propagation';

// Database row types for DECIMAL fields that come back as strings
interface SolarActivityRow {
id?: number;
timestamp: Date;
solar_flux_index: string; // DECIMAL comes back as string
a_index: string; // DECIMAL comes back as string
k_index: string; // DECIMAL comes back as string
solar_wind_speed?: string | null; // DECIMAL comes back as string
solar_wind_density?: string | null; // DECIMAL comes back as string
xray_class?: string;
created_at?: Date;
updated_at?: Date;
}

export class Propagation {
/**
* Save solar activity data
Expand Down Expand Up @@ -33,7 +47,16 @@ export class Propagation {
data.xray_class || null
]);

return result.rows[0];
const row = result.rows[0] as SolarActivityRow;
// Convert DECIMAL fields from strings to numbers
return {
...row,
solar_flux_index: parseFloat(row.solar_flux_index),
a_index: parseFloat(row.a_index),
k_index: parseFloat(row.k_index),
solar_wind_speed: row.solar_wind_speed ? parseFloat(row.solar_wind_speed) : undefined,
solar_wind_density: row.solar_wind_density ? parseFloat(row.solar_wind_density) : undefined
};
}

/**
Expand All @@ -49,7 +72,16 @@ export class Propagation {

const result = await query(sql);
if (result.rows[0]) {
return result.rows[0];
const row = result.rows[0] as SolarActivityRow;
// Convert DECIMAL fields from strings to numbers
return {
...row,
solar_flux_index: parseFloat(row.solar_flux_index),
a_index: parseFloat(row.a_index),
k_index: parseFloat(row.k_index),
solar_wind_speed: row.solar_wind_speed ? parseFloat(row.solar_wind_speed) : undefined,
solar_wind_density: row.solar_wind_density ? parseFloat(row.solar_wind_density) : undefined
};
}
} catch (error) {
console.warn('Database unavailable for solar activity query, using fallback:', error);
Expand Down Expand Up @@ -109,7 +141,15 @@ export class Propagation {
`;

const result = await query(sql, [startDate, endDate]);
return result.rows;
// Convert DECIMAL fields from strings to numbers for all rows
return result.rows.map((row: SolarActivityRow): SolarActivity => ({
...row,
solar_flux_index: parseFloat(row.solar_flux_index),
a_index: parseFloat(row.a_index),
k_index: parseFloat(row.k_index),
solar_wind_speed: row.solar_wind_speed ? parseFloat(row.solar_wind_speed) : undefined,
solar_wind_density: row.solar_wind_density ? parseFloat(row.solar_wind_density) : undefined
}));
}

/**
Expand Down