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

- Modified FHC_Model contructor to get UID from vilesci authentication

Browse Source 
- Copied functionalities from old libraries to controllers
- Ported old libraries to CI
- Modified codeception
This commit is contained in:
paolo
2016-06-03 16:19:06 +02:00
parent efe7355a4d
commit dabcf8188b
16 changed files with 697 additions and 202 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/controllers/api/v1/codex/Nation.php
+16
View File
@@ -28,6 +28,22 @@ class Nation extends APIv1_Controller
$this->NationModel->setUID($this->_getUID());
}
public function getNation()
{
$nation_code = $this->get("nation_code");
if (isset($nation_code))
{
$result = $this->NationModel->loadWhere(array('nation_code' => $nation_code));
$this->response($result, REST_Controller::HTTP_OK);
}
else
{
$this->response();
}
}
public function getAll()
{
if (!$this->get('orderEnglish'))
application/controllers/api/v1/codex/Orgform.php
+20 -7
View File
@@ -46,6 +46,26 @@ class Orgform extends APIv1_Controller
$this->response();
}
}
/**
* @return void
*/
public function getAll()
{
$result = $this->OrgformModel->loadWhole();
$this->response($result, REST_Controller::HTTP_OK);
}
/**
* @return void
*/
public function getOrgformLV()
{
$result = $this->OrgformModel->getOrgformLV();
$this->response($result, REST_Controller::HTTP_OK);
}
/**
* @return void
@@ -71,13 +91,6 @@ class Orgform extends APIv1_Controller
}
}
public function getAll()
{
$result = $this->OrgformModel->loadWhole();
$this->response($result, REST_Controller::HTTP_OK);
}
private function _validate($orgform = NULL)
{
return true;
application/controllers/api/v1/organisation/Studiensemester.php
+201 -14
View File
@@ -54,25 +54,212 @@ class Studiensemester extends APIv1_Controller
{
$art = $this->get('art');
$result = $this->StudiensemesterModel->addOrder('start');
if ($result->error == EXIT_SUCCESS)
$this->StudiensemesterModel->addOrder('start');
$this->StudiensemesterModel->addLimit(1);
if (isset($art))
{
$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()'));
}
}
$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
*/
public function getAll()
{
$order = $this->get('order');
if (strcasecmp($order, 'DESC') == 0)
{
$this->StudiensemesterModel->addOrder('ende', 'DESC');
}
else
{
$this->StudiensemesterModel->addOrder('ende', 'ASC');
}
$result = $this->StudiensemesterModel->loadWhole();
$this->response($result, REST_Controller::HTTP_OK);
}
/**
* @return void
*/
public function getAkt()
{
$result = $this->StudiensemesterModel->loadWhere(array('start <=' => 'NOW()', 'ende >=' => 'NOW()'));
$this->response($result, REST_Controller::HTTP_OK);
}
/**
* @return void
*/
public function getAktNext()
{
$semester = $this->get('semester');
$result = null;
if (!is_numeric($semester))
{
$result = $this->StudiensemesterModel->loadWhere(array('start <=' => 'NOW()', 'ende >=' => 'NOW()'));
}
if (is_object($result) && $result->error == EXIT_SUCCESS && is_array($result->retval) &&
count($result->retval) > 0)
{
// Return $result
}
else
{
$this->StudiensemesterModel->addOrder('ende');
$this->StudiensemesterModel->addLimit(1);
$whereArray = array('ende >=' => 'NOW()');
if (is_numeric($semester))
{
if ($semester % 2 == 0)
{
$ss = 'SS';
}
else
{
$ss = 'WS';
}
$whereArray['SUBSTRING(studiensemester_kurzbz FROM 1 FOR 2) ='] = $ss;
}
$result = $this->StudiensemesterModel->loadWhere($whereArray);
}
$this->response($result, REST_Controller::HTTP_OK);
}
/**
* @return void
*/
public function getLastOrAktSemester()
{
$result = $this->StudiensemesterModel->getLastOrAktSemester($this->get('days'));
$this->response($result, REST_Controller::HTTP_OK);
}
/**
* @return void
*/
public function getNextFrom()
{
$result = $this->StudiensemesterModel->getNextFrom($this->get('studiensemester_kurzbz'));
$this->response($result, REST_Controller::HTTP_OK);
}
/**
* @return void
*/
public function getPrevious()
{
$this->StudiensemesterModel->addOrder('ende', 'DESC');
$this->StudiensemesterModel->addLimit(1);
$result = $this->StudiensemesterModel->loadWhere(array('ende <' => 'NOW()'));
$this->response($result, REST_Controller::HTTP_OK);
}
/**
* @return void
*/
public function getNearest()
{
$result = $this->StudiensemesterModel->getNearest($this->get('semester'));
$this->response($result, REST_Controller::HTTP_OK);
}
/**
* @return void
*/
public function getFinished()
{
$limit = $this->get('limit');
$this->StudiensemesterModel->addOrder('ende', 'DESC');
$this->StudiensemesterModel->addLimit($limit);
$result = $this->StudiensemesterModel->loadWhere(array('start <=' => 'NOW()'));
$this->response($result, REST_Controller::HTTP_OK);
}
/**
* @return void
*/
public function getTimestamp()
{
$studiensemester_kurzbz = $this->get('studiensemester_kurzbz');
if (isset($studiensemester_kurzbz))
{
$result = $this->StudiensemesterModel->load($studiensemester_kurzbz);
if (is_array($result->retval) && count($result->retval) > 0)
{
$studiensemester = $result->retval[0];
if (is_object($studiensemester))
{
$start = "";
if (isset($studiensemester->start))
{
$start = mktime(0, 0, 0,
mb_substr($studiensemester->start, 5, 2),
mb_substr($studiensemester->start, 8, 2),
mb_substr($studiensemester->start, 0, 4)
);
}
$ende = "";
if (isset($studiensemester->ende))
{
$ende = mktime(0, 0, 0,
mb_substr($studiensemester->ende, 5, 2),
mb_substr($studiensemester->ende, 8, 2),
mb_substr($studiensemester->ende, 0, 4)
);
}
$result->retval = array(
'studiensemester_kurzbz' => $studiensemester_kurzbz,
'start' => $start,
'ende' => $ende
);
}
}
$this->response($result, REST_Controller::HTTP_OK);
}
else
{
$this->response();
}
}
/**
* @return void
application/controllers/api/v1/person/Kontakt.php
+63 -6
View File
@@ -29,25 +29,82 @@ class Kontakt extends APIv1_Controller
$this->KontaktModel->setUID($this->_getUID());
}
public function getKontakt()
public function getKontakt()
{
$personID = $this->get("person_id");
$kontakt_id = $this->get("kontakt_id");
if (isset($personID))
if (isset($kontakt_id))
{
$result = $this->KontaktModel->loadWhere(array('person_id' => $personID));
$result = $this->KontaktModel->addJoin('public.tbl_standort', 'standort_id', 'LEFT');
if ($result->error == EXIT_SUCCESS)
{
$result = $this->KontaktModel->addJoin('public.tbl_firma', 'firma_id', 'LEFT');
if ($result->error == EXIT_SUCCESS)
{
$result = $this->KontaktModel->loadWhere(array('kontakt_id' => $kontakt_id));
}
}
$this->response($result, REST_Controller::HTTP_OK);
}
else
{
$this->response();
$this->response();
}
}
public function getKontaktByPersonID()
{
$person_id = $this->get("person_id");
if (isset($person_id))
{
$result = $this->KontaktModel->addJoin('public.tbl_standort', 'standort_id', 'LEFT');
if ($result->error == EXIT_SUCCESS)
{
$result = $this->KontaktModel->addJoin('public.tbl_firma', 'firma_id', 'LEFT');
if ($result->error == EXIT_SUCCESS)
{
$result = $this->KontaktModel->loadWhere(array('person_id' => $person_id));
}
}
$this->response($result, REST_Controller::HTTP_OK);
}
else
{
$this->response();
}
}
public function getKontaktByPersonIDKontaktTyp()
{
$person_id = $this->get("person_id");
$kontakttyp = $this->get("kontakttyp");
if (isset($person_id) && isset($kontakttyp))
{
$result = $this->KontaktModel->addJoin('public.tbl_standort', 'standort_id', 'LEFT');
if ($result->error == EXIT_SUCCESS)
{
$result = $this->KontaktModel->addJoin('public.tbl_firma', 'firma_id', 'LEFT');
if ($result->error == EXIT_SUCCESS)
{
$result = $this->KontaktModel->loadWhere(array('person_id' => $person_id, 'kontakttyp' => $kontakttyp));
}
}
$this->response($result, REST_Controller::HTTP_OK);
}
else
{
$this->response();
}
}
public function postKontakt()
{
$post = $this->_parseData($this->post());
$post = $this->_parseData($this->post());
if (is_array($post))
{