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

- Added permission "basis/studienplan_semester" for table lehre.tbl_studienplan_semester

Browse Source 
- Added method getStudienplaeneFromSem in controller Studienplan
- Added method getNextStudiensemester in controller Studiensemester
This commit is contained in:
paolo
2016-05-23 10:32:21 +02:00
parent 606bd3d342
commit a34f82fd3c
4 changed files with 79 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/controllers/api/v1/organisation/Studienplan.php
+42
View File
@@ -47,4 +47,46 @@ class Studienplan extends APIv1_Controller
$this->response();
}
}
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');
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);
}
}
$this->response($result, REST_Controller::HTTP_OK);
}
else
{
$this->response();
}
}
}
application/controllers/api/v1/organisation/Studiensemester.php
+27
View File
@@ -46,6 +46,33 @@ class Studiensemester extends APIv1_Controller
$this->response();
}
}
/**
* @return void
*/
public function getNextStudiensemester()
{
$art = $this->get('art');
$result = $this->StudiensemesterModel->addOrder('start');
if ($result->error == EXIT_SUCCESS)
{
$result = $this->StudiensemesterModel->addLimit(1);
if ($result->error == EXIT_SUCCESS)
{
if (isset($art))
{
$result = $this->StudiensemesterModel->loadWhere(array('start >' => 'NOW()', 'SUBSTRING(studiensemester_kurzbz FROM 1 FOR 2) = ' => $art));
}
else
{
$result = $this->StudiensemesterModel->loadWhere(array('start >' => 'NOW()'));
}
}
}
$this->response($result, REST_Controller::HTTP_OK);
}
/**
* @return void