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

- Cleaned the controllers by moving the database related code and more complex logic

Browse Source 
in the models or libraries
- DmsLib bug fix
- Person_model bug fix
This commit is contained in:
bison
2016-08-31 14:15:39 +02:00
parent 0c912c0122
commit 939ca288fc
10 changed files with 194 additions and 163 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/controllers/api/v1/organisation/Studiengang2.php
-2
View File
@@ -15,8 +15,6 @@ if (!defined("BASEPATH")) exit("No direct script access allowed");
class Studiengang2 extends APIv1_Controller
{
private static $PROPERTIES_SEPARATOR = "properties_separator";
/**
* Course API constructor.
*/
application/controllers/api/v1/organisation/Studienplan.php
+15 -39
View File
@@ -12,7 +12,7 @@
*/
// ------------------------------------------------------------------------
if (!defined('BASEPATH')) exit('No direct script access allowed');
if (!defined("BASEPATH")) exit("No direct script access allowed");
class Studienplan extends APIv1_Controller
{
@@ -23,14 +23,12 @@ class Studienplan extends APIv1_Controller
{
parent::__construct();
// Load model PersonModel
$this->load->model('organisation/studienplan_model', 'StudienplanModel');
$this->load->model("organisation/studienplan_model", "StudienplanModel");
}
public function getStudienplan()
{
$studienplan_id = $this->get('studienplan_id');
$studienplan_id = $this->get("studienplan_id");
if (isset($studienplan_id))
{
@@ -46,15 +44,11 @@ class Studienplan extends APIv1_Controller
public function getStudienplaene()
{
$studiengang_kz = $this->get('studiengang_kz');
$studiengang_kz = $this->get("studiengang_kz");
if (isset($studiengang_kz))
{
$result = $this->StudienplanModel->addJoin('lehre.tbl_studienordnung', 'studienordnung_id');
if ($result->error == EXIT_SUCCESS)
{
$result = $this->StudienplanModel->loadWhere(array('studiengang_kz' => $this->get('studiengang_kz')));
}
$result = $this->StudienplanModel->getStudienplaene($studiengang_kz);
$this->response($result, REST_Controller::HTTP_OK);
}
@@ -66,37 +60,19 @@ class Studienplan extends APIv1_Controller
public function getStudienplaeneFromSem()
{
$studiengang_kz = $this->get('studiengang_kz');
$studiensemester_kurzbz = $this->get('studiensemester_kurzbz');
$ausbildungssemester = $this->get('ausbildungssemester');
$orgform_kurzbz = $this->get('orgform_kurzbz');
$studiengang_kz = $this->get("studiengang_kz");
$studiensemester_kurzbz = $this->get("studiensemester_kurzbz");
$ausbildungssemester = $this->get("ausbildungssemester");
$orgform_kurzbz = $this->get("orgform_kurzbz");
if (isset($studiengang_kz) && isset($studiensemester_kurzbz))
{
$result = $this->StudienplanModel->addJoin('lehre.tbl_studienordnung', 'studienordnung_id');
if ($result->error == EXIT_SUCCESS)
{
$result = $this->StudienplanModel->addJoin('lehre.tbl_studienplan_semester', 'studienplan_id');
if ($result->error == EXIT_SUCCESS)
{
$whereArray = array('tbl_studienplan.aktiv' => 'TRUE',
'tbl_studienordnung.studiengang_kz' => $studiengang_kz,
'tbl_studienplan_semester.studiensemester_kurzbz' => $studiensemester_kurzbz
);
if(isset($ausbildungssemester))
{
$whereArray['tbl_studienplan_semester.semester'] = $ausbildungssemester;
}
if(isset($orgform_kurzbz))
{
$whereArray['orgform_kurzbz'] = $orgform_kurzbz;
}
$result = $this->StudienplanModel->loadWhere($whereArray);
}
}
$result = $this->StudienplanModel->getStudienplaeneBySemester(
$studiengang_kz,
$studiensemester_kurzbz,
$ausbildungssemester,
$orgform_kurzbz
);
$this->response($result, REST_Controller::HTTP_OK);
}