diff --git a/scripts/viewdb.php b/scripts/viewdb.php index 4e247aa..cf6bafa 100644 --- a/scripts/viewdb.php +++ b/scripts/viewdb.php @@ -1,4 +1,8 @@ select_db('birds'); @@ -10,10 +14,9 @@ if ($mysqli->connect_error) { } // SQL query to select data from database -$sql = "SELECT * FROM detections +$sql = "SELECT COUNT(*) AS 'Total' FROM detections ORDER BY Date DESC, Time DESC"; -$fulltable = $mysqli->query($sql); -$totalcount=mysqli_num_rows($fulltable); +$totalcount = $mysqli->query($sql); $sql1 = "SELECT Date, Time, Sci_Name, Com_Name, MAX(Confidence) FROM detections @@ -22,26 +25,25 @@ $sql1 = "SELECT Date, Time, Sci_Name, Com_Name, MAX(Confidence) ORDER BY Time DESC"; $mosttable = $mysqli->query($sql1); -$sql2 = "SELECT * FROM detections +$sql2 = "SELECT COUNT(*) AS 'Total' FROM detections WHERE Date = CURDATE()"; -$todaystable = $mysqli->query($sql2); -$todayscount=mysqli_num_rows($todaystable); +$todayscount = $mysqli->query($sql2); -$sql3 = "SELECT * FROM detections +$sql3 = "SELECT COUNT(*) AS 'Total' FROM detections WHERE Date = CURDATE() AND Time >= DATE_SUB(NOW(),INTERVAL 1 HOUR)"; -$lasthourtable = $mysqli->query($sql3); -$lasthourcount=mysqli_num_rows($lasthourtable); +$lasthourcount = $mysqli->query($sql3); -$sql4 = "SELECT Com_Name, Date, Time, MAX(Confidence) - FROM detections - GROUP BY Com_Name +$sql4 = "SELECT Com_Name, Date, Time, MAX(Confidence) + FROM detections + WHERE Date = CURDATE() + GROUP BY Com_Name ORDER BY MAX(Confidence) DESC"; $specieslist = $mysqli->query($sql4); -$speciescount=mysqli_num_rows($specieslist); +$speciescount = mysqli_num_rows($specieslist); $sql5 = "SELECT Com_Name,COUNT(*) - AS Total + AS 'Total' FROM detections GROUP BY Com_Name ORDER BY Total DESC"; @@ -73,9 +75,9 @@ $mysqli->close();