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

[Ara Pulido]

[Ara Pulido (ara)]

I have implemented an easy version of the feature requested in bug 291066.

Using the available DB schema, I use a new type of result for a testcase "Started", which will appear in the database as "2".

In the Image list view, it won't appear as a result, as it is not finished.
In the Testcases list (inside an image), it will appear as "Started" if no finished results have been summitted.
In the Results list view (inside a testcase), it will appear as a new option to submit aside from Passed/Failed and it would have a clock icon.

Using the Last Changed timestamp, we would know when the tester marked the test as "Started".

No DB schema or data changes needed.

=== added file 'code/modules/qatracker/images/started.png'
Binary files code/modules/qatracker/images/started.png	1970-01-01 00:00:00 +0000 and code/modules/qatracker/images/started.png	2009-12-15 12:25:22 +0000 differ
=== modified file 'code/modules/qatracker/qatracker.display.php'
--- code/modules/qatracker/qatracker.display.php	2009-11-09 16:50:28 +0000
+++ code/modules/qatracker/qatracker.display.php	2009-12-15 12:25:22 +0000
@@ -458,8 +458,11 @@
 			$item->reporterid=user_load(array('uid' => $item->reporterid))->name;
 			if ($item->result == 0)
 				$image="<img style=\"margin-top:-3px\" src=\"$base_url/modules/qatracker/images/fail.png\" alt=\"fail\" />";
-			else
+			elseif ($item->result == 1)
 				$image="<img style=\"margin-top:-3px\" src=\"$base_url/modules/qatracker/images/pass.png\" alt=\"pass\" />";
+			else
+				$image="<img style=\"margin-top:-3px\" src=\"$base_url/modules/qatracker/images/started.png\" alt=\"started\" />";
+
 			if (date("H:i:s",$item->lastchange) == "00:00:00")
 				$item->lastchange=date("Y-m-d",$item->lastchange);
 			else
@@ -537,7 +540,7 @@
 	$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) {
 		$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_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_testcase.id=qatracker_result.testcaseid) OR qatracker_result.status is Null) GROUP BY qatracker_testcase.title, substring(qatracker_product.title from '.* (.*) .*$')");
+		$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_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;
 		while ($item = db_fetch_object($tests)) {
 			if ($item->count == 0)
@@ -689,14 +692,18 @@
 		$data=qatracker_checkpostvalue();
 		$username=$user->uid;
 	}
-	if ($data['isot_result']==0)
+
+	if ($data['isot_result']=='0')
 		$selectf="checked=\"checked\"";
-	else
+	elseif ($data['isot_result']=='1')
 		$selectp="checked=\"checked\"";
+	else
+		$selects="checked=\"checked\"";
+
 	$content="<br />".$data['isot_error']."<br /><form method=\"post\" action=\"\">
 		<table cellpadding=\"2\" border=\"0\">
 			<tr><td>Username : </td><td><b><i>".user_load(array('uid' => $username))->name."</i></b></td></tr>
-			<tr><td style=\"padding-top:1em;\">Result : <span style=\"color:red\">*</span></td><td style=\"padding-top:1em;width:100%\"><input type=\"radio\" name=\"isot_result\" value=\"1\" $selectp />Passed <input type=\"radio\" name=\"isot_result\" value=\"0\" $selectf />Failed</td></tr>
+			<tr><td style=\"padding-top:1em;\">Result : <span style=\"color:red\">*</span></td><td style=\"padding-top:1em;width:100%\"><input type=\"radio\" name=\"isot_result\" value=\"1\" $selectp />Passed <input type=\"radio\" name=\"isot_result\" value=\"0\" $selectf />Failed <input type=\"radio\" name=\"isot_result\" value=\"2\" $selects />Started</td></tr>
 			<tr><td style=\"padding-top:2em;\">Bug ID</td><td style=\"padding-top:2em;width:100%\">Serious</td></tr>";
 	$count=0;
 	if (count($data['isot_bug'])!=0) {

=== modified file 'code/modules/qatracker/qatracker.function.php'
--- code/modules/qatracker/qatracker.function.php	2008-03-05 20:45:53 +0000
+++ code/modules/qatracker/qatracker.function.php	2009-12-15 12:25:22 +0000
@@ -168,9 +168,9 @@
 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);
-	$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_testcase.status='0'");
+	$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);
-	$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.status='0'");
+	$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_result($reports);
@@ -215,16 +215,29 @@
 }
 
 function qatracker_getresultsnumber($buildID, $testcaseID) {
+	$fail="";
 	$total=db_query("SELECT count(id) from qatracker_result WHERE buildid='".$buildID."' AND testcaseid='".$testcaseID."' AND status='0'");
 	$total=db_result($total);
-	if ($total == 0)
+	if ($total == 0) {
 		$total="None";
-	$fail=db_query("SELECT count(id) from qatracker_result WHERE buildid='".$buildID."' AND testcaseid='".$testcaseID."' AND status='0' AND result='0'");
-	$fail=db_result($fail);
-	if ($fail != 0)
-		$fail="<span style=\"font-weight:bold; color:#641500;\">($fail)</span>";
-	else
-		$fail="";
+	}
+	else {
+		$finished=db_query("SELECT count(id) from qatracker_result WHERE buildid='".$buildID."' AND testcaseid='".$testcaseID."' AND status='0' AND result != '2'");
+		$finished=db_result($finished);    
+		if ($finished == 0) {
+			$total = "Started";
+		}
+		else {
+			$total = $finished;
+			$fail=db_query("SELECT count(id) from qatracker_result WHERE buildid='".$buildID."' AND testcaseid='".$testcaseID."' AND status='0' AND result='0'");
+			$fail=db_result($fail);
+
+			if ($fail != 0)
+				$fail="<span style=\"font-weight:bold; color:#641500;\">($fail)</span>";
+			else
+				$fail="";
+		}
+	}
 	return "$total $fail";
 }