Changeset 19641

Timestamp:

09/15/19 14:37:52 (5 years ago)

Author:

Daniela Dorner

Message:

replace ATel in comment by link to ATel

File:

• trunk/www/flare_alerts/sent.php (modified) (5 diffs)

trunk/www/flare_alerts/sent.php

@@ -146 +146 @@
         }
         echo "<tr>\n";
+        foreach ($colnames as $key)
+        {
+            if ($key=="Comment")
+            {
+                if (strpos($row[$key],"ATel") !== false)
+                    echo "<td>".preg_replace("/ATel\ \#(\d{4,5})/", "<a href='http://www.astronomerstelegram.org/?read=$1'>ATel #$1</a>", $row[$key])."</td>\n";
+                else
+                    echo "<td>".$row[$key]."</td>\n";
+            }
+            else
+                echo "<td>".$row[$key]."</td>\n";
+        }
+        echo "</tr>\n";
+    }
+    echo "</table><br>\n";
+
+    echo "<hr>\n";
+    echo "<hr>\n";
+    echo "<h2>Alert Statistics: </h2>";
+    $query="SELECT fRecepientName AS 'To', Count(*) AS 'count' FROM Sent LEFT JOIN Recepient USING (fRecepientKey) WHERE fSentTime BETWEEN ".$start." AND ".$stop;
+    if ($source != -1)
+        $query.=" AND fSourceKey=".$source;
+    if ($type != -1)
+        $query.=" AND fRecepientKey=".$type;
+    $query.=" GROUP BY fRecepientName ORDER BY count DESC";
+
+    echo "<table border='1' style='border-collapse:collapse'>\n";
+    $first_row = 0;
+    $colnames = "";
+    $result = $db->query($query)->fetchAll(PDO::FETCH_ASSOC);
+    foreach($result as $row) 
+    {
+        if ($first_row == 0)
+        {
+            $first_row = 1;
+            echo "<tr>\n";
+            $colnames = array_keys($row);
+            foreach($colnames as $colname){
+                echo "<th>".$colname."</th>\n";
+            }
+            echo "</tr>\n";
+        }
+        echo "<tr>\n";
         foreach ($colnames as $key) {
             
@@ -152 +195 @@
         echo "</tr>\n";
     }
-    echo "</table><br>\n";
-
-    echo "<hr>\n";
-    echo "<hr>\n";
-    echo "<h2>Alert Statistics: </h2>";
-    $query="SELECT fRecepientName AS 'To', Count(*) AS 'count' FROM Sent LEFT JOIN Recepient USING (fRecepientKey) WHERE fSentTime BETWEEN ".$start." AND ".$stop;
-    if ($source != -1)
-        $query.=" AND fSourceKey=".$source;
-    if ($type != -1)
-        $query.=" AND fRecepientKey=".$type;
-    $query.=" GROUP BY fRecepientName ORDER BY count DESC";
+    echo "</table>\n";
+
+    echo "<hr>\n";
+    $query="SELECT fSourceName AS 'Source', Count(*) AS 'count' FROM Sent LEFT JOIN factdata.Source USING (fSourceKey) ";
+    $query.="WHERE fSentTime BETWEEN ".$start." AND ".$stop;
+    if ($source != -1)
+        $query.=" AND fSourceKey=".$source;
+    if ($type != -1)
+        $query.=" AND fRecepientKey=".$type;
+    $query.=" GROUP BY fSourceName ORDER BY count DESC";
+
 
     echo "<table border='1' style='border-collapse:collapse'>\n";
@@ -190 +233 @@
 
     echo "<hr>\n";
-    $query="SELECT fSourceName AS 'Source', Count(*) AS 'count' FROM Sent LEFT JOIN factdata.Source USING (fSourceKey) ";
+    $query="SELECT fSourceName AS 'Source', fRecepientName AS 'To', Count(*) AS 'count' FROM Sent ";
+    $query.="LEFT JOIN Recepient USING (fRecepientKey) LEFT JOIN factdata.Source USING (fSourceKey) ";
     $query.="WHERE fSentTime BETWEEN ".$start." AND ".$stop;
     if ($source != -1)
@@ -196 +240 @@
     if ($type != -1)
         $query.=" AND fRecepientKey=".$type;
-    $query.=" GROUP BY fSourceName ORDER BY count DESC";
+    $query.=" GROUP BY fRecepientName, fSourceName ORDER BY fRecepientName ";
 
 
@@ -224 +268 @@
     echo "</table>\n";
 
-    echo "<hr>\n";
-    $query="SELECT fSourceName AS 'Source', fRecepientName AS 'To', Count(*) AS 'count' FROM Sent ";
-    $query.="LEFT JOIN Recepient USING (fRecepientKey) LEFT JOIN factdata.Source USING (fSourceKey) ";
-    $query.="WHERE fSentTime BETWEEN ".$start." AND ".$stop;
-    if ($source != -1)
-        $query.=" AND fSourceKey=".$source;
-    if ($type != -1)
-        $query.=" AND fRecepientKey=".$type;
-    $query.=" GROUP BY fRecepientName, fSourceName ORDER BY fRecepientName ";
-
-
-    echo "<table border='1' style='border-collapse:collapse'>\n";
-    $first_row = 0;
-    $colnames = "";
-    $result = $db->query($query)->fetchAll(PDO::FETCH_ASSOC);
-    foreach($result as $row) 
-    {
-        if ($first_row == 0)
-        {
-            $first_row = 1;
-            echo "<tr>\n";
-            $colnames = array_keys($row);
-            foreach($colnames as $colname){
-                echo "<th>".$colname."</th>\n";
-            }
-            echo "</tr>\n";
-        }
-        echo "<tr>\n";
-        foreach ($colnames as $key) {
-            
-            echo "<td>".$row[$key]."</td>\n";
-        }
-        echo "</tr>\n";
-    }
-    echo "</table>\n";
-
     echo "<hr size='2px' style='border-width:5px'>\n";