mirror of
https://github.com/FH-Complete/FHC-Core.git
synced 2026-06-05 06:09:27 +00:00
This commit is contained in:
@@ -25,8 +25,6 @@ umbenennen in "Betreuer"<br>
|
||||
<li>Soll beim Drucken der Studienerfolgsbestätigung für
|
||||
alle Semester auch das aktuelle Semester ausgedruckt werden?
|
||||
(möglicherweise enthaelt dies noch nicht alle Noten)</li>
|
||||
<li>Export mit den fehlenden/abgegebenen Dokumenten der Studenten
|
||||
(Kontrollliste)</li>
|
||||
<li>Eintragung von Betreuungen für Diplomarbeiten die am Zeugnis
|
||||
des Vorsemesters aufscheinen sollen jedoch dieses Semester abgerechnet
|
||||
werden.<br>
|
||||
@@ -427,6 +425,7 @@ Seamonkey Version nicht möglich<br>
|
||||
<!-- ********************* Erledigt ******************************************-->
|
||||
<hr>
|
||||
<h2>Erledigte Anforderungen</h2>
|
||||
<br>
|
||||
<ul>
|
||||
<li>Suche für die Firmenverwaltung wurde hinzugefügt<br>
|
||||
18.04.2008 oesi<br>
|
||||
|
||||
@@ -163,6 +163,8 @@ loadVariables($conn, $user);
|
||||
$maxlength[$i]=3;
|
||||
$worksheet->write($zeile,++$i,"UID", $format_bold);
|
||||
$maxlength[$i]=3;
|
||||
$worksheet->write($zeile,++$i,"ORGFORM", $format_bold);
|
||||
$maxlength[$i]=7;
|
||||
$worksheet->write($zeile,++$i,"VORNAMEN", $format_bold);
|
||||
$maxlength[$i]=8;
|
||||
|
||||
@@ -200,6 +202,7 @@ loadVariables($conn, $user);
|
||||
$prestudent = new prestudent($conn, null, null);
|
||||
$prestudent->getLastStatus($row->prestudent_id);
|
||||
$status = $prestudent->rolle_kurzbz;
|
||||
$orgform = $prestudent->orgform_kurzbz;
|
||||
|
||||
$i=0;
|
||||
|
||||
@@ -487,6 +490,12 @@ loadVariables($conn, $user);
|
||||
}
|
||||
$i++;
|
||||
|
||||
//Orgform
|
||||
if(strlen($orgform)>$maxlength[$i])
|
||||
$maxlength[$i] = strlen($orgform);
|
||||
$worksheet->write($zeile,$i, $orgform);
|
||||
$i++;
|
||||
|
||||
//Vornamen
|
||||
if(strlen($row->vornamen)>$maxlength[$i])
|
||||
$maxlength[$i] = strlen($row->vornamen);
|
||||
|
||||
@@ -107,7 +107,7 @@
|
||||
<fo:block text-align="left" line-height="12pt" font-family="sans-serif" font-size="8pt">
|
||||
Vorname(n), Familienname
|
||||
<fo:inline font-size="12pt">
|
||||
\n <xsl:value-of select="titelpre" /><xsl:text> </xsl:text><xsl:value-of select="vorname" /><xsl:text> </xsl:text><xsl:value-of select="nachname" /><xsl:text> </xsl:text><xsl:value-of select="titelpost" />
|
||||
\n <xsl:value-of select="titelpre" /><xsl:text> </xsl:text><xsl:value-of select="vorname" /><xsl:text> </xsl:text><xsl:value-of select="vornamen" /><xsl:text> </xsl:text><xsl:value-of select="nachname" /><xsl:text> </xsl:text><xsl:value-of select="titelpost" />
|
||||
</fo:inline>
|
||||
|
||||
|
||||
|
||||
@@ -107,7 +107,7 @@
|
||||
<fo:block text-align="left" line-height="12pt" font-family="sans-serif" font-size="8pt">
|
||||
Vorname(n), Familienname
|
||||
<fo:inline font-size="12pt">
|
||||
\n <xsl:value-of select="titelpre" /><xsl:text> </xsl:text><xsl:value-of select="vorname" /><xsl:text> </xsl:text><xsl:value-of select="nachname" /><xsl:text> </xsl:text><xsl:value-of select="titelpost" />
|
||||
\n <xsl:value-of select="titelpre" /><xsl:text> </xsl:text><xsl:value-of select="vorname" /><xsl:text> </xsl:text><xsl:value-of select="vornamen" /><xsl:text> </xsl:text><xsl:value-of select="nachname" /><xsl:text> </xsl:text><xsl:value-of select="titelpost" />
|
||||
</fo:inline>
|
||||
|
||||
|
||||
|
||||
@@ -77,6 +77,12 @@
|
||||
$maxlength[$i] = 11;
|
||||
$worksheet->write(2,++$i,"EMail", $format_bold);
|
||||
$maxlength[$i] = 5;
|
||||
$worksheet->write(2,++$i,"STRASSE", $format_bold);
|
||||
$maxlength[$i] = 6;
|
||||
$worksheet->write(2,++$i,"PLZ", $format_bold);
|
||||
$maxlength[$i] = 3;
|
||||
$worksheet->write(2,++$i,"ORT", $format_bold);
|
||||
$maxlength[$i] = 3;
|
||||
|
||||
$qry = "SELECT *, (SELECT kontakt FROM tbl_kontakt WHERE kontakttyp='email' AND person_id=tbl_prestudent.person_id ORDER BY zustellung LIMIT 1) as email FROM public.tbl_prestudent JOIN public.tbl_person USING(person_id) WHERE reihungstest_id='$reihungstest->reihungstest_id' ORDER BY nachname, vorname";
|
||||
|
||||
@@ -107,6 +113,24 @@
|
||||
if(strlen($row->email)>$maxlength[$i])
|
||||
$maxlength[$i] = strlen($row->email);
|
||||
|
||||
$qry = "SELECT * FROM public.tbl_adresse WHERE person_id='$row->person_id' ORDER BY zustelladresse LIMIT 1";
|
||||
if($result_adresse = pg_query($conn, $qry))
|
||||
{
|
||||
if($row_adresse = pg_fetch_object($result_adresse))
|
||||
{
|
||||
$worksheet->write($zeile,++$i,$row_adresse->strasse);
|
||||
if(strlen($row_adresse->strasse)>$maxlength[$i])
|
||||
$maxlength[$i] = strlen($row_adresse->strasse);
|
||||
|
||||
$worksheet->write($zeile,++$i,$row_adresse->plz);
|
||||
if(strlen($row_adresse->plz)>$maxlength[$i])
|
||||
$maxlength[$i] = strlen($row_adresse->plz);
|
||||
|
||||
$worksheet->write($zeile,++$i,$row_adresse->ort);
|
||||
if(strlen($row_adresse->ort)>$maxlength[$i])
|
||||
$maxlength[$i] = strlen($row_adresse->ort);
|
||||
}
|
||||
}
|
||||
$zeile++;
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user