diff --git a/scripts/clear_all_data.sh b/scripts/clear_all_data.sh index 1e4ea47..10eb1ef 100755 --- a/scripts/clear_all_data.sh +++ b/scripts/clear_all_data.sh @@ -59,6 +59,7 @@ fi sudo -u ${USER} ln -fs $(dirname ${my_dir})/scripts/spectrogram.php ${EXTRACTED} sudo -u ${USER} ln -fs $(dirname ${my_dir})/scripts/viewday.php ${EXTRACTED} sudo -u ${USER} ln -fs $(dirname ${my_dir})/scripts/overview.php ${EXTRACTED} +sudo -u ${USER} ln -fs $(dirname ${my_dir})/scripts/stats.php ${EXTRACTED} sudo -u ${USER} ln -fs $(dirname ${my_dir})/scripts/viewdb.php ${EXTRACTED} sudo -u ${USER} ln -fs $(dirname ${my_dir})/homepage/images/favicon.ico ${EXTRACTED} sudo -u ${USER} ln -fs ${HOME}/phpsysinfo ${EXTRACTED} diff --git a/scripts/install_services.sh b/scripts/install_services.sh index afeaf39..ff73340 100755 --- a/scripts/install_services.sh +++ b/scripts/install_services.sh @@ -182,6 +182,7 @@ create_necessary_dirs() { sudo -u ${USER} ln -fs $(dirname ${my_dir})/scripts/spectrogram.php ${EXTRACTED} sudo -u ${USER} ln -fs $(dirname ${my_dir})/scripts/viewday.php ${EXTRACTED} sudo -u ${USER} ln -fs $(dirname ${my_dir})/scripts/overview.php ${EXTRACTED} + sudo -u ${USER} ln -fs $(dirname ${my_dir})/scripts/stats.php ${EXTRACTED} sudo -u ${USER} ln -fs $(dirname ${my_dir})/scripts/viewdb.php ${EXTRACTED} sudo -u ${USER} ln -fs $(dirname ${my_dir})/homepage/images/favicon.ico ${EXTRACTED} sudo -u ${USER} ln -fs ${HOME}/phpsysinfo ${EXTRACTED} diff --git a/scripts/overview.php b/scripts/overview.php index cc6df56..55d69ad 100644 --- a/scripts/overview.php +++ b/scripts/overview.php @@ -53,6 +53,10 @@ $mysqli->close(); + + + +
+
+
+

Number of Detections

+ + + + + + + + + + + + + +
TotalTodayLast HourNumber of Unique Species
fetch_assoc()) { echo $row['Total']; };?>fetch_assoc()) { echo $row['Total']; };?>fetch_assoc()) { echo $row['Total']; };?>
+

Summary

+ + + + + + +fetch_assoc()) +{ + $MAX = sprintf("%.1f%%", $rows['MAX(Confidence)'] * 100) +?> + + + + + + + +
Common NameOccurrencesMax Confidence Score
+
+
+
+

Species Stats

+ +

+ +
+";echo $_POST['species'];echo " + + + + + + + "; +while($rows = $specificstats->fetch_assoc()) { + $dbname = preg_replace('/ /', '_', $rows['Com_Name']); + $dbsciname = preg_replace('/ /', '_', $rows['Sci_Name']); + echo " + + + + + "; +}} +?> +
Common NameScientific NameOccurrencesHighest Confidence Score
";echo "";echo $rows['Com_Name']; echo "";echo "";echo $rows['Sci_Name']; echo "";echo $rows['COUNT(*)'];echo "";echo $rows['MAX(Confidence)'];echo "
+
+
+ +
+ + diff --git a/scripts/update_services.sh b/scripts/update_services.sh index 7e208c5..3dcd03b 100755 --- a/scripts/update_services.sh +++ b/scripts/update_services.sh @@ -174,6 +174,7 @@ create_necessary_dirs() { sudo -u ${USER} ln -fs $(dirname ${my_dir})/scripts/spectrogram.php ${EXTRACTED} sudo -u ${USER} ln -fs $(dirname ${my_dir})/scripts/viewday.php ${EXTRACTED} sudo -u ${USER} ln -fs $(dirname ${my_dir})/scripts/overview.php ${EXTRACTED} + sudo -u ${USER} ln -fs $(dirname ${my_dir})/scripts/stats.php ${EXTRACTED} sudo -u ${USER} ln -fs $(dirname ${my_dir})/scripts/viewdb.php ${EXTRACTED} sudo -u ${USER} ln -fs $(dirname ${my_dir})/homepage/images/favicon.ico ${EXTRACTED} sudo -u ${USER} ln -fs ${HOME}/phpsysinfo ${EXTRACTED} diff --git a/scripts/viewdb.php b/scripts/viewdb.php index fa78751..cbc80a3 100644 --- a/scripts/viewdb.php +++ b/scripts/viewdb.php @@ -8,44 +8,44 @@ $mysqli = mysqli_connect(); $mysqli->select_db('birds'); if ($mysqli->connect_error) { - die('Connect Error (' . - $mysqli->connect_errno . ') '. - $mysqli->connect_error); + die('Connect Error (' . + $mysqli->connect_errno . ') '. + $mysqli->connect_error); } // SQL query to select data from database $sql = "SELECT COUNT(*) AS 'Total' FROM detections - ORDER BY Date DESC, Time DESC"; + ORDER BY Date DESC, Time DESC"; $totalcount = $mysqli->query($sql); $sql1 = "SELECT Date, Time, Sci_Name, Com_Name, MAX(Confidence) - FROM detections - WHERE Date = CURDATE() - GROUP BY Date, Time, Sci_Name, Com_Name - ORDER BY Time DESC"; + FROM detections + WHERE Date = CURDATE() + GROUP BY Date, Time, Sci_Name, Com_Name + ORDER BY Time DESC"; $mosttable = $mysqli->query($sql1); $sql2 = "SELECT COUNT(*) AS 'Total' FROM detections - WHERE Date = CURDATE()"; + WHERE Date = CURDATE()"; $todayscount = $mysqli->query($sql2); $sql3 = "SELECT COUNT(*) AS 'Total' FROM detections - WHERE Date = CURDATE() - AND Time >= DATE_SUB(NOW(),INTERVAL 1 HOUR)"; + WHERE Date = CURDATE() + AND Time >= DATE_SUB(NOW(),INTERVAL 1 HOUR)"; $lasthourcount = $mysqli->query($sql3); $sql4 = "SELECT Com_Name, Date, Time, MAX(Confidence) - FROM detections - GROUP BY Com_Name - ORDER BY MAX(Confidence) DESC"; + FROM detections + GROUP BY Com_Name + ORDER BY MAX(Confidence) DESC"; $specieslist = $mysqli->query($sql4); $speciescount = mysqli_num_rows($specieslist); $sql5 = "SELECT Com_Name,COUNT(*) - AS 'Total' - FROM detections - GROUP BY Com_Name - ORDER BY Total DESC"; + AS 'Total' + FROM detections + GROUP BY Com_Name + ORDER BY Total DESC"; $speciestally = $mysqli->query($sql5); $mysqli->close(); @@ -59,6 +59,12 @@ $mysqli->close(); BirdNET-Pi DB + @@ -68,16 +74,16 @@ $mysqli->close();
- - - - + + + + - - - - + + + +
TotalTodayLast HourNumber of Unique SpeciesTotalTodayLast HourNumber of Unique Species
fetch_assoc()) { echo $row['Total']; };?>fetch_assoc()) { echo $row['Total']; };?>fetch_assoc()) { echo $row['Total']; };?>fetch_assoc()) { echo $row['Total']; };?>fetch_assoc()) { echo $row['Total']; };?>fetch_assoc()) { echo $row['Total']; };?>
@@ -86,76 +92,28 @@ $mysqli->close(); - - - - + + + + fetch_assoc()) { - $Confidence = sprintf("%.1f%%", $rows['MAX(Confidence)'] * 100); + $Confidence = sprintf("%.1f%%", $rows['MAX(Confidence)'] * 100); + $dbname = preg_replace('/ /', '_', $rows['Com_Name']); + $dbsciname = preg_replace('/ /', '_', $rows['Sci_Name']); ?> - - - - - + + + + +
TimeScientific NameCommon NameConfidenceTimeScientific NameCommon NameConfidence
-
-
-

Detected Species by Confidence

- - - - - - - -fetch_assoc()) -{ - $MAX = sprintf("%.1f%%", $rows['MAX(Confidence)'] * 100) -?> - - - - - - - - -
SpeciesDateTimeMax Confidence Score
-
-
-

Species List by Detections

- - - - - -fetch_assoc()) -{ -?> - - - - - - - - - -
SpeciesDetections