From 9a72e97f53222d84a1bac13e0ed25a2595c494f7 Mon Sep 17 00:00:00 2001
From: Tony Lambregts <tony.lambregts@gmail.com>
Date: Tue, 17 Jan 2006 02:34:58 +0000
Subject: [PATCH] Test result count should not include queued tests.  Don't
 display queued test results in test results table.

---
 include/testResults.php | 46 ++++++++++++++++++++++++++---------------
 1 file changed, 29 insertions(+), 17 deletions(-)

diff --git a/include/testResults.php b/include/testResults.php
index fb272f3..477bc53 100644
--- a/include/testResults.php
+++ b/include/testResults.php
@@ -566,23 +566,29 @@ class testData{
         {
             $oTest = new testData($oRow->testingId);
             $oVersion = new version($oTest->iVersionId);
-            $oApp  = new application($oVersion->iAppId);
-            $oSubmitter = new User($oTest->iSubmitterId);
-            if ($c % 2 == 1) { $bgcolor = 'color0'; } else { $bgcolor = 'color1'; }
-            echo "<tr class=\"$bgcolor\">\n";
-            echo "    <td>".print_date(mysqltimestamp_to_unixtimestamp($oTest->sSubmitTime))."</td>\n";
-            echo "    <td>\n";
-            echo $oSubmitter->sEmail ? "<a href=\"mailto:".$oSubmitter->sEmail."\">":"";
-            echo $oSubmitter->sRealname;
-            echo $oSubmitter->sEmail ? "</a>":"";
-            echo "    </td>\n";
-            echo "    <td>".$oApp->sName."</td>\n";
-            echo "    <td>".$oVersion->sName."</td>\n";
-            echo "    <td>".$oTest->sTestedRelease."</td>\n";
-            echo "    <td align=\"center\">[<a href=".$_SERVER['PHP_SELF']."?sub=view&iTestingId=".$oTest->iTestingId.">process</a>]</td>\n";
-            echo "</tr>\n\n";
-            $c++;
+            // dont show testing results of versions that are still queued.
+            if ($oVersion->sQueued == 'false')
+            {
+                $oApp  = new application($oVersion->iAppId);
+                $oSubmitter = new User($oTest->iSubmitterId);
+                if ($c % 2 == 1) { $bgcolor = 'color0'; } else { $bgcolor = 'color1'; }
+                echo "<tr class=\"$bgcolor\">\n";
+                echo "    <td>".print_date(mysqltimestamp_to_unixtimestamp($oTest->sSubmitTime))."</td>\n";
+                echo "    <td>\n";
+                echo $oSubmitter->sEmail ? "<a href=\"mailto:".$oSubmitter->sEmail."\">":"";
+                echo $oSubmitter->sRealname;
+                echo $oSubmitter->sEmail ? "</a>":"";
+                echo "    </td>\n";
+                echo "    <td>".$oApp->sName."</td>\n";
+                echo "    <td>".$oVersion->sName."</td>\n";
+                echo "    <td>".$oTest->sTestedRelease."</td>\n";
+                echo "    <td align=\"center\">[<a href=".$_SERVER['PHP_SELF']."?sub=view&iTestingId=".$oTest->iTestingId.">process</a>]</td>\n";
+                echo "</tr>\n\n";
+                $c++;
+            }
         }
+        echo "</table>","\n";
+        
         echo html_frame_end();
 
     }
@@ -591,7 +597,13 @@ class testData{
 /* Get the number of TestResults in the database */
 function getNumberOfQueuedTests()
 {
-    $hResult = query_appdb("SELECT count(*) as num_tests FROM testResults WHERE queued='true';");
+    $sQuery = "SELECT count(*) as num_tests
+               FROM testResults, appVersion
+               WHERE appVersion.versionId=testResults.versionId
+               and appVersion.queued='false' 
+               and testResults.queued='true';";
+
+    $hResult = query_appdb($sQuery);
     if($hResult)
     {
       $row = mysql_fetch_object($hResult);