Merge remote-tracking branch 'origin/master' into stempelvorlagen

This commit is contained in:
kindlm
2015-01-30 17:18:06 +01:00
17 changed files with 997 additions and 78 deletions
+6 -9
View File
@@ -1,9 +1,6 @@
reports
datenimport
kompetenzen
abrechnung
casetime
ldap
kontoimport
studienplatzverwaltung
eps
#ignore all addons
*
#except template addon
!template/*
!CodingGuidelines.txt
!index.html
+6 -1
View File
@@ -25,6 +25,7 @@ require_once('../../../include/functions.inc.php');
require_once('../../../include/studiensemester.class.php');
require_once('../../../include/konto.class.php');
require_once('../../../include/phrasen.class.php');
require_once('../../../include/student.class.php');
$sprache = getSprache();
$p = new phrasen($sprache);
@@ -39,6 +40,10 @@ else
$uid=get_uid();
$student_studiengang = new student();
$student_studiengang->load($uid);
$xsl_stg_kz = $student_studiengang->studiengang_kz;
$stg = '';
if(!($erg=$db->db_query("SELECT * FROM campus.vw_benutzer WHERE uid='".addslashes($uid)."'")))
@@ -132,7 +137,7 @@ echo $p->t('global/studiensemester')."</b> <SELECT name='stsem' onChange=\"MM_ju
$konto = new konto();
if ($konto->checkStudienbeitrag($uid, $stsem))
{
echo "<a href='../pdfExport.php?xsl=Inskription&xml=student.rdf.php&ss=".$stsem."&uid=".$uid."'>".$p->t('tools/inskriptionsbestaetigung')."</a>";
echo "<a href='../pdfExport.php?xsl=Inskription&xml=student.rdf.php&ss=".$stsem."&uid=".$uid."&xsl_stg_kz=".$xsl_stg_kz."'>".$p->t('tools/inskriptionsbestaetigung')."</a>";
echo ' - '.$p->t('tools/studienbeitragFuerSSBezahltAmDatum',array($stsem, $konto->buchungsdatum));
}
else
+27 -1
View File
@@ -28,6 +28,7 @@ require_once('../../../include/benutzer.class.php');
require_once('../../../include/mitarbeiter.class.php');
require_once('../../../include/resturlaub.class.php');
require_once('../../../include/benutzerberechtigung.class.php');
require_once('../../../include/addon.class.php');
if (!$db = new basis_db())
die('Fehler beim Oeffnen der Datenbankverbindung');
@@ -61,6 +62,29 @@ echo '<html>
<title>Urlaubsfreigabe</title>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<link rel="stylesheet" href="../../../skin/style.css.php" type="text/css">
<script src="../../../include/js/jquery1.9.min.js" type="text/javascript"></script>';
// ADDONS laden
$addon_obj = new addon();
$addon_obj->loadAddons();
foreach($addon_obj->result as $addon)
{
echo '<script type="application/x-javascript" src="../../../addons/'.$addon->kurzbz.'/cis/init.js.php" ></script>';
}
// Wenn Seite fertig geladen ist Addons aufrufen
echo '
<script>
$( document ).ready(function()
{
for(i in addon)
{
addon[i].init("cis/private/profile/urlaubsfreigabe.php", {uid:\''.$uid.'\'});
}
});
</script>';
echo '
</head>
<body>
@@ -258,6 +282,7 @@ if($uid!='')
if($gebuchterurlaub=='')
$gebuchterurlaub=0;
echo '<div id="resturlaub">';
echo "<table ><tr><td nowrap><h3>Urlaub im Gesch&auml;ftsjahr $geschaeftsjahr</h3></td></tr>";
echo "<tr><td nowrap>Anspruch</td><td align='right' nowrap>$anspruch Tage</td><td class='grey' nowrap>&nbsp;&nbsp;&nbsp( j&auml;hrlich )</td></tr>";
echo "<tr><td nowrap>+ Resturlaub</td><td align='right' nowrap>";
@@ -276,6 +301,7 @@ if($uid!='')
echo "<tr><td nowrap>- aktuell gebuchter Urlaub&nbsp;</td><td align='right' nowrap>$gebuchterurlaub Tage</td><td class='grey' nowrap>&nbsp;&nbsp;&nbsp;( $datum_beginn - $datum_ende )</td></tr>";
echo "<tr><td style='border-top: 1px solid black;' nowrap>aktueller Stand</td><td style='border-top: 1px solid black;' align='right' nowrap>".($anspruch+$resturlaubstage-$gebuchterurlaub)." Tage</td><td class='grey' nowrap>&nbsp;&nbsp;&nbsp;( Stichtag: $datum_ende )</td></tr>";
echo "</table>";
echo '</div>';
echo '</td></tr></table>';
}
@@ -307,4 +333,4 @@ echo '</tr></table>
</body>
</html>';
?>
?>
+25 -1
View File
@@ -442,6 +442,28 @@ $datum_obj = new datum();
<link rel="stylesheet" href="../../../skin/jquery-ui-1.9.2.custom.min.css" type="text/css">
<script src="../../../include/js/tablesort/table.js" type="text/javascript"></script>
<script src="../../../include/js/jquery1.9.min.js" type="text/javascript"></script>
<?php
// ADDONS laden
$addon_obj = new addon();
$addon_obj->loadAddons();
foreach($addon_obj->result as $addon)
{
echo '<script type="application/x-javascript" src="../../../addons/'.$addon->kurzbz.'/cis/init.js.php" ></script>';
}
// Wenn Seite fertig geladen ist Addons aufrufen
echo '
<script>
$( document ).ready(function()
{
for(i in addon)
{
addon[i].init("cis/private/profile/urlaubstool.php", {uid:\''.$uid.'\'});
}
});
</script>';
?>
<script language="Javascript">
function conf_del()
{
@@ -547,6 +569,7 @@ $datum_obj = new datum();
if($gebuchterurlaub=='')
$gebuchterurlaub=0;
$content_resturlaub.='<div id="resturlaub">';
$content_resturlaub.="<table><tr><td nowrap><h3>".$p->t('urlaubstool/urlaubImGeschaeftsjahr')." $geschaeftsjahr</h3></td><td></td></tr>";
$content_resturlaub.="<tr><td nowrap>".$p->t('urlaubstool/anspruch')."</td><td align='right' nowrap>$anspruch ".$p->t('urlaubstool/tage')."</td><td class='grey' nowrap>&nbsp;&nbsp;&nbsp( ".$p->t('urlaubstool/jaehrlich')." )</td></tr>";
$content_resturlaub.="<tr><td nowrap>+ ".$p->t('urlaubstool/resturlaub')."</td><td align='right' nowrap>$resturlaubstage ".$p->t('urlaubstool/tage')."</td><td class='grey' nowrap>&nbsp;&nbsp;&nbsp;( ".$p->t('urlaubstool/stichtag').": $datum_beginn )</td>";
@@ -554,6 +577,7 @@ $content_resturlaub.="<tr><td nowrap>- ".$p->t('urlaubstool/aktuellGebuchterUrla
$content_resturlaub .="</tr>";
$content_resturlaub.="<tr><td style='border-top: 1px solid black;' nowrap>".$p->t('urlaubstool/aktuellerStand')."</td><td style='border-top: 1px solid black;' align='right' nowrap>".($anspruch+$resturlaubstage-$gebuchterurlaub)." ".$p->t('urlaubstool/tage')."</td><td class='grey' nowrap>&nbsp;&nbsp;&nbsp;( ".$p->t('urlaubstool/stichtag').": $datum_ende )</td></tr>";
$content_resturlaub.="</table>";
$content_resturlaub.='</div>';
//Formular Auswahl Monat und Jahr für Kalender
echo '<table width="95%" align="left">';
@@ -776,4 +800,4 @@ echo "<table width='100%'><tr><td><br>".$vgmail;
echo "<br>".$vtmail."</td></tr></table>";
?>
</body>
</html>
</html>
+25 -3
View File
@@ -78,8 +78,30 @@ $num_rows_stunde=$db->db_num_rows($result_stunde);
<title><?php echo $p->t('zeitsperre/zeitsperre');?></title>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<link rel="stylesheet" href="../../../skin/style.css.php" type="text/css">
<link href="../../../skin/flexcrollstyles.css" rel="stylesheet" type="text/css" />
<script src="../../../include/js/flexcroll.js" type="text/javascript" ></script>
<script src="../../../include/js/jquery1.9.min.js" type="text/javascript"></script>
<?php
// ADDONS laden
$addon_obj = new addon();
$addon_obj->loadAddons();
foreach($addon_obj->result as $addon)
{
echo '<script type="application/x-javascript" src="../../../addons/'.$addon->kurzbz.'/cis/init.js.php" ></script>';
}
// Wenn Seite fertig geladen ist Addons aufrufen
echo '
<script>
$( document ).ready(function()
{
for(i in addon)
{
addon[i].init("cis/private/profile/urlaubstool.php", {uid:\''.$uid.'\'});
}
});
</script>';
?>
<script language="Javascript">
function conf_del()
{
@@ -646,7 +668,7 @@ echo '<tr>';
echo "<td class='tdvertical'>";
echo $content_form;
echo '</td>';
echo "<td class='tdvertical'>$content_resturlaub</td>";
echo "<td class='tdvertical'><div id='resturlaub'>$content_resturlaub</div></td>";
echo '</tr><tr><td colspan=2>';
echo $content_table;
echo '</td>';
+46 -9
View File
@@ -60,7 +60,7 @@ $filter = (isset($_GET['filter'])?$_GET['filter']:'foo');
$alle = (isset($_POST['alle'])?(isset($_POST['normal'])?false:true):false);
$angezeigte_tage = '50';
echo '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
echo '<!DOCTYPE HTML>
<html>
<head>
<title>'.$p->t("zeitaufzeichnung/zeitaufzeichnung").'</title>
@@ -70,8 +70,31 @@ echo '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www
<link href="../../../skin/jquery.css" rel="stylesheet" type="text/css"/>
<link href="../../../skin/jquery-ui-1.9.2.custom.min.css" rel="stylesheet" type="text/css">
<script src="../../../include/js/tablesort/table.js" type="text/javascript"></script>
<script src="../../../include/js/jquery1.9.min.js" type="text/javascript" ></script>
<script src="../../../include/js/jquery1.9.min.js" type="text/javascript" ></script>
';
// ADDONS laden
$addon_obj = new addon();
$addon_obj->loadAddons();
foreach($addon_obj->result as $addon)
{
echo '<script type="application/x-javascript" src="../../../addons/'.$addon->kurzbz.'/cis/init.js.php" ></script>';
}
// Wenn Seite fertig geladen ist Addons aufrufen
echo '
<script>
$( document ).ready(function()
{
for(i in addon)
{
addon[i].init("cis/private/tools/zeitaufzeichnung.php", {uid:\''.$user.'\'});
}
});
</script>
';
echo '
<script type="text/javascript">
$(document).ready(function()
{
@@ -407,7 +430,10 @@ if($projekt->getProjekteMitarbeiter($user))
//Formular
echo '<br><form action="'.$_SERVER['PHP_SELF'].'?zeitaufzeichnung_id='.$zeitaufzeichnung_id.'" method="POST" onsubmit="return checkdatum()">';
echo '<table>
<tr>
<td>';
echo '<table>';
//Projekt
echo '<tr>
@@ -464,7 +490,7 @@ if($projekt->getProjekteMitarbeiter($user))
$oe->getFrequent($user,'180','3',true);
$trennlinie = true;
foreach ($oe->result as $row)
foreach ($oe->result as $row)
{
if($oe_kurzbz_2 == $row->oe_kurzbz)
$selected = 'selected';
@@ -581,9 +607,13 @@ if($projekt->getProjekteMitarbeiter($user))
echo '<input type="submit" value="'.$p->t("global/aendern").'" name="edit">&nbsp;&nbsp;';
echo '<input type="submit" value="'.$p->t("zeitaufzeichnung/alsNeuenEintragSpeichern").'" name="save"></td></tr>';
}
echo '</table>';
echo '</table>';
echo '</td><td valign="top"><span id="zeitsaldo"></span></td></tr>
</table>';
echo '<hr>';
echo '<h3>'.($alle===true?$p->t('zeitaufzeichnung/alleEintraege'):$p->t('zeitaufzeichnung/xTageAnsicht', array($angezeigte_tage))).'</h3> <input type="submit" value="'.($alle===true?$p->t('zeitaufzeichnung/xTageAnsicht', array($angezeigte_tage)):$p->t('zeitaufzeichnung/alleAnzeigen')).'" name="'.($alle===true?'normal':'alle').'">';
echo '<h3>'.($alle===true?$p->t('zeitaufzeichnung/alleEintraege'):$p->t('zeitaufzeichnung/xTageAnsicht', array($angezeigte_tage))).'</h3>';
echo '<input type="submit" value="'.($alle===true?$p->t('zeitaufzeichnung/xTageAnsicht', array($angezeigte_tage)):$p->t('zeitaufzeichnung/alleAnzeigen')).'" name="'.($alle===true?'normal':'alle').'">';
echo '</form>';
$za = new zeitaufzeichnung();
@@ -659,7 +689,12 @@ if($projekt->getProjekteMitarbeiter($user))
$tagessaldo = $tagessaldo-$pausesumme;
$tagessaldo = date('H:i', ($tagessaldo));
echo '<tr>
<td '.$style.' colspan="7"></td>
<td '.$style.' colspan="7">';
// Zusaetzlicher span fuer Addon Informationen
echo '<span id="tag_'.$datum->formatDatum($tagesbeginn,'d_m_Y').'"></span>';
echo '</td>
<td align="right" colspan="2" '.$style.'>
<b>'.$p->t("zeitaufzeichnung/arbeitszeit").': '.$datum->formatDatum($tagesbeginn, $format='H:i').'-'.$datum->formatDatum($tagesende, $format='H:i').' '.$p->t("eventkalender/uhr").'</b><br>
'.$p->t("zeitaufzeichnung/pause").' '.($pflichtpause==false?$p->t("zeitaufzeichnung/inklusivePflichtpause"):'').':
@@ -796,6 +831,8 @@ else
echo $p->t("zeitaufzeichnung/fehlerBeimErmittelnDerProjekte");
}
echo '</body>
echo '
<span id="globalmessages"></span>
</body>
</html>';
?>
?>
+148 -47
View File
@@ -195,7 +195,7 @@ elseif(in_array($xsl,array('Zertifikat','Diplomurkunde','Diplomzeugnis','Bakkurk
'Sammelzeugnis','PrProtDiplEng','PrProtBakkEng','BakkzeugnisEng','DiplomzeugnisEng','statusbericht',
'DiplSupplement','Zutrittskarte','Projektbeschr','Ausbildungsver','AusbildStatus','PrProtBA','PrProtMA',
'PrProtBAEng','PrProtMAEng','Studienordnung','Erfolgsnachweis','ErfolgsnwHead','Studienblatt','LV_Informationen',
'LVZeugnis','AnwListBarcode','Honorarvertrag','AusbVerEng','AusbVerEngHead','Zeugnis')))
'LVZeugnis','AnwListBarcode','Honorarvertrag','AusbVerEng','AusbVerEngHead','Zeugnis','ErfolgsnachweisE','ErfolgsnwHeadE')))
{
if(!$rechte->isBerechtigt('admin') && !$rechte->isBerechtigt('assistenz'))
{
@@ -443,73 +443,174 @@ if (!isset($_REQUEST["archive"]))
}
else
{
// Archivieren von Dokumenten
$uid = $_REQUEST["uid"];
$ss = $_REQUEST["ss"];
$heute = date('Y-m-d');
$student=new student();
$student->load($uid);
$prestudent=new prestudent();
$prestudent->getLastStatus($student->prestudent_id,$ss);
$semester=$prestudent->ausbildungssemester;
$query = "SELECT
tbl_studiengang.studiengang_kz, tbl_studentlehrverband.semester, tbl_studiengang.typ,
tbl_studiengang.kurzbz, tbl_person.person_id FROM tbl_person, tbl_benutzer,
tbl_studentlehrverband, tbl_studiengang
WHERE
tbl_studentlehrverband.student_uid = tbl_benutzer.uid
AND tbl_benutzer.person_id = tbl_person.person_id
AND tbl_studentlehrverband.studiengang_kz = tbl_studiengang.studiengang_kz
AND tbl_studentlehrverband.student_uid = ".$db->db_add_param($uid)."
AND tbl_studentlehrverband.studiensemester_kurzbz = ".$db->db_add_param($ss);
if($result = $db->db_query($query))
if(isset($_REQUEST['ss']))
{
if($row = $db->db_fetch_object($result))
$ss = $_REQUEST["ss"];
$prestudent=new prestudent();
$prestudent->getLastStatus($student->prestudent_id,$ss);
$semester=$prestudent->ausbildungssemester;
$query = "SELECT
tbl_studiengang.studiengang_kz, tbl_studentlehrverband.semester, tbl_studiengang.typ,
tbl_studiengang.kurzbz, tbl_person.person_id FROM tbl_person, tbl_benutzer,
tbl_studentlehrverband, tbl_studiengang
WHERE
tbl_studentlehrverband.student_uid = tbl_benutzer.uid
AND tbl_benutzer.person_id = tbl_person.person_id
AND tbl_studentlehrverband.studiengang_kz = tbl_studiengang.studiengang_kz
AND tbl_studentlehrverband.student_uid = ".$db->db_add_param($uid)."
AND tbl_studentlehrverband.studiensemester_kurzbz = ".$db->db_add_param($ss);
if($result = $db->db_query($query))
{
$person_id = $row->person_id;
$titel = $xsl."_".strtoupper($row->typ).strtoupper($row->kurzbz)."_".$semester;
$bezeichnung = $xsl." ".strtoupper($row->typ).strtoupper($row->kurzbz)." ".$semester.". Semester";
$studiengang_kz = $row->studiengang_kz;
}
else
{
$echo = 'Datensatz wurde nicht gefunden';
if($row = $db->db_fetch_object($result))
{
$person_id = $row->person_id;
$titel = $xsl."_".strtoupper($row->typ).strtoupper($row->kurzbz)."_".$semester;
$bezeichnung = $xsl." ".strtoupper($row->typ).strtoupper($row->kurzbz)." ".$semester.". Semester";
$studiengang_kz = $row->studiengang_kz;
}
else
{
$echo = 'Datensatz wurde nicht gefunden';
}
}
}
else
{
$studiengang = new studiengang();
$studiengang->load($student->studiengang_kz);
$studiengang_kz=$student->studiengang_kz;
$person_id = $student->person_id;
$titel = $vorlage->bezeichnung.'_'.$studiengang->kuerzel;
$bezeichnung = $vorlage->bezeichnung.'_'.$studiengang->kuerzel;
}
if($rechte->isBerechtigt('admin', $studiengang_kz, 'suid') || $rechte->isBerechtigt('assistenz', $studiengang_kz, 'suid'))
{
if(PDF_CREATE_FUNCTION=='FOP')
if(mb_strstr($vorlage->mimetype, 'application/vnd.oasis.opendocument'))
{
$fop = new fop();
$file = $fop->generatePdf($xml_doc->saveXML(), $xsl_content, $filename, "F");
}
else
{
$filename = $user;
$fo2pdf = new XslFo2Pdf();
switch($vorlage->mimetype)
{
case 'application/vnd.oasis.opendocument.text':
$endung = 'odt';
break;
case 'application/vnd.oasis.opendocument.spreadsheet':
$endung = 'ods';
break;
default:
$endung = 'pdf';
}
// Load the XSL source
$xsl_doc = new DOMDocument;
if(!$xsl_doc->loadXML($xsl_content))
die('unable to load xsl');
// Configure the transformer
$proc = new XSLTProcessor;
$proc->importStyleSheet($xsl_doc); // attach the xsl rules
$buffer = $proc->transformToXml($xml_doc);
if (!$fo2pdf->generatePdf($buffer, $filename, 'F'))
{
echo('Failed to generate PDF');
}
$file = "/tmp/".$filename.".pdf";
}
$buffer = $proc->transformToXml($xml_doc);
//echo $buffer;
//exit;
$tempfolder = '/tmp/'.uniqid();
mkdir($tempfolder);
chdir($tempfolder);
file_put_contents('content.xml', $buffer);
// Wenn ein Style XSL uebergeben wurde wird ein zweites XML File erstellt mit den
// Styleanweisungen und ebenfalls zum Zip hinzugefuegt
if(isset($_GET['style_xsl']))
{
$style_xsl=$_GET['style_xsl'];
$style_vorlage = new vorlage();
$style_vorlage->getAktuelleVorlage($xsl_stg_kz, $style_xsl, $version);
$style_xsl_doc = new DOMDocument;
if(!$style_xsl_doc->loadXML($style_vorlage->text))
die('unable to load xsl');
// Configure the transformer
$style_proc = new XSLTProcessor;
$style_proc->importStyleSheet($style_xsl_doc); // attach the xsl rules
$stylebuffer = $style_proc->transformToXml($xml_doc);
file_put_contents('styles.xml', $stylebuffer);
}
$vorlage_found=false;
$addons = new addon();
foreach($addons->aktive_addons as $addon)
{
$zipfile = DOC_ROOT.'addons/'.$addon.'/system/vorlage_zip/'.$vorlage->vorlage_kurzbz.'.'.$endung;
if(file_exists($zipfile))
{
$vorlage_found=true;
break;
}
}
if(!$vorlage_found)
$zipfile = DOC_ROOT.'system/vorlage_zip/'.$vorlage->vorlage_kurzbz.'.'.$endung;
$tempname_zip = 'out.zip';
if(copy($zipfile, $tempname_zip))
{
exec("zip $tempname_zip content.xml");
if(isset($_GET['style_xsl']))
exec("zip $tempname_zip styles.xml");
clearstatcache();
$tempPdfName = $vorlage->vorlage_kurzbz.'.pdf';
exec("unoconv -e IsSkipEmptyPages=false --stdout -f pdf $tempname_zip > $tempPdfName");
}
$file = $tempfolder.'/'.$tempPdfName;
}
else
{
if(PDF_CREATE_FUNCTION=='FOP')
{
$fop = new fop();
$file = $fop->generatePdf($xml_doc->saveXML(), $xsl_content, $filename, "F");
}
else
{
$filename = $user;
$fo2pdf = new XslFo2Pdf();
// Load the XSL source
$xsl_doc = new DOMDocument;
if(!$xsl_doc->loadXML($xsl_content))
die('unable to load xsl');
// Configure the transformer
$proc = new XSLTProcessor;
$proc->importStyleSheet($xsl_doc); // attach the xsl rules
$buffer = $proc->transformToXml($xml_doc);
if (!$fo2pdf->generatePdf($buffer, $filename, 'F'))
{
echo('Failed to generate PDF');
}
$file = "/tmp/".$filename.".pdf";
}
}
$handle = fopen($file, "rb");
$string = fread($handle, filesize($file));
fclose($handle);
+40
View File
@@ -4407,6 +4407,46 @@ function StudentCreateDiplSupplement()
window.open('<?php echo APP_ROOT; ?>content/pdfExport.php?xml=diplomasupplement.xml.php&output=pdf&xsl=DiplSupplement&xsl_stg_kz='+stg_kz+'&uid='+paramList,'DiplomaSupplement', 'height=200,width=350,left=0,top=0,hotkeys=0,resizable=yes,status=no,scrollbars=yes,toolbar=no,location=no,menubar=no,dependent=yes');
}
// ****
// * Archiviert das Diplomasupplement einer Person
// ****
function StudentDiplomasupplementArchivieren()
{
netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
tree = document.getElementById('student-tree');
//Markierte Studenten holen
var start = new Object();
var end = new Object();
var numRanges = tree.view.selection.getRangeCount();
var paramList= '';
var errormsg='';
var labelalt = document.getElementById('student-zeugnis-button-archivieren-diplomasupplement').label;
document.getElementById('student-zeugnis-button-archivieren-diplomasupplement').label='Loading...';
for (var t = 0; t < numRanges; t++)
{
tree.view.selection.getRangeAt(t,start,end);
for (var v = start.value; v <= end.value; v++)
{
var col = tree.columns ? tree.columns["student-treecol-uid"] : "student-treecol-uid";
var uid=tree.view.getCellText(v,col);
stg_kz=getTreeCellText(tree,"student-treecol-studiengang_kz", v);
url = '<?php echo APP_ROOT; ?>content/pdfExport.php?xml=diplomasupplement.xml.php&output=pdf&xsl=DiplSupplement&xsl_stg_kz='+stg_kz+'&uid='+uid+'&archive=true';
var req = new phpRequest(url,'','');
var response = req.execute();
if(response!='')
errormsg = errormsg + response;
}
}
document.getElementById('student-zeugnis-button-archivieren-diplomasupplement').label=labelalt;
StudentAkteTreeDatasource.Refresh(false);
}
// ****
// * Erstellt den Ausbildungsvertrag fuer einen oder mehrere Studenten
// ****
@@ -94,9 +94,10 @@ echo '<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>';
<spacer flex="1"/>
<button id="student-zeugnis-button-archivieren" label="aktuelles Zeugnis archivieren" disabled="false" oncommand="StudentZeugnisArchivieren()"/>
<button id="student-zeugnis-button-archivieren-englisch" label="aktuelles Zeugnis archivieren (englisch)" disabled="false" oncommand="StudentZeugnisArchivieren('eng')"/>
<button id="student-zeugnis-button-archivieren-diplomasupplement" label="Diplomasupplement archivieren" disabled="false" oncommand="StudentDiplomasupplementArchivieren()"/>
<spacer flex="1"/>
</vbox>
</hbox>
<spacer flex="8" />
</vbox>
</overlay>
</overlay>
+1 -1
View File
@@ -512,7 +512,7 @@ class konto extends basis_db
{
if($row = $this->db_fetch_object())
{
if ($row->differenz == 0)
if ($row->differenz >= 0)
{
$this->buchungsdatum = isset($buch_date[1])?$buch_date[1]:'';
return true;
+3 -2
View File
@@ -70,7 +70,7 @@ class vorlage extends basis_db
if($studiengang_kz!='')
{
$qry = "SELECT
tbl_vorlagestudiengang.*, tbl_vorlage.mimetype
tbl_vorlagestudiengang.*, tbl_vorlage.mimetype, tbl_vorlage.bezeichnung
FROM
public.tbl_vorlagestudiengang
JOIN public.tbl_vorlage USING(vorlage_kurzbz)
@@ -93,7 +93,7 @@ class vorlage extends basis_db
else
{
$qry = "SELECT
tbl_vorlagestudiengang.*, tbl_vorlage.mimetype
tbl_vorlagestudiengang.*, tbl_vorlage.mimetype, tbl_vorlage.bezeichnung
FROM
public.tbl_vorlagestudiengang
JOIN public.tbl_vorlage USING(vorlage_kurzbz)
@@ -115,6 +115,7 @@ class vorlage extends basis_db
$this->version = $row->version;
$this->text = $row->text;
$this->mimetype = $row->mimetype;
$this->bezeichnung = $row->bezeichnung;
return true;
}
else
+2 -1
View File
@@ -403,7 +403,7 @@ class zeugnisnote extends basis_db
tbl_lehrveranstaltung.lehrform_kurzbz as lv_lehrform_kurzbz,
tbl_zeugnisnote.studiensemester_kurzbz, tbl_zeugnisnote.uebernahmedatum, tbl_zeugnisnote.benotungsdatum,
tbl_zeugnisnote.note, tbl_zeugnisnote.updateamum, tbl_zeugnisnote.updatevon, tbl_zeugnisnote.insertamum, tbl_zeugnisnote.insertvon,
tbl_note.bezeichnung as note_bezeichnung, tbl_zeugnisnote.bemerkung, tbl_lehrveranstaltung.lvnr
tbl_note.bezeichnung as note_bezeichnung, tbl_zeugnisnote.bemerkung, tbl_lehrveranstaltung.lvnr, tbl_studienplan_lehrveranstaltung.sort as studienplan_lehrveranstaltung_sort
FROM
lehre.tbl_lehrveranstaltung
LEFT JOIN lehre.tbl_zeugnisnote ON(tbl_lehrveranstaltung.lehrveranstaltung_id=tbl_zeugnisnote.lehrveranstaltung_id AND tbl_zeugnisnote.student_uid=".$this->db_add_param($student_uid)." AND tbl_zeugnisnote.studiensemester_kurzbz IN(".$stsem."))
@@ -445,6 +445,7 @@ class zeugnisnote extends basis_db
$obj->studienplan_lehrveranstaltung_id = $row->studienplan_lehrveranstaltung_id;
$obj->studienplan_lehrveranstaltung_id_parent = $row->studienplan_lehrveranstaltung_id_parent;
$obj->studienplan_lehrveranstaltung_semester = $row->semester;
$obj->studienplan_lehrveranstaltung_sort = $row->studienplan_lehrveranstaltung_sort;
$this->result[] = $obj;
}
+1
View File
@@ -170,6 +170,7 @@ function draw_studienerfolg($uid, $studiensemester_kurzbz)
$xml .= " <bezeichnung><![CDATA[".$row->lehrveranstaltung_bezeichnung."]]></bezeichnung>";
$xml .= " <bezeichnung_englisch><![CDATA[".$row->lehrveranstaltung_bezeichnung_english."]]></bezeichnung_englisch>";
$xml .= " <note>".$note."</note>";
$xml .= " <note_idx>".$row->note."</note_idx>";
$xml .= " <sws>".sprintf('%.1f',$row->semesterstunden/$wochen)."</sws>";
$xml .= " <ects>".$row->ects."</ects>";
if($row->benotungsdatum!='')
+336
View File
@@ -0,0 +1,336 @@
<?xml version="1.0" encoding="UTF-8"?>
<xsl:stylesheet version="1.0" xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
<xsl:output method="xml" version="1.0" indent="yes" />
<xsl:template match="studienerfolge">
<fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:layout-master-set>
<fo:simple-page-master page-height="297mm" page-width="210mm" margin="5mm 25mm 5mm 25mm" master-name="PageMaster">
<fo:region-body margin="20mm 0mm 20mm 0mm"/>
</fo:simple-page-master>
</fo:layout-master-set>
<xsl:apply-templates select="studienerfolg"/>
</fo:root>
</xsl:template>
<xsl:template match="studienerfolg">
<fo:page-sequence master-reference="PageMaster">
<fo:flow flow-name="xsl-region-body" >
<!-- Logo -->
<fo:block>
<!--<fo:external-graphic src="../skin/images/logo.jpg" posx="140" posy="15" width="60mm" height="20mm" />-->
<fo:external-graphic posx="140" posy="15" width="60mm" height="20mm" >
<xsl:attribute name="src">
<xsl:value-of select="logopath" />logo.jpg
</xsl:attribute>
</fo:external-graphic>
</fo:block>
<!-- Titel -->
<fo:block-container position="absolute" top="20mm" left="15mm">
<fo:block font-size="16pt">UAS Technikum Wien</fo:block>
</fo:block-container>
<fo:block-container position="absolute" top="26mm" left="15mm">
<fo:block font-size="12pt">Hoechstaedtplatz 6\nA-1200 Vienna</fo:block>
<fo:block font-size="6pt">ZVR-Nr.: 074476426, DVR-Nr.: 0928381</fo:block>
</fo:block-container>
<fo:block-container position="absolute" top="45mm" left="15mm">
<fo:block text-align="left" line-height="20pt" font-family="sans-serif" font-size="16pt">
<xsl:text>Student progress report</xsl:text>
</fo:block>
</fo:block-container>
<!--FINANZAMT-->
<fo:block-container position="absolute" top="55mm" left="15mm">
<fo:block text-align="left" line-height="10pt" font-family="sans-serif" font-size="8pt">
<xsl:choose>
<xsl:when test="string-length(finanzamt)!=0">
<xsl:text>(For submission to local tax office in accordance with the Family Welfare Act 1967 section 2.1 lit.b)</xsl:text>
</xsl:when>
</xsl:choose>
</fo:block>
</fo:block-container>
<!-- NAME - GEBURTSDATUM - MATRIKELNUMMER -->
<fo:block-container position="absolute" top="60mm" left="15mm">
<fo:table table-layout="fixed" border-collapse="separate">
<fo:table-column column-width="120mm"/>
<fo:table-column column-width="30mm"/>
<fo:table-column column-width="30mm"/>
<fo:table-body>
<fo:table-row line-height="14pt">
<fo:table-cell border-width="0.2mm" border-style="solid">
<fo:block font-family="sans-serif" font-size="8pt" content-width="45mm" text-align="left">
<xsl:text> Last Name, First Name\n</xsl:text>
</fo:block>
</fo:table-cell>
<fo:table-cell border-width="0.2mm" border-style="solid">
<fo:block font-family="sans-serif" font-size="8pt" content-width="45mm" text-align="left">
<xsl:text> Date of Birth\n</xsl:text>
</fo:block>
</fo:table-cell>
<fo:table-cell border-width="0.2mm" border-style="solid">
<fo:block font-family="sans-serif" font-size="8pt" content-width="45mm" text-align="left">
<xsl:text> Student ID\n</xsl:text>
</fo:block>
</fo:table-cell>
</fo:table-row>
</fo:table-body>
</fo:table>
</fo:block-container>
<fo:block-container position="absolute" top="65mm" left="16mm">
<fo:block text-align="left" line-height="14pt" font-family="sans-serif" font-size="10pt" font-weight="bold">
<xsl:value-of select="titelpre" /><xsl:text> </xsl:text><xsl:value-of select="nachname" /><xsl:text> </xsl:text><xsl:value-of select="vorname" /><xsl:text> </xsl:text><xsl:value-of select="titelpost" />
</fo:block>
</fo:block-container>
<fo:block-container position="absolute" top="65mm" left="137mm">
<fo:block text-align="left" line-height="14pt" font-family="sans-serif" font-size="10pt" font-weight="bold">
<xsl:value-of select="gebdatum" />
</fo:block>
</fo:block-container>
<fo:block-container position="absolute" top="65mm" left="167mm">
<fo:block text-align="left" line-height="14pt" font-family="sans-serif" font-size="10pt" font-weight="bold">
<xsl:value-of select="matrikelnr" />
</fo:block>
</fo:block-container>
<!--STUDIENGANG UND KENNZAHL -->
<fo:block-container position="absolute" top="70.8mm" left="15mm">
<fo:table table-layout="fixed" border-collapse="separate">
<fo:table-column column-width="150.4mm"/>
<fo:table-column column-width="30mm"/>
<fo:table-body>
<fo:table-row line-height="14pt">
<fo:table-cell border-width="0.2mm" border-style="solid">
<fo:block font-family="sans-serif" font-size="8pt" content-width="45mm" text-align="left">
<xsl:text> Degree Program \n</xsl:text>
</fo:block>
</fo:table-cell>
<fo:table-cell border-width="0.2mm" border-style="solid">
<fo:block font-family="sans-serif" font-size="8pt" content-width="45mm" text-align="left">
<xsl:text> Program Code\n</xsl:text>
</fo:block>
</fo:table-cell>
</fo:table-row>
</fo:table-body>
</fo:table>
</fo:block-container>
<fo:block-container position="absolute" top="76mm" left="16mm">
<fo:block text-align="left" line-height="14pt" font-family="sans-serif" font-size="10pt" font-weight="bold">
<xsl:value-of select="studiengang_englisch" />
</fo:block>
</fo:block-container>
<fo:block-container position="absolute" top="76mm" left="167mm">
<fo:block text-align="left" line-height="14pt" font-family="sans-serif" font-size="10pt" font-weight="bold">
<xsl:value-of select="studiengang_kz" />
</fo:block>
</fo:block-container>
<!-- Studiensemester - Ausbildungssemester -->
<fo:block-container position="absolute" top="81.6mm" left="15mm">
<fo:table table-layout="fixed" border-collapse="separate">
<fo:table-column column-width="120mm"/>
<fo:table-column column-width="60.4mm"/>
<fo:table-body>
<fo:table-row line-height="14pt">
<fo:table-cell border-width="0.2mm" border-style="solid">
<fo:block font-family="sans-serif" font-size="8pt" content-width="45mm" text-align="left">
<xsl:text> Current Year\n</xsl:text>
</fo:block>
</fo:table-cell>
<fo:table-cell border-width="0.2mm" border-style="solid">
<fo:block font-family="sans-serif" font-size="8pt" content-width="45mm" text-align="left">
<xsl:text> Student current enrolled in:\n</xsl:text>
</fo:block>
</fo:table-cell>
</fo:table-row>
</fo:table-body>
</fo:table>
</fo:block-container>
<fo:block-container position="absolute" top="87mm" left="16mm">
<fo:block text-align="left" line-height="10pt" font-family="sans-serif" font-size="10pt" font-weight="bold">
<xsl:value-of select="studiensemester_aktuell" />
</fo:block>
</fo:block-container>
<fo:block-container position="absolute" top="87mm" left="137mm">
<fo:block text-align="left" line-height="10pt" font-family="sans-serif" font-size="10pt" font-weight="bold">
<xsl:value-of select="semester_aktuell" />
</fo:block>
</fo:block-container>
<!-- TABELLE -->
<fo:block-container position="absolute" top="110mm" left="15mm">
<fo:block text-align="left" line-height="14pt" font-family="sans-serif" font-size="10pt" font-weight="bold">
<xsl:text>The following courses have been completed:</xsl:text>
</fo:block>
</fo:block-container>
<fo:block-container position="absolute" top="120mm" left="15mm">
<fo:table table-layout="fixed" border-collapse="separate" border-width="0.2mm" border-style="solid">
<fo:table-column column-width="70mm"/>
<fo:table-column column-width="24mm"/>
<fo:table-column column-width="32mm"/>
<fo:table-column column-width="13mm"/>
<fo:table-column column-width="10mm"/>
<fo:table-column column-width="15mm"/>
<fo:table-column column-width="15mm"/>
<fo:table-body>
<fo:table-row line-height="10pt">
<fo:table-cell border-width="0.2mm" border-style="solid">
<fo:block font-size="8pt" font-weight="bold">
<xsl:text> Subject</xsl:text>
</fo:block>
</fo:table-cell>
<fo:table-cell border-width="0.2mm" border-style="solid">
<fo:block font-size="8pt" font-weight="bold" content-width="24mm" text-align="center">
<xsl:text>Year</xsl:text>
</fo:block>
</fo:table-cell>
<fo:table-cell border-width="0.2mm" border-style="solid">
<fo:block font-size="8pt" font-weight="bold" content-width="32mm" text-align="center">
<xsl:text>Semester</xsl:text>
</fo:block>
</fo:table-cell>
<fo:table-cell border-width="0.2mm" border-style="solid">
<fo:block font-size="8pt" font-weight="bold" content-width="13mm" text-align="center">
<xsl:text>SP/W</xsl:text>
</fo:block>
</fo:table-cell>
<fo:table-cell border-width="0.2mm" border-style="solid">
<fo:block font-size="8pt" font-weight="bold" content-width="10mm" text-align="center">
<xsl:text>ECTS</xsl:text>
</fo:block>
</fo:table-cell>
<fo:table-cell border-width="0.2mm" border-style="solid">
<fo:block font-size="8pt" font-weight="bold" content-width="15mm" text-align="center">
<xsl:text>Date</xsl:text>
</fo:block>
</fo:table-cell>
<fo:table-cell border-width="0.2mm" border-style="solid">
<fo:block font-size="8pt" font-weight="bold" content-width="15mm" text-align="center">
<xsl:text>Grade</xsl:text>
</fo:block>
</fo:table-cell>
</fo:table-row>
<xsl:apply-templates select="unterrichtsfach"/>
<fo:table-row line-height="10pt">
<fo:table-cell border-width="0.2mm" border-style="solid">
<fo:block font-size="8pt" font-weight="bold">
<xsl:text> Total:</xsl:text>
</fo:block>
</fo:table-cell>
<fo:table-cell border-width="0.2mm" border-style="solid">
<fo:block font-size="8pt" font-weight="bold" content-width="24mm" text-align="center">
<xsl:value-of select="studiensemester_kurzbz" />
</fo:block>
</fo:table-cell>
<fo:table-cell border-width="0.2mm" border-style="solid">
<fo:block font-size="8pt" font-weight="bold" content-width="32mm" text-align="center">
<xsl:text></xsl:text>
</fo:block>
</fo:table-cell>
<fo:table-cell border-width="0.2mm" border-style="solid">
<fo:block font-size="8pt" font-weight="bold" content-width="13mm" text-align="center">
<xsl:value-of select="gesamtstunden" />
</fo:block>
</fo:table-cell>
<fo:table-cell border-width="0.2mm" border-style="solid">
<fo:block font-size="8pt" font-weight="bold" content-width="10mm" text-align="center">
<xsl:value-of select="gesamtects" />
</fo:block>
</fo:table-cell>
<fo:table-cell border-width="0.2mm" border-style="solid">
<fo:block font-size="8pt" font-weight="bold" content-width="15mm" text-align="center">
<xsl:text>Average:</xsl:text>
</fo:block>
</fo:table-cell>
<fo:table-cell border-width="0.2mm" border-style="solid">
<fo:block font-size="8pt" font-weight="bold" content-width="15mm" text-align="center">
<xsl:value-of select="schnitt" />
</fo:block>
</fo:table-cell>
</fo:table-row>
</fo:table-body>
</fo:table>
<fo:block>
\n\n
</fo:block>
<fo:table>
<fo:table-column column-width="35mm"/>
<fo:table-column column-width="145mm"/>
<fo:table-body>
<fo:table-row>
<fo:table-cell border-width="0.2mm" border-style="solid">
<fo:block font-size="10pt">Date: <xsl:value-of select="datum" /></fo:block>
</fo:table-cell>
<fo:table-cell border-width="0.2mm" border-style="solid">
<fo:block font-size="10pt" text-align="right" content-width="145mm">Digitally created - valid without signature and stamp</fo:block>
</fo:table-cell>
</fo:table-row>
</fo:table-body>
</fo:table>
<fo:table>
<fo:table-column column-width="15mm"/>
<fo:table-column column-width="155mm"/>
<fo:table-body>
<fo:table-row>
<fo:table-cell>
<fo:block font-size="7pt">Grades: </fo:block>
</fo:table-cell>
<fo:table-cell>
<fo:block font-size="7pt">excellent (1), very good (2), good (3), satisfactory (4), fail (5), Credit based on previous experience/work (ar), not graded (nb),</fo:block>
</fo:table-cell>
</fo:table-row>
<fo:table-row>
<fo:table-cell>
<fo:block font-size="7pt"></fo:block>
</fo:table-cell>
<fo:table-cell>
<fo:block font-size="7pt">Participated with success (met), passed (b), successfully completed (ea), not successfully completed (nea), did not participate (nt)</fo:block>
</fo:table-cell>
</fo:table-row>
</fo:table-body>
</fo:table>
</fo:block-container>
</fo:flow>
</fo:page-sequence>
</xsl:template>
<xsl:template match="unterrichtsfach">
<fo:table-row line-height="10pt">
<fo:table-cell border-width="0.2mm" border-style="solid" >
<fo:block font-size="8pt" content-width="70mm">
<xsl:text> </xsl:text>
<xsl:choose>
<xsl:when test="string-length(bezeichnung_englisch)!=0">
<xsl:value-of select="bezeichnung_englisch"/>
</xsl:when>
<xsl:otherwise>
<xsl:text>[ACHTUNG: Keine englische Bezeichung für "</xsl:text><xsl:value-of select="bezeichnung"/><xsl:text>" in der Datenbank!]</xsl:text>
</xsl:otherwise>
</xsl:choose>
</fo:block>
</fo:table-cell>
<fo:table-cell border-width="0.2mm" border-style="solid" ><fo:block font-size="8pt" content-width="24mm" text-align="center"><xsl:text> </xsl:text><xsl:value-of select="../studiensemester_kurzbz" /></fo:block></fo:table-cell>
<fo:table-cell border-width="0.2mm" border-style="solid" ><fo:block font-size="8pt" content-width="32mm" text-align="center"><xsl:text> </xsl:text><xsl:value-of select="../semester" /></fo:block></fo:table-cell>
<fo:table-cell border-width="0.2mm" border-style="solid" ><fo:block font-size="8pt" content-width="13mm" text-align="center"><xsl:text> </xsl:text><xsl:value-of select="sws" /></fo:block></fo:table-cell>
<fo:table-cell border-width="0.2mm" border-style="solid" ><fo:block font-size="8pt" content-width="10mm" text-align="center"><xsl:text> </xsl:text><xsl:value-of select="ects" /></fo:block></fo:table-cell>
<fo:table-cell border-width="0.2mm" border-style="solid" ><fo:block font-size="8pt" content-width="15mm" text-align="center"><xsl:text> </xsl:text><xsl:value-of select="benotungsdatum" /></fo:block></fo:table-cell>
<fo:table-cell border-width="0.2mm" border-style="solid" ><fo:block font-size="8pt" content-width="15mm" text-align="center"><xsl:text> </xsl:text><xsl:value-of select="note" /></fo:block></fo:table-cell>
</fo:table-row>
</xsl:template>
</xsl:stylesheet >
+320
View File
@@ -0,0 +1,320 @@
<?xml version="1.0" encoding="UTF-8"?>
<xsl:stylesheet version="1.0" xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
<xsl:output method="xml" version="1.0" indent="yes" />
<xsl:template match="studienerfolge">
<fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:layout-master-set>
<fo:simple-page-master page-height="297mm" page-width="210mm" margin="5mm 25mm 5mm 25mm" master-name="PageMaster">
<fo:region-body margin="20mm 0mm 20mm 0mm"/>
</fo:simple-page-master>
</fo:layout-master-set>
<xsl:apply-templates select="studienerfolg"/>
</fo:root>
</xsl:template>
<xsl:template match="studienerfolg">
<fo:page-sequence master-reference="PageMaster">
<fo:flow flow-name="xsl-region-body" >
<!-- Logo -->
<fo:block>
<!--<fo:external-graphic src="../skin/images/logo.jpg" posx="140" posy="15" width="60mm" height="20mm" />-->
<fo:external-graphic posx="140" posy="15" width="60mm" height="20mm" >
<xsl:attribute name="src">
<xsl:value-of select="logopath" />logo.jpg
</xsl:attribute>
</fo:external-graphic>
</fo:block>
<!-- Titel -->
<fo:block-container position="absolute" top="20mm" left="15mm">
<fo:block font-size="16pt">Fachhochschule Technikum Wien</fo:block>
</fo:block-container>
<fo:block-container position="absolute" top="26mm" left="15mm">
<fo:block font-size="12pt">Höchstädtplatz 6\nA-1200 Wien</fo:block>
<fo:block font-size="6pt">ZVR-Nr.: 074476426, DVR-Nr.: 0928381</fo:block>
</fo:block-container>
<fo:block-container position="absolute" top="45mm" left="15mm">
<fo:block text-align="left" line-height="20pt" font-family="sans-serif" font-size="16pt">
<xsl:text>Bestätigung des Studienerfolges</xsl:text>
</fo:block>
</fo:block-container>
<!--FINANZAMT-->
<fo:block-container position="absolute" top="55mm" left="15mm">
<fo:block text-align="left" line-height="10pt" font-family="sans-serif" font-size="8pt">
<xsl:value-of select="finanzamt" />
</fo:block>
</fo:block-container>
<!-- NAME - GEBURTSDATUM - MATRIKELNUMMER -->
<fo:block-container position="absolute" top="60mm" left="15mm">
<fo:table table-layout="fixed" border-collapse="separate">
<fo:table-column column-width="120mm"/>
<fo:table-column column-width="30mm"/>
<fo:table-column column-width="30mm"/>
<fo:table-body>
<fo:table-row line-height="14pt">
<fo:table-cell border-width="0.2mm" border-style="solid">
<fo:block font-family="sans-serif" font-size="8pt" content-width="45mm" text-align="left">
<xsl:text> Familienname, Vorname\n</xsl:text>
</fo:block>
</fo:table-cell>
<fo:table-cell border-width="0.2mm" border-style="solid">
<fo:block font-family="sans-serif" font-size="8pt" content-width="45mm" text-align="left">
<xsl:text> Geburtsdatum\n</xsl:text>
</fo:block>
</fo:table-cell>
<fo:table-cell border-width="0.2mm" border-style="solid">
<fo:block font-family="sans-serif" font-size="8pt" content-width="45mm" text-align="left">
<xsl:text> Personenkennzeichen\n</xsl:text>
</fo:block>
</fo:table-cell>
</fo:table-row>
</fo:table-body>
</fo:table>
</fo:block-container>
<fo:block-container position="absolute" top="65mm" left="16mm">
<fo:block text-align="left" line-height="14pt" font-family="sans-serif" font-size="10pt" font-weight="bold">
<xsl:value-of select="titelpre" /><xsl:text> </xsl:text><xsl:value-of select="nachname" /><xsl:text> </xsl:text><xsl:value-of select="vorname" /><xsl:text> </xsl:text><xsl:value-of select="titelpost" />
</fo:block>
</fo:block-container>
<fo:block-container position="absolute" top="65mm" left="137mm">
<fo:block text-align="left" line-height="14pt" font-family="sans-serif" font-size="10pt" font-weight="bold">
<xsl:value-of select="gebdatum" />
</fo:block>
</fo:block-container>
<fo:block-container position="absolute" top="65mm" left="167mm">
<fo:block text-align="left" line-height="14pt" font-family="sans-serif" font-size="10pt" font-weight="bold">
<xsl:value-of select="matrikelnr" />
</fo:block>
</fo:block-container>
<!--STUDIENGANG UND KENNZAHL -->
<fo:block-container position="absolute" top="70.8mm" left="15mm">
<fo:table table-layout="fixed" border-collapse="separate">
<fo:table-column column-width="150.4mm"/>
<fo:table-column column-width="30mm"/>
<fo:table-body>
<fo:table-row line-height="14pt">
<fo:table-cell border-width="0.2mm" border-style="solid">
<fo:block font-family="sans-serif" font-size="8pt" content-width="45mm" text-align="left">
<xsl:text> Studiengang\n</xsl:text>
</fo:block>
</fo:table-cell>
<fo:table-cell border-width="0.2mm" border-style="solid">
<fo:block font-family="sans-serif" font-size="8pt" content-width="45mm" text-align="left">
<xsl:text> Kennzahl\n</xsl:text>
</fo:block>
</fo:table-cell>
</fo:table-row>
</fo:table-body>
</fo:table>
</fo:block-container>
<fo:block-container position="absolute" top="76mm" left="16mm">
<fo:block text-align="left" line-height="14pt" font-family="sans-serif" font-size="10pt" font-weight="bold">
<xsl:value-of select="studiengang" />
</fo:block>
</fo:block-container>
<fo:block-container position="absolute" top="76mm" left="167mm">
<fo:block text-align="left" line-height="14pt" font-family="sans-serif" font-size="10pt" font-weight="bold">
<xsl:value-of select="studiengang_kz" />
</fo:block>
</fo:block-container>
<!-- Studiensemester - Ausbildungssemester -->
<fo:block-container position="absolute" top="81.6mm" left="15mm">
<fo:table table-layout="fixed" border-collapse="separate">
<fo:table-column column-width="120mm"/>
<fo:table-column column-width="60.4mm"/>
<fo:table-body>
<fo:table-row line-height="14pt">
<fo:table-cell border-width="0.2mm" border-style="solid">
<fo:block font-family="sans-serif" font-size="8pt" content-width="45mm" text-align="left">
<xsl:text> Aktuelles Studiensemester\n</xsl:text>
</fo:block>
</fo:table-cell>
<fo:table-cell border-width="0.2mm" border-style="solid">
<fo:block font-family="sans-serif" font-size="8pt" content-width="45mm" text-align="left">
<xsl:text> Aktuelles Ausbildungssemester\n</xsl:text>
</fo:block>
</fo:table-cell>
</fo:table-row>
</fo:table-body>
</fo:table>
</fo:block-container>
<fo:block-container position="absolute" top="87mm" left="16mm">
<fo:block text-align="left" line-height="10pt" font-family="sans-serif" font-size="10pt" font-weight="bold">
<xsl:value-of select="studiensemester_aktuell" />
</fo:block>
</fo:block-container>
<fo:block-container position="absolute" top="87mm" left="137mm">
<fo:block text-align="left" line-height="10pt" font-family="sans-serif" font-size="10pt" font-weight="bold">
<xsl:value-of select="semester_aktuell" />
</fo:block>
</fo:block-container>
<!-- TABELLE -->
<fo:block-container position="absolute" top="110mm" left="15mm">
<fo:block text-align="left" line-height="14pt" font-family="sans-serif" font-size="10pt" font-weight="bold">
<xsl:text>Folgende Prüfungen wurden abgelegt:</xsl:text>
</fo:block>
</fo:block-container>
<fo:block-container position="absolute" top="120mm" left="15mm">
<fo:table table-layout="fixed" border-collapse="separate" border-width="0.2mm" border-style="solid">
<fo:table-column column-width="70mm"/>
<fo:table-column column-width="24mm"/>
<fo:table-column column-width="32mm"/>
<fo:table-column column-width="13mm"/>
<fo:table-column column-width="10mm"/>
<fo:table-column column-width="15mm"/>
<fo:table-column column-width="15mm"/>
<fo:table-body>
<fo:table-row line-height="10pt">
<fo:table-cell border-width="0.2mm" border-style="solid">
<fo:block font-size="8pt" font-weight="bold">
<xsl:text> Lehrveranstaltung</xsl:text>
</fo:block>
</fo:table-cell>
<fo:table-cell border-width="0.2mm" border-style="solid">
<fo:block font-size="8pt" font-weight="bold" content-width="24mm" text-align="center">
<xsl:text>Studiensemester</xsl:text>
</fo:block>
</fo:table-cell>
<fo:table-cell border-width="0.2mm" border-style="solid">
<fo:block font-size="8pt" font-weight="bold" content-width="32mm" text-align="center">
<xsl:text>Ausbildungssemester</xsl:text>
</fo:block>
</fo:table-cell>
<fo:table-cell border-width="0.2mm" border-style="solid">
<fo:block font-size="8pt" font-weight="bold" content-width="13mm" text-align="center">
<xsl:text>SWS</xsl:text>
</fo:block>
</fo:table-cell>
<fo:table-cell border-width="0.2mm" border-style="solid">
<fo:block font-size="8pt" font-weight="bold" content-width="10mm" text-align="center">
<xsl:text>ECTS</xsl:text>
</fo:block>
</fo:table-cell>
<fo:table-cell border-width="0.2mm" border-style="solid">
<fo:block font-size="8pt" font-weight="bold" content-width="15mm" text-align="center">
<xsl:text>Datum</xsl:text>
</fo:block>
</fo:table-cell>
<fo:table-cell border-width="0.2mm" border-style="solid">
<fo:block font-size="8pt" font-weight="bold" content-width="15mm" text-align="center">
<xsl:text>Benotung</xsl:text>
</fo:block>
</fo:table-cell>
</fo:table-row>
<xsl:apply-templates select="unterrichtsfach"/>
<fo:table-row line-height="10pt">
<fo:table-cell border-width="0.2mm" border-style="solid">
<fo:block font-size="8pt" font-weight="bold">
<xsl:text> Semestersumme:</xsl:text>
</fo:block>
</fo:table-cell>
<fo:table-cell border-width="0.2mm" border-style="solid">
<fo:block font-size="8pt" font-weight="bold" content-width="24mm" text-align="center">
<xsl:value-of select="studiensemester_kurzbz" />
</fo:block>
</fo:table-cell>
<fo:table-cell border-width="0.2mm" border-style="solid">
<fo:block font-size="8pt" font-weight="bold" content-width="32mm" text-align="center">
<xsl:text></xsl:text>
</fo:block>
</fo:table-cell>
<fo:table-cell border-width="0.2mm" border-style="solid">
<fo:block font-size="8pt" font-weight="bold" content-width="13mm" text-align="center">
<xsl:value-of select="gesamtstunden" />
</fo:block>
</fo:table-cell>
<fo:table-cell border-width="0.2mm" border-style="solid">
<fo:block font-size="8pt" font-weight="bold" content-width="10mm" text-align="center">
<xsl:value-of select="gesamtects" />
</fo:block>
</fo:table-cell>
<fo:table-cell border-width="0.2mm" border-style="solid">
<fo:block font-size="8pt" font-weight="bold" content-width="15mm" text-align="center">
<xsl:text>Schnitt:</xsl:text>
</fo:block>
</fo:table-cell>
<fo:table-cell border-width="0.2mm" border-style="solid">
<fo:block font-size="8pt" font-weight="bold" content-width="15mm" text-align="center">
<xsl:value-of select="schnitt" />
</fo:block>
</fo:table-cell>
</fo:table-row>
</fo:table-body>
</fo:table>
<fo:block>
\n\n
</fo:block>
<fo:table>
<fo:table-column column-width="35mm"/>
<fo:table-column column-width="145mm"/>
<fo:table-body>
<fo:table-row>
<fo:table-cell border-width="0.2mm" border-style="solid">
<fo:block font-size="10pt">Datum: <xsl:value-of select="datum" /></fo:block>
</fo:table-cell>
<fo:table-cell border-width="0.2mm" border-style="solid">
<fo:block font-size="10pt" text-align="right" content-width="145mm">Gilt auch ohne Unterschrift und Stempel</fo:block>
</fo:table-cell>
</fo:table-row>
</fo:table-body>
</fo:table>
<fo:table>
<fo:table-column column-width="15mm"/>
<fo:table-column column-width="155mm"/>
<fo:table-body>
<fo:table-row>
<fo:table-cell>
<fo:block font-size="7pt">Benotung: </fo:block>
</fo:table-cell>
<fo:table-cell>
<fo:block font-size="7pt">Sehr gut (1), Gut (2), Befriedigend (3), Genügend (4), Nicht genügend (5), angerechnet (ar), nicht beurteilt (nb), mit Erfolg teilgenommen (met),</fo:block>
</fo:table-cell>
</fo:table-row>
<fo:table-row>
<fo:table-cell>
<fo:block font-size="7pt"></fo:block>
</fo:table-cell>
<fo:table-cell>
<fo:block font-size="7pt">bestanden (b), approbiert (ap), erfolgreich absolviert (ea), nicht erfolgreich absolviert (nea), nicht teilgenommen (nt)</fo:block>
</fo:table-cell>
</fo:table-row>
</fo:table-body>
</fo:table>
</fo:block-container>
</fo:flow>
</fo:page-sequence>
</xsl:template>
<xsl:template match="unterrichtsfach">
<fo:table-row line-height="10pt">
<fo:table-cell border-width="0.2mm" border-style="solid" ><fo:block font-size="8pt" content-width="70mm"><xsl:text> </xsl:text><xsl:value-of select="bezeichnung" /></fo:block></fo:table-cell>
<fo:table-cell border-width="0.2mm" border-style="solid" ><fo:block font-size="8pt" content-width="24mm" text-align="center"><xsl:text> </xsl:text><xsl:value-of select="../studiensemester_kurzbz" /></fo:block></fo:table-cell>
<fo:table-cell border-width="0.2mm" border-style="solid" ><fo:block font-size="8pt" content-width="32mm" text-align="center"><xsl:text> </xsl:text><xsl:value-of select="../semester" /></fo:block></fo:table-cell>
<fo:table-cell border-width="0.2mm" border-style="solid" ><fo:block font-size="8pt" content-width="13mm" text-align="center"><xsl:text> </xsl:text><xsl:value-of select="sws" /></fo:block></fo:table-cell>
<fo:table-cell border-width="0.2mm" border-style="solid" ><fo:block font-size="8pt" content-width="10mm" text-align="center"><xsl:text> </xsl:text><xsl:value-of select="ects" /></fo:block></fo:table-cell>
<fo:table-cell border-width="0.2mm" border-style="solid" ><fo:block font-size="8pt" content-width="15mm" text-align="center"><xsl:text> </xsl:text><xsl:value-of select="benotungsdatum" /></fo:block></fo:table-cell>
<fo:table-cell border-width="0.2mm" border-style="solid" ><fo:block font-size="8pt" content-width="15mm" text-align="center"><xsl:text> </xsl:text><xsl:value-of select="note" /></fo:block></fo:table-cell>
</fo:table-row>
</xsl:template>
</xsl:stylesheet >
+2
View File
@@ -0,0 +1,2 @@
*
!.gitignore
+7 -2
View File
@@ -1057,11 +1057,16 @@ function hideAllTreeColumns()
*/
function saveJsondataFromTree(nodeId, studienplan_id, studienplan_lehrveranstaltung_id)
{
var obj = $("#treeData").find("li[id="+nodeId+"]");
var jsonData = $("#treeData").jstree("get_json", $("#treeData").find("li[id="+nodeId+"]"));
var jsonData=Array();
// Wenn eine verschiebung innerhalb des Studienplans stattfindet wird der Eintrag aus dem Tree geholt
if(studienplan_lehrveranstaltung_id!='')
{
jsonData = $("#treeData").jstree("get_json", $("#treeData").find("li[id="+nodeId+"]"));
}
var copy = false;
// Wenn die Lehrveranstaltung aus dem Lehrveranstaltungstree kommt ist diese mit copy_ geprefixt
if(jsonData.length !== 1)
{
jsonData = $("#treeData").jstree("get_json", $("#copy_"+nodeId));