mirror of
https://github.com/FH-Complete/FHC-Core.git
synced 2026-07-26 09:04:28 +00:00
Cleanup
This commit is contained in:
+125
-132
@@ -24,7 +24,7 @@ require_once(dirname(__FILE__).'/benutzer.class.php');
|
|||||||
class student extends benutzer
|
class student extends benutzer
|
||||||
{
|
{
|
||||||
|
|
||||||
//Tabellenspalten
|
//Tabellenspalten
|
||||||
public $matrikelnr;
|
public $matrikelnr;
|
||||||
public $prestudent_id;
|
public $prestudent_id;
|
||||||
public $studiengang_kz;
|
public $studiengang_kz;
|
||||||
@@ -189,8 +189,8 @@ class student extends benutzer
|
|||||||
{
|
{
|
||||||
//Neuen Datensatz anlegen
|
//Neuen Datensatz anlegen
|
||||||
$qry = "INSERT INTO public.tbl_student(student_uid, matrikelnr, updateamum, updatevon, prestudent_id,
|
$qry = "INSERT INTO public.tbl_student(student_uid, matrikelnr, updateamum, updatevon, prestudent_id,
|
||||||
studiengang_kz, semester, verband, gruppe, insertamum, insertvon)
|
studiengang_kz, semester, verband, gruppe, insertamum, insertvon)
|
||||||
VALUES(".$this->db_add_param($this->uid).",".
|
VALUES(".$this->db_add_param($this->uid).",".
|
||||||
$this->db_add_param($this->matrikelnr).",".
|
$this->db_add_param($this->matrikelnr).",".
|
||||||
$this->db_add_param($this->updateamum).','.
|
$this->db_add_param($this->updateamum).','.
|
||||||
$this->db_add_param($this->updatevon).','.
|
$this->db_add_param($this->updatevon).','.
|
||||||
@@ -206,14 +206,14 @@ class student extends benutzer
|
|||||||
{
|
{
|
||||||
//Bestehenden Datensatz updaten
|
//Bestehenden Datensatz updaten
|
||||||
$qry = 'UPDATE public.tbl_student SET'.
|
$qry = 'UPDATE public.tbl_student SET'.
|
||||||
' matrikelnr='.$this->db_add_param($this->matrikelnr).','.
|
' matrikelnr='.$this->db_add_param($this->matrikelnr).','.
|
||||||
' updateamum='.$this->db_add_param($this->updateamum).','.
|
' updateamum='.$this->db_add_param($this->updateamum).','.
|
||||||
' updatevon='.$this->db_add_param($this->updatevon).','.
|
' updatevon='.$this->db_add_param($this->updatevon).','.
|
||||||
' studiengang_kz='.$this->db_add_param($this->studiengang_kz).','.
|
' studiengang_kz='.$this->db_add_param($this->studiengang_kz).','.
|
||||||
' semester='.$this->db_add_param($this->semester).','.
|
' semester='.$this->db_add_param($this->semester).','.
|
||||||
' verband='.$this->db_add_param(($this->verband==''?' ':$this->verband)).','.
|
' verband='.$this->db_add_param(($this->verband==''?' ':$this->verband)).','.
|
||||||
' gruppe='.$this->db_add_param(($this->gruppe==''?' ':$this->gruppe)).
|
' gruppe='.$this->db_add_param(($this->gruppe==''?' ':$this->gruppe)).
|
||||||
" WHERE student_uid=".$this->db_add_param($this->uid).";";
|
" WHERE student_uid=".$this->db_add_param($this->uid).";";
|
||||||
}
|
}
|
||||||
|
|
||||||
if($this->db_query($qry))
|
if($this->db_query($qry))
|
||||||
@@ -270,7 +270,7 @@ class student extends benutzer
|
|||||||
if($gruppe!=null)
|
if($gruppe!=null)
|
||||||
$sql_query.= ",public.tbl_benutzergruppe";
|
$sql_query.= ",public.tbl_benutzergruppe";
|
||||||
$sql_query.= " WHERE tbl_prestudent.prestudent_id=tbl_student.prestudent_id AND tbl_person.person_id=tbl_benutzer.person_id AND tbl_benutzer.uid = tbl_student.student_uid AND tbl_studentlehrverband.student_uid=tbl_student.student_uid AND $where ORDER BY nachname, vorname";
|
$sql_query.= " WHERE tbl_prestudent.prestudent_id=tbl_student.prestudent_id AND tbl_person.person_id=tbl_benutzer.person_id AND tbl_benutzer.uid = tbl_student.student_uid AND tbl_studentlehrverband.student_uid=tbl_student.student_uid AND $where ORDER BY nachname, vorname";
|
||||||
//echo $sql_query;
|
|
||||||
if(!$this->db_query($sql_query))
|
if(!$this->db_query($sql_query))
|
||||||
{
|
{
|
||||||
$this->errormsg=$this->db_last_error();
|
$this->errormsg=$this->db_last_error();
|
||||||
@@ -325,60 +325,53 @@ class student extends benutzer
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Gibt Studenten zurück die im übergebenen Studiengang und semester sind
|
* Gibt Studenten zurück die im übergebenen Studiengang und semester sind
|
||||||
* @param $studiengang_kz
|
* @param $studiengang_kz
|
||||||
* @param $semester
|
* @param $semester
|
||||||
* @return boolean
|
* @return boolean
|
||||||
*/
|
*/
|
||||||
public function getStudentsStudiengang($studiengang_kz, $semester = null)
|
public function getStudentsStudiengang($studiengang_kz, $semester = null)
|
||||||
{
|
{
|
||||||
/*
|
$qry = "SELECT * FROM public.tbl_student
|
||||||
if($studiengang_kz == '')
|
JOIN public.tbl_benutzer ON (student_uid = uid)
|
||||||
{
|
JOIN public.tbl_person USING (person_id)
|
||||||
$this->errormsg ="Es wurde kein Studiengang übergeben";
|
WHERE tbl_benutzer.aktiv = 'true'";
|
||||||
return false;
|
|
||||||
}
|
|
||||||
*/
|
|
||||||
$qry = "SELECT * FROM public.tbl_student
|
|
||||||
JOIN public.tbl_benutzer ON (student_uid = uid)
|
|
||||||
JOIN public.tbl_person USING (person_id)
|
|
||||||
WHERE tbl_benutzer.aktiv = 'true'";
|
|
||||||
if($studiengang_kz!='')
|
if($studiengang_kz!='')
|
||||||
$qry.=" AND studiengang_kz =".$this->db_add_param($studiengang_kz,FHC_INTEGER);
|
$qry.=" AND studiengang_kz =".$this->db_add_param($studiengang_kz,FHC_INTEGER);
|
||||||
|
|
||||||
if($semester != null)
|
if($semester != null)
|
||||||
$qry .= " AND semester =".$this->db_add_param($semester, FHC_INTEGER);
|
$qry .= " AND semester =".$this->db_add_param($semester, FHC_INTEGER);
|
||||||
$qry.=" ORDER BY nachname, vorname";
|
$qry.=" ORDER BY nachname, vorname";
|
||||||
|
|
||||||
|
|
||||||
if($result = $this->db_query($qry))
|
if($result = $this->db_query($qry))
|
||||||
{
|
{
|
||||||
while($row = $this->db_fetch_object($result))
|
while($row = $this->db_fetch_object($result))
|
||||||
{
|
{
|
||||||
$stud = new student();
|
$stud = new student();
|
||||||
$stud->uid = $row->student_uid;
|
$stud->uid = $row->student_uid;
|
||||||
$stud->matrikelnr = $row->matrikelnr;
|
$stud->matrikelnr = $row->matrikelnr;
|
||||||
$stud->prestudent_id = $row->prestudent_id;
|
$stud->prestudent_id = $row->prestudent_id;
|
||||||
$stud->studiengang_kz = $row->studiengang_kz;
|
$stud->studiengang_kz = $row->studiengang_kz;
|
||||||
$stud->semester = $row->semester;
|
$stud->semester = $row->semester;
|
||||||
$stud->verband = $row->verband;
|
$stud->verband = $row->verband;
|
||||||
$stud->gruppe = $row->gruppe;
|
$stud->gruppe = $row->gruppe;
|
||||||
$stud->person_id = $row->person_id;
|
$stud->person_id = $row->person_id;
|
||||||
$stud->vorname = $row->vorname;
|
$stud->vorname = $row->vorname;
|
||||||
$stud->nachname = $row->nachname;
|
$stud->nachname = $row->nachname;
|
||||||
$stud->gebdatum = $row->gebdatum;
|
$stud->gebdatum = $row->gebdatum;
|
||||||
|
|
||||||
$this->result[] = $stud;
|
$this->result[] = $stud;
|
||||||
}
|
}
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
$this->errormsg = "Fehler bei der Abfrage aufgetreten";
|
$this->errormsg = "Fehler bei der Abfrage aufgetreten";
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Prueft ob die StudentLehrverband Zuteilung
|
* Prueft ob die StudentLehrverband Zuteilung
|
||||||
@@ -690,55 +683,55 @@ class student extends benutzer
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Laedt alle Incoming
|
* Laedt alle Incoming
|
||||||
* @return boolean
|
* @return boolean
|
||||||
*/
|
*/
|
||||||
public function getIncoming()
|
public function getIncoming()
|
||||||
{
|
{
|
||||||
$qry = "
|
$qry = "
|
||||||
SELECT
|
SELECT
|
||||||
distinct tbl_student.*, tbl_benutzer.*, tbl_person.*
|
distinct tbl_student.*, tbl_benutzer.*, tbl_person.*
|
||||||
FROM
|
FROM
|
||||||
public.tbl_student
|
public.tbl_student
|
||||||
JOIN public.tbl_benutzer ON (student_uid = uid)
|
JOIN public.tbl_benutzer ON (student_uid = uid)
|
||||||
JOIN public.tbl_person USING (person_id)
|
JOIN public.tbl_person USING (person_id)
|
||||||
JOIN public.tbl_prestudent USING (prestudent_id)
|
JOIN public.tbl_prestudent USING (prestudent_id)
|
||||||
JOIN public.tbl_prestudentstatus USING(prestudent_id)
|
JOIN public.tbl_prestudentstatus USING(prestudent_id)
|
||||||
WHERE
|
WHERE
|
||||||
tbl_benutzer.aktiv AND
|
tbl_benutzer.aktiv AND
|
||||||
tbl_prestudentstatus.status_kurzbz='Incoming'
|
tbl_prestudentstatus.status_kurzbz='Incoming'
|
||||||
";
|
";
|
||||||
|
|
||||||
if($result = $this->db_query($qry))
|
if($result = $this->db_query($qry))
|
||||||
{
|
{
|
||||||
while($row = $this->db_fetch_object($result))
|
while($row = $this->db_fetch_object($result))
|
||||||
{
|
{
|
||||||
$stud = new student();
|
$stud = new student();
|
||||||
$stud->uid = $row->student_uid;
|
$stud->uid = $row->student_uid;
|
||||||
$stud->matrikelnr = $row->matrikelnr;
|
$stud->matrikelnr = $row->matrikelnr;
|
||||||
$stud->prestudent_id = $row->prestudent_id;
|
$stud->prestudent_id = $row->prestudent_id;
|
||||||
$stud->studiengang_kz = $row->studiengang_kz;
|
$stud->studiengang_kz = $row->studiengang_kz;
|
||||||
$stud->semester = $row->semester;
|
$stud->semester = $row->semester;
|
||||||
$stud->verband = $row->verband;
|
$stud->verband = $row->verband;
|
||||||
$stud->gruppe = $row->gruppe;
|
$stud->gruppe = $row->gruppe;
|
||||||
$stud->person_id = $row->person_id;
|
$stud->person_id = $row->person_id;
|
||||||
$stud->vorname = $row->vorname;
|
$stud->vorname = $row->vorname;
|
||||||
$stud->nachname = $row->nachname;
|
$stud->nachname = $row->nachname;
|
||||||
$stud->gebdatum = $row->gebdatum;
|
$stud->gebdatum = $row->gebdatum;
|
||||||
|
|
||||||
$this->result[] = $stud;
|
$this->result[] = $stud;
|
||||||
}
|
}
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
$this->errormsg = "Fehler bei der Abfrage aufgetreten";
|
$this->errormsg = "Fehler bei der Abfrage aufgetreten";
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public function getStudentUidsForMeldung($studiensemester1, $studiensemester2, $studiensemester3, $zeitraumStart, $zeitraumEnde)
|
public function getStudentUidsForMeldung($studiensemester1, $studiensemester2, $studiensemester3, $zeitraumStart, $zeitraumEnde)
|
||||||
{
|
{
|
||||||
$qry = "SELECT DISTINCT ON(student_uid)* FROM public.tbl_student
|
$qry = "SELECT DISTINCT ON(student_uid)* FROM public.tbl_student
|
||||||
JOIN public.tbl_benutzer ON(student_uid = uid)
|
JOIN public.tbl_benutzer ON(student_uid = uid)
|
||||||
JOIN public.tbl_person USING(person_id)
|
JOIN public.tbl_person USING(person_id)
|
||||||
@@ -764,19 +757,19 @@ class student extends benutzer
|
|||||||
return $uids;
|
return $uids;
|
||||||
}
|
}
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Löscht die Zuordnung eines Studenten zu einer Lehrverbandsgruppe
|
* Löscht die Zuordnung eines Studenten zu einer Lehrverbandsgruppe
|
||||||
* @param type $uid
|
* @param type $uid
|
||||||
* @param type $studiengang_kz
|
* @param type $studiengang_kz
|
||||||
* @param type $studiensemester
|
* @param type $studiensemester
|
||||||
* @param type $semester
|
* @param type $semester
|
||||||
* @param type $verband
|
* @param type $verband
|
||||||
* @param type $gruppe
|
* @param type $gruppe
|
||||||
*/
|
*/
|
||||||
public function delete_studentLehrverband($uid, $studiengang_kz, $studiensemester, $semester)
|
public function delete_studentLehrverband($uid, $studiengang_kz, $studiensemester, $semester)
|
||||||
{
|
{
|
||||||
$qry = 'DELETE FROM public.tbl_studentlehrverband '
|
$qry = 'DELETE FROM public.tbl_studentlehrverband '
|
||||||
. 'WHERE student_uid='.$this->db_add_param($uid)
|
. 'WHERE student_uid='.$this->db_add_param($uid)
|
||||||
. ' AND studiensemester_kurzbz='.$this->db_add_param($studiensemester)
|
. ' AND studiensemester_kurzbz='.$this->db_add_param($studiensemester)
|
||||||
@@ -792,7 +785,7 @@ class student extends benutzer
|
|||||||
$this->errormsg = 'StudentLehrverband konnte nicht gelöscht werden.';
|
$this->errormsg = 'StudentLehrverband konnte nicht gelöscht werden.';
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Lädt alle LV eines Studenten für ein Semester (standardmäßig aktuelles Semester)
|
* Lädt alle LV eines Studenten für ein Semester (standardmäßig aktuelles Semester)
|
||||||
@@ -816,18 +809,18 @@ class student extends benutzer
|
|||||||
. 'AND studiensemester_kurzbz = ' . $this->db_add_param($studiensemester)
|
. 'AND studiensemester_kurzbz = ' . $this->db_add_param($studiensemester)
|
||||||
. ' ORDER BY bezeichnung';
|
. ' ORDER BY bezeichnung';
|
||||||
|
|
||||||
if($result = $this->db_query($qry))
|
if($result = $this->db_query($qry))
|
||||||
{
|
{
|
||||||
while($row = $this->db_fetch_object($result))
|
while($row = $this->db_fetch_object($result))
|
||||||
{
|
{
|
||||||
$this->result[] = $row;
|
$this->result[] = $row;
|
||||||
}
|
}
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
$this->errormsg = "Fehler bei der Abfrage aufgetreten";
|
$this->errormsg = "Fehler bei der Abfrage aufgetreten";
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user