[phpBT-dev] CVS: phpbt report.php,1.4,1.5

[Benjamin C. <bc...@us...>]

Update of /cvsroot/phpbt/phpbt
In directory usw-pr-cvs1:/tmp/cvs-serv26319

Modified Files:
	report.php 
Log Message:
Change the query a bit to grab all bugs, including those not assigned

Index: report.php
===================================================================
RCS file: /cvsroot/phpbt/phpbt/report.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- report.php	2001/08/04 03:38:58	1.4
+++ report.php	2001/08/04 03:59:56	1.5
@@ -12,7 +12,7 @@
 	
 	$t->set_block('content', 'row', 'rows');
 	$t->set_block('row', 'col', 'cols');
-	$t->set_var('reporttitle', 'Status of Assigned bugs');
+	$t->set_var('reporttitle', 'Bug resolutions');
 	
 	// Start off our query
 	$querystring = 'select Email as "Assigned To", sum(if(Resolution = "0",1,0)) as "Open"';
@@ -25,10 +25,11 @@
 	}
 	$resfields[] = 'Total';
 	
-	if ($projectid && is_numeric($projectid)) 
-		$projectquery = "and Project = $projectid";
-		
-	$q->query("$querystring, count(BugID) as Total from Bug b, User u where AssignedTo = UserID $projectquery group by AssignedTo");
+	if ($projectid && is_numeric($projectid)) {
+		$projectquery = "where Project = $projectid";
+	}
+	
+	$q->query("$querystring, count(BugID) as Total from Bug b left join User u on AssignedTo = UserID $projectquery group by AssignedTo");
 	if (!$q->num_rows()) {
 		$t->set_var('rows', 'No data to display');
 	} else {
@@ -42,11 +43,16 @@
 		$t->set_var('cols', '');
 		while ($row = $q->grab()) {
 			foreach ($resfields as $col) {
+				if ($row[$col] == '') {
+					$coldata = 'Unassigned';
+				} elseif ($col == 'Assigned To') {
+					$coldata = sprintf("<a href='mailto:%s'>%s</a>", 
+						stripslashes($row[$col]), stripslashes($row[$col]));
+				} else {
+					$coldata = stripslashes($row[$col]);
+				}
 				$t->set_var(array(
-					'coldata' => $col == 'Assigned To' 
-						? sprintf("<a href='mailto:%s'>%s</a>", stripslashes($row[$col]),
-							stripslashes($row[$col]))
-						: stripslashes($row[$col]),
+					'coldata' => $coldata,
 					'colclass' => $col == 'Assigned To' ? '' : 'center-col'
 					));
 				$t->parse('cols', 'col', true);