blackicedbear/FHC-Core
1
0
Fork 0
mirror of https://github.com/FH-Complete/FHC-Core.git synced 2026-07-20 00:12:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge origin/ci into ci

Browse Source 
Conflicts:
	application/config/rest.php
	application/libraries/FHC_Auth.php
	tests/codeception/api/LoginCept.php
This commit is contained in:
paolo
2016-04-20 17:57:55 +02:00
parent 0ffe7fbcc6
commit 78e4c2900b
23 changed files with 914 additions and 445 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/studienplan.class.php
+12 -11
View File
@@ -24,12 +24,19 @@
* Stefan Puraner <puraner@technikum-wien.at>
*/
require_once(dirname(__FILE__).'/basis_db.class.php');
require_once(dirname(__FILE__).'/datum.class.php');
class studienplan extends basis_db
// CI
require_once(dirname(__FILE__).'/../ci_hack.php');
require_once(dirname(__FILE__).'/../application/models/studies/Plan_model.php');
class studienplan extends Plan_model
{
use db_extra; //CI Hack
public $new = true; // boolean
public $result = array(); // Objekte
public $errormsg; // string
//Tabellenspalten
protected $studienplan_id; // integer (PK)
@@ -74,10 +81,10 @@ class studienplan extends basis_db
$this->$name=$value;
}
public function __get($name)
/*public function __get($name)
{
return $this->$name;
}
}*/
/**
* Laedt Studienplan mit der ID $studienplan_id
@@ -722,13 +729,7 @@ class studienplan extends basis_db
*/
function getStudienplaene($studiengang_kz)
{
$qry = "SELECT
distinct tbl_studienplan.*
FROM
lehre.tbl_studienplan
JOIN lehre.tbl_studienordnung USING(studienordnung_id)
WHERE
tbl_studienordnung.studiengang_kz=".$this->db_add_param($studiengang_kz, FHC_INTEGER);
$qry = str_replace('?', $this->db_add_param($studiengang_kz, FHC_INTEGER), $this->_curriculaQuery);
if($result = $this->db_query($qry))
{