diff --git a/cis/private/pdfExport.php b/cis/private/pdfExport.php index 99b5c94f0..a570c75f9 100644 --- a/cis/private/pdfExport.php +++ b/cis/private/pdfExport.php @@ -233,7 +233,7 @@ if ((((isset($_GET["uid"]) && $user == $_GET["uid"])) || $rechte->isBerechtigt(' if (isset($_GET['ss'])) $stsem_zahlung = $konto->getLastStSemBuchungstypen($user, $buchungstypen, $_GET['ss']); - if ((($xsl=='Inskription') || ($xsl == 'Studienblatt')) && ($_GET["ss"] != $stsem_zahlung)) + if ((($xsl == 'Inskription') || ($xsl == 'InskriptionEng') || ($xsl == 'Studienblatt')) && ($_GET["ss"] != $stsem_zahlung)) { die('Der Studienbeitrag wurde noch nicht bezahlt'); } diff --git a/cis/private/profile/dokumente.php b/cis/private/profile/dokumente.php index 598c65148..f75529561 100644 --- a/cis/private/profile/dokumente.php +++ b/cis/private/profile/dokumente.php @@ -244,18 +244,22 @@ if (in_array($stsem, $stsem_arr)) '.$p->t('global/name').' - '; + '; if ($stsem_zahlung != FALSE && $stsem == $stsem_zahlung) { $path = "../pdfExport.php?xsl=Inskription&xml=student.rdf.php&ss=".$stsem."&uid=".$uid."&xsl_stg_kz=".$xsl_stg_kz; - echo ''; - echo ''.$p->t('tools/inskriptionsbestaetigung').' '.$stsem.''; + echo ''; + echo ''.$p->t('tools/inskriptionsbestaetigung').' '.$stsem.' ' . $p->t('global/deutsch'). ''; + + $patheng = "../pdfExport.php?xsl=InskriptionEng&xml=student.rdf.php&ss=".$stsem."&uid=".$uid."&xsl_stg_kz=".$xsl_stg_kz; + echo ''; + echo ''.$p->t('tools/inskriptionsbestaetigung').' '.$stsem.' ' . $p->t('global/englisch'). ''; } else { - echo ''.$p->t('tools/studienbeitragFuerSSNochNichtBezahlt',array($stsem)).''; + echo ''.$p->t('tools/studienbeitragFuerSSNochNichtBezahlt',array($stsem)).''; } - echo ''; + echo ''; if (defined('CIS_DOKUMENTE_STUDIENBUCHLBATT_DRUCKEN') && CIS_DOKUMENTE_STUDIENBUCHLBATT_DRUCKEN) { diff --git a/content/fas.xul.php b/content/fas.xul.php index 449f917b7..80efdb2f9 100644 --- a/content/fas.xul.php +++ b/content/fas.xul.php @@ -125,7 +125,8 @@ foreach($addon_obj->result as $addon) - + + @@ -513,6 +514,12 @@ foreach($addon_obj->result as $addon) label = "&menu-dokumente-inskriptionsbestaetigung.label;" command = "menu-dokumente-inskriptionsbestaetigung:command" accesskey = "&menu-dokumente-inskriptionsbestaetigung.accesskey;"/> + 0) - window.open('content/pdfExport.php?xml=student.rdf.php&xsl=Inskription&stg_kz='+stg_kz+'&uid='+paramList+'&ss='+stsem+'&output='+output,'Inskriptionsbestaetigung', 'height=200,width=350,left=0,top=0,hotkeys=0,resizable=yes,status=no,scrollbars=yes,toolbar=no,location=no,menubar=no,dependent=yes'); + window.open('content/pdfExport.php?xml=student.rdf.php&xsl='+ xsl +'&stg_kz='+stg_kz+'&uid='+paramList+'&ss='+stsem+'&output='+output,'Inskriptionsbestaetigung', 'height=200,width=350,left=0,top=0,hotkeys=0,resizable=yes,status=no,scrollbars=yes,toolbar=no,location=no,menubar=no,dependent=yes'); else alert('Bitte einen Studenten auswaehlen'); } diff --git a/locale/de-AT/fas.dtd b/locale/de-AT/fas.dtd index df6180904..c3d420ede 100644 --- a/locale/de-AT/fas.dtd +++ b/locale/de-AT/fas.dtd @@ -187,6 +187,10 @@ + + + + diff --git a/rdf/student.rdf.php b/rdf/student.rdf.php index af0bbe82d..6eb9a967e 100644 --- a/rdf/student.rdf.php +++ b/rdf/student.rdf.php @@ -1218,6 +1218,7 @@ else bezeichnung.']]> bezeichnung.']]> + english.']]> typ.']]> orgform_kurzbz.']]> diff --git a/system/vorlage_zip/Inskription.odt b/system/vorlage_zip/Inskription.odt index d1933cdcb..6471c5cc2 100644 Binary files a/system/vorlage_zip/Inskription.odt and b/system/vorlage_zip/Inskription.odt differ diff --git a/system/vorlage_zip/InskriptionEng.odt b/system/vorlage_zip/InskriptionEng.odt new file mode 100644 index 000000000..e26be218e Binary files /dev/null and b/system/vorlage_zip/InskriptionEng.odt differ diff --git a/system/xsl/inskriptioneng_0.xml b/system/xsl/inskriptioneng_0.xml new file mode 100644 index 000000000..c2080a5ec --- /dev/null +++ b/system/xsl/inskriptioneng_0.xml @@ -0,0 +1,347 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- + + + + --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- + + + + --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- + + + + --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- + + + + + + + Certificate of Enrolment University of Applied Sciences Demo + + + + + + To be submitted to (place where the certificate is to be submitted and its reference number, e.g. social security number). + + + Student number + + + + + + + + + + + + + + + + + + born on , is enrolled as a regular student in + (beginning ) + in the + + + Bachelor Degree program + + + Master Degree program + + + Degree Program + + + + + + + + + + + + (), + + st + nd + rd + th + + semester (beginning , ). + + + + + + + + Date: + + + Rector: + + + + + \ No newline at end of file