Merge branch 'master' into signatur

application/controllers/api/v1/project/Scrumteam.php

@@ -1,78 +0,0 @@
-<?php
-/**
- * FH-Complete
- *
- * @package		FHC-API
- * @author		FHC-Team
- * @copyright	Copyright (c) 2016, fhcomplete.org
- * @license		GPLv3
- * @link		http://fhcomplete.org
- * @since		Version 1.0
- * @filesource
- */
-// ------------------------------------------------------------------------
-
-if (!defined('BASEPATH')) exit('No direct script access allowed');
-
-class Scrumteam extends APIv1_Controller
-{
-	/**
-	 * Scrumteam API constructor.
-	 */
-	public function __construct()
-	{
-		parent::__construct();
-		// Load model ScrumteamModel
-		$this->load->model('project/scrumteam_model', 'ScrumteamModel');
-		
-		
-	}
-
-	/**
-	 * @return void
-	 */
-	public function getScrumteam()
-	{
-		$scrumteam_kurzbz = $this->get('scrumteam_kurzbz');
-		
-		if (isset($scrumteam_kurzbz))
-		{
-			$result = $this->ScrumteamModel->load($scrumteam_kurzbz);
-			
-			$this->response($result, REST_Controller::HTTP_OK);
-		}
-		else
-		{
-			$this->response();
-		}
-	}
-
-	/**
-	 * @return void
-	 */
-	public function postScrumteam()
-	{
-		if ($this->_validate($this->post()))
-		{
-			if (isset($this->post()['scrumteam_kurzbz']))
-			{
-				$result = $this->ScrumteamModel->update($this->post()['scrumteam_kurzbz'], $this->post());
-			}
-			else
-			{
-				$result = $this->ScrumteamModel->insert($this->post());
-			}
-			
-			$this->response($result, REST_Controller::HTTP_OK);
-		}
-		else
-		{
-			$this->response();
-		}
-	}
-	
-	private function _validate($scrumteam = NULL)
-	{
-		return true;
-	}
-}

application/models/project/Scrumteam_model.php

@@ -1,14 +0,0 @@
-<?php
-class Scrumteam_model extends DB_Model
-{
-
-	/**
-	 * Constructor
-	 */
-	public function __construct()
-	{
-		parent::__construct();
-		$this->dbTable = 'fue.tbl_scrumteam';
-		$this->pk = 'scrumteam_kurzbz';
-	}
-}

system/dbupdate_3.3.php

@@ -143,7 +143,7 @@ if(!$result = @$db->db_query("SELECT 1 FROM public.vw_msg_vars_person LIMIT 1"))
 						   a.gemeinde AS "Gemeinde",
 						   a.langtext AS "Nation",
 						   ke.kontakt AS "Email",
-						   kt.kontakt AS "Telefon"				
+						   kt.kontakt AS "Telefon"
 					  FROM public.tbl_person p
 				 LEFT JOIN (
 								SELECT person_id,
@@ -879,7 +879,7 @@ if (!$result = @$db->db_query("SELECT 1 FROM system.tbl_log LIMIT 1"))
 			 INCREMENT BY 1
 			 NO MAXVALUE
 			 NO MINVALUE
-			 CACHE 1;system.tbl_log
+			 CACHE 1;
 			ALTER TABLE system.tbl_log ALTER COLUMN log_id SET DEFAULT nextval('system.tbl_log_log_id_seq');
 
 			GRANT SELECT, INSERT ON system.tbl_log TO vilesci;

tests/codeception/tests/api/v1/ProjectScrumteamCept.php

@@ -1,11 +0,0 @@
-<?php
-
-$I = new ApiTester($scenario);
-$I->wantTo("Test API call v1/project/Scrumteam/: Scrumteam");
-$I->amHttpAuthenticated("admin", "1q2w3");
-$I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org");
-$I->sendGET("v1/project/Scrumteam/Scrumteam", array("scrumteam_kurzbz" => "1"));
-$I->seeResponseCodeIs(200);
-$I->seeResponseIsJson();
-$I->seeResponseContainsJson(["error" => 0]);
-$I->wait();

tests/codeception/tests/api/v1/RessourceZeitfensterCept.php

@@ -1,11 +0,0 @@
-<?php
-
-$I = new ApiTester($scenario);
-$I->wantTo("Test API call v1/ressource/Zeitfenster/: Zeitfenster");
-$I->amHttpAuthenticated("admin", "1q2w3");
-$I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org");
-$I->sendGET("v1/ressource/Zeitfenster/Zeitfenster", array("wochentag" => "1", "studiengang_kz" => "1", "ort_kurzbz" => "1", "stunde" => "1"));
-$I->seeResponseCodeIs(200);
-$I->seeResponseIsJson();
-$I->seeResponseContainsJson(["error" => 0]);
-$I->wait();