From f87ebc828f00b9fdbb41c8fa187ffe25086c8aa0 Mon Sep 17 00:00:00 2001
From: Eike Foken <kontakt@eikefoken.de>
Date: Wed, 31 Aug 2011 10:16:54 +0200
Subject: [PATCH] Fix recent jobs

---
 application/controllers/projects.php  | 2 +-
 application/models/job.php            | 2 +-
 application/views/projects/detail.php | 2 ++
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/application/controllers/projects.php b/application/controllers/projects.php
index 89a7ff7..103ab04 100644
--- a/application/controllers/projects.php
+++ b/application/controllers/projects.php
@@ -126,7 +126,7 @@ class Projects extends CI_Controller {
 
 		$data['project'] = $project;
 		$data['trials'] = $this->trial->getByProjectId($id);
-		$data['jobs'] = $this->job->getRecent();
+		$data['jobs'] = $this->job->getRecent($id);
 
 		$this->load->view('projects/detail', $data);
 	}
diff --git a/application/models/job.php b/application/models/job.php
index 1ea0f02..dd2a560 100644
--- a/application/models/job.php
+++ b/application/models/job.php
@@ -76,7 +76,7 @@ class Job extends CI_Model {
 	public function getRecent($projectId = '') {
 		$this->db->select('jobs.*, trials.project_id, trials.name');
 		$this->db->join('trials', 'jobs.trial_id = trials.id', 'left');
-		$this->db->where('finished_at', 0);
+		//$this->db->where('finished_at', 0);
 
 		if (!empty($projectId)) {
 			$this->db->where('project_id', $projectId);
diff --git a/application/views/projects/detail.php b/application/views/projects/detail.php
index 5f8eb9f..1bc8f16 100644
--- a/application/views/projects/detail.php
+++ b/application/views/projects/detail.php
@@ -84,6 +84,7 @@
 				<tr>
 					<th scope="col"><?=_('Trial');?></th>
 					<th scope="col"><?=_('Started');?></th>
+					<th scope="col"><?=_('Finished');?></th>
 					<th scope="col"><?=_('Actions');?></th>
 				</tr>
 			</thead>
@@ -95,6 +96,7 @@
 				<tr>
 					<td><?=$job['name'];?></td>
 					<td><?=$job['started_at'];?></td>
+					<td><?=$job['finished_at'] != '0000-00-00 00:00:00' ? $job['finished_at'] : _('Currently running');?></td>
 					<td>
 						<a href="<?=site_url('trials/results/' . $job['id']);?>" title="<?= sprintf(_('Show results for the trial &quot;%s&quot;'), $job['name']);?>"><?=_('Show results');?></a> |
 						<a href="<?=site_url('trials/edit/' . $job['id']);?>" title="<?= sprintf(_('Edit trial &quot;%s&quot;'), $job['name']);?>"><?=_('Edit');?></td>