karsten/scattport-web
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Implement job lists

Browse Source
This commit is contained in:
Eike Foken
2011-09-20 22:35:24 +02:00
parent aebde4aa79
commit 4b2ca67e68
5 changed files with 236 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
application/models/job.php
View File

@@ -66,6 +66,22 @@ class Job extends CI_Model {
return $this->db->where('id', $job_id)->update('jobs', $data);
}
/**
* Marks a finished job as seen.
*
* @param string $jobId
* @return boolean Returns TRUE on success.
*/
public function markSeen($jobId) {
$this->db->where('started_by', $this->session->userdata('user_id'));
$this->db->where('finished_at !=', 0);
$this->db->where('id', $jobId);
$query = $this->db->update('jobs', array('seen' => 1));
return $this->db->affected_rows() > 0;
}
/**
* Gets a specific job.
*
@@ -91,7 +107,7 @@ class Job extends CI_Model {
public function getRecent($projectId = '') {
$this->db->select('jobs.*, experiments.project_id, experiments.name');
$this->db->join('experiments', 'jobs.experiment_id = experiments.id', 'left');
//$this->db->where('finished_at', 0);
$this->db->order_by('created_at DESC');
if (!empty($projectId)) {
$this->db->where('project_id', $projectId);
@@ -99,9 +115,9 @@ class Job extends CI_Model {
$jobs = $this->db->get('jobs')->result_array();
return array_map(function($var) {
if($var['started_at'] == '0000-00-00 00:00:00') {
if ($var['started_at'] == '0000-00-00 00:00:00') {
$var['status'] = 'pending';
} elseif($var['finished_at'] == '0000-00-00 00:00:00') {
} else if ($var['finished_at'] == '0000-00-00 00:00:00') {
$var['status'] = 'running';
} else {
$var['status'] = 'complete';