From aef90eefa98282db6837741c1a82e15660359a8b Mon Sep 17 00:00:00 2001
From: Gabriel Baker <gabriel@autonomicpilot.co.uk>
Date: Wed, 5 Jun 2013 06:45:04 +0100
Subject: [PATCH] Some more summary tweaks

---
 PHPCI/View/Index/index.phtml  |  4 ++--
 PHPCI/View/SummaryTable.phtml | 34 ++++++++++++++++++++++------------
 2 files changed, 24 insertions(+), 14 deletions(-)

diff --git a/PHPCI/View/Index/index.phtml b/PHPCI/View/Index/index.phtml
index 8ffa4b56..dcc26701 100644
--- a/PHPCI/View/Index/index.phtml
+++ b/PHPCI/View/Index/index.phtml
@@ -48,8 +48,8 @@
 				<th>Project</th>
 				<th>Last Success</th>
 				<th>Last Failure</th>
-				<th>Status</th>
-				<th style="width: 1%"></th>
+				<th>Success/Failed Builds</th>
+				<th>Total Builds</th>
 			</tr>
 			</thead>
 			<tbody>
diff --git a/PHPCI/View/SummaryTable.phtml b/PHPCI/View/SummaryTable.phtml
index cacfd204..e3bbee1d 100644
--- a/PHPCI/View/SummaryTable.phtml
+++ b/PHPCI/View/SummaryTable.phtml
@@ -14,33 +14,43 @@ foreach($builds as $build):
 		$health = false;
 		$projects[$build->getProjectId()]['count'] = 0;
 		$projects[$build->getProjectId()]['health'] = 0;
+		$projects[$build->getProjectId()]['successes'] = 0;
+		$projects[$build->getProjectId()]['failures'] = 0;
 	}
 
-	if (
-		$build->getStatus() < 2 ||
-		(
-			!is_null($prevBuild) &&
-			$projects[$build->getProjectId()]['count'] >= $maxbuildcount &&
-			$build->getProjectId() === $prevBuild->getProjectId()
-		)
-	) {
+	if ($build->getStatus() < 2) {
 		continue;
 	}
+	if (
+		!is_null($prevBuild) &&
+		$projects[$build->getProjectId()]['count'] >= $maxbuildcount &&
+		$build->getProjectId() === $prevBuild->getProjectId()
+	) {
+		$projects[$build->getProjectId()]['count']++;
+		continue;
+	}
+
 	switch ((int)$build->getStatus()) {
 		case 2:
 			$projects[$build->getProjectId()]['health']++;
+			$projects[$build->getProjectId()]['successes']++;
+
 			if ( empty($projects[$build->getProjectId()]['lastsuccess']) ) {
 				$projects[$build->getProjectId()]['lastsuccess'] = $build->getStarted();
 			}
 			break;
 		case 3:
 			$projects[$build->getProjectId()]['health']--;
+			$projects[$build->getProjectId()]['failures']++;
+
 			if ( empty($projects[$build->getProjectId()]['lastfailure']) ) {
 				$projects[$build->getProjectId()]['lastfailure'] = $build->getStarted();
 			}
 			break;
 	}
+
 	$projects[$build->getProjectId()]['count']++;
+	$projects[$build->getProjectId()]['projectname'] = $build->getProject()->getTitle();
 	$prevBuild = $build;
 endforeach;
 
@@ -52,10 +62,10 @@ foreach($projects as $projectId => $project):
 ?>
 <tr>
 	<td><?= $project['health'] < 0 ? 'Stormy': ($project['health'] < 5? 'Overcast': 'Sunny') ?></td>
-	<td><?= $projectId ?></td>
-	<td><?= empty($project['lastsuccess']) ? 'Never' :$project['lastsuccess']->format("d-m-Y H:i:s" ) ?></td>
-	<td><?= empty($project['lastfailure']) ? 'Never' :$project['lastfailure']->format("d-m-Y H:i:s" ) ?></td>
-	<td><?= $project['health'] ?></td>
+	<td><?= $project['projectname'] ?></td>
+	<td><?= empty($project['lastsuccess']) ? 'Never' :$project['lastsuccess']->format("Y-m-d H:i:s") ?></td>
+	<td><?= empty($project['lastfailure']) ? 'Never' :$project['lastfailure']->format("Y-m-d H:i:s") ?></td>
+	<td><?= $project['successes'] ?>/<?= $project['failures'] ?></td>
 	<td><?= $project['count'] ?></td>
 </tr>
 <?php endforeach; ?>
\ No newline at end of file