Fixes
This commit is contained in:
Dan Cryer
parent
56b8a57efd
commit
edc4fc1b1b
|
|
@ -19,6 +19,16 @@ use b8;
|
|||
*/
|
||||
class HomeController extends \PHPCI\Controller
|
||||
{
|
||||
/**
|
||||
* @var \b8\Store\BuildStore
|
||||
*/
|
||||
protected $_buildStore;
|
||||
|
||||
/**
|
||||
* @var \b8\Store\ProjectStore
|
||||
*/
|
||||
protected $_projectStore;
|
||||
|
||||
public function init()
|
||||
{
|
||||
$this->_buildStore = b8\Store\Factory::getStore('Build');
|
||||
|
|
@ -31,10 +41,15 @@ class HomeController extends \PHPCI\Controller
|
|||
public function index()
|
||||
{
|
||||
$projects = $this->_projectStore->getWhere(array(), 50, 0, array(), array('title' => 'ASC'));
|
||||
$summary = $this->_buildStore->getBuildSummary();
|
||||
|
||||
$summaryBuilds = array();
|
||||
foreach ($projects['items'] as $project) {
|
||||
$summaryBuilds[$project->getId()] = $this->_buildStore->getLatestBuilds($project->getId());
|
||||
}
|
||||
|
||||
$summaryView = new b8\View('SummaryTable');
|
||||
$summaryView->builds = $summary['items'];
|
||||
$summaryView->projects = $projects['items'];
|
||||
$summaryView->builds = $summaryBuilds;
|
||||
|
||||
$this->view->builds = $this->getLatestBuildsHtml();
|
||||
$this->view->projects = $projects['items'];
|
||||
|
|
|
|||
|
|
@ -19,6 +19,26 @@ use PHPCI\Store\Base\BuildStoreBase;
|
|||
*/
|
||||
class BuildStore extends BuildStoreBase
|
||||
{
|
||||
public function getLatestBuilds($projectId)
|
||||
{
|
||||
$query = 'SELECT * FROM build WHERE project_id = :pid ORDER BY id DESC LIMIT 5';
|
||||
$stmt = \b8\Database::getConnection('read')->prepare($query);
|
||||
$stmt->bindValue(':pid', $projectId);
|
||||
|
||||
if ($stmt->execute()) {
|
||||
$res = $stmt->fetchAll(\PDO::FETCH_ASSOC);
|
||||
|
||||
$map = function ($item) {
|
||||
return new \PHPCI\Model\Build($item);
|
||||
};
|
||||
$rtn = array_map($map, $res);
|
||||
|
||||
return $rtn;
|
||||
} else {
|
||||
return array();
|
||||
}
|
||||
}
|
||||
|
||||
public function getBuildSummary()
|
||||
{
|
||||
$query = 'SELECT COUNT(*) AS cnt FROM build b LEFT JOIN project p on p.id = b.project_id GROUP BY b.project_id ORDER BY p.title ASC, b.id DESC';
|
||||
|
|
|
|||
|
|
@ -1,87 +1,80 @@
|
|||
<?php
|
||||
// echo "<pre>";
|
||||
// var_dump($builds);
|
||||
// echo "</pre>";
|
||||
|
||||
$maxbuildcount = 5;
|
||||
$projects = array();
|
||||
$prevBuild = null;
|
||||
$health = false;
|
||||
foreach($projects as $project):
|
||||
$statuses = array();
|
||||
$successes = 0;
|
||||
$failures = 0;
|
||||
$health = '';
|
||||
$subcls = '';
|
||||
$cls = '';
|
||||
|
||||
foreach($builds as $build):
|
||||
$success = null;
|
||||
$failure = null;
|
||||
|
||||
if ($build->getStatus() < 2) {
|
||||
continue;
|
||||
}
|
||||
if (count($builds[$project->getId()])) {
|
||||
|
||||
if ( is_null($prevBuild) || $build->getProjectId() !== $prevBuild->getProjectId() ) {
|
||||
$health = false;
|
||||
$projects[$build->getProjectId()]['count'] = 0;
|
||||
$projects[$build->getProjectId()]['health'] = 0;
|
||||
$projects[$build->getProjectId()]['successes'] = 0;
|
||||
$projects[$build->getProjectId()]['failures'] = 0;
|
||||
$projects[$build->getProjectId()]['lastbuildstatus'] = (int)$build->getStatus();
|
||||
}
|
||||
// Use the latest build information to determine current status:
|
||||
$latestBuild = $builds[$project->getId()][0];
|
||||
|
||||
if (
|
||||
!is_null($prevBuild) &&
|
||||
$projects[$build->getProjectId()]['count'] >= $maxbuildcount &&
|
||||
$build->getProjectId() === $prevBuild->getProjectId()
|
||||
) {
|
||||
$projects[$build->getProjectId()]['count']++;
|
||||
continue;
|
||||
}
|
||||
switch ($latestBuild->getStatus()) {
|
||||
case 0:
|
||||
$cls = 'active';
|
||||
$status = 'Pending';
|
||||
break;
|
||||
|
||||
switch ((int)$build->getStatus()) {
|
||||
case 2:
|
||||
$projects[$build->getProjectId()]['health']++;
|
||||
$projects[$build->getProjectId()]['successes']++;
|
||||
case 1:
|
||||
$cls = 'warning';
|
||||
$status = 'Running';
|
||||
break;
|
||||
|
||||
if ( empty($projects[$build->getProjectId()]['lastsuccess']) ) {
|
||||
$projects[$build->getProjectId()]['lastsuccess'] = $build;
|
||||
case 2:
|
||||
$cls = 'success';
|
||||
$status = 'Success';
|
||||
break;
|
||||
|
||||
case 3:
|
||||
$cls = 'danger';
|
||||
$status = 'Failed';
|
||||
break;
|
||||
}
|
||||
|
||||
// Use the last 5 builds to determine project health:
|
||||
$successes = 0;
|
||||
$failures = 0;
|
||||
|
||||
foreach ($builds[$project->getId()] as $build) {
|
||||
switch ($build->getStatus()) {
|
||||
case 0:
|
||||
$statuses[] = 'pending';
|
||||
break;
|
||||
case 1:
|
||||
$statuses[] = 'running';
|
||||
break;
|
||||
case 2:
|
||||
$successes++;
|
||||
$statuses[] = 'ok';
|
||||
$success = is_null($success) ? $build->getFinished()->format('Y-m-d H:i:s') : $success;
|
||||
break;
|
||||
case 3:
|
||||
$failures++;
|
||||
$statuses[] = 'failed';
|
||||
$failure = is_null($failure) ? $build->getFinished()->format('Y-m-d H:i:s') : $failure;
|
||||
break;
|
||||
}
|
||||
break;
|
||||
case 3:
|
||||
$projects[$build->getProjectId()]['health']--;
|
||||
$projects[$build->getProjectId()]['failures']++;
|
||||
|
||||
if ( empty($projects[$build->getProjectId()]['lastfailure']) ) {
|
||||
$projects[$build->getProjectId()]['lastfailure'] = $build;
|
||||
}
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
$projects[$build->getProjectId()]['count']++;
|
||||
$projects[$build->getProjectId()]['projectname'] = $build->getProject()->getTitle();
|
||||
$prevBuild = $build;
|
||||
endforeach;
|
||||
|
||||
foreach($projects as $projectId => $project):
|
||||
switch($project['lastbuildstatus'])
|
||||
{
|
||||
case 0:
|
||||
$cls = 'active';
|
||||
$status = 'Pending';
|
||||
break;
|
||||
|
||||
case 1:
|
||||
$cls = 'danger';
|
||||
$status = 'Running';
|
||||
break;
|
||||
|
||||
case 2:
|
||||
$cls = 'success';
|
||||
$status = 'Success';
|
||||
break;
|
||||
|
||||
case 3:
|
||||
$cls = 'error';
|
||||
$status = 'Failed';
|
||||
break;
|
||||
if ($failures == 0) {
|
||||
$health = 'Good';
|
||||
$subcls = 'success';
|
||||
} elseif ($failures > $successes) {
|
||||
$health = 'Bad';
|
||||
$subcls = 'danger';
|
||||
} else {
|
||||
$health = 'Warning';
|
||||
$subcls = 'warning';
|
||||
}
|
||||
|
||||
$health = ($project['health'] <= 0 ? 'Stormy': ($project['successes'] < $project['count']? 'Overcast': 'Sunny'));
|
||||
$subcls = ($project['health'] <= 0 ? 'danger': ($project['successes'] < $project['count']? 'warning': 'success'));
|
||||
?>
|
||||
<tr class="<?php print $cls; ?>">
|
||||
<td>
|
||||
|
|
@ -89,26 +82,16 @@ foreach($projects as $projectId => $project):
|
|||
<?= $health ?>
|
||||
</span>
|
||||
</td>
|
||||
<td><a href='<?= PHPCI_URL ?>project/view/<?= $projectId ?>'><?= $project['projectname'] ?></a></td>
|
||||
<td><a href='<?= PHPCI_URL ?>project/view/<?= $project->getId() ?>'><?= $project->getTitle() ?></a></td>
|
||||
<td><?php print is_null($success) ? 'Never' : $success; ?></td>
|
||||
<td><?php print is_null($failure) ? 'Never' : $failure; ?></td>
|
||||
<td>
|
||||
<?php if (empty($project['lastsuccess'])) {
|
||||
echo "Never";
|
||||
} else { ?>
|
||||
<a href='<?= PHPCI_URL ?>build/view/<?= $project['lastsuccess']->getId() ?>'>
|
||||
<?= $project['lastsuccess']->getStarted()->format("Y-m-d H:i:s") ?>
|
||||
</a>
|
||||
<?php } ?>
|
||||
<?php
|
||||
foreach ($statuses as $status) {
|
||||
print '<img alt="'.$status.'" src="' . PHPCI_URL . 'assets/img/icon-build-' . $status . '.png">';
|
||||
}
|
||||
?>
|
||||
</td>
|
||||
<td>
|
||||
<?php if (empty($project['lastfailure'])) {
|
||||
echo "Never";
|
||||
} else { ?>
|
||||
<a href='<?= PHPCI_URL ?>build/view/<?= $project['lastfailure']->getId() ?>'>
|
||||
<?= $project['lastfailure']->getStarted()->format("Y-m-d H:i:s") ?>
|
||||
</a>
|
||||
<?php } ?>
|
||||
</td>
|
||||
<td><?= $project['successes'] ?>/<?= $project['failures'] ?></td>
|
||||
<td><a class="btn btn-default btn-small" href='<?= PHPCI_URL ?>project/build/<?= $projectId ?>'>build now »</a></td>
|
||||
<td><a class="btn btn-default btn-small" href='<?= PHPCI_URL ?>project/build/<?= $project->getId(); ?>'>build now »</a></td>
|
||||
</tr>
|
||||
<?php endforeach; ?>
|
||||
|
|
|
|||
Loading…
Reference in a new issue