initial transition

php/newpowerapi.php

@@ -107,16 +107,17 @@ if (isset($_GET['county'])) {
             SELECT
                 n.county,
                 n.state,
-                n.outages as outage,
-                n.fetch_time as time,
-                n.served,
+                SUM(n.outages) as outage,
+                MAX(n.fetch_time) as time,
+                SUM(n.served) as served,
                 CASE
-                    WHEN n.served > 0 THEN ROUND(CAST((n.outages::FLOAT / n.served) * 100 AS NUMERIC), 2)
+                    WHEN SUM(n.served) > 0 THEN ROUND(CAST((SUM(n.outages)::FLOAT / SUM(n.served)) * 100 AS NUMERIC), 2)
                     ELSE 0
                 END as perout
             FROM newcountyoutages n, latest_fetch
             WHERE n.fetch_time = latest_fetch.max_fetch_time
                 AND n.cwa = $1
+            GROUP BY n.county, n.state
         ";
 
         $result = pg_query_params($dbconn, $query, ['RLX']);