mirror of
https://github.com/FH-Complete/FHC-Core.git
synced 2026-06-01 12:19:28 +00:00
Merge branch 'master' of https://github.com/FH-Complete/FHC-Core into feature-15490/lehrauftragsliste_stammkostenstelle_bei_fix_angestellten
This commit is contained in:
@@ -179,6 +179,8 @@ $worksheet->write($zeile, ++$i, "RT_PUNKTE2", $format_bold);
|
||||
$maxlength[$i] = 10;
|
||||
$worksheet->write($zeile, ++$i, "RT_GESAMTPUNKTE", $format_bold);
|
||||
$maxlength[$i] = 18;
|
||||
$worksheet->write($zeile,++$i,"ANMERKUNG", $format_bold);
|
||||
$maxlength[$i]=30;
|
||||
$worksheet->write($zeile, ++$i, "PRIORITÄT", $format_bold);
|
||||
$maxlength[$i] = 8;
|
||||
|
||||
@@ -659,7 +661,21 @@ function draw_content($row)
|
||||
$maxlength[$i] = mb_strlen($row->rt_gesamtpunkte);
|
||||
$worksheet->write($zeile, $i, $row->rt_gesamtpunkte);
|
||||
$i++;
|
||||
|
||||
|
||||
//Anmerkung
|
||||
$qry_1 = "SELECT anmerkung FROM public.tbl_prestudent WHERE prestudent_id=".$db->db_add_param($row->prestudent_id)." LIMIT 1";
|
||||
|
||||
if($db->db_query($qry_1))
|
||||
{
|
||||
if($row_1 = $db->db_fetch_object())
|
||||
{
|
||||
if(mb_strlen($row_1->anmerkung)>$maxlength[$i])
|
||||
$maxlength[$i]=mb_strlen($row_1->anmerkung);
|
||||
|
||||
$worksheet->write($zeile,$i, $row_1->anmerkung);
|
||||
}
|
||||
}
|
||||
$i++;
|
||||
//Priorisierung
|
||||
$prio = $prio_relativ.' ('.$row->priorisierung.')';
|
||||
if (mb_strlen($prio) > $maxlength[$i])
|
||||
|
||||
Reference in New Issue
Block a user