diff --git a/scripts/stats.php b/scripts/stats.php index 06fff9d..d055636 100644 --- a/scripts/stats.php +++ b/scripts/stats.php @@ -22,6 +22,16 @@ if(isset($_GET['sort']) && $_GET['sort'] == "occurrences") { $statement2 = $db->prepare('SELECT Date, Time, File_Name, Com_Name, COUNT(*), MAX(Confidence) FROM detections GROUP BY Com_Name ORDER BY COUNT(*) DESC'); ensure_db_ok($statement2); $result2 = $statement2->execute(); + +} else if(isset($_GET['sort']) && $_GET['sort'] == "confidence") { + $statement = $db->prepare('SELECT Date, Time, File_Name, Com_Name, COUNT(*), MAX(Confidence) FROM detections GROUP BY Com_Name ORDER BY MAX(Confidence) DESC'); + ensure_db_ok($statement); + $result = $statement->execute(); + + $statement2 = $db->prepare('SELECT Date, Time, File_Name, Com_Name, COUNT(*), MAX(Confidence) FROM detections GROUP BY Com_Name ORDER BY MAX(Confidence) DESC'); + ensure_db_ok($statement2); + $result2 = $statement2->execute(); + } else { $statement = $db->prepare('SELECT Date, Time, File_Name, Com_Name, COUNT(*), MAX(Confidence) FROM detections GROUP BY Com_Name ORDER BY Com_Name ASC'); @@ -33,8 +43,6 @@ if(isset($_GET['sort']) && $_GET['sort'] == "occurrences") { $result2 = $statement2->execute(); } - - if(isset($_GET['species'])){ $selection = htmlspecialchars_decode($_GET['species'], ENT_QUOTES); $statement3 = $db->prepare("SELECT Com_Name, Sci_Name, COUNT(*), MAX(Confidence), File_Name, Date, Time from detections WHERE Com_Name = \"$selection\""); @@ -71,6 +79,9 @@ if (get_included_files()[0] === __FILE__) { +
@@ -80,12 +91,17 @@ if (get_included_files()[0] === __FILE__) { fetchArray(SQLITE3_ASSOC)) { $comname = preg_replace('/ /', '_', $results['Com_Name']); $comname = preg_replace('/\'/', '', $comname); $filename = "/By_Date/".$results['Date']."/".$comname."/".$results['File_Name']; $birds[] = $results['Com_Name']; + if ($_GET['sort'] == "confidence") { + $confidence[] = ' (' . round($results['MAX(Confidence)'] * 100) . '%)'; + } } if(count($birds) > 45) { @@ -93,6 +109,7 @@ if (get_included_files()[0] === __FILE__) { } else { $num_cols = 1; } + $num_rows = ceil(count($birds) / $num_cols); for ($row = 0; $row < $num_rows; $row++) { @@ -104,7 +121,7 @@ if (get_included_files()[0] === __FILE__) { if ($index < count($birds)) { ?> +

+ +

Choose a species to load images from Flickr.

- +