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

- Added parameter available to methods getByStudiengangStudiensemester and

Browse Source 
getReihungstestByPersonID of controller Reihungstest
- Added parameter available to method getReihungstestByPersonID of library ReihungstestLib
This commit is contained in:
bison
2016-09-07 15:41:29 +02:00
parent 3065b02512
commit 89744f36f5
2 changed files with 21 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/controllers/api/v1/crm/Reihungstest.php
+11 -5
View File
@@ -23,7 +23,7 @@ class Reihungstest extends APIv1_Controller
{ {
parent::__construct(); parent::__construct();
// Load model ReihungstestModel // Load model ReihungstestModel
$this->load->model("crm/reihungstest_model", "ReihungstestModel"); $this->load->model("crm/Reihungstest_model", "ReihungstestModel");
// Load library ReihungstestLib // Load library ReihungstestLib
$this->load->library("ReihungstestLib"); $this->load->library("ReihungstestLib");
} }
@@ -54,15 +54,20 @@ class Reihungstest extends APIv1_Controller
{ {
$studiengang_kz = $this->get("studiengang_kz"); $studiengang_kz = $this->get("studiengang_kz");
$studiensemester_kurzbz = $this->get("studiensemester_kurzbz"); $studiensemester_kurzbz = $this->get("studiensemester_kurzbz");
$available = $this->get("available");
if (isset($studiengang_kz)) if (isset($studiengang_kz))
{ {
$parameters = array("studiengang_kz" => $studiengang_kz); $parametersArray = array("studiengang_kz" => $studiengang_kz);
if (isset($studiensemester_kurzbz)) if (isset($studiensemester_kurzbz))
{ {
$parameters["studiensemester_kurzbz"] = $studiensemester_kurzbz; $parametersArray["studiensemester_kurzbz"] = $studiensemester_kurzbz;
} }
$result = $this->ReihungstestModel->loadWhere($parameters); if (isset($available))
{
$parametersArray["anmeldefrist >="] = "NOW()";
}
$result = $this->ReihungstestModel->loadWhere($parametersArray);
$this->response($result, REST_Controller::HTTP_OK); $this->response($result, REST_Controller::HTTP_OK);
} }
@@ -78,10 +83,11 @@ class Reihungstest extends APIv1_Controller
public function getReihungstestByPersonID() public function getReihungstestByPersonID()
{ {
$person_id = $this->get("person_id"); $person_id = $this->get("person_id");
$available = $this->get("available");
if (isset($person_id)) if (isset($person_id))
{ {
$result = $this->reihungstestlib->getReihungstestByPersonID($person_id); $result = $this->reihungstestlib->getReihungstestByPersonID($person_id, $available);
$this->response($result, REST_Controller::HTTP_OK); $this->response($result, REST_Controller::HTTP_OK);
} }
application/libraries/ReihungstestLib.php
+10 -2
View File
@@ -15,6 +15,7 @@ class ReihungstestLib
$this->ci =& get_instance(); $this->ci =& get_instance();
$this->ci->load->model("crm/RtPerson_model", "RtPersonModel"); $this->ci->load->model("crm/RtPerson_model", "RtPersonModel");
$this->ci->load->model("crm/Reihungstest_model", "ReihungstestModel");
} }
/** /**
@@ -46,12 +47,19 @@ class ReihungstestLib
/** /**
* @return void * @return void
*/ */
public function getReihungstestByPersonID($person_id) public function getReihungstestByPersonID($person_id, $available = null)
{ {
$this->ci->ReihungstestModel->addJoin("public.tbl_rt_person", "reihungstest_id = rt_id"); $this->ci->ReihungstestModel->addJoin("public.tbl_rt_person", "reihungstest_id = rt_id");
$this->ci->ReihungstestModel->addJoin("public.tbl_person", "person_id"); $this->ci->ReihungstestModel->addJoin("public.tbl_person", "person_id");
$this->ci->ReihungstestModel->addJoin("public.tbl_ort", "tbl_ort.ort_kurzbz = tbl_rt_person.ort_kurzbz", "LEFT"); $this->ci->ReihungstestModel->addJoin("public.tbl_ort", "tbl_ort.ort_kurzbz = tbl_rt_person.ort_kurzbz", "LEFT");
return $this->ci->ReihungstestModel->loadWhere(array("person_id" => $person_id)); $parametersArray = array("person_id" => $person_id);
if (isset($available))
{
$parametersArray["anmeldefrist >="] = "NOW()";
}
return $this->ci->ReihungstestModel->loadWhere($parametersArray);
} }
} }