- <%= for {label, complete} <- [{"HRRR", @unprocessed.total - @unprocessed.hrrr}, {"Weather", @unprocessed.total - @unprocessed.weather}, {"Terrain", @unprocessed.total - @unprocessed.terrain}, {"IEMRE", @unprocessed.total - @unprocessed.iemre}, {"ERA5", @unprocessed.total - @unprocessed.era5}] do %>
- <% pct =
- if @unprocessed.total > 0, do: round(complete * 100 / @unprocessed.total), else: 0 %>
-
+ <%= for {key, label, complete, denom} <- [
+ {"hrrr", "HRRR", @unprocessed.total - @unprocessed.hrrr, @unprocessed.total},
+ {"weather", "Weather", @unprocessed.total - @unprocessed.weather, @unprocessed.total},
+ {"terrain", "Terrain", @unprocessed.total - @unprocessed.terrain, @unprocessed.total},
+ {"iemre", "IEMRE", @unprocessed.total - @unprocessed.iemre, @unprocessed.total},
+ {"era5", "ERA5", @unprocessed.era5_done, @unprocessed.era5_candidates}
+ ] do %>
+ <% pct = if denom > 0, do: round(complete * 100 / denom), else: 0 %>
+
{label}
- {format_number(complete)} / {format_number(@unprocessed.total)}
+ {format_number(complete)} / {format_number(denom)}
<% end %>
diff --git a/test/microwaveprop_web/live/contact_live_test.exs b/test/microwaveprop_web/live/contact_live_test.exs
index 815b5295..5adaa848 100644
--- a/test/microwaveprop_web/live/contact_live_test.exs
+++ b/test/microwaveprop_web/live/contact_live_test.exs
@@ -5,6 +5,7 @@ defmodule MicrowavepropWeb.ContactLiveTest do
alias Microwaveprop.Radio.Contact
alias Microwaveprop.Repo
+ alias Microwaveprop.Weather.Era5Profile
setup do
Req.Test.stub(Microwaveprop.Terrain.ElevationClient, fn conn ->
@@ -153,5 +154,42 @@ defmodule MicrowavepropWeb.ContactLiveTest do
live(conn, ~p"/contacts/#{Ecto.UUID.generate()}")
end
end
+
+ test "shows atmospheric profile section with ERA5 source for pre-HRRR contact", %{conn: conn} do
+ # Pre-2014 contact — HRRR is unavailable, ERA5 is the fallback source.
+ contact =
+ create_contact(%{
+ qso_timestamp: ~U[2010-06-15 18:00:00Z],
+ pos1: %{"lat" => 32.9, "lon" => -97.0},
+ pos2: %{"lat" => 30.3, "lon" => -97.7}
+ })
+
+ {:ok, _} =
+ Repo.insert(%Era5Profile{
+ valid_time: ~U[2010-06-15 18:00:00Z],
+ lat: 33.0,
+ lon: -97.0,
+ profile: [
+ %{"pres" => 850.0, "tmpc" => 15.0, "dwpc" => 10.0, "hght" => 1500.0}
+ ],
+ surface_temp_c: 25.0,
+ surface_dewpoint_c: 18.0,
+ surface_pressure_mb: 1012.0,
+ hpbl_m: 1200.0,
+ pwat_mm: 30.0,
+ surface_refractivity: 320.0,
+ min_refractivity_gradient: -50.0,
+ ducting_detected: false
+ })
+
+ {:ok, lv, _html} = live(conn, ~p"/contacts/#{contact.id}")
+
+ html = render_async(lv)
+ assert html =~ "Atmospheric Profile"
+ assert html =~ "ERA5"
+ # Collapsed summary shows HPBL / PWAT / lat,lon from the injected ERA5 row.
+ assert html =~ "1200"
+ assert html =~ "33.0"
+ end
end
end
diff --git a/test/microwaveprop_web/live/status_live_test.exs b/test/microwaveprop_web/live/status_live_test.exs
new file mode 100644
index 00000000..bd37b257
--- /dev/null
+++ b/test/microwaveprop_web/live/status_live_test.exs
@@ -0,0 +1,68 @@
+defmodule MicrowavepropWeb.StatusLiveTest do
+ use MicrowavepropWeb.ConnCase, async: false
+
+ import Microwaveprop.AccountsFixtures
+ import Phoenix.LiveViewTest
+
+ alias Microwaveprop.Cache
+ alias Microwaveprop.Radio.Contact
+ alias Microwaveprop.Repo
+ alias Microwaveprop.Weather.Era5Profile
+
+ setup %{conn: conn} do
+ Cache.invalidate({MicrowavepropWeb.StatusLive, :count_unprocessed})
+ Cache.invalidate({MicrowavepropWeb.StatusLive, :stats})
+ Cache.invalidate({MicrowavepropWeb.StatusLive, :db_stats})
+
+ user = user_fixture()
+ {:ok, admin} = user |> Ecto.Changeset.change(%{is_admin: true}) |> Repo.update()
+ conn = log_in_user(conn, admin)
+ {:ok, conn: conn}
+ end
+
+ defp create_era5_candidate do
+ {:ok, contact} =
+ %Contact{}
+ |> Contact.changeset(%{
+ station1: "W5TEST",
+ station2: "K5TEST",
+ qso_timestamp: ~U[2010-06-15 18:00:00Z],
+ mode: "CW",
+ band: Decimal.new("1296"),
+ grid1: "EM12",
+ grid2: "EM00",
+ pos1: %{"lat" => 33.0, "lon" => -97.0},
+ pos2: %{"lat" => 30.3, "lon" => -97.7},
+ distance_km: Decimal.new("300")
+ })
+ |> Ecto.Changeset.change(%{hrrr_status: :unavailable})
+ |> Repo.insert()
+
+ contact
+ end
+
+ test "ERA5 progress bar numerator is actual era5 profile matches not total-minus-candidates", %{conn: conn} do
+ create_era5_candidate()
+
+ # No ERA5 profile yet — candidates = 1, done = 0
+ {:ok, lv, _html} = live(conn, ~p"/status")
+ era5_row = lv |> element(~s|[data-progress-key="era5"]|) |> render()
+ assert era5_row =~ "ERA5"
+ assert era5_row =~ "0 / 1"
+
+ # Insert a matching era5_profile row — done should become 1
+ {:ok, _} =
+ Repo.insert(%Era5Profile{
+ valid_time: ~U[2010-06-15 18:00:00Z],
+ lat: 33.0,
+ lon: -97.0,
+ ducting_detected: false
+ })
+
+ Cache.invalidate({MicrowavepropWeb.StatusLive, :count_unprocessed})
+
+ {:ok, lv, _html} = live(conn, ~p"/status")
+ era5_row = lv |> element(~s|[data-progress-key="era5"]|) |> render()
+ assert era5_row =~ "1 / 1"
+ end
+end