Merge lp:~primes2h/ubuntu-qa-website/bug_741840 into lp:~ubuntu-qa-website-devel/ubuntu-qa-website/trunk

[Sergio Zanchetta]

In laptop tracker:
1) Filtered milestones by title instead of id, preventing release names from being shown twice in a special circumstance. Fixed LP: #741840
2) Ordered laptop info by title in laptop reports, preventing mix-ups in certain situations.
3) Filtered releases by milestone status to avoid the need to delete the milestone itself.
4) Started test icons are shown now in laptop reports if a user forget to set test result as Passed or Failed.
5) Added new function to arrange laptop make names automatically from dmidecode output and a fix for HP model names.
6) Implemented milestone download info.

N.B.: Because of milestone download info implementation, build number (version) of milestones must be changed to release number accordingly. (e.g. 11.04, 10.04.2)

[lp:~primes2h/ubuntu-qa-website/bug_741840]

157. By Sergio Zanchetta on 2011-03-25

In laptop tracker: ordered laptop info by title in laptop reports, preventing mix-ups in certain situations.

158. By Sergio Zanchetta on 2011-04-02

Filtered releases by milestone status to avoid the need to delete the milestone itself.

159. By Sergio Zanchetta on 2011-04-02

Started test icons are shown now in laptop reports if a user forget to set test result as Passed or Failed

160. By Sergio Zanchetta on 2011-04-04

New function to arrange laptop make names automatically from dmidecode output. Further makes can be added in the future. A fix for HP model names is also present.

161. By Sergio Zanchetta on 2011-04-04

Implemented milestone download info for laptop tracker.

=== modified file 'code/modules/qatracker/qatracker.display.php'
--- code/modules/qatracker/qatracker.display.php	2011-03-15 14:30:22 +0000
+++ code/modules/qatracker/qatracker.display.php	2011-04-04 13:05:55 +0000
@@ -869,7 +869,7 @@
 						qawebsite_user_setting_info.value 
 						FROM qawebsite_user_setting 
 						LEFT JOIN qawebsite_user_setting_info ON qawebsite_user_setting.id=qawebsite_user_setting_info.settingid 
-						WHERE userid='".$reporterID."' AND siteid='".$site->id."'");
+						WHERE userid='".$reporterID."' AND siteid='".$site->id."' ORDER BY title");
 
 	$lpusername = db_result(db_query("SELECT value from qawebsite_user_setting_info WHERE userid='".$reporterID."' AND settingid='1'"));
 	$reporter = db_result(db_query("SELECT name from users WHERE uid='".$reporterID."'"));
@@ -991,6 +991,10 @@
 						$content.="	<a rel=\"external\" href=\"$base_url/qatracker/result/".$build."/".$testcase->id."\">
 								<img style=\"margin-bottom:0px;\" src=\"$base_url/modules/qatracker/images/pass.png\" alt=\"spacer\" /></a></div>";
 					break;
+					case "2":
+						$content.="     <a rel=\"external\" href=\"$base_url/qatracker/result/".$build."/".$testcase->id."\">
+                                                                <img style=\"margin-bottom:0px;\" src=\"$base_url/modules/qatracker/images/started.png\" alt=\"spacer\" /></a></div>";
+					break;
 				}
 				$content.="&nbsp;".qatracker_getbugslist($build, $testcase->id, 0)."<br \></td>";
 			}
@@ -1030,11 +1034,13 @@
 				array_push_associative($lpusername,array($item->name => $item->value));
 			break;
 			case "8":
-				if ($item->value!='') 
-					array_push($laptopnameitem,$item->value);
+				if ($item->value!='')
+					array_push($laptopnameitem,qatracker_getlaptopmake($item->value));
 			break;
 			case "9":
 				if ($item->value!='') {
+					if (substr($item->value,0,2)=='HP')
+						$item->value=substr($item->value,2);
 					array_push($laptopnameitem,$item->value);
 					array_push_associative($laptop,array($item->name => implode(" ", $laptopnameitem)));
 					$laptopnameitem=array();
@@ -1044,7 +1050,7 @@
 	}
 	asort($laptop);
 
-	$milestones=db_query("SELECT title FROM qatracker_milestone WHERE siteid='".$site->id."' ORDER BY id");
+	$milestones=db_query("SELECT title FROM qatracker_milestone WHERE siteid='".$site->id."' AND status < '2' ORDER BY title");
 
 	$release=array();
 	$lastreleasename='';
@@ -1424,17 +1430,23 @@
 	//Don't wait 30s to timeout
 	ini_set("default_socket_timeout", 1);
 
-	if ($site->id != "1")
+	if ($site->id != "1" && $site->id != "12")
 		return "<br />Function not implemented yet.";
 	$info=db_fetch_object(db_query("SELECT qatracker_build.version as version, qatracker_product.title as product, qatracker_milestone.status as server, qatracker_milestone.title as release FROM qatracker_build LEFT JOIN qatracker_milestone ON qatracker_milestone.id=qatracker_build.milestoneid LEFT JOIN qatracker_product ON qatracker_product.id=qatracker_build.productid WHERE qatracker_build.id='".$buildID."'"));
 	$url=array();
 	$url['release']=split(" ",$info->release);
+
+	if ($url['release'][1] == "Final")
+		$url['milestone']="";
+	else
+		$url['milestone']=strtolower("-".$url['release'][1]."".$url['release'][2]."");
+
 	$url['release']=strtolower($url['release'][0]);
 	
-	if ($info->server == "0")
+	if ($site->id == "12" || $info->server == "1")
+		$url['server']="releases.ubuntu.com";
+	elseif ($info->server == "0")
 		$url['server']="cdimage.ubuntu.com";
-	elseif ($info->server == "1")
-		$url['server']="releases.ubuntu.com";
 	else
 		return "<br />Download information not available.<br />Archived build";
 
@@ -1451,8 +1463,14 @@
 	if (ereg("Upgrade",$info->product))
 		return "<br />For upgrades, please use update-manager.";
 	elseif (ereg("Desktop",$info->product)) {
-        $url['type']="/daily-live/";
-        $url['file']=$url['release']."-desktop-".$url['arch'].".iso";
+		if ($site->id == "12") {
+ 			$url['type']="/";
+			$url['file']="ubuntu-".$url['version']."".$url['milestone']."-desktop-".$url['arch'].".iso";
+		}
+		else {
+	        	$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/";

=== modified file 'code/modules/qatracker/qatracker.function.php'
--- code/modules/qatracker/qatracker.function.php	2011-02-17 16:09:49 +0000
+++ code/modules/qatracker/qatracker.function.php	2011-04-04 13:05:55 +0000
@@ -236,7 +236,6 @@
 		return "$done/$total $fail $started";
 }
 
-
 function qatracker_getbuildreportstat($productid, $isoid=0) {
 	if ($isoid != 0)
 		$where="AND qatracker_result.buildid='$isoid'";
@@ -300,4 +299,27 @@
 	}
 }
 
+function qatracker_getlaptopmake($make) {
+	switch($make) {
+		case "ASUSTeK Computer Inc." :
+			return "Asus";
+		break;
+		case "Dell Inc." :
+			return "Dell";
+		break;
+		case "Hewlett-Packard" :
+			return "HP";
+		break;
+		case "Matsushita Electric Industrial Co.,Ltd." :
+			return "Panasonic";
+		break;
+		case "SAMSUNG ELECTRONICS CO., LTD." :
+			return "Samsung";
+		break;
+		case "TOSHIBA" :
+			return "Toshiba";
+		break;
+	}
+	return $make;
+}
 ?>