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

Extend project and trial management

Browse Source
This commit is contained in:
Eike Foken
2011-08-19 01:44:23 +02:00
parent 64659ca207
commit b2a9b8b087
11 changed files with 231 additions and 229 deletions
Download Patch File Download Diff File Expand all files Collapse all files

95
application/controllers/projects.php
View File

@@ -1,30 +1,31 @@
<?php
/*
* Copyright (c) 2011 Karsten Heiken <karsten@disposed.de>
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/
/**
*
* @author Karsten Heiken <karsten@disposed.de>
*/
* @author Eike Foken <kontakt@eikefoken.de>
*/
class Projects extends CI_Controller {
/**
@@ -43,7 +44,7 @@ class Projects extends CI_Controller {
$projects = $this->project->getAll();
$tpl['projects'] = $projects;
$this->load->view('project/list', $tpl);
$this->load->view('projects/list', $tpl);
}
/**
@@ -100,7 +101,7 @@ class Projects extends CI_Controller {
$data['model']['success'] = isset($modelUploaded) && $modelUploaded ? true : false;
$data['config']['success'] = isset($configUploaded) && $configUploaded ? true: false;
$this->load->view('project/new', $data);
$this->load->view('projects/new', $data);
} else {
$data = array(
'name' => $this->input->post('name'),
@@ -112,17 +113,9 @@ class Projects extends CI_Controller {
$data['project_id'] = $this->project->create($data);
if (isset($data['project_id'])) {
$userpath = FCPATH . 'uploads/' . $this->session->userdata('user_id') . '/';
$projectpath = $userpath . $data['project_id'] . '/';
if (!is_dir($projectpath)) {
if (!is_dir($userpath)) {
mkdir($userpath, 0777);
chmod($userpath, 0777);
}
mkdir($projectpath, 0777);
chmod($projectpath, 0777);
}
$this->load->helper('directory');
$projectPath = FCPATH.'uploads/'.$this->session->userdata('user_id').'/'.$data['project_id'].'/';
mkdirs($projectPath);
if ($modelUploaded) {
copy($modelData['full_path'], $projectpath . $modelData['file_name']);
@@ -132,10 +125,10 @@ class Projects extends CI_Controller {
}
$this->messages->add($projectpath, 'notice');
redirect('/projects/detail/' . $data['project_id'], 301);
redirect('/projects/detail/' . $data['project_id'], 303);
} else {
$this->messages->add(_('The project could not be created.'), 'error');
$this->load->view('project/new');
$this->load->view('projects/new');
}
}
}
@@ -143,22 +136,22 @@ class Projects extends CI_Controller {
/**
* Shows the project details
*
* @param integer $prj_id The ID of the project to show
* @param integer $id The ID of the project to show
*/
public function detail($prj_id) {
$project = $this->project->getById($prj_id);
public function detail($id) {
$this->load->helper('typography');
$project = $this->project->getById($id);
if (!$project) {
$this->messages->add(_('The project could not be loaded.'), 'error');
redirect('projects', 301);
redirect('projects', 303);
}
$this->session->set_userdata('active_project', $prj_id);
$trials = $this->trial->getByProjectId($prj_id);
$data['project'] = $project;
$data['trials'] = $this->trial->getByProjectId($id);
$data['jobsDone'] = null;
$tpl['project'] = $project;
$tpl['trials'] = $trials;
$tpl['jobsDone'] = null;
$this->load->view('project/detail', $tpl);
$this->load->view('projects/detail', $data);
}
/**
@@ -166,11 +159,11 @@ class Projects extends CI_Controller {
*
* @param integer $projectId
*/
public function delete($projectId) {
$this->project->delete($projectId);
$this->session->unset_userdata('active_project');
$this->messages->add(_('The project was deleted.'), 'success');
redirect('projects');
public function delete($id) {
if ($this->project->delete($id)) {
$this->messages->add(_('The project was deleted.'), 'success');
}
redirect('projects', 303);
}
}

61
application/controllers/trials.php
View File

@@ -42,9 +42,13 @@ class Trials extends CI_Controller {
}
/**
* Create a new project.
* Allows users to create new trials.
*
* @param string $projectId
*/
public function create($projectId = '') {
public function create($projectId = '', $copyId = '') {
// TODO: Handle copying of trials
$project = $this->project->getByID($projectId);
if (empty($projectId) || !isset($project['id'])){
@@ -58,22 +62,8 @@ class Trials extends CI_Controller {
$parameters[$program['id']] = $this->parameter->getAll($program['id']);
}
$config = array(
array(
'field' => 'name',
'label' => _('Trial name'),
'rules' => 'required|min_length[3]|max_length[60]|trim',
),
array(
'field' => 'description',
'label' => _('Description'),
'rules' => 'required|trim',
),
);
$this->form_validation->set_rules($config);
if ($this->form_validation->run() === true) {
// TODO: handle file upload
if ($this->form_validation->run('trials/create') === true) {
// TODO: Handle file upload
$data = array(
'name' => $this->input->post('name'),
@@ -83,43 +73,32 @@ class Trials extends CI_Controller {
'creator_id' => $this->session->userdata('user_id'),
);
$result = $this->trial->create($data);
if ($result) {
$trialId = $this->trial->create($data);
if ($trialId) {
foreach ($_POST as $key => $value) {
if (preg_match('/^param-[0-9a-z]+/', $key) && !empty($value)) {
$param['parameter_id'] = substr($key, 6, 16);
$param['value'] = $this->input->post($key);
$this->trial->addParameter($param, $result);
$this->trial->addParameter($param, $trialId);
}
}
$userpath = FCPATH . 'uploads/' . $this->session->userdata('user_id') . '/';
$projectpath = $userpath . $projectId . '/';
$trialpath = $projectpath . $result . '/';
if(!is_dir($trialpath)) {
if (!is_dir($projectpath)) {
if(!is_dir($userpath)) {
mkdir($userpath);
chmod($userpath, 0777);
}
mkdir($projectpath);
chmod($projectpath, 0777);
}
mkdir($trialpath);
chmod($trialpath, 0777);
}
$this->load->helper('directory');
$trialPath = FCPATH.'uploads/'.$this->session->userdata('user_id').'/'.$projectId.'/'. $trialId.'/';
mkdirs($trialPath);
redirect('trials/detail/' . $result, 'refresh');
redirect('trials/detail/' . $trialId, 'refresh');
} else {
$this->messages->add(_('The trial could not be created.'), 'error');
}
}
$tpl['parameters'] = $parameters;
$tpl['programs'] = $programs;
$tpl['project'] = $project;
$data = array(); // empty the data array
$data['parameters'] = $parameters;
$data['programs'] = $programs;
$data['project'] = $project;
$this->load->view('trial/new', $tpl);
$this->load->view('trial/new', $data);
}
}