Änderung rückgängig gemacht

This commit is contained in:
Manfred Kindl
2011-09-15 14:24:13 +00:00
parent 15ae710694
commit 72c6c92d8f
+6 -19
View File
@@ -51,13 +51,6 @@ if($studiengang_kz!='')
$format_bold =& $workbook->addFormat();
$format_bold->setBold();
$format_bold_merge =& $workbook->addFormat();
$format_bold_merge->setBold();
$format_bold_merge->setAlign('merge');
$format_center =& $workbook->addFormat();
$format_center->setAlign('merge');
$format_rotate =& $workbook->addFormat();
$format_rotate->setTextRotation(270);
@@ -72,8 +65,6 @@ if($studiengang_kz!='')
$maxlength[$spalte]=7;
$worksheet->write($zeile,++$spalte,'STATUS',$format_bold);
$maxlength[$spalte]=6;
$worksheet->write($zeile,++$spalte,'SEMESTER',$format_bold);
$maxlength[$spalte]=8;
$dokumente = new dokument();
$dokumente->getDokumente($studiengang_kz);
@@ -86,10 +77,10 @@ if($studiengang_kz!='')
}
// Daten holen
$qry = "SELECT public.tbl_person.nachname, public.tbl_person.vorname, public.tbl_prestudent.prestudent_id, public.get_rolle_prestudent(public.tbl_prestudent.prestudent_id, NULL) as status, tbl_studentlehrverband.semester FROM
public.tbl_person JOIN public.tbl_prestudent USING(person_id) JOIN campus.vw_student USING (person_id) JOIN public.tbl_studentlehrverband ON (uid=student_uid)
$qry = "SELECT nachname, vorname, prestudent_id, public.get_rolle_prestudent(prestudent_id, NULL) as status FROM
public.tbl_person JOIN public.tbl_prestudent USING(person_id)
WHERE
public.tbl_prestudent.prestudent_id IN(
prestudent_id IN(
SELECT
distinct prestudent_id
FROM
@@ -100,8 +91,8 @@ if($studiengang_kz!='')
dokument_kurzbz NOT IN( SELECT dokument_kurzbz FROM tbl_dokumentprestudent WHERE
prestudent_id=tbl_prestudent.prestudent_id) AND studiengang_kz='".addslashes($studiengang_kz)."')<>0
AND tbl_prestudentstatus.studiensemester_kurzbz='".addslashes($studiensemester_kurzbz)."' AND studiengang_kz='".addslashes($studiengang_kz)."'
) AND public.tbl_studentlehrverband.studiensemester_kurzbz='".addslashes($studiensemester_kurzbz)."'
ORDER BY semester, public.tbl_person.nachname, public.tbl_person.vorname
)
ORDER BY nachname, vorname
";
if($result = $db->db_query($qry))
@@ -123,10 +114,6 @@ if($studiengang_kz!='')
$worksheet->write($zeile,++$spalte, $row->status);
if(mb_strlen($row->status)>$maxlength[$spalte])
$maxlength[$spalte]=mb_strlen($row->status);
$worksheet->write($zeile,++$spalte, $row->semester, $format_center);
if(mb_strlen($row->semester)>$maxlength[$spalte])
$maxlength[$spalte]=mb_strlen($row->semester);
$dokumente = new dokument();
$dokumente->getPrestudentDokumente($row->prestudent_id);
@@ -134,7 +121,7 @@ if($studiengang_kz!='')
foreach ($dokumente->result as $docs)
{
if(isset($dokumente_arr[$docs->dokument_kurzbz]))
$worksheet->write($zeile,$dokumente_arr[$docs->dokument_kurzbz], 'X', $format_bold_merge);
$worksheet->write($zeile,$dokumente_arr[$docs->dokument_kurzbz], 'X', $format_bold);
}
}
}