claudecode/AvianVisitors
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

use common get_summary()

Browse Source
This commit is contained in:
frederik
2025-08-26 20:14:28 +02:00
parent a21a4d7ae5
commit 0dceebea38
2 changed files with 30 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scripts/overview.php
+13 -53
View File
@@ -152,73 +152,33 @@ if(isset($_GET['ajax_detections']) && $_GET['ajax_detections'] == "true" && isse
die(); die();
} }
function get_chart_data($db, $force_regen = false) {
if ($force_regen || !isset($_SESSION['chart_data'])) {
$statement = $db->prepare('SELECT COUNT(*) FROM detections');
ensure_db_ok($statement);
$result = $statement->execute();
$totalcount = $result->fetchArray(SQLITE3_ASSOC);
$statement2 = $db->prepare('SELECT COUNT(*) FROM detections WHERE Date == DATE(\'now\', \'localtime\')');
ensure_db_ok($statement2);
$result2 = $statement2->execute();
$todaycount = $result2->fetchArray(SQLITE3_ASSOC);
$statement3 = $db->prepare('SELECT COUNT(*) FROM detections WHERE Date == Date(\'now\', \'localtime\') AND TIME >= TIME(\'now\', \'localtime\', \'-1 hour\')');
ensure_db_ok($statement3);
$result3 = $statement3->execute();
$hourcount = $result3->fetchArray(SQLITE3_ASSOC);
$statement5 = $db->prepare('SELECT COUNT(DISTINCT(Sci_Name)) FROM detections WHERE Date == Date(\'now\',\'localtime\')');
ensure_db_ok($statement5);
$result5 = $statement5->execute();
$speciestally = $result5->fetchArray(SQLITE3_ASSOC);
$statement6 = $db->prepare('SELECT COUNT(DISTINCT(Sci_Name)) FROM detections');
ensure_db_ok($statement6);
$result6 = $statement6->execute();
$totalspeciestally = $result6->fetchArray(SQLITE3_ASSOC);
// Store the data in session to be reused by other charts
$_SESSION['chart_data'] = [
'totalcount' => $totalcount,
'todaycount' => $todaycount,
'hourcount' => $hourcount,
'speciestally' => $speciestally,
'totalspeciestally' => $totalspeciestally
];
}
return $_SESSION['chart_data'];
}
if(isset($_GET['ajax_left_chart']) && $_GET['ajax_left_chart'] == "true") { if(isset($_GET['ajax_left_chart']) && $_GET['ajax_left_chart'] == "true") {
// Force the data to regenerate and store it in session $chart_data = get_summary();
$chart_data = get_chart_data($db, true); $_SESSION['chart_data'] = $chart_data;
?> ?>
<table> <table>
<tr> <tr>
<th>Total</th> <th>Total</th>
<td><?php echo $chart_data['totalcount']['COUNT(*)'];?></td> <td><?php echo $chart_data['totalcount'];?></td>
</tr> </tr>
<tr> <tr>
<th>Today</th> <th>Today</th>
<td><form action="" method="GET"><button type="submit" name="view" value="Todays Detections"><?php echo $chart_data['todaycount']['COUNT(*)'];?></button></td> <td><form action="" method="GET"><button type="submit" name="view" value="Todays Detections"><?php echo $chart_data['todaycount'];?></button></td>
</form> </form>
</tr> </tr>
<tr> <tr>
<th>Last Hour</th> <th>Last Hour</th>
<td><?php echo $chart_data['hourcount']['COUNT(*)'];?></td> <td><?php echo $chart_data['hourcount'];?></td>
</tr> </tr>
<tr> <tr>
<th>Species Detected Today</th> <th>Species Detected Today</th>
<td><form action="" method="GET"><input type="hidden" name="view" value="Recordings"><button type="submit" name="date" value="<?php echo date('Y-m-d');?>"><?php echo $chart_data['speciestally']['COUNT(DISTINCT(Sci_Name))'];?></button></td> <td><form action="" method="GET"><input type="hidden" name="view" value="Recordings"><button type="submit" name="date" value="<?php echo date('Y-m-d');?>"><?php echo $chart_data['speciestally'];?></button></td>
</form> </form>
</tr> </tr>
<tr> <tr>
<th>Total Number of Species</th> <th>Total Number of Species</th>
<td><form action="" method="GET"><button type="submit" name="view" value="Species Stats"><?php echo $chart_data['totalspeciestally']['COUNT(DISTINCT(Sci_Name))'];?></button></td> <td><form action="" method="GET"><button type="submit" name="view" value="Species Stats"><?php echo $chart_data['totalspeciestally'];?></button></td>
</form> </form>
</tr> </tr>
</table> </table>
@@ -229,7 +189,7 @@ if(isset($_GET['ajax_left_chart']) && $_GET['ajax_left_chart'] == "true") {
if(isset($_GET['ajax_center_chart']) && $_GET['ajax_center_chart'] == "true") { if(isset($_GET['ajax_center_chart']) && $_GET['ajax_center_chart'] == "true") {
// Retrieve the cached data from session without regenerating // Retrieve the cached data from session without regenerating
$chart_data = get_chart_data($db); $chart_data = $_SESSION['chart_data'];
?> ?>
<table><tr> <table><tr>
<th>Total</th> <th>Total</th>
@@ -239,11 +199,11 @@ if(isset($_GET['ajax_center_chart']) && $_GET['ajax_center_chart'] == "true") {
<th>Species Today</th> <th>Species Today</th>
</tr> </tr>
<tr> <tr>
<td><?php echo $chart_data['totalcount']['COUNT(*)'];?></td> <td><?php echo $chart_data['totalcount'];?></td>
<td><form action="" method="GET"><input type="hidden" name="view" value="Todays Detections"><?php echo $chart_data['todaycount']['COUNT(*)'];?></td></form> <td><form action="" method="GET"><input type="hidden" name="view" value="Todays Detections"><?php echo $chart_data['todaycount'];?></td></form>
<td><?php echo $chart_data['hourcount']['COUNT(*)'];?></td> <td><?php echo $chart_data['hourcount'];?></td>
<td><form action="" method="GET"><button type="submit" name="view" value="Species Stats"><?php echo $chart_data['totalspeciestally']['COUNT(DISTINCT(Sci_Name))'];?></button></td></form> <td><form action="" method="GET"><button type="submit" name="view" value="Species Stats"><?php echo $chart_data['totalspeciestally'];?></button></td></form>
<td><form action="" method="GET"><input type="hidden" name="view" value="Recordings"><button type="submit" name="date" value="<?php echo date('Y-m-d');?>"><?php echo $chart_data['speciestally']['COUNT(DISTINCT(Sci_Name))'];?></button></td></form> <td><form action="" method="GET"><input type="hidden" name="view" value="Recordings"><button type="submit" name="date" value="<?php echo date('Y-m-d');?>"><?php echo $chart_data['speciestally'];?></button></td></form>
</tr> </tr>
</table> </table>
scripts/todays_detections.php
+17 -40
View File
@@ -25,35 +25,12 @@ if(isset($kiosk) && $kiosk == true) {
$db = new SQLite3('./scripts/birds.db', SQLITE3_OPEN_READONLY); $db = new SQLite3('./scripts/birds.db', SQLITE3_OPEN_READONLY);
$db->busyTimeout(1000); $db->busyTimeout(1000);
$statement1 = $db->prepare('SELECT COUNT(*) FROM detections'); $summary = get_summary();
ensure_db_ok($statement1); $totalcount = $summary['totalcount'];
$result1 = $statement1->execute(); $todaycount = $summary['todaycount'];
$totalcount = $result1->fetchArray(SQLITE3_ASSOC); $hourcount = $summary['hourcount'];
$todayspeciestally = $summary['speciestally'];
$statement2 = $db->prepare('SELECT COUNT(*) FROM detections WHERE Date == DATE(\'now\', \'localtime\')'); $totalspeciestally = $summary['totalspeciestally'];
ensure_db_ok($statement2);
$result2 = $statement2->execute();
$todaycount = $result2->fetchArray(SQLITE3_ASSOC);
$statement3 = $db->prepare('SELECT COUNT(*) FROM detections WHERE Date == Date(\'now\', \'localtime\') AND TIME >= TIME(\'now\', \'localtime\', \'-1 hour\')');
ensure_db_ok($statement3);
$result3 = $statement3->execute();
$hourcount = $result3->fetchArray(SQLITE3_ASSOC);
$statement4 = $db->prepare('SELECT Com_Name, Sci_Name, Time, Confidence FROM detections LIMIT 1');
ensure_db_ok($statement4);
$result4 = $statement4->execute();
$mostrecent = $result4->fetchArray(SQLITE3_ASSOC);
$statement5 = $db->prepare('SELECT COUNT(DISTINCT(Sci_Name)) FROM detections WHERE Date == Date(\'now\', \'localtime\')');
ensure_db_ok($statement5);
$result5 = $statement5->execute();
$todayspeciestally = $result5->fetchArray(SQLITE3_ASSOC);
$statement6 = $db->prepare('SELECT COUNT(DISTINCT(Sci_Name)) FROM detections');
ensure_db_ok($statement6);
$result6 = $statement6->execute();
$totalspeciestally = $result6->fetchArray(SQLITE3_ASSOC);
if(isset($_GET['comname'])) { if(isset($_GET['comname'])) {
$birdName = htmlspecialchars_decode($_GET['comname'], ENT_QUOTES); $birdName = htmlspecialchars_decode($_GET['comname'], ENT_QUOTES);
@@ -311,16 +288,16 @@ if(isset($_GET['today_stats'])) {
<th>Species Today</th> <th>Species Today</th>
</tr> </tr>
<tr> <tr>
<td><?php echo $totalcount['COUNT(*)'];?></td> <td><?php echo $totalcount;?></td>
<form action="" method="GET"> <form action="" method="GET">
<td><input type="hidden" name="view" value="Recordings"><?php if($kiosk == false){?><button type="submit" name="date" value="<?php echo date('Y-m-d');?>"><?php echo $todaycount['COUNT(*)'];?></button><?php } else { echo $todaycount['COUNT(*)']; }?></td> <td><input type="hidden" name="view" value="Recordings"><?php if($kiosk == false){?><button type="submit" name="date" value="<?php echo date('Y-m-d');?>"><?php echo $todaycount;?></button><?php } else { echo $todaycount; }?></td>
</form> </form>
<td><?php echo $hourcount['COUNT(*)'];?></td> <td><?php echo $hourcount;?></td>
<form action="" method="GET"> <form action="" method="GET">
<td><?php if($kiosk == false){?><button type="submit" name="view" value="Species Stats"><?php echo $totalspeciestally['COUNT(DISTINCT(Sci_Name))'];?></button><?php }else { echo $totalspeciestally['COUNT(DISTINCT(Sci_Name))']; }?></td> <td><?php if($kiosk == false){?><button type="submit" name="view" value="Species Stats"><?php echo $totalspeciestally;?></button><?php }else { echo $totalspeciestally; }?></td>
</form> </form>
<form action="" method="GET"> <form action="" method="GET">
<td><input type="hidden" name="view" value="Recordings"><?php if($kiosk == false){?><button type="submit" name="date" value="<?php echo date('Y-m-d');?>"><?php echo $todayspeciestally['COUNT(DISTINCT(Sci_Name))'];?></button><?php } else { echo $todayspeciestally['COUNT(DISTINCT(Sci_Name))']; }?></td> <td><input type="hidden" name="view" value="Recordings"><?php if($kiosk == false){?><button type="submit" name="date" value="<?php echo date('Y-m-d');?>"><?php echo $todayspeciestally;?></button><?php } else { echo $todayspeciestally; }?></td>
</form> </form>
</tr> </tr>
</table> </table>
@@ -427,11 +404,11 @@ if (get_included_files()[0] === __FILE__) {
<th>Species Today</th> <th>Species Today</th>
</tr> </tr>
<tr> <tr>
<td><?php echo $totalcount['COUNT(*)'];?></td> <td><?php echo $totalcount;?></td>
<td><input type="hidden" name="view" value="Recordings"><?php if($kiosk == false){?><button type="submit" name="date" value="<?php echo date('Y-m-d');?>"><?php echo $todaycount['COUNT(*)'];?></button><?php } else { echo $todaycount['COUNT(*)']; }?></td> <td><input type="hidden" name="view" value="Recordings"><?php if($kiosk == false){?><button type="submit" name="date" value="<?php echo date('Y-m-d');?>"><?php echo $todaycount;?></button><?php } else { echo $todaycount; }?></td>
<td><?php echo $hourcount['COUNT(*)'];?></td> <td><?php echo $hourcount;?></td>
<td><?php if($kiosk == false){?><button type="submit" name="view" value="Species Stats"><?php echo $totalspeciestally['COUNT(DISTINCT(Sci_Name))'];?></button><?php }else { echo $totalspeciestally['COUNT(DISTINCT(Sci_Name))']; }?></td> <td><?php if($kiosk == false){?><button type="submit" name="view" value="Species Stats"><?php echo $totalspeciestally;?></button><?php }else { echo $totalspeciestally; }?></td>
<td><input type="hidden" name="view" value="Recordings"><?php if($kiosk == false){?><button type="submit" name="date" value="<?php echo date('Y-m-d');?>"><?php echo $todayspeciestally['COUNT(DISTINCT(Sci_Name))'];?></button><?php } else { echo $todayspeciestally['COUNT(DISTINCT(Sci_Name))']; }?></td> <td><input type="hidden" name="view" value="Recordings"><?php if($kiosk == false){?><button type="submit" name="date" value="<?php echo date('Y-m-d');?>"><?php echo $todayspeciestally;?></button><?php } else { echo $todayspeciestally; }?></td>
</tr> </tr>
</table></form></div> </table></form></div>
@@ -488,7 +465,7 @@ document.getElementById("searchterm").onkeydown = (function(e) {
function switchViews(element) { function switchViews(element) {
if(searchterm == ""){ if(searchterm == ""){
document.getElementById("detections_table").innerHTML = "<h3>Loading <?php echo $todaycount['COUNT(*)']; ?> detections...</h3>"; document.getElementById("detections_table").innerHTML = "<h3>Loading <?php echo $todaycount; ?> detections...</h3>";
} else { } else {
document.getElementById("detections_table").innerHTML = "<h3>Loading...</h3>"; document.getElementById("detections_table").innerHTML = "<h3>Loading...</h3>";
} }