Merge branch 'master' of disposed.de:scattport

application/controllers/jobs.php

@@ -1,11 +1,24 @@
 <?php
 
 class Jobs extends CI_Controller {
-	
+
+	/**
+     * Constructor.
+     */
+    public function __construct() {
+        parent::__construct();
+		$this->load->model('job');
+
+        // load language file
+        $this->lang->load(strtolower($this->router->class));
+    }
+
+	/**
+	 * Get jobs belonging to projects owned by the user.
+	 */
 	public function getOwn() {
 		$query = $this->db->order_by('progress', 'desc')
 			->get_where('jobs', array('started_by' => $this->session->userdata('user_id')));
-		$count = $query->num_rows();
 		$jobs = $query->result_array();
 		
 		for($i=0; $i<count($jobs); $i++) {
@@ -14,10 +27,13 @@ class Jobs extends CI_Controller {
 			
 			switch($progress) {
 				case -1:
-					$progress = "Warte auf Start...";
+					$progress = lang('waiting');
+					break;
+				case -2:
+					$progress = lang('failed');
 					break;
 				case 100:
-					$progress = "Fertig";
+					$progress = lang('done');
 					break;
 				default:
 					$progress = $progress . "%";
@@ -31,28 +47,25 @@ class Jobs extends CI_Controller {
 			->set_content_type('application/json')
 			->set_output(json_encode(
 				array(
-					'count' => $count,
+					'count' => count($jobs),
 					'jobs' => $jobs
 				)
 			));
 	}
-	
-	public function listResultsNotSeen() {
-		$query = $this->db->order_by('started_at', 'asc')
-			->get_where('jobs', array('started_by' => $this->session->userdata('user_id'), 'seen' => '0'));
-		$count = $query->num_rows();
-		$jobs = $query->result_array();
-		
-		for($i=0; $i<count($jobs); $i++) {
-			$jobs[$i]['project_name'] = $this->db->select('name')->get_where('projects', array('id' => $jobs[$i]['project_id']))->row()->name;
-		}		
 
+
+	/**
+	 * Get a list of results that the owner has not yet seen.
+	 * @todo not yet verified
+	 */
+	public function get_unseen_results() {
+		$results = $this->job->getUnseenResults();
 		$this->output
 			->set_content_type('application/json')
 			->set_output(json_encode(
 				array(
-					'count' => $count,
-					'jobs' => $jobs
+					'count' => count($results),
+					'results' => $results
 				)
 			));
 	}

application/controllers/projects.php

@@ -64,7 +64,7 @@ class Projects extends CI_Controller {
 		//	->set_output(json_encode(array('count' => $count, 'projects' => $projects)));
 	}
 
-	public function detail($projects, $area, $id) {
+	public function detail($project_id) {
 		$project = $this->project->get($id);
 		$this->output
 			->set_content_type('application/json')

application/controllers/statusrpc.php

@@ -44,6 +44,6 @@ class Statusrpc extends CI_Controller {
 			die("Unauthorized access.");
 		}
 
-		$this->server->update_workload($secret, $workload);
+		$this->server->updateWorkload($secret, $workload);
 	}
 }