Merge lp:~ara/ubuntu-qa-website/maverick_alpha3_changes into lp:~ubuntu-qa-website-devel/ubuntu-qa-website/trunk

[Ara Pulido]

Bug fixes:
 * Bug #507950: iso tracker should indicate some how that tests are under way on the topmost screen
 * Bug #600685: Cannot add more than 3 bug entry fields in the ISO Tracker.
 * Bug #599819: Test coverage does not show testcases with zero results

New features:
 * Bug #436450: iso.qa. needs a working admin interface
 * Bug #291089: [iso.qa] "Not complete" filter
 * Bug #600249: Need to add arm preinstalled images to the tracker database

=== modified file 'code/modules/qatracker/qatracker.display.php'
--- code/modules/qatracker/qatracker.display.php	2010-06-22 13:41:41 +0000
+++ code/modules/qatracker/qatracker.display.php	2010-07-20 17:27:41 +0000
@@ -29,10 +29,11 @@
 		return qawebsite_sitelist();
 	}
 	
-	$header="<div style=\"color: #000000; font-size: 15px; text-decoration: none;\">".qatracker_getpath($args)."</div>";
+    $header="<div style=\"color: #000000; font-size: 15px; text-decoration: none;\">".qatracker_getpath($args)."</div>";
 	if (count($args) < 1) {
 		$args[0]="build";
-	}
+    }
+
 	switch ($args[0]) {
 		case "build":
 			if (count($args) > 2)
@@ -100,9 +101,11 @@
 						else
 							$content=qatracker_adminui_milestone($args[2]);
 					break;
-					case "product":
+                    case "product":
+                        $content=qatracker_adminui_product();
+                    break;
 					case "testcase":
-						$content="<br /><b>Sorry, this feature hasn't been reimplemented yet</b>";
+						$content=qatracker_adminui_testcase();
 					break;
 					default:
 						return drupal_not_found();
@@ -208,8 +211,9 @@
 			<table class=\"listing\" style=\"margin-bottom:2em\">
 				<tr class=\"trheader\">
 					<td style=\"width:50%\" align=\"left\"><b>Description</b></td>
-					<td style=\"width:15%\" align=\"left\"><b>Test status</b></td>
-					<td style=\"width:30%\" align=\"center\"><b>Bugs</b></td>";
+					<td style=\"width:10%\" align=\"left\"><b>Mandatory</b></td>
+					<td style=\"width:10%\" align=\"left\"><b>Optional</b></td>
+					<td style=\"width:20%\" align=\"center\"><b>Bugs</b></td>";
 					if (user_access($site->adminrole) && $archive == 0) {
 						$content.="<td style=\"width:5%\" align=\"center\"><input type=\"checkbox\" name=\"checkall\" onclick=\"checkAll(document.forms['isolist'], this, '".$chkclass."')\" /></td>";
 					}
@@ -227,8 +231,21 @@
 			$lastVersion=$item->version;
 		}
 		if ($item->icon == null)
-			$item->icon="info.png";
-		if ($status == null || $status == "all" || ($status=="untested" && ereg(">0/",qatracker_getbuildstat($item->id))) || ($status=="completed" && ereg("^<span style=\"font-weight:bold",qatracker_getbuildstat($item->id))) || ($status=="inprogress" && !ereg("^<span style=\"font-weight:bold",qatracker_getbuildstat($item->id)) && !ereg("0/",qatracker_getbuildstat($item->id)))) {
+            $item->icon="info.png";
+
+        $mandatory_build_status = qatracker_getbuildstat($item->id);
+        $optional_build_status = qatracker_getbuildstat_optional($item->id);
+
+        $build_status = "";
+
+        if ((ereg("0/", $mandatory_build_status) || ereg("None", $mandatory_build_status)) && (ereg("0/", $optional_build_status) || ereg("None", $optional_build_status))) 
+            $build_status = "untested";
+        elseif ((ereg("<span style=\"font-weight:bold; color:#006400;", $mandatory_build_status) || ereg("None", $mandatory_build_status)) && (ereg("<span style=\"font-weight:bold; color:#006400;", $optional_build_status) || ereg("None", $optional_build_status)))
+            $build_status = "completed";
+        else 
+            $build_status = "started";
+
+		if ($status == null || $status == "all" || ($status=="untested" && $build_status=="untested") || ($status=="completed" && $build_status=="completed") || ($status=="started" && $build_status=="started") || ($status=="notcompleted" && ($build_status=="started" || $build_status=="untested"))) {
 			$content.="
 				<tr$id>";
 					if ($item->buildstatus != 1 || $archive == 1)
@@ -236,8 +253,9 @@
 					else
 						$content.="<td style=\"width:45%\" align=\"left\" valign=\"bottom\"><a href=\"$base_url/qatracker/info/".$item->id."\"><img src=\"$base_url/modules/qatracker/images/icon/".$item->icon."\" style=\"margin-bottom:-3px;\" alt=\"download info\" /></a> <a href=\"$base_url/qatracker/test/".$item->id."\"><span style=\"text-decoration:line-through\">".$item->product." (rebuilding...)</span></a></td>";
 					$content.="
-					<td style=\"width:15%\" align=\"left\" valign=\"bottom\">".qatracker_getbuildstat($item->id,$archive)."</td>
-					<td style=\"width:30%\" align=\"center\" valign=\"bottom\">".qatracker_getbugslist($item->id, 0, 0)."</td>";
+					<td style=\"width:10%\" align=\"left\" valign=\"bottom\">".$mandatory_build_status."</td>
+					<td style=\"width:10%\" align=\"left\" valign=\"bottom\">".$optional_build_status."</td>
+					<td style=\"width:20%\" align=\"center\" valign=\"bottom\">".qatracker_getbugslist($item->id, 0, 0)."</td>";
 						if (user_access($site->adminrole)) {
 							$content.="<td style=\"width:5%\" align=\"center\" valign=\"bottom\"><input type=\"checkbox\" class=\"".$chkclass."\" value=\"".$item->id."\" name=\"isota_iso[]\" /></td>";
 						}
@@ -588,7 +606,7 @@
 	if (user_access($site->userrole) && $archive!=1 && $rebuild!=1) {
 		if (!$count)
 			$content.="<p style=\"text-align:center;font-weight:bold;padding-top:1em;padding-bottom:1em;\">No results for that specific test case, maybe would you like to make the first one ?</p>";
-		if ($_POST['isot_valid']) {
+		if ( ($_POST['isot_valid']) && (!$_POST['isot_addbug']) ) {
 			$result=qatracker_validresult($buildID, $testcaseID);
 			if ($result == null)
 				return null;
@@ -598,7 +616,7 @@
 		else {
 			$resultID=db_query("SELECT id FROM qatracker_result WHERE buildid='".$buildID."' AND testcaseid='".$testcaseID."' AND reporterid='".$user->uid."' ");
 			$resultID=db_result($resultID);
-			if ($resultID) {
+            if ($resultID) {
 				$content.="<br /><b>You have already posted a result, the form below lets you update it or delete it:</b>";
 				$content.=qatracker_addresult($resultID);
 			}
@@ -623,7 +641,7 @@
 			"Ubuntu Server" => "Server",
 			"DVD" => "DVD",
             "Netbook" => "Netbook",
-            "arm" => "ARM",
+            "ARM" => "ARM",
 			"Netboot" => "Netboot"
 		);
 	}
@@ -634,10 +652,20 @@
 		}
 	}
 	$content="<br />This page shows how many times each testcase has been tested.<br />Testcases with no results are shown in red, with less than 5 results in orange and with more than 5 results in green.<br />This page doesn't show the result of those tests but only the coverage (if a testcase has 6 failed result it'll be shown in green anyway)";
-	foreach ($products as $product => $title) {
+    foreach ($products as $product => $title) {
 		$content.="<h1>$title</h1><table class=\"listing\" style=\"width:auto;\">";
-		$tests=db_query("SELECT qatracker_testcase.title, count(qatracker_result.id) FROM qatracker_build LEFT JOIN qatracker_milestone ON qatracker_milestone.id=qatracker_build.milestoneid LEFT JOIN qatracker_result ON qatracker_result.buildid=qatracker_build.id LEFT JOIN qatracker_product ON qatracker_product.id=qatracker_build.productid RIGHT JOIN qatracker_testcase ON qatracker_testcase.productid=qatracker_product.id WHERE qatracker_product.siteid='".$site->id."' AND qatracker_testcase.status='0' AND qatracker_product.status='0' AND qatracker_product.title~'".$product."' AND qatracker_build.status='0' AND qatracker_milestone.status='0' AND ((qatracker_result.status='0' AND qatracker_result.result != '2' AND qatracker_testcase.id=qatracker_result.testcaseid) OR qatracker_result.status is Null) GROUP BY qatracker_testcase.title, substring(qatracker_product.title from '.* (.*) .*$')");
-		$result=false;
+        $tests=db_query("SELECT t.title, count(r.id) FROM qatracker_testcase t 
+                                LEFT JOIN qatracker_product p ON p.id = t.productid 
+                                LEFT JOIN qatracker_build b ON b.productid = p.id 
+                                LEFT JOIN qatracker_milestone m ON b.milestoneid = m.id 
+                                LEFT JOIN qatracker_result r ON r.buildid = b.id AND r.testcaseid = t.id 
+                                WHERE m.status = 0 
+                                AND p.status = '0' AND p.siteid = '".$site->id."' AND p.title~'".$product."'
+                                AND b.status = '0'
+                                AND t.status = '0'
+                                AND (( r.result != '2' AND r.status = '0') OR r.id IS NULL)
+                                GROUP BY t.title");
+	    $result=false;
 		while ($item = db_fetch_object($tests)) {
 			if ($item->count == 0)
 				$count="<span style=\"color:red; font-weight:bold;\">".$item->count." tests done</span>";
@@ -653,9 +681,21 @@
 		$content.="</table>";
     }
 	$content.="<h1>Optional Testcases</h1><table class=\"listing\" style=\"width:auto;\">";
-	$tests=db_query("SELECT qatracker_testcase.title, count(qatracker_result.id) FROM qatracker_build LEFT JOIN qatracker_milestone ON qatracker_milestone.id=qatracker_build.milestoneid LEFT JOIN qatracker_result ON qatracker_result.buildid=qatracker_build.id LEFT JOIN qatracker_testcase ON qatracker_result.testcaseid = qatracker_testcase.id LEFT JOIN qatracker_product ON qatracker_product.id = qatracker_testcase.productid WHERE qatracker_product.siteid='".$site->id."' AND qatracker_testcase.status='2' AND qatracker_build.status='0' AND qatracker_milestone.status='0' AND ((qatracker_result.status='0' AND qatracker_result.result != '2' AND qatracker_testcase.id=qatracker_result.testcaseid) OR qatracker_result.status is Null) GROUP BY qatracker_testcase.title");
+
+
+    $tests=db_query("SELECT t.title, count(r.id) FROM qatracker_testcase t 
+                                LEFT JOIN qatracker_product p ON p.id = t.productid 
+                                LEFT JOIN qatracker_build b ON b.productid = p.id 
+                                LEFT JOIN qatracker_milestone m ON b.milestoneid = m.id 
+                                LEFT JOIN qatracker_result r ON r.buildid = b.id AND r.testcaseid = t.id 
+                                WHERE m.status = 0 
+                                AND p.status = '0' AND p.siteid = '".$site->id."' 
+                                AND b.status = '0' 
+                                AND t.status = '2' 
+                                AND (( r.result != '2' AND r.status = '0') OR r.id IS NULL) 
+                                GROUP BY t.title");
 	$result=false;
-	while ($item = db_fetch_object($tests)) {
+    while ($item = db_fetch_object($tests)) {
 		if ($item->count == 0)
 			$count="<span style=\"color:red; font-weight:bold;\">".$item->count." tests done</span>";
 		elseif ($item->count > 5)
@@ -668,7 +708,7 @@
 	if (!$result)
 		$content.="<tr><td style=\"width:25em;\" colspan=\"2\"><b>This product is not currently on the tracker.</b></td></tr>";
 	$content.="</table>";
-   
+
 	return $content;
 }
 
@@ -852,7 +892,7 @@
 			array_push_associative($data['isot_bug'], array($bug->bugnumber => $bug->bugimportance));
 		$username=$data['isot_poster'];
 	}
-	else {
+    else {
 		$data=qatracker_checkpostvalue();
 		$username=$user->uid;
 	}
@@ -879,12 +919,14 @@
 			$content.="<tr><td><input type=\"text\" size=\"12\" name=\"isot_bugnumber[]\" value=\"$bugnumber\"/></td><td style=\"width:100%\" align=\"left\"><input type=\"checkbox\" name=\"isot_serious[]\" value=\"$count\" $checked/></td></tr>";
 			$count++;
 		}
-	}
+    }
 	$total=$count;
-	if ($count < 3)
-		$total=3;
-	elseif ($_POST['isot_addbug'])
-		$total++;
+    if ($count < 3) {
+        $total=3;
+    }
+    elseif ($_POST['isot_addbug'] != "") {
+        $total++;
+    }
 	for ($i=$count;$i<$total;$i++)
 		$content.="<tr><td><input type=\"text\" size=\"12\" name=\"isot_bugnumber[]\" /></td><td style=\"width:100%\" align=\"left\"><input type=\"checkbox\" name=\"isot_serious[]\" value=\"$i\"/></td></tr>";
 	$content.="
@@ -913,7 +955,8 @@
 
 function qatracker_validresult($buildID, $testcaseID, $admin = 0, $resultID1 = 0) {
 	global $user, $base_url;
-	$data=qatracker_checkpostvalue();
+    $data=qatracker_checkpostvalue();
+
 	if ($data['isot_error']) {
 		return qatracker_addresult($isodID, 0);
 	}
@@ -1033,15 +1076,17 @@
 	if (ereg("Upgrade",$info->product))
 		return "<br />For upgrades, please use update-manager.";
 	elseif (ereg("Desktop",$info->product)) {
-		if (ereg("armel",$info->product)) {
-			$url['type']="/ports/daily-live/";
-			$url['file']=$url['release']."-desktop-".$url['arch'].".img";
-		}
-		else {
-			$url['type']="/daily-live/";
-			$url['file']=$url['release']."-desktop-".$url['arch'].".iso";
-		}
-	}
+        $url['type']="/daily-live/";
+        $url['file']=$url['release']."-desktop-".$url['arch'].".iso";
+    }
+    elseif (ereg("ARM Preinstalled omap3",$info->product)) {
+		$url['type']="/ubuntu-netbook/ports/daily-preinstalled/";
+		$url['file']=$url['release']."-preinstalled-netbook-armel+omap.img.gz";
+	}	
+    elseif (ereg("ARM Preinstalled omap4",$info->product)) {
+		$url['type']="/ubuntu-netbook/ports/daily-preinstalled/";
+		$url['file']=$url['release']."-preinstalled-netbook-armel+omap4.img.gz";
+	}	
 	elseif (ereg("Alternate",$info->product)) {
 		$url['type']="/daily/";
 		$url['file']=$url['release']."-alternate-".$url['arch'].".iso";
@@ -1513,7 +1558,7 @@
 }
 
 function qatracker_adminui_result($buildID, $testcaseID, $resultID) {
-	if ($_POST['isot_valid']) {
+	if ( ($_POST['isot_valid']) && (!$_POST['isot_addbug'])) {
 		$data=qatracker_checkpostvalue();
 		if ($data['isot_error']) {
 			$content.=qatracker_addresult($resultID, 1);
@@ -1582,6 +1627,105 @@
 	}
 }
 
+function qatracker_adminui_testcase() {
+    global $base_url, $site, $user;
+    if ($_POST['isota_addtestcase'] && is_array($_POST['isota_case'])) {
+        $tc_title = trim(db_escape_string($_POST['isota_testcasetitle']));
+        $tc_url = trim(db_escape_string($_POST['isota_testcaseurl']));
+        if ($tc_title == "") {
+            drupal_set_message("The title of the testcase cannot be empty.");
+        }
+        else { 
+	    	foreach ($_POST['isota_case'] as $number) {
+		    	$test=db_result(db_query("SELECT count(id) FROM qatracker_testcase WHERE title='".$tc_title."' AND productid='".db_escape_string($number)."'"));
+			    if ($test == 0) {
+				    db_query("INSERT INTO qatracker_testcase (productid, title, link) VALUES ('".db_escape_string($number)."', '".$tc_title."', '".$tc_url."')");
+			    }
+	    	}
+            drupal_set_message("The testcases have correctly been added.<br />", "notice_msg");
+        }
+		    drupal_set_header("Location: $base_url/qatracker/admin/testcase");
+            return null;
+	}
+	else {
+		$content="<br /><form id=\"testlist\" method=\"post\" action=\"\">";
+		$tests=db_query("SELECT id, title FROM qatracker_product WHERE siteid='".$site->id."' AND status='0' ORDER BY title ASC");
+		$olddistro="";
+		while ($item = db_fetch_object($tests)) {
+			$distribution=explode(" ",$item->title);
+			$distribution=$distribution[0];
+			if ($olddistro != $distribution) {
+				if ($olddistro != "")
+					$content.="</table>";
+				$content.="<table class=\"listing\" style=\"margin-bottom:1em;width:25em;\">
+				<tr class=\"trheader\" style=\"width:0\">
+					<td><b>".$distribution."</b></td>
+					<td><input type=\"checkbox\" name=\"checkall\" onclick=\"checkAll(document.forms['testlist'], this, '".$distribution."')\" /></td>
+				</tr>";
+				$olddistro=$distribution;
+			}
+			$content.="<tr><td>".$item->title."</td><td><input type=\"checkbox\" class=\"".$distribution."\" name=\"isota_case[]\" value=\"".$item->id."\" /></td></tr>";
+		}
+		$content.="</table><p>
+			<input type=\"checkbox\" name=\"checkall\" onclick=\"checkAll(document.forms['testlist'], this)\" />Check all<br /><br />
+			<b>Testcase title</b> <input type=\"text\" name=\"isota_testcasetitle\" /><br /><br />
+			<b>Testcase URL</b> <input type=\"text\" name=\"isota_testcaseurl\" /><br /><br />
+			";
+		$content.="<input type=\"submit\" name=\"isota_addtestcase\" value=\"Add testcase\" />
+		</p></form>";
+		return $content;
+	}
+}
+
+function qatracker_adminui_product() {
+	global $base_url, $site, $user;
+    if ($_POST['isota_addproduct'] && $_POST['isota_product']) {
+        $product = trim(db_escape_string(($_POST['isota_product'])));
+        if ($product == "") {
+            drupal_set_message("The product name cannot be blank.");
+        }
+        else {
+            $test=db_result(db_query("SELECT count(id) from qatracker_product WHERE title='".$product."' AND siteid = '".$site->id."'"));
+            if ($test > 0) {
+                drupal_set_message("That product already exists. Please, choose another name.");
+            }
+            else {
+                db_query("INSERT INTO qatracker_product (siteid, title, type) VALUES ('".$site->id."','".$product."', 0)");
+                drupal_set_message("The product was successfully added.");
+            }
+        }
+
+		drupal_set_header("Location: $base_url/qatracker/admin/product");
+		return null;
+	}
+    else {
+		$content="<br /><form id=\"productlist\" method=\"post\" action=\"\">";
+		$tests=db_query("SELECT id, title FROM qatracker_product WHERE siteid='".$site->id."' AND status='0' ORDER BY title ASC");
+		$olddistro="";
+		while ($item = db_fetch_object($tests)) {
+			$distribution=explode(" ",$item->title);
+			$distribution=$distribution[0];
+			if ($olddistro != $distribution) {
+				if ($olddistro != "")
+					$content.="</table>";
+				$content.="<table class=\"listing\" style=\"margin-bottom:1em;width:25em;\">
+				<tr class=\"trheader\" style=\"width:0\">
+					<td><b>".$distribution."</b></td>
+				</tr>";
+				$olddistro=$distribution;
+			}
+			$content.="<tr><td>".$item->title."</td></tr>";
+		}
+		$content.="</table><p>
+			<b>Product name</b> <input type=\"text\" name=\"isota_product\" /><br /><br />
+            <input type=\"submit\" name=\"isota_addproduct\" value=\"Add product\" />
+		    </p></form>";
+		return $content;
+	}
+}
+
+
+
 function qatracker_adminui_report($milestone, $type) {
 	if ($milestone == 0)
 		$content.="You must specify a milestone (using the drop-down menu at the bottom of the main page)";
@@ -1873,14 +2017,18 @@
 			$menu['Status']['<b>All</b>']=$page.$filter."/all";
 		else
 			$menu['Status']['All']=$page.$filter."/all";
-		if (arg(3) == "untested")
+	    if (arg(3) == "notcompleted")
+			$menu['Status']['<b>Not Completed</b>']=$page.$filter."/notcompleted";
+		else
+			$menu['Status']['Not Completed']=$page.$filter."/notcompleted";
+	    if (arg(3) == "untested")
 			$menu['Status']['<b>Untested</b>']=$page.$filter."/untested";
 		else
 			$menu['Status']['Untested']=$page.$filter."/untested";
-		if (arg(3) == "inprogress")
-			$menu['Status']['<b>In progress</b>']=$page.$filter."/inprogress";
+		if (arg(3) == "started")
+			$menu['Status']['<b>Started</b>']=$page.$filter."/started";
 		else
-			$menu['Status']['In progress']=$page.$filter."/inprogress";
+			$menu['Status']['Started']=$page.$filter."/started";
 		if (arg(3) == "completed")
 			$menu['Status']['<b>Completed</b>']=$page.$filter."/completed";
 		else

=== modified file 'code/modules/qatracker/qatracker.function.php'
--- code/modules/qatracker/qatracker.function.php	2010-06-22 13:41:41 +0000
+++ code/modules/qatracker/qatracker.function.php	2010-07-20 17:27:41 +0000
@@ -18,7 +18,7 @@
 */
 
 function qatracker_checkpostvalue() {
-	$data=$_POST;
+    $data=$_POST;
 	$data['isot_comment']=htmlentities($data['isot_comment'],ENT_QUOTES,"UTF-8");
     $data['isot_bug']=array();
     $count=0;
@@ -153,7 +153,13 @@
 					$path.=" -> <a href=\"/qatracker/admin/milestone\">Milestone management</a>";
 					if (count($args) > 2)
 						$path.=" -> <a href=\"/qatracker/admin/milestone/".$args[2]."\">Milestone detail</a>";
-				break;
+                    break;
+                case "product":
+                    $path.=" -> <a href=\"/qatracker/admin/product\">Product management</a>";
+                    break;
+                case "testcase":
+                    $path.=" -> <a href=\"/qatracker/admin/testcase\">Testcase management</a>";
+                    break;
 			}
 		break;
 		case "report":
@@ -172,15 +178,69 @@
 }
 
 function qatracker_getbuildstat($buildID,$archive=0) {
-	$total=db_query("SELECT count(title) from qatracker_testcase LEFT JOIN qatracker_build ON qatracker_build.productid=qatracker_testcase.productid WHERE qatracker_build.id='$buildID' AND qatracker_testcase.status='0' AND qatracker_testcase.status='0'");
-	$total=db_result($total);
+	$total=db_query("SELECT count(title) from qatracker_testcase LEFT JOIN qatracker_build ON qatracker_build.productid=qatracker_testcase.productid WHERE qatracker_build.id='$buildID' AND qatracker_testcase.status='0'");
+    $total=db_result($total);
+
+    if ($total==0)
+        return "None";
+
 	$done=db_query("SELECT count(DISTINCT testcaseID) from qatracker_result LEFT JOIN qatracker_testcase ON qatracker_testcase.id=qatracker_result.testcaseid WHERE qatracker_result.buildid='".$buildID."' AND qatracker_result.status='0' AND qatracker_result.result != '2' AND qatracker_testcase.status='0'");
 	$done=db_result($done);
+    
+    $started=db_query("SELECT count(DISTINCT testcaseID) from qatracker_result LEFT JOIN qatracker_testcase ON qatracker_testcase.id=qatracker_result.testcaseid WHERE qatracker_result.buildid='".$buildID."' AND qatracker_result.status='0' AND qatracker_result.result='2' AND qatracker_testcase.status='0'");
+    $started=db_result($started);
+
+    if ($started != 0)
+        $started = "<span style=\"color:#F5B800;\">($started)</span>";
+    else
+        $started = "";
+
+    $donet=db_query("SELECT count(DISTINCT testcaseID) from qatracker_result LEFT JOIN qatracker_testcase ON qatracker_testcase.id=qatracker_result.testcaseid WHERE qatracker_result.buildid='".$buildID."' AND qatracker_result.result != '2' AND qatracker_result.status='0'");
+	$donet=db_result($donet);
+	$reports=db_query("SELECT count(qatracker_result.id) from  qatracker_result LEFT JOIN qatracker_testcase ON qatracker_testcase.id=qatracker_result.testcaseid WHERE qatracker_testcase.status='0' AND buildid='".$buildID."' AND qatracker_result.status='0'");
+	$reports=db_result($reports);
+	$fail=db_query("SELECT count(qatracker_result.id) from  qatracker_result LEFT JOIN qatracker_testcase ON qatracker_testcase.id=qatracker_result.testcaseid WHERE qatracker_testcase.status='0' AND buildid='".$buildID."' AND qatracker_result.status='0' AND result='0'");
+	$fail=db_result($fail);
+	if ($archive == 1)
+		$total=$done;
+	if ($fail != 0)
+		$fail="<span style=\"font-weight:bold; color:#641500;\">($fail)</span>";
+	else
+		$fail="";
+	if ($archive == "1")
+		return "$donet $fail";
+   
+    if ($done == $total) 
+		return "<span style=\"font-weight:bold; color:#006400;\">$done/$total</span> $fail";
+	elseif ($reports == 0)
+        return "<span style=\"color:#000a8a;\">$done/$total</span> $fail"; 
+	else
+		return "$done/$total $fail $started";
+}
+
+function qatracker_getbuildstat_optional($buildID,$archive=0) {
+	$total=db_query("SELECT count(title) from qatracker_testcase LEFT JOIN qatracker_build ON qatracker_build.productid=qatracker_testcase.productid WHERE qatracker_build.id='$buildID' AND qatracker_testcase.status='2'");
+    $total=db_result($total);
+
+    if ($total==0)
+        return "None";
+
+	$done=db_query("SELECT count(DISTINCT testcaseID) from qatracker_result LEFT JOIN qatracker_testcase ON qatracker_testcase.id=qatracker_result.testcaseid WHERE qatracker_result.buildid='".$buildID."' AND qatracker_result.status='0' AND qatracker_result.result != '2' AND qatracker_testcase.status='2'");
+    $done=db_result($done);
+
+	$started=db_query("SELECT count(DISTINCT testcaseID) from qatracker_result LEFT JOIN qatracker_testcase ON qatracker_testcase.id=qatracker_result.testcaseid WHERE qatracker_result.buildid='".$buildID."' AND qatracker_result.status='0' AND qatracker_result.result ='2' AND qatracker_testcase.status='2'");
+    $started=db_result($started);
+
+    if ($started != 0)
+        $started = "<span style=\"color:#F5B800;\">($started)</span>";
+    else
+        $started = "";
+
 	$donet=db_query("SELECT count(DISTINCT testcaseID) from qatracker_result LEFT JOIN qatracker_testcase ON qatracker_testcase.id=qatracker_result.testcaseid WHERE qatracker_result.buildid='".$buildID."' AND qatracker_result.result != '2' AND qatracker_result.status='0'");
 	$donet=db_result($donet);
-	$reports=db_query("SELECT count(id) from qatracker_result WHERE buildid='".$buildID."' AND status='0'");
+	$reports=db_query("SELECT count(qatracker_result.id) from qatracker_result LEFT JOIN qatracker_testcase ON qatracker_testcase.id=qatracker_result.testcaseid WHERE qatracker_testcase.status='2' AND buildid='".$buildID."' AND qatracker_result.status='0'");
 	$reports=db_result($reports);
-	$fail=db_query("SELECT count(id) from qatracker_result WHERE buildid='".$buildID."' AND status='0' AND result='0'");
+	$fail=db_query("SELECT count(qatracker_result.id) from  qatracker_result LEFT JOIN qatracker_testcase ON qatracker_testcase.id=qatracker_result.testcaseid WHERE qatracker_testcase.status='2'AND buildid='".$buildID."' AND qatracker_result.status='0' AND result='0'");
 	$fail=db_result($fail);
 	if ($archive == 1)
 		$total=$done;
@@ -190,12 +250,12 @@
 		$fail="";
 	if ($archive == "1")
 		return "$donet $fail";
-	if ($done == $total)
+	if ($done == $total) 
 		return "<span style=\"font-weight:bold; color:#006400;\">$done/$total</span> $fail";
 	elseif ($reports == 0)
 		return "<span style=\"color:#000a8a;\">$done/$total</span> $fail";
 	else
-		return "$done/$total $fail";
+		return "$done/$total $fail $started";
 }
 
 function qatracker_getbuildreportstat($productid, $isoid=0) {