From 37c29455ef203e42002c60078cbb3501d0c9e301 Mon Sep 17 00:00:00 2001 From: ma0068 Date: Mon, 21 Mar 2022 10:52:19 +0100 Subject: [PATCH] =?UTF-8?q?intern=20angerechnet=20f=C3=BCr=20Notenliste=20?= =?UTF-8?q?hinzugef=C3=BCgt?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- cis/private/lehre/notenliste.xls.php | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/cis/private/lehre/notenliste.xls.php b/cis/private/lehre/notenliste.xls.php index 7853600de..c2357baa9 100644 --- a/cis/private/lehre/notenliste.xls.php +++ b/cis/private/lehre/notenliste.xls.php @@ -112,6 +112,12 @@ else $format_highlight->setBorder(1); $format_highlight->setBorderColor('white'); + $format_highlightright=& $workbook->addFormat(); + $format_highlightright->setFgColor(15); + $format_highlightright->setBorder(1); + $format_highlightright->setBorderColor('white'); + $format_highlightright->setAlign('right'); + $format_border_bottom =& $workbook->addFormat(); $format_border_bottom ->setBottom(2); $format_border_bottom->setBold(); @@ -174,7 +180,7 @@ else $qry.=' ORDER BY nachname, vorname'; if($result = $db->db_query($qry)) - { + {center while($row=$db->db_fetch_object($result)) { $worksheet->write($lines,1,"$row->vorname $row->nachname"); @@ -246,15 +252,22 @@ else if($elem->bisio_id!='' && $elem->status!='Incoming' && ($elem->bis > $stsemdatumvon || $elem->bis=='') && $elem->von < $stsemdatumbis) //Outgoing $inc.=' (o)'; + $note = $elem->note; if($elem->note==6) //angerechnet { $inc.=' (ar)'; $note='ar'; } + if ($elem->note == 19) // intern angerechnet + { + $inc .= ' (iar)'; + $note = 'iar'; + } + if ($elem->mobilitaetstyp_kurzbz !='' && $elem->doubledegree == 1) //dd-Program { - $inc.=' (d.d.)'; + $inc .=' (d.d.)'; } $worksheet->write($lines,1,$elem->uid); @@ -262,7 +275,7 @@ else $worksheet->write($lines,3,$elem->vorname); $worksheet->write($lines,4,'="'.$elem->semester.$elem->verband.$elem->gruppe.'"'); $worksheet->write($lines,5,'="'.trim($elem->matrikelnr).'"',$format_highlight); - $worksheet->write($lines,6,$note,$format_highlight); + $worksheet->write($lines,6, $note, $format_highlightright); $i++; $lines++; }