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

Extended function getActualInteressenten to differ only by STG-type/-kz

Browse Source 
Now the function accepts the optional arguments:
. typ (= studiengangstyp)
. studiengang_kz
to retrieve more specific data.
This commit is contained in:
Cris
2019-03-12 17:53:44 +01:00
parent e45fc66770
commit 0b5f9f51f7
1 changed files with 31 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/prestudent.class.php
+31 -8
View File
@@ -426,7 +426,7 @@ class prestudent extends person
* @boolean $prio Wenn true, dann wird nur der Prestudent mit dem am höchsten priorisierten Studiengang zurückgegeben.
* return Objekt-Array mit allen Prestudenten einer Person, die aktuell an STG interessiert sind.
*/
public function getActualInteressenten($prestudent_id, $prio = false)
public function getActualInteressenten($prestudent_id, $prio = false, $typ = NULL, $studiengang_kz = NULL)
{
if (is_numeric($prestudent_id))
{
@@ -436,11 +436,17 @@ class prestudent extends person
prestudent_id,
studienplan_id,
studiengang_kz,
typ,
tbl_studiengangstyp.bezeichnung AS typ_bz,
ausbildungssemester
FROM
public.tbl_prestudentstatus
JOIN
public.tbl_prestudent USING (prestudent_id)
JOIN
public.tbl_studiengang USING (studiengang_kz)
JOIN
public.tbl_studiengangstyp USING (typ)
WHERE
tbl_prestudent.person_id = (
SELECT
@@ -450,8 +456,8 @@ class prestudent extends person
WHERE
prestudent_id = ". $this->db_add_param($prestudent_id). "
)
-- Filter only future studiensemester (incl. actual one)
/* Filter only future studiensemester (incl. actual one) */
AND
studiensemester_kurzbz IN (
SELECT
@@ -461,12 +467,25 @@ class prestudent extends person
WHERE
ende > now()
)
AND
status_kurzbz = 'Interessent'
-- Order to get the very last status and highest prio on top
ORDER BY
status_kurzbz = 'Interessent'";
if (!is_null($typ) && is_string($typ))
{
$qry .= "
AND tbl_studiengang.typ = ". $this->db_add_param($typ);
}
if (!is_null($studiengang_kz) && is_numeric($studiengang_kz))
{
$qry .= "
AND tbl_studiengang.studiengang_kz = ". $this->db_add_param($studiengang_kz);
}
$qry .= "
-- Order to get the very last status and highest prio on top
ORDER BY
priorisierung NULLS LAST,
prestudent_id,
datum DESC,
@@ -481,6 +500,8 @@ class prestudent extends person
";
}
//echo "<br>". $qry;
if($this->db_query($qry))
{
while($row = $this->db_fetch_object())
@@ -490,6 +511,8 @@ class prestudent extends person
$obj->prestudent_id = $row->prestudent_id;
$obj->studienplan_id = $row->studienplan_id;
$obj->studiengang_kz = $row->studiengang_kz;
$obj->typ = $row->typ;
$obj->typ_bz = $row->typ_bz;
$obj->ausbildungssemester = $row->ausbildungssemester;
$this->result[] = $obj;