From 1316c2a6b54d93bd81809458847ce338104cc6be Mon Sep 17 00:00:00 2001
From: oesi <oesi@technikum-wien.at>
Date: Fri, 13 Mar 2015 17:01:37 +0100
Subject: [PATCH] =?UTF-8?q?Inskriptionsbest=C3=A4tigung=20wird=20jetzt=20a?=
 =?UTF-8?q?ls=20PDF=20geliefert=20wenn=20diese=20mit=20unoconv=20erstellt?=
 =?UTF-8?q?=20wird?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 content/fas.xul.php                   |  2 +-
 content/student/studentoverlay.js.php | 11 +++++++++--
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/content/fas.xul.php b/content/fas.xul.php
index 37bfe04e0..32d9dfe09 100644
--- a/content/fas.xul.php
+++ b/content/fas.xul.php
@@ -120,7 +120,7 @@ foreach($addon_obj->result as $addon)
   <command id="menu-statistic-studentendetails:command" oncommand="StatistikPrintStudentExportExtended();"/>
   <command id="menu-statistic-lektorenstatistik:command" oncommand="StatistikPrintLektorenstatistik();"/>
   <command id="menu-statistic-stromanalyse:command" oncommand="StatistikPrintStromanalyse();"/>
-  <command id="menu-dokumente-inskriptionsbestaetigung:command" oncommand="StudentPrintInskriptionsbestaetigung();"/>
+  <command id="menu-dokumente-inskriptionsbestaetigung:command" oncommand="StudentPrintInskriptionsbestaetigung(event);"/>
   <command id="menu-dokumente-zeugnis:command" oncommand="StudentCreateZeugnis('Zeugnis',event);"/>
   <command id="menu-dokumente-zeugniseng:command" oncommand="StudentCreateZeugnis('ZeugnisEng',event);"/>
   <!--<command id="menu-dokumente-sammelzeugnis:command" oncommand="StudentCreateSammelzeugnis('Sammelzeugnis');"/>-->
diff --git a/content/student/studentoverlay.js.php b/content/student/studentoverlay.js.php
index acdb3a4c7..083987b30 100644
--- a/content/student/studentoverlay.js.php
+++ b/content/student/studentoverlay.js.php
@@ -2066,7 +2066,7 @@ function StudentAddRolle(rolle, semester, studiensemester)
 // ****
 // * Druckt die Instkriptionsbestaetigung
 // ****
-function StudentPrintInskriptionsbestaetigung()
+function StudentPrintInskriptionsbestaetigung(event)
 {
 	tree = document.getElementById('student-tree');
 	//Alle markierten Studenten holen
@@ -2095,8 +2095,15 @@ function StudentPrintInskriptionsbestaetigung()
 		return false;
 	}
 	
+	if (event.shiftKey) 
+	    var output='odt';
+	else if (event.ctrlKey)
+		var output='doc';
+	else
+		var output='pdf';
+
 	if(anzahl>0)
-		window.open('<?php echo APP_ROOT; ?>content/pdfExport.php?xml=student.rdf.php&xsl=Inskription&stg_kz='+stg_kz+'&uid='+paramList+'&ss='+stsem,'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('<?php echo APP_ROOT; ?>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');
 	else
 		alert('Bitte einen Studenten auswaehlen');
 }