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

Add configuration to experiment detail pages

Browse Source
This commit is contained in:
Eike Foken
2011-09-14 23:03:24 +02:00
parent 9bf495ad9d
commit 0fa7d14a74
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
application/controllers/experiments.php
View File

@@ -161,6 +161,7 @@ class Experiments extends CI_Controller {
$this->load->helper('typography'); $this->load->helper('typography');
$data['experiment'] = $experiment; $data['experiment'] = $experiment;
$data['parameters'] = $this->experiment->getParameters($experiment['id']);
$data['job'] = $this->job->getByExperimentId($experiment['id']); $data['job'] = $this->job->getByExperimentId($experiment['id']);
$data['project'] = $this->project->getById($experiment['project_id']); $data['project'] = $this->project->getById($experiment['project_id']);

2
application/models/experiment.php
View File

@@ -103,7 +103,7 @@ class Experiment extends CI_Model {
* @return array * @return array
*/ */
public function getParameters($experimentId) { public function getParameters($experimentId) {
$this->db->select('experiments_parameters.*, parameters.name AS `name`, parameters.type AS `type`'); $this->db->select('experiments_parameters.*, parameters.readable, parameters.name, parameters.type, parameters.unit');
$this->db->join('parameters', 'experiments_parameters.parameter_id = parameters.id', 'left'); $this->db->join('parameters', 'experiments_parameters.parameter_id = parameters.id', 'left');
$this->db->where('experiment_id', $experimentId); $this->db->where('experiment_id', $experimentId);