testData: add preview support

include/testData.php

@@ -471,35 +471,8 @@ class testData{
         echo $this->sComments,"\n";
     }
 
-    // Show the Test results for a application version
+    function CreateTestTable()
-    function ShowVersionsTestingTable($sLink, $iDisplayLimit)
     {
-        global $aClean;
-
-        /* escape input parameters */
-        $link = query_escape_string($link);
-        $iDisplayLimit = query_escape_string($iDisplayLimit);
-
-        $bShowAll = ($aClean['bShowAll'] == "true") ? true : false;
-
-        $sQuery = "SELECT * 
-                   FROM testResults
-                   WHERE versionId = '?'
-                   AND
-                   queued = '?'
-                   ORDER BY testedDate DESC";
-	
-        if(!$bShowAll)
-            $sQuery.=" LIMIT 0,".$iDisplayLimit;
-
-        $hResult = query_parameters($sQuery, $this->iVersionId, "false");
-        if(!$hResult)
-            return;
-
-        $rowsUsed = query_num_rows($hResult);
-
-        if($rowsUsed == 0)
-             return;
         echo '<div class="info_container">',"\n";
         echo '<div class="title_class">Test Results</div>',"\n";
         echo '<div class="info_contents">',"\n";
@@ -523,15 +496,17 @@ class testData{
         $oTableRowHeader->AddTextCell("Submitter");
         $oTable->SetHeader($oTableRowHeader);
 
-        $iIndex = 0;
+        return $oTable;
-        while($oRow = query_fetch_object($hResult))
+    }
+
+    /* Creates and returns a table row for a test result table */
+    function CreateTestTableRow($iCurrentId, $sLink)
     {
-            $oTest = new testData($oRow->testingId);
+        $oVersion = new Version($this->iVersionId);
-            $oVersion = new Version($oTest->iVersionId);
         $oApp  = new Application($oVersion->iAppId);
-            $oSubmitter = new User($oTest->iSubmitterId);
+        $oSubmitter = new User($this->iSubmitterId);
-            $oDistribution = new distribution($oTest->iDistributionId);
+        $oDistribution = new distribution($this->iDistributionId);
-            $bgcolor = $oTest->sTestedRating;
+        $bgcolor = $this->sTestedRating;
 
         // initialize the array ech time we loop
         $oTableRowClick = null;
@@ -540,7 +515,7 @@ class testData{
 
         /* if the test we are displaying is this test then */
         /* mark it as the current test */
-            if ($oTest->iTestingId == $this->iTestingId)
+        if ($this->iTestingId == $iCurrentId)
         {
             $sTRClass = $bgcolor;
 
@@ -551,13 +526,13 @@ class testData{
             $sTRClass = $bgcolor;
 
             $oInactiveColor = new color();
-              $oInactiveColor->SetColorByName($oTest->sTestedRating);
+            $oInactiveColor->SetColorByName($this->sTestedRating);
 
             $oHighlightColor = GetHighlightColorFromInactiveColor($oInactiveColor);
 
             $oTableRowHighlight = new TableRowHighlight($oHighlightColor, $oInactiveColor);
 
-              $sUrl = $sLink.$oTest->iTestingId;
+            $sUrl = $sLink.$this->iTestingId;
 
             $oTableRowClick = new TableRowClick($sUrl);
             $oTableRowClick->SetHighlight($oTableRowHighlight);
@@ -572,20 +547,20 @@ class testData{
         $oTableRow->SetClass($sTRClass);
 
         $oTableRow->AddTextCell($oDistribution->objectMakeLink());
-            $oTableRow->AddTextCell(date("M d Y", mysqldatetime_to_unixtimestamp($oTest->sTestedDate)));
+        $oTableRow->AddTextCell(date("M d Y", mysqldatetime_to_unixtimestamp($this->sTestedDate)));
-            $oTableRow->AddTextCell($oTest->sTestedRelease.'&nbsp');
+        $oTableRow->AddTextCell($this->sTestedRelease.'&nbsp');
-            $oTableRow->AddTextCell($oTest->sInstalls.'&nbsp');
+        $oTableRow->AddTextCell($this->sInstalls.'&nbsp');
-            $oTableRow->AddTextCell($oTest->sRuns.'&nbsp');
+        $oTableRow->AddTextCell($this->sRuns.'&nbsp');
-            $oTableRow->AddTextCell($oTest->sTestedRating.'&nbsp');
+        $oTableRow->AddTextCell($this->sTestedRating.'&nbsp');
         $oTableRow->AddTextCell($oSubmitter->objectMakeLink().'&nbsp');
-            if ($_SESSION['current']->hasAppVersionModifyPermission($oVersion))
+        if ($this->iTestingId && $_SESSION['current']->hasAppVersionModifyPermission($oVersion))
         {
             $oObject = new objectManager("testData");
-                $oTableRow->AddTextCell('<a href="'.$oObject->makeUrl("edit", $oTest->iTestingId,
+            $oTableRow->AddTextCell('<a href="'.$oObject->makeUrl("edit", $this->iTestingId,
                                     "Edit Test Results").'">'.
                                     'Edit</a> &nbsp; ',"\n".
                                     '<a href="objectManager.php?sClass=testData&bIsQueue=false&sAction='.
-                                        'delete&iId='.$oTest->iTestingId.'&sTitle=Delete+Test+Results'.
+                                    'delete&iId='.$this->iTestingId.'&sTitle=Delete+Test+Results'.
                                     '">Delete</a></td>',"\n");
         }
 
@@ -593,6 +568,46 @@ class testData{
         if($oTableRowClick)
             $oTableRow->SetRowClick($oTableRowClick);
 
+        return $oTableRow;
+    }
+
+    // Show the Test results for a application version
+    function ShowVersionsTestingTable($sLink, $iDisplayLimit)
+    {
+        global $aClean;
+
+        /* escape input parameters */
+        $sLink = query_escape_string($sLink);
+        $iDisplayLimit = query_escape_string($iDisplayLimit);
+
+        $bShowAll = ($aClean['bShowAll'] == "true") ? true : false;
+
+        $sQuery = "SELECT * 
+                   FROM testResults
+                   WHERE versionId = '?'
+                   AND
+                   queued = '?'
+                   ORDER BY testedDate DESC";
+	
+        if(!$bShowAll)
+            $sQuery.=" LIMIT 0,".$iDisplayLimit;
+
+        $hResult = query_parameters($sQuery, $this->iVersionId, "false");
+        if(!$hResult)
+            return;
+
+        $rowsUsed = query_num_rows($hResult);
+
+        if($rowsUsed == 0)
+             return;
+
+        $oTable = $this->CreateTestTable();
+
+        $iIndex = 0;
+        while($oRow = query_fetch_object($hResult))
+        {
+            $oTest = new testData($oRow->testingId);
+            $oTableRow = $oTest->CreateTestTableRow($this->iTestingId, $sLink);
             // add the row to the table
             $oTable->AddRow($oTableRow);
 
@@ -1114,10 +1129,21 @@ class testData{
              "you can submit it into the AppDB, reject it or delete it.</p>\n";
     }
 
+    function objectShowPreview()
+    {
+        return TRUE;
+    }
+
     function display()
     {
-        /* STUB */
+        $this->ShowTestResult();
-        return TRUE;
+        $this->iSubmitterId = $_SESSION['current']->iUserId;
+
+        $oTable = $this->CreateTestTable();
+
+        $oTable->AddRow($this->CreateTestTableRow($this->iTestingId, ""));
+
+        echo $oTable->GetString();
     }
 
 

include/testData_queue.php

@@ -148,6 +148,11 @@ class testData_queue
         $oTest->objectDisplayQueueProcessingHelp();
     }
 
+    function objectShowPreview()
+    {
+        return $this->oTestData->objectShowPreview();
+    }
+
     function display()
     {
         return $this->oTestData->display();