deblan/phpci
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Some more summary tweaks

Browse source
This commit is contained in:
Gabriel Baker 2013-06-05 06:45:04 +01:00
parent 76adf14b28
commit aef90eefa9
2 changed files with 24 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
PHPCI/View/Index/index.phtml
View file

@ -48,8 +48,8 @@
<th>Project</th> <th>Project</th>
<th>Last Success</th> <th>Last Success</th>
<th>Last Failure</th> <th>Last Failure</th>
<th>Status</th> <th>Success/Failed Builds</th>
<th style="width: 1%"></th> <th>Total Builds</th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>

34
PHPCI/View/SummaryTable.phtml
View file

@ -14,33 +14,43 @@ foreach($builds as $build):
$health = false; $health = false;
$projects[$build->getProjectId()]['count'] = 0; $projects[$build->getProjectId()]['count'] = 0;
$projects[$build->getProjectId()]['health'] = 0; $projects[$build->getProjectId()]['health'] = 0;
$projects[$build->getProjectId()]['successes'] = 0;
$projects[$build->getProjectId()]['failures'] = 0;
} }
if ( if ($build->getStatus() < 2) {
$build->getStatus() < 2 ||
(
!is_null($prevBuild) &&
$projects[$build->getProjectId()]['count'] >= $maxbuildcount &&
$build->getProjectId() === $prevBuild->getProjectId()
)
) {
continue; continue;
} }
if (
!is_null($prevBuild) &&
$projects[$build->getProjectId()]['count'] >= $maxbuildcount &&
$build->getProjectId() === $prevBuild->getProjectId()
) {
$projects[$build->getProjectId()]['count']++;
continue;
}
switch ((int)$build->getStatus()) { switch ((int)$build->getStatus()) {
case 2: case 2:
$projects[$build->getProjectId()]['health']++; $projects[$build->getProjectId()]['health']++;
$projects[$build->getProjectId()]['successes']++;
if ( empty($projects[$build->getProjectId()]['lastsuccess']) ) { if ( empty($projects[$build->getProjectId()]['lastsuccess']) ) {
$projects[$build->getProjectId()]['lastsuccess'] = $build->getStarted(); $projects[$build->getProjectId()]['lastsuccess'] = $build->getStarted();
} }
break; break;
case 3: case 3:
$projects[$build->getProjectId()]['health']--; $projects[$build->getProjectId()]['health']--;
$projects[$build->getProjectId()]['failures']++;
if ( empty($projects[$build->getProjectId()]['lastfailure']) ) { if ( empty($projects[$build->getProjectId()]['lastfailure']) ) {
$projects[$build->getProjectId()]['lastfailure'] = $build->getStarted(); $projects[$build->getProjectId()]['lastfailure'] = $build->getStarted();
} }
break; break;
} }
$projects[$build->getProjectId()]['count']++; $projects[$build->getProjectId()]['count']++;
$projects[$build->getProjectId()]['projectname'] = $build->getProject()->getTitle();
$prevBuild = $build; $prevBuild = $build;
endforeach; endforeach;
@ -52,10 +62,10 @@ foreach($projects as $projectId => $project):
?> ?>
<tr> <tr>
<td><?= $project['health'] < 0 ? 'Stormy': ($project['health'] < 5? 'Overcast': 'Sunny') ?></td> <td><?= $project['health'] < 0 ? 'Stormy': ($project['health'] < 5? 'Overcast': 'Sunny') ?></td>
<td><?= $projectId ?></td> <td><?= $project['projectname'] ?></td>
<td><?= empty($project['lastsuccess']) ? 'Never' :$project['lastsuccess']->format("d-m-Y H:i:s" ) ?></td> <td><?= empty($project['lastsuccess']) ? 'Never' :$project['lastsuccess']->format("Y-m-d H:i:s") ?></td>
<td><?= empty($project['lastfailure']) ? 'Never' :$project['lastfailure']->format("d-m-Y H:i:s" ) ?></td> <td><?= empty($project['lastfailure']) ? 'Never' :$project['lastfailure']->format("Y-m-d H:i:s") ?></td>
<td><?= $project['health'] ?></td> <td><?= $project['successes'] ?>/<?= $project['failures'] ?></td>
<td><?= $project['count'] ?></td> <td><?= $project['count'] ?></td>
</tr> </tr>
<?php endforeach; ?> <?php endforeach; ?>