diff --git a/main.php b/main.php index 3beea14..a6496ad 100644 --- a/main.php +++ b/main.php @@ -1866,17 +1866,26 @@ elseif ($service === 'powerapi') { if (isset($_GET['county'])) { try { $query = " - SELECT DISTINCT ON (county, state) + WITH latest_update AS ( + SELECT MAX(update) as max_update FROM countyoutages + ) + SELECT county, state, SUM(outages) as outage, - update as time, + MAX(update) as time, SUM(served) as served, - ROUND(CAST((SUM(outages)::FLOAT / SUM(served)) * 100 AS NUMERIC), 2) as perout + ROUND( + CASE + WHEN SUM(served) > 0 THEN (SUM(outages)::FLOAT / SUM(served)) * 100 + ELSE 0 + END::NUMERIC, 2 + ) as perout FROM countyoutages - WHERE update = (SELECT MAX(update) FROM countyoutages) - AND cwa = $1 - GROUP BY county, state, update + JOIN latest_update ON countyoutages.update = latest_update.max_update + WHERE cwa = $1 + GROUP BY county, state + ORDER BY county, state; "; $result = pg_query_params($dbconn, $query, ['RLX']); diff --git a/youtube.html b/youtube.html deleted file mode 100644 index 7d4bde2..0000000 --- a/youtube.html +++ /dev/null @@ -1,35 +0,0 @@ - - - - - - - - - - - - - -