mirror of
https://github.com/FH-Complete/FHC-Core.git
synced 2026-07-26 09:04:28 +00:00
Merge branch 'master' into feature-25999/C4_cleanup
This commit is contained in:
@@ -309,15 +309,15 @@ class Person_model extends DB_Model
|
||||
{
|
||||
$qry = "SELECT person_id
|
||||
FROM public.tbl_prestudent p
|
||||
JOIN
|
||||
JOIN
|
||||
(
|
||||
SELECT DISTINCT ON(prestudent_id) *
|
||||
FROM public.tbl_prestudentstatus
|
||||
WHERE prestudent_id IN
|
||||
WHERE prestudent_id IN
|
||||
(
|
||||
SELECT prestudent_id
|
||||
FROM public.tbl_prestudent
|
||||
WHERE person_id IN
|
||||
SELECT prestudent_id
|
||||
FROM public.tbl_prestudent
|
||||
WHERE person_id IN
|
||||
(
|
||||
SELECT p2.person_id
|
||||
FROM public.tbl_person p
|
||||
@@ -331,8 +331,8 @@ class Person_model extends DB_Model
|
||||
ORDER BY prestudent_id, datum DESC, insertamum DESC
|
||||
) ps USING(prestudent_id)
|
||||
JOIN public.tbl_status USING(status_kurzbz)
|
||||
WHERE status_kurzbz = 'Interessent'
|
||||
AND studiengang_kz IN
|
||||
WHERE status_kurzbz = 'Interessent'
|
||||
AND studiengang_kz IN
|
||||
(
|
||||
SELECT studiengang_kz
|
||||
FROM public.tbl_prestudent p
|
||||
@@ -389,5 +389,38 @@ class Person_model extends DB_Model
|
||||
'prestudent_id' => $prestudent_id
|
||||
]);
|
||||
}
|
||||
}
|
||||
|
||||
public function checkUnruly($vorname, $nachname, $gebdatum)
|
||||
{
|
||||
$qry = "SELECT person_id, vorname, nachname, gebdatum, unruly
|
||||
FROM tbl_person
|
||||
WHERE tbl_person.vorname = ?
|
||||
AND tbl_person.nachname = ?
|
||||
AND tbl_person.gebdatum = ?
|
||||
AND tbl_person.unruly = TRUE;";
|
||||
|
||||
return $this->execQuery($qry, [$vorname, $nachname, $gebdatum]);
|
||||
}
|
||||
|
||||
public function checkUnrulyWhere($where, $paramsArray)
|
||||
{
|
||||
$qry = 'SELECT *
|
||||
FROM tbl_person p
|
||||
WHERE '.$where.';';
|
||||
|
||||
return $this->execQuery($qry, $paramsArray);
|
||||
}
|
||||
|
||||
public function updateUnruly($person_id, $unruly)
|
||||
{
|
||||
$result = $this->update($person_id, array(
|
||||
'unruly' => $unruly
|
||||
));
|
||||
|
||||
if (isError($result)) {
|
||||
return error($result->msg, EXIT_ERROR);
|
||||
} else if (isSuccess($result) && hasData($result)) {
|
||||
return success($result);
|
||||
}
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user