Test result count should not include queued tests. Don't display queued test results in test results table.

This commit is contained in:
Tony Lambregts
2006-01-17 02:34:58 +00:00
committed by WineHQ
parent b587dbfd17
commit 9a72e97f53

View File

@@ -566,23 +566,29 @@ class testData{
{ {
$oTest = new testData($oRow->testingId); $oTest = new testData($oRow->testingId);
$oVersion = new version($oTest->iVersionId); $oVersion = new version($oTest->iVersionId);
$oApp = new application($oVersion->iAppId); // dont show testing results of versions that are still queued.
$oSubmitter = new User($oTest->iSubmitterId); if ($oVersion->sQueued == 'false')
if ($c % 2 == 1) { $bgcolor = 'color0'; } else { $bgcolor = 'color1'; } {
echo "<tr class=\"$bgcolor\">\n"; $oApp = new application($oVersion->iAppId);
echo " <td>".print_date(mysqltimestamp_to_unixtimestamp($oTest->sSubmitTime))."</td>\n"; $oSubmitter = new User($oTest->iSubmitterId);
echo " <td>\n"; if ($c % 2 == 1) { $bgcolor = 'color0'; } else { $bgcolor = 'color1'; }
echo $oSubmitter->sEmail ? "<a href=\"mailto:".$oSubmitter->sEmail."\">":""; echo "<tr class=\"$bgcolor\">\n";
echo $oSubmitter->sRealname; echo " <td>".print_date(mysqltimestamp_to_unixtimestamp($oTest->sSubmitTime))."</td>\n";
echo $oSubmitter->sEmail ? "</a>":""; echo " <td>\n";
echo " </td>\n"; echo $oSubmitter->sEmail ? "<a href=\"mailto:".$oSubmitter->sEmail."\">":"";
echo " <td>".$oApp->sName."</td>\n"; echo $oSubmitter->sRealname;
echo " <td>".$oVersion->sName."</td>\n"; echo $oSubmitter->sEmail ? "</a>":"";
echo " <td>".$oTest->sTestedRelease."</td>\n"; echo " </td>\n";
echo " <td align=\"center\">[<a href=".$_SERVER['PHP_SELF']."?sub=view&iTestingId=".$oTest->iTestingId.">process</a>]</td>\n"; echo " <td>".$oApp->sName."</td>\n";
echo "</tr>\n\n"; echo " <td>".$oVersion->sName."</td>\n";
$c++; 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(); echo html_frame_end();
} }
@@ -591,7 +597,13 @@ class testData{
/* Get the number of TestResults in the database */ /* Get the number of TestResults in the database */
function getNumberOfQueuedTests() 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) if($hResult)
{ {
$row = mysql_fetch_object($hResult); $row = mysql_fetch_object($hResult);