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

rt login fixed bei zwei rts

Browse Source
This commit is contained in:
ma0048
2022-01-27 10:41:41 +01:00
parent f82315cfe7
commit f8d01b0866
2 changed files with 11 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cis/testtool/login.php
+2 -3
View File
@@ -132,7 +132,7 @@ if (isset($_REQUEST['prestudent']))
}
else
{
if ($rt->getReihungstestPersonDatum($ps->prestudent_id, $ps->studiengang_kz, date('Y-m-d')))
if ($rt->getReihungstestPersonDatum($ps->prestudent_id, date('Y-m-d')))
{
// TODO Was ist wenn da mehrere Zurueckkommen?!
if (isset($rt->result[0]))
@@ -149,7 +149,6 @@ if (isset($_REQUEST['prestudent']))
}
if ($reihungstest_id != '' && $rt->load($reihungstest_id))
{
if ($rt->freigeschaltet)
{
// regenerate Session ID after Login
@@ -700,7 +699,7 @@ else // LOGIN Site (vor Login)
else
$selected='';
echo '
<OPTION value="'.$prestd->prestudent_id.'" data-stg="' . $prestd->studiengang_kz .'"'.$selected.'>'.$prestd->nachname.' '.$prestd->vorname.' ('.(strtoupper($stg->typ.$stg->kurzbz)).')</OPTION>\n';
<OPTION value="'.$prestd->prestudent_id.'" '.$selected.'>'.$prestd->nachname.' '.$prestd->vorname.' ('.(strtoupper($stg->typ.$stg->kurzbz)).')</OPTION>\n';
}
// An der FHTW gibt es 3 Testuser für den Camus International
if (CAMPUS_NAME == 'FH Technikum Wien')
include/reihungstest.class.php
+9 -11
View File
@@ -1245,18 +1245,16 @@ class reihungstest extends basis_db
* @param date $datum Datum an dem der Reihugnstest stattfindet.
* @return boolean true wenn erfolgreich geladen, false im Fehlerfall
*/
public function getReihungstestPersonDatum($prestudent_id, $studiengang_kz,$datum)
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.studiengang_kz = ". $this->db_add_param($studiengang_kz) ."
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 pss.studienplan_id = rt_person.studienplan_id AND ps.person_id = rt_person.person_id
JOIN tbl_reihungstest rt ON rt_person.rt_id = rt.reihungstest_id
WHERE ps.prestudent_id = ".$this->db_add_param($prestudent_id)."
AND rt.datum=".$this->db_add_param($datum);
if ($result = $this->db_query($qry))
{
while ($row = $this->db_fetch_object($result))