diff --git a/homepage/menu.html b/homepage/menu.html index 3690a9c..f116a01 100644 --- a/homepage/menu.html +++ b/homepage/menu.html @@ -39,7 +39,7 @@ footer { } button { background-color: transparent; - text-size:large; + font-size:small; border:none; cursor:pointer; } diff --git a/scripts/play.php b/scripts/play.php index 24e6b53..0cddd5b 100644 --- a/scripts/play.php +++ b/scripts/play.php @@ -10,21 +10,41 @@ if($db == False){ } if(isset($_POST['bydate'])){ -$statement = $db->prepare('SELECT DISTINCT(Date), Com_Name from detections GROUP BY Date'); -if($statement == False){ - echo "Database is busy"; - header("refresh: 0;"); -} -$result = $statement->execute(); -$view = "bydate"; -} else { -$statement = $db->prepare('SELECT DISTINCT(Com_Name) from detections ORDER BY Com_Name'); -if($statement == False){ - echo "Database is busy"; - header("refresh: 0;"); -} -$result = $statement->execute(); -$view = "byspecies"; + $statement = $db->prepare('SELECT DISTINCT(Date), Com_Name from detections GROUP BY Date'); + if($statement == False){ + echo "Database is busy"; + header("refresh: 0;"); + } + $result = $statement->execute(); + $view = "bydate"; +} elseif(isset($_POST['byspecies'])) { + $statement = $db->prepare('SELECT DISTINCT(Com_Name) from detections ORDER BY Com_Name'); + if($statement == False){ + echo "Database is busy"; + header("refresh: 0;"); + } + $result = $statement->execute(); + $view = "byspecies"; +} elseif(isset($_POST['date'])) { + $date = $_POST['date']; + $statement = $db->prepare("SELECT DISTINCT(Com_Name) from detections WHERE Date == \"$date\" ORDER BY Com_Name"); + if($statement == False){ + echo "Database is busy"; + header("refresh: 0;"); + } + $result = $statement->execute(); + $view = "date"; +} elseif(isset($_POST['species'])) { + $species = $_POST['species']; + $statement = $db->prepare("SELECT * from detections WHERE Com_Name == \"$species\" ORDER BY Com_Name"); + $statement3 = $db->prepare("SELECT Date, Time, Com_Name, MAX(Confidence), File_Name from detections WHERE Com_Name == \"$species\" ORDER BY Com_Name"); + if($statement == False || $statement3 == False){ + echo "Database is busy"; + header("refresh: 0;"); + } + $result = $statement->execute(); + $result3 = $statement3->execute(); + $view = "species"; } ?> @@ -39,68 +59,84 @@ $view = "byspecies";
+fetchArray(SQLITE3_ASSOC)) { - $comname = preg_replace('/ /', '_', $results['Com_Name']); - $comlink = "/By_Date/".date('Y-m-d')."/".$comname; ?> -
$date";} -else { - $name = $results['Com_Name']; - echo "";}?> + if($view == "bydate"){ + $date = $results['Date']; + echo ""; + } elseif($view == "byspecies") { + $name = $results['Com_Name']; + echo ""; + } elseif($view == "date") { + $name = $results['Com_Name']; + echo ""; + }; };} else { + while($results=$result3->fetchArray(SQLITE3_ASSOC)){ + $maxconf = $results['MAX(Confidence)']; + $date = $results['Date']; + $time = $results['Time']; + $comname = preg_replace('/ /', '_', $results['Com_Name']); + $file = $results['File_Name']; + $filename = "/By_Date/".$date."/".$comname."/".$results['File_Name']; + echo " + + + + + +
Max Confidence: $maxconf
Most confident recording: $file
"; + };};?>
-
prepare("SELECT * FROM detections where Com_Name == \"$name\" ORDER BY Date DESC, Time DESC"); - if($statement2 == False){ - echo "Database is busy"; - header("refresh: 0;"); - } - $result2 = $statement2->execute(); - echo " - - - - - - - "; - while($results=$result2->fetchArray(SQLITE3_ASSOC)) - { - $comname = preg_replace('/ /', '_', $results['Com_Name']); - $date = $results['Date']; - $comlink = "/By_Date/".$date."/".$comname."/".$results['File_Name']; - $sciname = preg_replace('/ /', '_', $results['Sci_Name']); - $sci_name = $results['Sci_Name']; - $time = $results['Time']; - $confidence = $results['Confidence']; - echo " - - - - - - - "; + if(isset($_POST['species'])){ + $name = $_POST['species']; + $statement2 = $db->prepare("SELECT * FROM detections where Com_Name == \"$name\" ORDER BY Date DESC, Time DESC"); + if($statement2 == False){ + echo "Database is busy"; + header("refresh: 0;"); + } + $result2 = $statement2->execute(); + echo "
DateTimeScientific NameCommon NameConfidence
$date$time$sci_name
- $confidence
+ + + + + + + "; + while($results=$result2->fetchArray(SQLITE3_ASSOC)) + { + $comname = preg_replace('/ /', '_', $results['Com_Name']); + $date = $results['Date']; + $comlink = "/By_Date/".$date."/".$comname."/".$results['File_Name']; + $sciname = preg_replace('/ /', '_', $results['Sci_Name']); + $sci_name = $results['Sci_Name']; + $time = $results['Time']; + $confidence = $results['Confidence']; + echo " + + + + + + + "; - }echo "
DateTimeScientific NameCommon NameConfidence
$date$time$sci_name
+ $confidence
";}?> + }echo "";}?>
diff --git a/scripts/stats.php b/scripts/stats.php index 19aa494..2d53770 100644 --- a/scripts/stats.php +++ b/scripts/stats.php @@ -26,7 +26,7 @@ $result2 = $statement2->execute(); if(isset($_POST['species'])){ $selection = $_POST['species']; $statement3 = $db->prepare("SELECT Com_Name, Sci_Name, COUNT(*), MAX(Confidence) from detections - WHERE Com_Name = '$selection'"); + WHERE Com_Name = \"$selection\""); if($statement3 == False) { echo "Database busy"; header("refresh: 0;");