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

[Ara Pulido]

This merge fixes a small bug (not trimming spaces in bug fields; bug 578349) and it adds a new feature: deleting own reports (bug 579155).

This feature has been requested by a lot of users, who often submit a report mistakenly in the wrong image or testcase.

[lp:~ara/ubuntu-qa-website/fixes_578349_579155]

145. By Ara Pulido on 2010-06-08

Updated coverage report with new products and optional testcases

[Ara Pulido (ara)]

This merge request now also includes a fix for bug 495373

[Brian Murray (brian-murray)]

Its not obvious to me what changed in $tests=db_query.

[Ara Pulido (ara)]

> Its not obvious to me what changed in $tests=db_query.

This change is related to bug 495373, but it is not a new feature itself. While I was fixing the testcase coverage report, I realized that there was a previous bug in it. It was showing any testcase, no matter which site we were in. The ISO tracker manages each site (iso.qa.ubuntu.com, mozilla.qa.ubuntu.com, etc) with a siteid. This particular query wasn't specifying the siteid and, therefore, it was showing any active build of any site.

[Brian Murray (brian-murray)]

+ $content.="<tr><td style=\"width:25em;\" colspan=\"2\"><b>This product is not currently on the tracker</b></td></tr>";

I think that sentence could use a period at the end of it, the same thing might also be true of "You must select a result" and "you need to provide a bug number" as those are complete sentences. However, I'm not really certain if there is a convention for this or what it might be if there is one. ;-)

Anyway looks great!

review: Approve

[lp:~ara/ubuntu-qa-website/fixes_578349_579155]

146. By Ara Pulido on 2010-06-22

Added a period to error messages

[Ara Pulido (ara)]

I have added a period at the end of the error messages and have merged the changes. Thanks for the review!

=== modified file 'code/modules/qatracker/qatracker.display.php'
--- code/modules/qatracker/qatracker.display.php	2010-04-16 11:26:57 +0000
+++ code/modules/qatracker/qatracker.display.php	2010-06-22 13:43:23 +0000
@@ -599,7 +599,7 @@
 			$resultID=db_query("SELECT id FROM qatracker_result WHERE buildid='".$buildID."' AND testcaseid='".$testcaseID."' AND reporterid='".$user->uid."' ");
 			$resultID=db_result($resultID);
 			if ($resultID) {
-				$content.="<br /><b>You have already posted a result, the form below lets you edit it :</b>";
+				$content.="<br /><b>You have already posted a result, the form below lets you update it or delete it:</b>";
 				$content.=qatracker_addresult($resultID);
 			}
 			else
@@ -621,8 +621,9 @@
 			"Alternate" => "Alternate",
 			"Desktop" => "Desktop",
 			"Ubuntu Server" => "Server",
-			"Ubuntu educational" => "Edubuntu Add-on",
 			"DVD" => "DVD",
+            "Netbook" => "Netbook",
+            "arm" => "ARM",
 			"Netboot" => "Netboot"
 		);
 	}
@@ -635,7 +636,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_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 '.* (.*) .*$')");
+		$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;
 		while ($item = db_fetch_object($tests)) {
 			if ($item->count == 0)
@@ -648,9 +649,26 @@
 			$result=true;
 		}
 		if (!$result)
-			$content.="<tr><td style=\"width:25em;\" colspan=\"2\"><b>This product is not currently on the tracker</b></td></tr>";
+			$content.="<tr><td style=\"width:25em;\" colspan=\"2\"><b>This product is not currently on the tracker.</b></td></tr>";
 		$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");
+	$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>";
+		elseif ($item->count > 5)
+			$count="<span style=\"color:green; font-weight:bold;\">".$item->count." tests done</span>";
+		else
+			$count="<span style=\"color:orange; font-weight:bold;\">".$item->count." tests done</span>";
+		$content.="<tr><td style=\"width:25em;\"><b>".$item->title."</b></td><td>$count</td></tr>";
+		$result=true;
 	}
+	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;
 }
 
@@ -661,7 +679,7 @@
 	while ($milestone=db_fetch_object($milestones))
 		$content.=qatracker_buildstat($milestone->id);
 	if (strlen($content) == 0)
-		$content="<br /><b>There is no milestone being currently tested</b>";
+		$content="<br /><b>There is no milestone being currently tested.</b>";
 	return $content;
 }
 
@@ -881,7 +899,9 @@
 		$content.="<input type=\"checkbox\" name=\"isot_status\" value=\"1\" $select /> Hide this report<br />";
 	}
 	if ($resultID != 0) {
-		$content.="<input type=\"hidden\" name=\"isot_edit\" value=\"1\"/><input type=\"submit\" name=\"isot_valid\" value=\"Edit result\"/>";
+        $content.="<input type=\"hidden\" name=\"isot_valid\" value=\"1\"/><input type=\"submit\" name=\"isot_edit\" value=\"Update result\"/>";
+        $content.="<br /><br/>Or you can also delete it if you made a mistake...&nbsp;&nbsp;&nbsp;";
+		$content.="<input type=\"submit\" name=\"isot_edit\" value=\"Delete result\" />";
 	}
 	else
 		$content.="<input type=\"submit\" style=\"width:12em\" name=\"isot_valid\" value=\"Submit result\"/>";
@@ -897,7 +917,7 @@
 	if ($data['isot_error']) {
 		return qatracker_addresult($isodID, 0);
 	}
-	if ($data['isot_edit'] == "1") {
+	if ($data['isot_edit'] == "Update result" || $data['isot_edit'] == "Delete result") {
 		$id=db_query("SELECT id FROM qatracker_result WHERE buildid='".$buildID."' AND testcaseid='".$testcaseID."' AND reporterid='".$user->uid."' ");
 		$resultID=db_result($id);
 		if ($admin == 1 && $resultID1 != 0) {
@@ -911,18 +931,35 @@
 			db_query("UPDATE qatracker_result SET result='".db_escape_string($data['isot_result'])."', lastchange='".date("Y-m-d H:i:s")."', comment='".db_escape_string($data['isot_comment'])."', changedby='".$user->uid."', status='".db_escape_string($status)."' WHERE id='".db_escape_string($resultID)." '");
 		}
 		else
-			db_query("UPDATE qatracker_result SET result='".db_escape_string($data['isot_result'])."', lastchange='".date("Y-m-d H:i:s")."', comment='".db_escape_string($data['isot_comment'])."' WHERE id='".db_escape_string($resultID)." '");
-		db_query("DELETE FROM qatracker_bug WHERE resultid='".$resultID."'");
+            if ($data['isot_edit'] == "Update result") {
+    			db_query("UPDATE qatracker_result SET result='".db_escape_string($data['isot_result'])."', lastchange='".date("Y-m-d H:i:s")."', comment='".db_escape_string($data['isot_comment'])."' WHERE id='".db_escape_string($resultID)." '");
+            }
+            else {
+		        db_query("DELETE FROM qatracker_result WHERE id='".$resultID."'");
+            }
+		    db_query("DELETE FROM qatracker_bug WHERE resultid='".$resultID."'");
 	}
 	else {
 		if (db_result(db_query("SELECT count(id) FROM qatracker_result WHERE buildid='".$buildID."' AND testcaseid='".$testcaseID."' AND reporterid='".$user->uid."'"))=="0")
 			db_query("INSERT INTO qatracker_result (buildid, testcaseid, reporterid, date, comment, result) VALUES (".$buildID.",".$testcaseID.",".$user->uid.",'".date("Y-m-d H:i:s")."','".db_escape_string($data['isot_comment'])."','".db_escape_string($data['isot_result'])."')");
 		$resultID=db_result(db_query("SELECT id FROM qatracker_result WHERE buildid=".$buildID." AND testcaseid=".$testcaseID." AND reporterid=".$user->uid.""));
 	}
-	$valid=0;
-	foreach ($data['isot_bug'] as $bugnumber => $bugimportance)
-		db_query("INSERT INTO qatracker_bug (resultid, bugnumber, bugimportance) VALUES ('".$resultID."','".db_escape_string($bugnumber)."','".db_escape_string($bugimportance)."')");
-	drupal_set_message("Thank you for your report.", "notice_msg");
+    $valid=0;
+    if ($data['isot_edit'] != "Delete result") {
+	    foreach ($data['isot_bug'] as $bugnumber => $bugimportance)
+            db_query("INSERT INTO qatracker_bug (resultid, bugnumber, bugimportance) VALUES ('".$resultID."','".db_escape_string($bugnumber)."','".db_escape_string($bugimportance)."')");
+    }
+
+    if ($data['isot_edit'] == "Delete result") {
+	    drupal_set_message("Your result has been successfully deleted.", "notice_msg");
+    }
+    else if ($data['isot_edit'] == "Update result") {
+	    drupal_set_message("Your report has been updated.", "notice_msg");
+    }
+    else {
+	    drupal_set_message("Thank you for your report.", "notice_msg");
+    }
+ 
 	drupal_set_header("Location: $base_url/qatracker/result/$buildID/$testcaseID");
 	return null;
 }
 
=== modified file 'code/modules/qatracker/qatracker.function.php'
--- code/modules/qatracker/qatracker.function.php	2009-12-21 14:53:47 +0000
+++ code/modules/qatracker/qatracker.function.php	2010-06-22 13:43:23 +0000
@@ -20,28 +20,32 @@
 function qatracker_checkpostvalue() {
 	$data=$_POST;
 	$data['isot_comment']=htmlentities($data['isot_comment'],ENT_QUOTES,"UTF-8");
-	$data['isot_bug']=array();
-	$count=0;
-	if ($data['isot_bugnumber']) {
-		foreach ($data['isot_bugnumber'] as $bug) {
-			if ($data['isot_serious'] && in_array($count,$data['isot_serious']))
-				$serious=1;
-			else
-				$serious=0;
-			if (is_numeric($bug))
-				array_push_associative($data['isot_bug'], array($bug => $serious));
-			elseif ($bug == "")
-				$data['isot_error'].="";
-			else
-				$data['isot_error'].="<font color=\"red\">Invalid value (".htmlentities($bug,ENT_QUOTES,"UTF-8").")</font><br />";
-			$count++;
-		}
-	}
-	if ((!is_numeric($data['isot_result'])) && ($data['isot_valid'] || $data['isot_addbug'])) {
-		$data['isot_error'].="<font color=\"red\">You must select a result</font><br />";
-	}
-	if (($data['isot_result'] == 0) && (count($data['isot_bug']) == 0) &&  ($_SERVER['REQUEST_METHOD'] === 'POST'))
-		$data['isot_error'].="<font color=\"red\">To mark a test as failed, you need to provide a bug number</font><br />";
+    $data['isot_bug']=array();
+    $count=0;
+
+    // If we are deleting do not check anything
+    if ($data['isot_edit'] != "Delete result") {
+        if ($data['isot_bugnumber']) {
+            foreach ($data['isot_bugnumber'] as $bug) {
+                if ($data['isot_serious'] && in_array($count,$data['isot_serious']))
+                    $serious=1;
+                else
+                    $serious=0;
+                if (is_numeric(trim($bug)))
+                    array_push_associative($data['isot_bug'], array(trim($bug) => $serious));
+                elseif ($bug == "")
+                    $data['isot_error'].="";
+                else
+                    $data['isot_error'].="<font color=\"red\">Invalid value (".htmlentities($bug,ENT_QUOTES,"UTF-8").")</font><br />";
+                $count++;
+            }
+        }
+        if ((!is_numeric($data['isot_result'])) && ($data['isot_valid'] || $data['isot_addbug'])) {
+            $data['isot_error'].="<font color=\"red\">You must select a result.</font><br />";
+        }
+        if (($data['isot_result'] == 0) && (count($data['isot_bug']) == 0) &&  ($_SERVER['REQUEST_METHOD'] === 'POST'))
+            $data['isot_error'].="<font color=\"red\">To mark a test as failed, you need to provide a bug number.</font><br />";
+    }
 	return $data;
 }