# HG changeset patch
# User Matti Hamalainen <ccr@tnsp.org>
# Date 1417086414 -7200
# Node ID 71621519a8830170351776d838ad7c8bd7589cf6
# Parent  2e106ba141903189493374e1b022177bba909a2c
Improve display of compo / entry statistics.

diff -r 2e106ba14190 -r 71621519a883 admajax.php
--- a/admajax.php	Thu Nov 27 12:57:50 2014 +0200
+++ b/admajax.php	Thu Nov 27 13:06:54 2014 +0200
@@ -835,9 +835,31 @@
     if ($nenabled > 0)
       echo "<li>".$nenabled." competitions that are NOT visible, but are enabled for voting?</li>\n";
 
-    $entries = stFetchSQL("SELECT COUNT(*) AS nentries, COUNT(DISTINCT compo_id) AS ncompos FROM entries");
-    if ($entries !== FALSE)
-      echo "<li><b>".$entries["nentries"]."</b> compo entries in system in <b>".$entries["ncompos"]."</b> compos.</li>\n";
+    // Count entries and compos
+    $nentries = $ncompos = 0;
+    foreach (stExecSQL("SELECT * FROM compos WHERE ctype=".COMPO_NORMAL) as $compo)
+    {
+      if (($ne = stFetchSQLColumn("SELECT COUNT(*) FROM entries WHERE compo_id=".$compo["id"])) !== false && $ne > 0)
+      {
+        $nentries += $ne;
+        $ncompos++;
+      }
+    }
+    if ($ncompos > 0)
+      echo "<li>VOTING COMPOS: <b>".$nentries."</b> compo entries in <b>".$ncompos."</b> compos.</li>\n";
+
+    $nentries = $ncompos = 0;
+    foreach (stExecSQL("SELECT * FROM compos WHERE ctype <> ".COMPO_NORMAL) as $compo)
+    {
+      if (($ne = stFetchSQLColumn("SELECT COUNT(*) FROM entries WHERE compo_id=".$compo["id"])) !== false && $ne > 0)
+      {
+        $nentries += $ne;
+        $ncompos++;
+      }
+    }
+    if ($ncompos > 0)
+      echo "<li>NON-VOTING COMPOS: <b>".$nentries."</b> entries/participants in <b>".$ncompos."</b> compos.</li>\n";
+
     
     if ($errors == 0)
       echo "<li>No errors/warnings detected.</li>\n";