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

Browse Source
This commit is contained in:
Andreas Österreicher
2008-10-03 09:29:26 +00:00
parent e8f5d3f2a0
commit 46d87c4803
8 changed files with 335 additions and 320 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/tw/anwesenheitsliste.inc.php
+26 -7
View File
@@ -240,25 +240,35 @@ $pdf->SetFont('Arial','',8);
$maxX +=40;
$pdf->SetXY($maxX,$maxY);
$pdf->MultiCell(40,$lineheight,'',1,'L',0);
$stsem_obj = new studiensemester($conn);
$stsem_obj->load($stsem);
$stsemdatumvon = $stsem_obj->start;
$stsemdatumbis = $stsem_obj->ende;
$qry = "SELECT
distinct vorname, nachname, matrikelnr,
distinct on(nachname, vorname, person_id) vorname, nachname, matrikelnr,
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
(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,
tbl_bisio.bisio_id,
tbl_zeugnisnote.note
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)
LEFT JOIN public.tbl_studentlehrverband USING(student_uid)
LEFT JOIN lehre.tbl_zeugnisnote on(vw_student_lehrveranstaltung.lehrveranstaltung_id=tbl_zeugnisnote.lehrveranstaltung_id AND tbl_zeugnisnote.student_uid=tbl_student.student_uid)
LEFT JOIN bis.tbl_bisio ON(uid=tbl_bisio.student_uid)
WHERE
lehrveranstaltung_id='".addslashes($lvid)."' AND
vw_student_lehrveranstaltung.lehrveranstaltung_id='".addslashes($lvid)."' AND
(tbl_zeugnisnote.studiensemester_kurzbz='".addslashes($stsem)."' OR tbl_zeugnisnote.studiensemester_kurzbz is null) AND
((tbl_bisio.von<'".$stsemdatumbis."' AND (tbl_bisio.bis>'".$stsemdatumvon."' OR tbl_bisio.bis is null)) OR tbl_bisio.von is null) AND
vw_student_lehrveranstaltung.studiensemester_kurzbz='".addslashes($stsem)."' AND
tbl_studentlehrverband.studiensemester_kurzbz='".addslashes($stsem)."'";
if($lehreinheit_id!='')
$qry.=" AND lehreinheit_id='".addslashes($lehreinheit_id)."'";
$qry.=" AND vw_student_lehrveranstaltung.lehreinheit_id='".addslashes($lehreinheit_id)."'";
$qry.=' ORDER BY nachname, vorname';
//echo $qry;
if($result = pg_query($conn, $qry))
{
$i=0;
@@ -290,10 +300,17 @@ 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);
if($elem->status=='Incoming')
if($elem->status=='Incoming') //Incoming
$inc=' (i)';
else
$inc='';
if($elem->bisio_id!='' && $elem->status!='Incoming') //Outgoing
$inc.=' (o)';
if($elem->note==6) //angerechnet
$inc.=' (ar)';
$pdf->MultiCell(130,$lineheight,$elem->vorname.$inc,0,'L',0);
$maxX +=130;
$pdf->SetXY($maxX,$maxY);
@@ -329,7 +346,9 @@ $maxY=$pdf->GetY()+5;
$maxX=30;
$pdf->SetXY($maxX,$maxY);
$pdf->SetFont('Arial','',8);
$pdf->MultiCell(520,$lineheight,'(i) ... Incoming',0,'L',0);
$pdf->MultiCell(520,$lineheight,'(i) ... Incoming',0,'L',0);
$pdf->MultiCell(520,$lineheight,'(o) ... Outgoing',0,'L',0);
$pdf->MultiCell(520,$lineheight,'(ar) ... angerechnet',0,'L',0);
//FHStg
$maxY=$pdf->GetY()+5;
include/tw/anwesenheitsliste_bilder.inc.php
+23 -5
View File
@@ -116,22 +116,31 @@ $pdf->SetFont('Arial','',8);
$maxX +=65;
//$pdf->SetXY($maxX,$maxY);
//$pdf->MultiCell(80,$lineheight,'Foto',1,'C',0);
$stsem_obj = new studiensemester($conn);
$stsem_obj->load($stsem);
$stsemdatumvon = $stsem_obj->start;
$stsemdatumbis = $stsem_obj->ende;
$qry = "SELECT
distinct vorname, nachname, matrikelnr, person_id,
distinct on(nachname, vorname, person_id) vorname, nachname, matrikelnr, person_id,
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
(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,
tbl_bisio.bisio_id,
tbl_zeugnisnote.note
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)
LEFT JOIN public.tbl_studentlehrverband USING(student_uid)
LEFT JOIN lehre.tbl_zeugnisnote on(vw_student_lehrveranstaltung.lehrveranstaltung_id=tbl_zeugnisnote.lehrveranstaltung_id AND tbl_zeugnisnote.student_uid=tbl_student.student_uid)
LEFT JOIN bis.tbl_bisio ON(uid=tbl_bisio.student_uid)
WHERE
lehrveranstaltung_id='".addslashes($lvid)."' AND
vw_student_lehrveranstaltung.lehrveranstaltung_id='".addslashes($lvid)."' AND
(tbl_zeugnisnote.studiensemester_kurzbz='".addslashes($stsem)."' OR tbl_zeugnisnote.studiensemester_kurzbz is null) AND
((tbl_bisio.von<'".$stsemdatumbis."' AND (tbl_bisio.bis>'".$stsemdatumvon."' OR tbl_bisio.bis is null)) OR tbl_bisio.von is null) AND
vw_student_lehrveranstaltung.studiensemester_kurzbz='".addslashes($stsem)."' AND
tbl_studentlehrverband.studiensemester_kurzbz='".addslashes($stsem)."'";
if($lehreinheit_id!='')
$qry.=" AND lehreinheit_id='".addslashes($lehreinheit_id)."'";
$qry.=" AND vw_student_lehrveranstaltung.lehreinheit_id='".addslashes($lehreinheit_id)."'";
$qry.=' ORDER BY nachname, vorname';
$lineheight=80;
@@ -170,6 +179,13 @@ if($result = pg_query($conn, $qry))
$inc=' (i)';
else
$inc='';
if($elem->bisio_id!='' && $elem->status!='Incoming') //Outgoing
$inc.=' (o)';
if($elem->note==6) //angerechnet
$inc.=' (ar)';
$pdf->MultiCell(130,$lineheight,$elem->vorname.$inc,0,'L',0);
$maxX +=130;
$pdf->SetXY($maxX,$maxY);
@@ -194,6 +210,8 @@ $maxX=30;
$pdf->SetXY($maxX,$maxY);
$pdf->SetFont('Arial','',8);
$pdf->MultiCell(520,$lineheight,'(i) ... Incoming',0,'L',0);
$pdf->MultiCell(520,$lineheight,'(o) ... Outgoing',0,'L',0);
$pdf->MultiCell(520,$lineheight,'(ar) ... angerechnet',0,'L',0);
//FHStg
$maxY=$pdf->GetY()+5;
include/wochenplan.class.php
+1 -1
View File
@@ -646,7 +646,7 @@ class wochenplan
if ($this->user=='lektor' && $this->type=='ort' && ($datum>=$datum_now && $datum>=$datum_res_lektor_start && $datum_mon<=$datum_res_lektor_ende))
{
echo ' <br />Titel: <input type="text" name="titel" size="10" maxlength="10" /> '.$this->crlf;
echo ' Beschreibung: <input type="text" name="beschreibung" size="20" maxlength="20" /> '.$this->crlf;
echo ' Beschreibung: <input type="text" name="beschreibung" size="20" maxlength="32" /> '.$this->crlf;
echo ' <input type="submit" name="reserve" value="Reservieren" />'.$this->crlf;
echo ' <input type="hidden" name="user_uid" value="'.$this->user_uid.'" />'.$this->crlf;
echo ' <input type="hidden" name="ort_kurzbz" value="'.$this->ort_kurzbz.'" />'.$this->crlf;