diff --git a/application/controllers/ajax.php b/application/controllers/ajax.php index 20171cd..3408f54 100644 --- a/application/controllers/ajax.php +++ b/application/controllers/ajax.php @@ -68,6 +68,16 @@ class Ajax extends CI_Controller { $this->output->set_output(auto_typography($data['description'])); } + /** + * + * @param string $experimentId + */ + public function rename_project($projectId) { + $this->load->model('project'); + $this->project->update(array('name' => $this->input->post('title')), $projectId); + $this->output->set_output(site_url('projects/detail/' . $projectId)); + } + /** * Saves the experiments description. * diff --git a/application/models/experiment.php b/application/models/experiment.php index be9247a..d880ab2 100644 --- a/application/models/experiment.php +++ b/application/models/experiment.php @@ -141,7 +141,11 @@ class Experiment extends CI_Model { * @return array */ public function getByProjectId($projectId) { + $this->db->select('experiments.*, jobs.id AS job_id, jobs.started_at, jobs.finished_at, jobs.progress'); + $this->db->join('jobs', 'jobs.experiment_id = experiments.id', 'left'); + $query = $this->db->get_where('experiments', array('project_id' => $projectId)); + return $query->result_array(); } diff --git a/application/views/projects/detail.php b/application/views/projects/detail.php index 44db041..7f11186 100644 --- a/application/views/projects/detail.php +++ b/application/views/projects/detail.php @@ -12,33 +12,18 @@
+
| =$experiment['name'];?> | -=_('Completed');?> | +=$job['status'];?> | + =_('Show results');?> | + =_('Copy');?> | =_('Edit');?> | - =_('Delete');?> + =_('Delete');?> |