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

Merge branch 'master' into feature-17517/AdaptierungenZeiterfassungenSprint177

Browse Source
This commit is contained in:
Andreas Österreicher
2022-03-04 15:03:03 +01:00
parent 6e6ed893e4 acf32ffc39
commit 418f2aee7b
34 changed files with 1231 additions and 369 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/reihungstest.class.php
+10 -9
View File
@@ -1247,15 +1247,16 @@ class reihungstest extends basis_db
*/
public function getReihungstestPersonDatum($prestudent_id, $datum)
{
$qry = "SELECT
tbl_rt_person.*
FROM
public.tbl_rt_person
JOIN public.tbl_prestudent USING(person_id)
JOIN public.tbl_reihungstest ON(tbl_reihungstest.reihungstest_id=tbl_rt_person.rt_id)
WHERE
tbl_prestudent.prestudent_id = ".$this->db_add_param($prestudent_id)."
AND tbl_reihungstest.datum=".$this->db_add_param($datum);
$qry = "SELECT rt_person.*
FROM tbl_prestudent ps
JOIN tbl_prestudentstatus pss ON ps.prestudent_id = pss.prestudent_id
JOIN tbl_rt_person rt_person ON ps.person_id = rt_person.person_id
JOIN tbl_reihungstest rt ON rt_person.rt_id = rt.reihungstest_id
JOIN tbl_rt_studienplan rtstp ON rt.reihungstest_id = rtstp.reihungstest_id
WHERE ps.prestudent_id = ".$this->db_add_param($prestudent_id)."
AND rtstp.studienplan_id = pss.studienplan_id
AND rt.datum=".$this->db_add_param($datum);
if ($result = $this->db_query($qry))
{
while ($row = $this->db_fetch_object($result))