From fd7cd907851e3c6d484cab93096dd0c06a86cf13 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20=C3=96sterreicher?= <oesi@technikum-wien.at>
Date: Fri, 11 Sep 2009 09:35:11 +0000
Subject: [PATCH] =?UTF-8?q?-=20FAS=20Men=C3=BCpunkt=20f=C3=BCr=20Bewerbers?=
 =?UTF-8?q?tatistik=20im=20Excel-Format?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 content/fas.xul.php       | 25 ++++++++++++++++++-------
 content/fasoverlay.js.php |  6 ++++--
 locale/de-AT/fas.dtd      | 13 ++++++++++---
 3 files changed, 32 insertions(+), 12 deletions(-)

diff --git a/content/fas.xul.php b/content/fas.xul.php
index 770d0372f..1cebd0106 100644
--- a/content/fas.xul.php
+++ b/content/fas.xul.php
@@ -84,7 +84,8 @@ echo '<?xul-overlay href="'.APP_ROOT.'content/fasoverlay.xul.php"?>';
   <command id="menu-statistic-lehrauftragsliste:command" oncommand="StatistikPrintLehrauftragsliste();"/>
   <command id="menu-statistic-projektarbeit:command" oncommand="StatistikPrintProjektarbeit();"/>
   <command id="menu-statistic-abschlusspruefung:command" oncommand="StatistikPrintAbschlusspruefung();"/>
-  <command id="menu-statistic-bewerberstatistik:command" oncommand="StatistikPrintBewerberstatistik();"/>
+  <command id="menu-statistic-bewerberstatistik-html:command" oncommand="StatistikPrintBewerberstatistik('');"/>
+  <command id="menu-statistic-bewerberstatistik-excel:command" oncommand="StatistikPrintBewerberstatistik('xls');"/>
   <command id="menu-statistic-abgaengerstatistik:command" oncommand="StatistikPrintAbgaengerstatistik();"/>
   <command id="menu-statistic-fehlendedokumente:command" oncommand="StatistikPrintFehlendeDokumente();"/>
   <command id="menu-statistic-notenspiegel:command" oncommand="StatistikPrintNotenspiegel('html');"/>
@@ -372,12 +373,22 @@ echo '<?xul-overlay href="'.APP_ROOT.'content/fasoverlay.xul.php"?>';
 						';
 					}
 					?>
-					 <menuitem
-		               id        =  "menu-statistic-bewerberstatistik"
-		               key       =  "menu-statistic-bewerberstatistik:key"
-		               label     = "&menu-statistic-bewerberstatistik.label;"
-		               command   =  "menu-statistic-bewerberstatistik:command"
-		               accesskey = "&menu-statistic-bewerberstatistik.accesskey;"/>
+					<menu id="menu-statistic-substatistik-bewerberstatistik" label="&menu-statistic-substatistik-bewerberstatistik.label;" accesskey="&menu-statistic-substatistik-bewerberstatistik.accesskey;">
+						<menupopup id="menu-statistic-substatistik-bewerberstatistik-popup">
+				             <menuitem
+				               id        =  "menu-statistic-bewerberstatistik-html"
+				               key       =  "menu-statistic-bewerberstatistik-html:key"
+				               label     = "&menu-statistic-bewerberstatistik-html.label;"
+				               command   =  "menu-statistic-bewerberstatistik-html:command"
+				               accesskey = "&menu-statistic-bewerberstatistik-html.accesskey;"/>
+				             <menuitem
+				               id        =  "menu-statistic-bewerberstatistik-excel"
+				               key       =  "menu-statistic-bewerberstatistik-excel:key"
+				               label     = "&menu-statistic-bewerberstatistik-excel.label;"
+				               command   =  "menu-statistic-bewerberstatistik-excel:command"
+				               accesskey = "&menu-statistic-bewerberstatistik-excel.accesskey;"/>
+		               </menupopup>
+					</menu>
 					<menuitem
 		               id        =  "menu-statistic-abgaengerstatistik"
 		               key       =  "menu-statistic-abgaengerstatistik:key"
diff --git a/content/fasoverlay.js.php b/content/fasoverlay.js.php
index 273be21c7..d4753bb95 100644
--- a/content/fasoverlay.js.php
+++ b/content/fasoverlay.js.php
@@ -941,11 +941,13 @@ function StatistikPrintNotenspiegel(typ)
 // ****
 // * Liefert eine statistik ueber die Anzahl der Interessenten/Bewerber Studenten
 // ****
-function StatistikPrintBewerberstatistik()
+function StatistikPrintBewerberstatistik(typ)
 {
 	var stsem = getStudiensemester();
 
-	window.open('<?php echo APP_ROOT ?>content/statistik/bewerberstatistik.php?stsem='+stsem,'Bewerberstatistik');
+	if(typ=='xls')
+		typ='&excel=true';
+	window.open('<?php echo APP_ROOT ?>content/statistik/bewerberstatistik.php?stsem='+stsem+typ,'Bewerberstatistik');
 }
 
 // ****
diff --git a/locale/de-AT/fas.dtd b/locale/de-AT/fas.dtd
index f612832b0..b4c8e5d34 100644
--- a/locale/de-AT/fas.dtd
+++ b/locale/de-AT/fas.dtd
@@ -106,9 +106,16 @@
 <!ENTITY menu-statistic-notenspiegel.label		"Notenspiegel HTML">
 <!ENTITY menu-statistic-notenspiegel.accesskey	"H">
 
-<!ENTITY menu-statistic-bewerberstatistik.key		"E">
-<!ENTITY menu-statistic-bewerberstatistik.label		"Bewerberstatistik">
-<!ENTITY menu-statistic-bewerberstatistik.accesskey	"E">
+<!ENTITY menu-statistic-substatistik-bewerberstatistik.label		"Bewerberstatistik">
+<!ENTITY menu-statistic-substatistik-bewerberstatistik.accesskey	"B">
+
+<!ENTITY menu-statistic-bewerberstatistik-html.key			"H">
+<!ENTITY menu-statistic-bewerberstatistik-html.label		"HTML">
+<!ENTITY menu-statistic-bewerberstatistik-html.accesskey	"H">
+
+<!ENTITY menu-statistic-bewerberstatistik-excel.key			"E">
+<!ENTITY menu-statistic-bewerberstatistik-excel.label		"EXCEL">
+<!ENTITY menu-statistic-bewerberstatistik-excel.accesskey	"E">
 
 <!ENTITY menu-statistic-substatistik.key		"S">
 <!ENTITY menu-statistic-substatistik.label		"Statistik">