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

fixing formatting on email

Browse Source
This commit is contained in:
ehpersonal38
2022-06-29 09:01:51 -04:00
parent ca09725e81
commit 23c35e4fe0
3 changed files with 47 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scripts/weekly_report.php
+45 -32
View File
@@ -1,7 +1,4 @@
<?php <?php
ini_set('display_errors', 1);
ini_set('display_startup_errors', 1);
error_reporting(E_ALL);
$startdate = strtotime('last sunday') - (7*86400); $startdate = strtotime('last sunday') - (7*86400);
$enddate = strtotime('last sunday') - (1*86400); $enddate = strtotime('last sunday') - (1*86400);
@@ -27,20 +24,20 @@ if(isset($_GET['ascii'])) {
$i = 0; $i = 0;
while($detection=$result1->fetchArray(SQLITE3_ASSOC)) while($detection=$result1->fetchArray(SQLITE3_ASSOC))
{ {
array_push($detections, $detection); $detections[$detection["Com_Name"]] = $detection["COUNT(*)"];
} }
echo "# Week ".date('W', $enddate)." Report (".date('F jS, Y',$startdate)." — ".date('F jS, Y',$enddate).")\n"; echo "# Week ".date('W', $enddate)." Report (".date('F jS, Y',$startdate)." — ".date('F jS, Y',$enddate).")\n";
echo "= Top 10 Species =\n"; echo "= <b>Top 10 Species</b> =<br>";
$i = 0; $i = 0;
foreach($detections as $detection) foreach($detections as $com_name=>$scount)
{ {
$i++; $i++;
if($i <= 10) { if($i <= 10) {
$statement2 = $db->prepare('SELECT COUNT(*) FROM detections WHERE Com_Name == "'.$detection["Com_Name"].'" AND Date BETWEEN "'.date("Y-m-d",$startdate - (7*86400)).'" AND "'.date("Y-m-d",$enddate - (7*86400)).'"'); $statement2 = $db->prepare('SELECT COUNT(*) FROM detections WHERE Com_Name == "'.$com_name.'" AND Date BETWEEN "'.date("Y-m-d",$startdate - (7*86400)).'" AND "'.date("Y-m-d",$enddate - (7*86400)).'"');
if($statement2 == False){ if($statement2 == False){
echo "Database is busy"; echo "Database is busy";
header("refresh: 0;"); header("refresh: 0;");
@@ -49,18 +46,41 @@ if(isset($_GET['ascii'])) {
$totalcount = $result2->fetchArray(SQLITE3_ASSOC); $totalcount = $result2->fetchArray(SQLITE3_ASSOC);
$priorweekcount = $totalcount['COUNT(*)']; $priorweekcount = $totalcount['COUNT(*)'];
$percentagediff = round((1 - $priorweekcount / $detection["COUNT(*)"]) * 100); $percentagediff = round((1 - $priorweekcount / $scount) * 100);
if($percentagediff > 0) { if($percentagediff > 0) {
$percentagediff = "+".$percentagediff."%"; $percentagediff = "<span style='color:green;font-size:small'>+".$percentagediff."%</span>";
} else { } else {
$percentagediff = "-".abs($percentagediff)."%"; $percentagediff = "<span style='color:red;font-size:small'>-".abs($percentagediff)."%</span>";
} }
echo $detection["Com_Name"]." - ".$detection["COUNT(*)"]." (".$percentagediff.")\n"; echo $com_name." - ".$scount." (".$percentagediff.")<br>";
} }
} }
echo "<br>= Species Detected for the First Time: =<br>";
$newspeciescount=0;
foreach($detections as $com_name=>$scount)
{
$statement3 = $db->prepare('SELECT COUNT(*) FROM detections WHERE Com_Name == "'.$com_name.'" AND Date NOT BETWEEN "'.date("Y-m-d",$startdate).'" AND "'.date("Y-m-d",$enddate).'"');
if($statement3 == False){
echo "Database is busy";
header("refresh: 0;");
}
$result3 = $statement3->execute();
$totalcount = $result3->fetchArray(SQLITE3_ASSOC);
$nonthisweekcount = $totalcount['COUNT(*)'];
if($nonthisweekcount == 0) {
$newspeciescount++;
echo $com_name." - ".$scount."<br>";
}
}
if($newspeciescount == 0) {
echo "No new species were seen this week.";
}
die(); die();
} }
@@ -96,7 +116,7 @@ while($detection=$result1->fetchArray(SQLITE3_ASSOC))
} }
} }
$i++; $i++;
array_push($detections, $detection); $detections[$detection["Com_Name"]] = $detection["COUNT(*)"];
} }
?> ?>
@@ -113,12 +133,11 @@ while($detection=$result1->fetchArray(SQLITE3_ASSOC))
<?php <?php
$i = 0; $i = 0;
foreach($detections as $detection) foreach($detections as $com_name=>$scount)
{ {
$i++; $i++;
if($i <= 10) { if($i <= 10) {
$statement2 = $db->prepare('SELECT COUNT(*) FROM detections WHERE Com_Name == "'.$detection["Com_Name"].'" AND Date BETWEEN "'.date("Y-m-d",$startdate - (7*86400)).'" AND "'.date("Y-m-d",$enddate - (7*86400)).'"'); $statement2 = $db->prepare('SELECT COUNT(*) FROM detections WHERE Com_Name == "'.$com_name.'" AND Date BETWEEN "'.date("Y-m-d",$startdate - (7*86400)).'" AND "'.date("Y-m-d",$enddate - (7*86400)).'"');
if($statement2 == False){ if($statement2 == False){
echo "Database is busy"; echo "Database is busy";
header("refresh: 0;"); header("refresh: 0;");
@@ -127,7 +146,7 @@ while($detection=$result1->fetchArray(SQLITE3_ASSOC))
$totalcount = $result2->fetchArray(SQLITE3_ASSOC); $totalcount = $result2->fetchArray(SQLITE3_ASSOC);
$priorweekcount = $totalcount['COUNT(*)']; $priorweekcount = $totalcount['COUNT(*)'];
$percentagediff = round((1 - $priorweekcount / $detection["COUNT(*)"]) * 100); $percentagediff = round((1 - $priorweekcount / $scount) * 100);
if($percentagediff > 0) { if($percentagediff > 0) {
$percentagediff = "<span style='color:green;font-size:small'>+".$percentagediff."%</span>"; $percentagediff = "<span style='color:green;font-size:small'>+".$percentagediff."%</span>";
@@ -135,7 +154,7 @@ while($detection=$result1->fetchArray(SQLITE3_ASSOC))
$percentagediff = "<span style='color:red;font-size:small'>-".abs($percentagediff)."%</span>"; $percentagediff = "<span style='color:red;font-size:small'>-".abs($percentagediff)."%</span>";
} }
echo "<tr><td>".$detection["Com_Name"]."<br><small style=\"font-size:small\">".$detection["COUNT(*)"]." (".$percentagediff.")</small><br></td></tr>"; echo "<tr><td>".$com_name."<br><small style=\"font-size:small\">".$scount." (".$percentagediff.")</small><br></td></tr>";
} }
} }
?> ?>
@@ -146,23 +165,16 @@ while($detection=$result1->fetchArray(SQLITE3_ASSOC))
<table > <table >
<thead> <thead>
<tr> <tr>
<th><?php echo "Species Seen for the First Time: <br>"; ?></th> <th><?php echo "Species Detected for the First Time: <br>"; ?></th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
<?php <?php
function searchForId($id, $array) {
foreach ($array as $key => $val) {
if ($val['Com_Name'] === $id) {
return $key;
}
}
return null;
}
foreach($detections as $detection) $newspeciescount=0;
foreach($detections as $com_name=>$scount)
{ {
$statement3 = $db->prepare('SELECT COUNT(*) FROM detections WHERE Com_Name == "'.$detection["Com_Name"].'" AND Date NOT BETWEEN "'.date("Y-m-d",$startdate).'" AND "'.date("Y-m-d",$enddate).'"'); $statement3 = $db->prepare('SELECT COUNT(*) FROM detections WHERE Com_Name == "'.$com_name.'" AND Date NOT BETWEEN "'.date("Y-m-d",$startdate).'" AND "'.date("Y-m-d",$enddate).'"');
if($statement3 == False){ if($statement3 == False){
echo "Database is busy"; echo "Database is busy";
header("refresh: 0;"); header("refresh: 0;");
@@ -171,13 +183,14 @@ while($detection=$result1->fetchArray(SQLITE3_ASSOC))
$totalcount = $result3->fetchArray(SQLITE3_ASSOC); $totalcount = $result3->fetchArray(SQLITE3_ASSOC);
$nonthisweekcount = $totalcount['COUNT(*)']; $nonthisweekcount = $totalcount['COUNT(*)'];
// TODO: add a "no species were seen for the first time this week", if applicable
if($nonthisweekcount == 0) { if($nonthisweekcount == 0) {
$key = array_search($detection["Com_Name"], array_column($detections, 'Com_Name')); $newspeciescount++;
echo "<tr><td>".$detection["Com_Name"]."<br><small style=\"font-size:small\">".$detections[$key]["COUNT(*)"]."</small><br></td></tr>"; echo "<tr><td>".$com_name."<br><small style=\"font-size:small\">".$scount."</small><br></td></tr>";
} }
} }
if($newspeciescount == 0) {
echo "<tr><td>No new species were seen this week.</td></tr>";
}
?> ?>
</tbody> </tbody>
</table> </table>
scripts/weekly_report.sh
+1 -1
View File
@@ -5,5 +5,5 @@ if [ ${APPRISE_WEEKLY_REPORT} == 1 ];then
NOTIFICATION=${NOTIFICATION#*#} NOTIFICATION=${NOTIFICATION#*#}
firstLine=`echo "${NOTIFICATION}" | head -1` firstLine=`echo "${NOTIFICATION}" | head -1`
NOTIFICATION=`echo "${NOTIFICATION}" | tail -n +2` NOTIFICATION=`echo "${NOTIFICATION}" | tail -n +2`
$HOME/BirdNET-Pi/birdnet/bin/apprise -vv -t "${firstLine}" -b "${NOTIFICATION}" --config=$HOME/BirdNET-Pi/apprise.txt $HOME/BirdNET-Pi/birdnet/bin/apprise -vv -t "${firstLine}" -b "${NOTIFICATION}" --input-format=html --config=$HOME/BirdNET-Pi/apprise.txt
fi fi
templates/weekly_report.cron
+1 -1
View File
@@ -1,2 +1,2 @@
#birdnet #birdnet
0 7 * * 1 $USER /usr/local/bin/weekly_report.sh >/dev/null 2>&1 0 1 * * 1 $USER /usr/local/bin/weekly_report.sh >/dev/null 2>&1