Mercurial > hg > fapweb

changeset 334:a02422200eca

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Work on fixing results display.
author Matti Hamalainen <ccr@tnsp.org>
date Thu, 28 Nov 2013 06:30:56 +0200
parents 018817535fab
children cd2fbd5e0b1a
files results.inc.php
diffstat 1 files changed, 13 insertions(+), 13 deletions(-) [+]
line wrap: on
line diff
--- a/results.inc.php	Thu Nov 28 04:45:24 2013 +0200
+++ b/results.inc.php	Thu Nov 28 06:30:56 2013 +0200
@@ -62,20 +62,18 @@
           $sql =
             "SELECT entries.*,SUM(votes.value) AS votesum FROM entries ".
             "LEFT JOIN votes ON votes.entry_id=entries.id ".
-            "WHERE entries.compo_id=".$compo["id"]." ".
-            "GROUP BY entries.id ".
-            "ORDER BY votesum DESC";
+            "WHERE entries.compo_id=".$compo["id"];
           break;
 
         case VOTE_ACTIVATE:
           $sql =
-            "SELECT entries.*,SUM(votes.value) AS votesum FROM entries ".
-            "LEFT JOIN votes ON votes.entry_id=entries.id ".
-            "LEFT JOIN votekeys ON votes.key_id=votekeys.id ".
-            "WHERE entries.compo_id=".$compo["id"]." ".
-            "AND votekeys.active<>0 ".
-            "GROUP BY entries.id ".
-            "ORDER BY votesum DESC";
+            "SELECT entries.*, ".
+              "(SELECT SUM(votes.value) FROM votes ".
+              "LEFT JOIN votekeys ON votes.key_id=votekeys.id ".
+              "WHERE votes.entry_id=entries.id AND votekeys.active<>0) ".
+              "AS votesum ".
+            "FROM entries ".
+            "WHERE entries.compo_id=".$compo["id"];
           break;
 
         case VOTE_ASSIGN:
@@ -84,12 +82,14 @@
             "LEFT JOIN votes ON votes.entry_id=entries.id ".
             "LEFT JOIN attendees ON votes.key_id=attendees.key_id ".
             "WHERE entries.compo_id=".$compo["id"]." ".
-            "AND attendees.key_id<>0 ".
-            "GROUP BY entries.id ".
-            "ORDER BY votesum DESC";
+            "AND attendees.key_id<>0";
           break;
       }
 
+      $sql .= " ".
+        "GROUP BY entries.id ".
+        "ORDER BY votesum DESC";
+
       // List results
       $prev = FALSE;
       $index = 0;