diff --git a/application/controllers/api/v1/crm/Reihungstest.php b/application/controllers/api/v1/crm/Reihungstest.php index 64c41d159..91c647fab 100644 --- a/application/controllers/api/v1/crm/Reihungstest.php +++ b/application/controllers/api/v1/crm/Reihungstest.php @@ -23,7 +23,7 @@ class Reihungstest extends APIv1_Controller { parent::__construct(); // Load model ReihungstestModel - $this->load->model("crm/reihungstest_model", "ReihungstestModel"); + $this->load->model("crm/Reihungstest_model", "ReihungstestModel"); // Load library ReihungstestLib $this->load->library("ReihungstestLib"); } @@ -54,15 +54,20 @@ class Reihungstest extends APIv1_Controller { $studiengang_kz = $this->get("studiengang_kz"); $studiensemester_kurzbz = $this->get("studiensemester_kurzbz"); + $available = $this->get("available"); if (isset($studiengang_kz)) { - $parameters = array("studiengang_kz" => $studiengang_kz); + $parametersArray = array("studiengang_kz" => $studiengang_kz); 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); } @@ -78,10 +83,11 @@ class Reihungstest extends APIv1_Controller public function getReihungstestByPersonID() { $person_id = $this->get("person_id"); + $available = $this->get("available"); if (isset($person_id)) { - $result = $this->reihungstestlib->getReihungstestByPersonID($person_id); + $result = $this->reihungstestlib->getReihungstestByPersonID($person_id, $available); $this->response($result, REST_Controller::HTTP_OK); } diff --git a/application/libraries/ReihungstestLib.php b/application/libraries/ReihungstestLib.php index f8ebdf3b9..d28820bdb 100644 --- a/application/libraries/ReihungstestLib.php +++ b/application/libraries/ReihungstestLib.php @@ -15,6 +15,7 @@ class ReihungstestLib $this->ci =& get_instance(); $this->ci->load->model("crm/RtPerson_model", "RtPersonModel"); + $this->ci->load->model("crm/Reihungstest_model", "ReihungstestModel"); } /** @@ -46,12 +47,19 @@ class ReihungstestLib /** * @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_person", "person_id"); $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); } } \ No newline at end of file