diff --git a/cis/private/lehre/anwesenheitsliste.pdf.php b/cis/private/lehre/anwesenheitsliste.pdf.php index f893a18a0..5b2a680d8 100644 --- a/cis/private/lehre/anwesenheitsliste.pdf.php +++ b/cis/private/lehre/anwesenheitsliste.pdf.php @@ -297,7 +297,8 @@ $pdf->SetFont('Arial','',8); $qry = "SELECT distinct vorname, nachname, matrikelnr, - tbl_studentlehrverband.semester, tbl_studentlehrverband.verband, tbl_studentlehrverband.gruppe + tbl_studentlehrverband.semester, tbl_studentlehrverband.verband, tbl_studentlehrverband.gruppe, + (SELECT rolle_kurzbz FROM public.tbl_prestudentrolle WHERE prestudent_id=tbl_student.prestudent_id ORDER BY datum DESC, insertamum DESC, ext_id DESC LIMIT 1) as status FROM campus.vw_student_lehrveranstaltung JOIN public.tbl_benutzer USING(uid) JOIN public.tbl_person USING(person_id) JOIN public.tbl_student ON(uid=student_uid) @@ -340,7 +341,11 @@ if($result = pg_query($conn, $qry)) $pdf->MultiCell(130,$lineheight,$elem->nachname,1,'L',1); $pdf->SetFont('Arial','',8); $pdf->SetXY($maxX+strlen($elem->nachname)*5+1,$maxY); - $pdf->MultiCell(130,$lineheight,$elem->vorname,0,'L',0); + if($elem->status=='Incoming') + $inc=' (i)'; + else + $inc=''; + $pdf->MultiCell(130,$lineheight,$elem->vorname.$inc,0,'L',0); $maxX +=130; $pdf->SetXY($maxX,$maxY); $pdf->SetFont('Arial','',8); @@ -369,6 +374,12 @@ if($result = pg_query($conn, $qry)) $inhalt[]=array($i,$elem->nachname.' '.$elem->vorname,trim($elem->matrikelnr),$elem->semester.$elem->verband.$elem->gruppe,'','','','','',''); } } +//Fussnote +$maxY=$pdf->GetY()+5; +$maxX=30; +$pdf->SetXY($maxX,$maxY); +$pdf->SetFont('Arial','',8); +$pdf->MultiCell(520,$lineheight,'(i) ... Incoming',0,'L',0); //FHStg $maxY=$pdf->GetY()+5; diff --git a/cis/private/lehre/notenliste.xls.php b/cis/private/lehre/notenliste.xls.php index 92aab3e9d..5d3a46af8 100644 --- a/cis/private/lehre/notenliste.xls.php +++ b/cis/private/lehre/notenliste.xls.php @@ -149,7 +149,8 @@ if (!$conn = pg_pconnect(CONN_STRING)) $qry = "SELECT distinct vorname, nachname, matrikelnr, student_uid as uid, - tbl_studentlehrverband.semester, tbl_studentlehrverband.verband, tbl_studentlehrverband.gruppe + tbl_studentlehrverband.semester, tbl_studentlehrverband.verband, tbl_studentlehrverband.gruppe, + (SELECT rolle_kurzbz FROM public.tbl_prestudentrolle WHERE prestudent_id=tbl_student.prestudent_id ORDER BY datum DESC, insertamum DESC, ext_id DESC LIMIT 1) as status FROM campus.vw_student_lehrveranstaltung JOIN public.tbl_benutzer USING(uid) JOIN public.tbl_person USING(person_id) JOIN public.tbl_student ON(uid=student_uid) @@ -173,7 +174,11 @@ if (!$conn = pg_pconnect(CONN_STRING)) if(!preg_match('*dummy*',$elem->uid) && $elem->semester!=10) { $worksheet->write($lines,0,$i); - $worksheet->write($lines,1,$elem->nachname); + if($elem->status=='Incoming') + $inc=' (i)'; + else + $inc=''; + $worksheet->write($lines,1,$elem->nachname.$inc); $worksheet->write($lines,2,$elem->vorname); $worksheet->write($lines,3,$elem->semester.$elem->verband.$elem->gruppe); $worksheet->write($lines,4,'="'.trim($elem->matrikelnr).'"'); @@ -189,6 +194,8 @@ if (!$conn = pg_pconnect(CONN_STRING)) $worksheet->write(++$lines,0,'5-Nicht Genügend, 6-Angerechnet, 7-nicht beurteilt,'); $worksheet->write(++$lines,0,'8-teilgenommen, 9-noch nicht eingetragen, 10-bestanden,'); $worksheet->write(++$lines,0,'11-approbiert, 12-erfolgreich absolviert, 13-nicht erfolgreich absolviert'); + $lines++; + $worksheet->write(++$lines,0,'(i) ... Incoming'); $worksheet->setColumn(0, 0, 5); $worksheet->setColumn(1, 1, 25); diff --git a/content/betriebsmitteloverlay.js.php b/content/betriebsmitteloverlay.js.php index 7b03ec72a..d8412e67b 100644 --- a/content/betriebsmitteloverlay.js.php +++ b/content/betriebsmitteloverlay.js.php @@ -388,4 +388,5 @@ function BetriebsmittelNeu() BetriebsmittelDetailResetFields(); document.getElementById('betriebsmittel-textbox-person_id').value = BetriebsmittelPerson_id; document.getElementById('betriebsmittel-textbox-ausgegebenam').value=tag+'.'+monat+'.'+jahr; + document.getElementById('betriebsmittel-textbox-kaution').value = '0.0'; } \ No newline at end of file diff --git a/content/fas.xul.php b/content/fas.xul.php index b20024c60..c97061c02 100644 --- a/content/fas.xul.php +++ b/content/fas.xul.php @@ -25,6 +25,7 @@ require_once('../vilesci/config.inc.php'); require_once('../include/functions.inc.php'); require_once('../include/fas/benutzer.class.php'); require_once('../include/benutzerberechtigung.class.php'); +require_once('../include/studiensemester.class.php'); // Testumgebung $user=get_uid(); @@ -269,6 +270,27 @@ echo ''; accesskey = "&menu-dokumente-diplsupplement.accesskey;"/> + getPrevious(); + echo ' + + + + + + '; + ?> content/pdfExport.php?xml=studienerfolg.rdf.php&xsl=Studienerfolg&uid='+paramList+'&ss='+getStudiensemester()+'&typ='+finanzamt,'DiplomaSupplement', 'height=200,width=350,left=0,top=0,hotkeys=0,resizable=yes,status=no,scrollbars=yes,toolbar=no,location=no,menubar=no,dependent=yes'); + window.open('content/pdfExport.php?xml=studienerfolg.rdf.php&xsl=Studienerfolg&uid='+paramList+'&ss='+studiensemester+'&typ='+finanzamt,'DiplomaSupplement', 'height=200,width=350,left=0,top=0,hotkeys=0,resizable=yes,status=no,scrollbars=yes,toolbar=no,location=no,menubar=no,dependent=yes'); } \ No newline at end of file diff --git a/include/studiensemester.class.php b/include/studiensemester.class.php index f1d26fd57..69f1e890d 100644 --- a/include/studiensemester.class.php +++ b/include/studiensemester.class.php @@ -351,5 +351,30 @@ class studiensemester return true; } + + // **** + // * Liefert das vorige Studiensemester + // **** + function getPrevious() + { + $qry = "SELECT studiensemester_kurzbz FROM public.tbl_studiensemester WHERE endeconn, $qry)) + { + if($row = pg_fetch_object($result)) + { + return $row->studiensemester_kurzbz; + } + else + { + $this->errormsg = 'Es wurde kein vorangegangenes Studiensemester gefunden'; + return false; + } + } + else + { + $this->errormsg = 'Fehler beim Ermitteln des vorangegangenen Studiensemesters'; + } + } } ?> \ No newline at end of file