diff --git a/application/controllers/api/v1/crm/Reihungstest.php b/application/controllers/api/v1/crm/Reihungstest.php index c34b1af76..9062105e7 100644 --- a/application/controllers/api/v1/crm/Reihungstest.php +++ b/application/controllers/api/v1/crm/Reihungstest.php @@ -87,7 +87,7 @@ class Reihungstest extends APIv1_Controller if (isset($person_id)) { - $result = $this->ReihungstestLib->getReihungstestByPersonID($person_id, $available); + $result = $this->reihungstestlib->getReihungstestByPersonID($person_id, $available); $this->response($result, REST_Controller::HTTP_OK); } diff --git a/application/models/system/Recipient_model.php b/application/models/system/Recipient_model.php index aa5c9a874..a76382925 100644 --- a/application/models/system/Recipient_model.php +++ b/application/models/system/Recipient_model.php @@ -275,9 +275,16 @@ class Recipient_model extends DB_Model FROM public.tbl_msg_recipient r JOIN public.tbl_msg_status s ON (r.message_id = s.message_id AND r.person_id = s.person_id) WHERE r.person_id = ? - AND s.status = ?'; + AND s.status = ? + AND r.message_id NOT IN ( + SELECT r.message_id + FROM public.tbl_msg_recipient r JOIN public.tbl_msg_status s + ON (r.message_id = s.message_id AND r.person_id = s.person_id) + WHERE r.person_id = ? + AND s.status > ? + )'; - $parametersArray = array($person_id, MSG_STATUS_UNREAD); + $parametersArray = array($person_id, MSG_STATUS_UNREAD, $person_id, MSG_STATUS_UNREAD); return $this->execQuery($sql, $parametersArray); }