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

- Incomming Verwaltung

Browse Source 
- Status kann jetzt editiert werden
- Studienerfolg zeigt nun keine negativen Noten mehr an und berücksichtigt das Attribut zeugnis
- im Lektor Tab werden nun auch die inaktiven Studiengaenge richtig dargestellt
This commit is contained in:
Andreas Österreicher
2007-08-17 13:43:57 +00:00
parent abbcbd366f
commit 8e0967b9f6
16 changed files with 625 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/prestudent.class.php
+17 -8
View File
@@ -340,7 +340,7 @@ class prestudent extends person
// ********
// * Laedt die Rolle(n) eines Prestudenten
// ********
function getPrestudentRolle($prestudent_id, $rolle_kurzbz=null, $studiensemester_kurzbz=null, $order="datum, insertamum")
function getPrestudentRolle($prestudent_id, $rolle_kurzbz=null, $studiensemester_kurzbz=null, $order="datum, insertamum", $ausbildungssemester=null)
{
if(!is_numeric($prestudent_id))
{
@@ -353,6 +353,8 @@ class prestudent extends person
$qry.= " AND rolle_kurzbz='".addslashes($rolle_kurzbz)."'";
if($studiensemester_kurzbz!=null)
$qry.= " AND studiensemester_kurzbz='".addslashes($studiensemester_kurzbz)."'";
if($ausbildungssemester!=null)
$qry.= " AND ausbildungssemester='".addslashes($ausbildungssemester)."'";
$qry.= ' ORDER BY '.$order;
if($result = pg_query($this->conn, $qry))
@@ -385,7 +387,7 @@ class prestudent extends person
// ********
// * Laedt die Rolle(n) eines Prestudenten
// ********
function load_rolle($prestudent_id, $rolle_kurzbz, $studiensemester_kurzbz)
function load_rolle($prestudent_id, $rolle_kurzbz, $studiensemester_kurzbz, $ausbildungssemester)
{
if(!is_numeric($prestudent_id))
{
@@ -395,7 +397,8 @@ class prestudent extends person
$qry = "SELECT * FROM public.tbl_prestudentrolle WHERE prestudent_id='$prestudent_id'".
" AND rolle_kurzbz='".addslashes($rolle_kurzbz)."'".
" AND studiensemester_kurzbz='".addslashes($studiensemester_kurzbz)."'";
" AND studiensemester_kurzbz='".addslashes($studiensemester_kurzbz)."'".
" AND ausbildungssemester='".addslashes($ausbildungssemester)."'";
if($result = pg_query($this->conn, $qry))
{
@@ -620,10 +623,16 @@ class prestudent extends person
}
else
{
if($this->studiensemester_old=='')
$this->studiensemester_old = $this->studiensemester_kurzbz;
if($this->ausbildungssemester_old=='')
$this->ausbildungssemester_old = $this->ausbildungssemester;
$qry = 'UPDATE public.tbl_prestudentrolle SET'.
' ausbildungssemester='.$this->addslashes($this->ausbildungssemester).",".
' datum='.$this->addslashes($this->datum).",".
" WHERE prestudent_id='".addslashes($this->prestudent_id)."' AND rolle_kurzbz='".addslashes($this->rolle_kurzbz)."' AND studiensemester_kurzbz='".addslashes($this->studiensemester_kurzbz)."';";
' studiensemester_kurzbz='.$this->addslashes($this->studiensemester_kurzbz).",".
' datum='.$this->addslashes($this->datum).
" WHERE prestudent_id='".addslashes($this->prestudent_id)."' AND rolle_kurzbz='".addslashes($this->rolle_kurzbz)."' AND studiensemester_kurzbz='".addslashes($this->studiensemester_old)."' AND ausbildungssemester='".addslashes($this->ausbildungssemester_old)."';";
}
if(pg_query($this->conn,$qry))
@@ -645,7 +654,7 @@ class prestudent extends person
// * $studiensemester_kurzbz
// * @return true wenn ok, false wenn Fehler
// ******************************************
function delete_rolle($prestudent_id, $rolle_kurzbz, $studiensemester_kurzbz)
function delete_rolle($prestudent_id, $rolle_kurzbz, $studiensemester_kurzbz, $ausbildungssemester)
{
if(!is_numeric($prestudent_id))
{
@@ -653,8 +662,8 @@ class prestudent extends person
return false;
}
$qry = "DELETE FROM public.tbl_prestudentrolle WHERE prestudent_id='$prestudent_id' AND rolle_kurzbz='".addslashes($rolle_kurzbz)."' AND studiensemester_kurzbz='".addslashes($studiensemester_kurzbz)."'";
if($this->load_rolle($prestudent_id, $rolle_kurzbz, $studiensemester_kurzbz))
$qry = "DELETE FROM public.tbl_prestudentrolle WHERE prestudent_id='$prestudent_id' AND rolle_kurzbz='".addslashes($rolle_kurzbz)."' AND studiensemester_kurzbz='".addslashes($studiensemester_kurzbz)."' AND ausbildungssemester='".addslashes($ausbildungssemester)."'";
if($this->load_rolle($prestudent_id, $rolle_kurzbz, $studiensemester_kurzbz, $ausbildungssemester))
{
pg_query($this->conn, 'BEGIN;');
include/wochenplan.class.php
+12 -12
View File
@@ -331,7 +331,7 @@ class wochenplan
{
echo '<TABLE width="100%" bgcolor="#EEEEEE" border="0" cellspacing="0">'.$this->crlf;
echo ' <TR>'.$this->crlf;
echo ' <TD valign="bottom">'.$this->crlf;
echo ' <TD valign="bottom">'.$this->crlf;
echo ' <P valign="top">';
if ($this->type=='student' || $this->type=='lektor')
echo '<strong>Person: </strong>'.$this->pers_titelpre.' '.$this->pers_vorname.' '.$this->pers_nachname.' - '.$this->pers_uid.'<br>';
@@ -347,7 +347,7 @@ class wochenplan
}
if ($this->type=='ort')
echo '<strong>Ort: </strong>'.$this->ort_kurzbz.' - '.$this->ort_bezeichnung.'<br>';
echo '</P>'.$this->crlf;
echo '</P>'.$this->crlf;
echo ' <div valign="bottom" align="center">'.$this->crlf;
//Kalender
@@ -368,7 +368,7 @@ class wochenplan
echo ' <A href="'.$kal_link_ss.'&format=csv&target=outlook" title="CSV-Outlook"><IMG src="../../../skin/images/outlook.png" height="24" alt="CSV-Outlook" border="0"></A>'.$this->crlf;
echo ' <A href="'.$kal_link_ss.'&format=ical&version=1&target=ical" title="iCal Version 1.0"><IMG src="../../../skin/images/vcal_v1.png" height="24" alt="iCal Version 1.0" border="0"></A>'.$this->crlf;
echo ' <A href="'.$kal_link_ss.'&format=ical&version=2&target=ical" title="iCal Version 2.0"><IMG src="../../../skin/images/vcal_v2.png" height="24" alt="iCal Version 2.0" border="0"></A>'.$this->crlf;
echo ' </div>'.$this->crlf;
echo ' </div>'.$this->crlf;
echo ' </TD>'.$this->crlf;
// Kalenderjump
@@ -403,13 +403,13 @@ class wochenplan
$next_ort=pg_fetch_object($result_ort,$i);
// Ort Jump
echo '<FORM align="center" name="AuswahlOrt" action="stpl_week.php">'.$this->crlf;
echo '<FORM align="center" name="AuswahlOrt" action="stpl_week.php">'.$this->crlf;
echo ' <p align="center">'.$this->crlf;
//$datum=mktime($this->datum[hours], $this->datum[minutes], $this->datum[seconds], $this->datum[mon], $this->datum[mday], $this->datum[year]);
if (isset($prev_ort))
{
echo ' <a href="stpl_week.php?type='.$this->type.'&datum='.$this->datum.'&ort_kurzbz='.$prev_ort->ort_kurzbz.'">'.$this->crlf;
echo ' <img src="../../../skin/images/left.gif" border="0" title="'.$prev_ort->ort_kurzbz.'" />'.$this->crlf;
echo ' <a href="stpl_week.php?type='.$this->type.'&datum='.$this->datum.'&ort_kurzbz='.$prev_ort->ort_kurzbz.'">'.$this->crlf;
echo ' <img src="../../../skin/images/left.gif" border="0" title="'.$prev_ort->ort_kurzbz.'" />'.$this->crlf;
echo ' </a>'.$this->crlf;
}
echo " <SELECT name=\"select\" onChange=\"MM_jumpMenu('self',this,0)\" class=\"xxxs_black\">".$this->crlf;
@@ -424,8 +424,8 @@ class wochenplan
echo ' </SELECT>'.$this->crlf;
if (isset($next_ort))
{
echo ' <a href="stpl_week.php?type='.$this->type.'&datum='.$this->datum.'&ort_kurzbz='.$next_ort->ort_kurzbz.'">'.$this->crlf;
echo ' <img src="../../../skin/images/right.gif" border="0" title="'.$next_ort->ort_kurzbz.'">'.$this->crlf;
echo ' <a href="stpl_week.php?type='.$this->type.'&datum='.$this->datum.'&ort_kurzbz='.$next_ort->ort_kurzbz.'">'.$this->crlf;
echo ' <img src="../../../skin/images/right.gif" border="0" title="'.$next_ort->ort_kurzbz.'">'.$this->crlf;
echo ' </a>'.$this->crlf;
}
echo ' </p>';
@@ -433,8 +433,8 @@ class wochenplan
}
echo ' <p align="center">';
// 4 Wochen zurueck
echo ' <a href="stpl_week.php?type='.$this->type.$link_parameter.'&datum='.$this->datum_prev4week.'">'.$this->crlf;
echo ' <img src="../../../skin/images/moreleft.gif" border="0" title="4 Wochen zurueck">'.$this->crlf;
echo ' <a href="stpl_week.php?type='.$this->type.$link_parameter.'&datum='.$this->datum_prev4week.'">'.$this->crlf;
echo ' <img src="../../../skin/images/moreleft.gif" border="0" title="4 Wochen zurueck">'.$this->crlf;
echo ' </a>';
// 1 Woche zurueck
echo '<a href="stpl_week.php?type='.$this->type;
@@ -458,7 +458,7 @@ class wochenplan
/**************************************************************************
* Zeichnen der Stundenplanwoche in HTML
*/
function draw_week($user_uid)
function draw_week($user_uid='')
{
// Stundentafel abfragen
$sql_query="SELECT stunde, beginn, ende FROM lehre.tbl_stunde ORDER BY stunde";
@@ -1599,4 +1599,4 @@ class wochenplan
}
?>
?>