From 5e9e3a08230c71552ae1dc905aaff7d098be921d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20=C3=96sterreicher?= <oesi@technikum-wien.at>
Date: Thu, 18 Oct 2007 09:18:21 +0000
Subject: [PATCH]

---
 content/fas.xul.php       | 47 ++++++++++++++++++++++++++++++++
 content/fasoverlay.js.php | 24 +++++++++++++++++
 locale/de-AT/fas.dtd      | 56 +++++++++++++++++++++++++++++++++------
 3 files changed, 119 insertions(+), 8 deletions(-)

diff --git a/content/fas.xul.php b/content/fas.xul.php
index 98d21af43..a554809cd 100644
--- a/content/fas.xul.php
+++ b/content/fas.xul.php
@@ -87,6 +87,10 @@ echo '<?xml-stylesheet href="datepicker/datepicker.css" type="text/css"?>';
   <command id="menu-statistic-notenspiegel:command" oncommand="StatistikPrintNotenspiegel('html');"/>
   <command id="menu-statistic-notenspiegel-excel:command" oncommand="StatistikPrintNotenspiegel('xls');"/>
   <command id="menu-statistic-bewerberstatistik:command" oncommand="StatistikPrintBewerberstatistik();"/>
+  <command id="menu-statistic-substatistik-studentenprosemester-excel:command" oncommand="StatistikPrintStudentenProSemester('xls');"/>
+  <command id="menu-statistic-substatistik-studentenprosemester-html:command" oncommand="StatistikPrintStudentenProSemester('');"/>
+  <command id="menu-statistic-substatistik-alvsstatistik-excel:command" oncommand="StatistikPrintALVSStatistik('xls');"/>
+  <command id="menu-statistic-substatistik-alvsstatistik-html:command" oncommand="StatistikPrintALVSStatistik('');"/>  
   <command id="menu-dokumente-inskriptionsbestaetigung:command" oncommand="StudentPrintInskriptionsbestaetigung();"/>
   <command id="menu-dokumente-zeugnis:command" oncommand="StudentCreateZeugnis();"/>
   <command id="menu-dokumente-diplsupplement:command" oncommand="StudentCreateDiplSupplement();"/>
@@ -102,6 +106,7 @@ echo '<?xml-stylesheet href="datepicker/datepicker.css" type="text/css"?>';
   <command id="menu-bis-studenten-plausibilitaetspruefung:command" oncommand="BISStudentenPlausicheck();"/>
   <command id="menu-bis-studenten-export:command" oncommand="BISStudentenExport();"/>
   <command id="menu-help-close:command" oncommand="OpenAboutDialog()"/>
+  <command id="menu-help-todo:command" oncommand="OpenToDoDialog()"/>
 </commandset>
 
 <keyset id="mainkeys">
@@ -247,6 +252,42 @@ echo '<?xml-stylesheet href="datepicker/datepicker.css" type="text/css"?>';
 		               accesskey = "&menu-statistic-notenspiegel.accesskey;"/>
 				</menupopup>
 			</menu>
+			<menu id="menu-statistic-substatistik" label="&menu-statistic-substatistik.label;" accesskey="&menu-statistic-substatistik.accesskey;">
+				<menupopup id="menu-statistic-substatistik-popup">
+					<menu id="menu-statistic-substatistik-studentenprosemester" label="&menu-statistic-substatistik-studentenprosemester.label;" accesskey="&menu-statistic-substatistik-studentenprosemester.accesskey;">
+						<menupopup id="menu-statistic-substatistik-studentenprosemester-popup">
+				             <menuitem
+				               id        =  "menu-statistic-substatistik-studentenprosemester-excel"
+				               key       =  "menu-statistic-substatistik-studentenprosemester-excel:key"
+				               label     = "&menu-statistic-substatistik-studentenprosemester-excel.label;"
+				               command   =  "menu-statistic-substatistik-studentenprosemester-excel:command"
+				               accesskey = "&menu-statistic-substatistik-studentenprosemester-excel.accesskey;"/>
+				             <menuitem
+				               id        =  "menu-statistic-substatistik-studentenprosemester-html"
+				               key       =  "menu-statistic-substatistik-studentenprosemester-html:key"
+				               label     = "&menu-statistic-substatistik-studentenprosemester-html.label;"
+				               command   =  "menu-statistic-substatistik-studentenprosemester-html:command"
+				               accesskey = "&menu-statistic-substatistik-studentenprosemester-html.accesskey;"/>
+						</menupopup>
+					</menu>
+					<menu id="menu-statistic-substatistik-alvsstatistik" label="&menu-statistic-substatistik-alvsstatistik.label;" accesskey="&menu-statistic-substatistik-alvsstatistik.accesskey;">
+						<menupopup id="menu-statistic-substatistik-alvsstatistik-popup">
+				             <menuitem
+				               id        =  "menu-statistic-substatistik-alvsstatistik-excel"
+				               key       =  "menu-statistic-substatistik-alvsstatistik-excel:key"
+				               label     = "&menu-statistic-substatistik-alvsstatistik-excel.label;"
+				               command   =  "menu-statistic-substatistik-alvsstatistik-excel:command"
+				               accesskey = "&menu-statistic-substatistik-alvsstatistik-excel.accesskey;"/>
+				             <menuitem
+				               id        =  "menu-statistic-substatistik-alvsstatistik-html"
+				               key       =  "menu-statistic-substatistik-alvsstatistik-html:key"
+				               label     = "&menu-statistic-substatistik-alvsstatistik-html.label;"
+				               command   =  "menu-statistic-substatistik-alvsstatistik-html:command"
+				               accesskey = "&menu-statistic-substatistik-alvsstatistik-html.accesskey;"/>
+						</menupopup>
+					</menu>
+				</menupopup>
+			</menu>
           <!--   <menuitem
                id        =  "menu-statistic-bewerberstatistik"
                key       =  "menu-statistic-bewerberstatistik:key"
@@ -400,6 +441,12 @@ echo '<?xml-stylesheet href="datepicker/datepicker.css" type="text/css"?>';
                label     = "&menu-help-close.label;"
                command   =  "menu-help-close:command"
                accesskey = "&menu-help-close.accesskey;"/>
+            <menuitem
+               id        =  "menu-help-todo"
+               key       =  "menu-help-todo:key"
+               label     = "&menu-help-todo.label;"
+               command   =  "menu-help-todo:command"
+               accesskey = "&menu-help-todo.accesskey;"/>
           </menupopup>
     </menu>
   </menubar>
diff --git a/content/fasoverlay.js.php b/content/fasoverlay.js.php
index f719eb984..7d24b115e 100644
--- a/content/fasoverlay.js.php
+++ b/content/fasoverlay.js.php
@@ -878,6 +878,30 @@ function OpenAboutDialog()
 	window.open('<?php echo APP_ROOT ?>content/about.xul.php','About','height=520,width=500,left=350,top=350,hotkeys=0,resizable=yes,status=no,scrollbars=yes,toolbar=no,location=no,menubar=no,dependent=yes');
 }
 
+// ****
+// * Oeffnet die ToDo Liste
+// ****
+function OpenToDoDialog()
+{
+	window.open('<?php echo APP_ROOT ?>content/ToDo_FASo.html','ToDo','height=600,width=600,left=150,top=150,hotkeys=0,resizable=yes,status=no,scrollbars=yes,toolbar=no,location=no,menubar=no,dependent=yes');
+}
+
+// ****
+// * Oeffnet ALVS-Statistik
+// ****
+function StatistikPrintALVSStatistik(format)
+{
+	window.open('<?php echo APP_ROOT ?>content/statistik/alvsstatistik.php?format='+format,'ALVS-Statistik','');
+}
+
+// ****
+// * Oeffnet Studenten/Semester Statistik
+// ****
+function StatistikPrintStudentenProSemester(format)
+{
+	window.open('<?php echo APP_ROOT ?>content/statistik/studentenprosemester.php?format='+format,'Studenten/Semester','');
+}
+
 // ****
 // * Wenn der Tab Mitarbeiter aktiviert ist und der Prestudent-, Student- oder Lehrveranstaltungstab
 // * markiert wird, dann wird im Menue auf den Verband Tag gewechselt
diff --git a/locale/de-AT/fas.dtd b/locale/de-AT/fas.dtd
index 47bedd7ab..bdc93c069 100644
--- a/locale/de-AT/fas.dtd
+++ b/locale/de-AT/fas.dtd
@@ -1,6 +1,9 @@
 <!ENTITY window.title			"FASo"> 
-<!ENTITY window.version			"1.1 vom 17.Juli 2007"> 
+<!ENTITY window.version			"1.2 vom 18.Oktober 2007"> 
 
+<!-- MENUE -->
+
+<!-- Datei -->
 <!ENTITY menu-file.label              	"Datei">
 <!ENTITY menu-file.accesskey           	"D">
 
@@ -8,13 +11,7 @@
 <!ENTITY menu-file-close.label         	"Beenden">
 <!ENTITY menu-file-close.accesskey     	"B">
 
-<!ENTITY menu-help.label              	"Hilfe">
-<!ENTITY menu-help.accesskey          	"H">
-
-<!ENTITY menu-help-close.key          	"H">
-<!ENTITY menu-help-close.label        	"Ueber">
-<!ENTITY menu-help-close.accesskey    	"U">
-
+<!-- Bearbeiten -->
 <!ENTITY menu-edit.label              	"Bearbeiten">
 <!ENTITY menu-edit.accesskey          	"B">
 
@@ -22,6 +19,7 @@
 <!ENTITY menu-edit-undo.label         	"Undo">
 <!ENTITY menu-edit-undo.accesskey     	"">
 
+<!-- Einstellungen -->
 <!ENTITY menu-prefs.label              	"Einstellungen">
 <!ENTITY menu-prefs.accesskey          	"E">
 
@@ -40,6 +38,7 @@
 <!ENTITY menu-prefs-kontofilterstg.label    	"Buchungen auf Studiengang filtern">
 <!ENTITY menu-prefs-kontofilterstg.accesskey	"B">
 
+<!-- Berichte -->
 <!ENTITY menu-statistic.label		"Berichte">
 <!ENTITY menu-statistic.accesskey	"R">
 
@@ -83,6 +82,33 @@
 <!ENTITY menu-statistic-bewerberstatistik.label		"Bewerberstatistik">
 <!ENTITY menu-statistic-bewerberstatistik.accesskey	"E">
 
+<!ENTITY menu-statistic-substatistik.key		"S">
+<!ENTITY menu-statistic-substatistik.label		"Statistik">
+<!ENTITY menu-statistic-substatistik.accesskey	"S">
+
+<!ENTITY menu-statistic-substatistik-studentenprosemester.label		"Student/Semester">
+<!ENTITY menu-statistic-substatistik-studentenprosemester.accesskey	"S">
+
+<!ENTITY menu-statistic-substatistik-studentenprosemester-excel.key			"E">
+<!ENTITY menu-statistic-substatistik-studentenprosemester-excel.label		"EXCEL">
+<!ENTITY menu-statistic-substatistik-studentenprosemester-excel.accesskey	"E">
+
+<!ENTITY menu-statistic-substatistik-studentenprosemester-html.key			"H">
+<!ENTITY menu-statistic-substatistik-studentenprosemester-html.label		"HTML">
+<!ENTITY menu-statistic-substatistik-studentenprosemester-html.accesskey	"H">
+
+<!ENTITY menu-statistic-substatistik-alvsstatistik.label		"ALVS-Statistik">
+<!ENTITY menu-statistic-substatistik-alvsstatistik.accesskey	"A">
+
+<!ENTITY menu-statistic-substatistik-alvsstatistik-excel.key		"E">
+<!ENTITY menu-statistic-substatistik-alvsstatistik-excel.label		"EXCEL">
+<!ENTITY menu-statistic-substatistik-alvsstatistik-excel.accesskey	"E">
+
+<!ENTITY menu-statistic-substatistik-alvsstatistik-html.key			"H">
+<!ENTITY menu-statistic-substatistik-alvsstatistik-html.label		"HTML">
+<!ENTITY menu-statistic-substatistik-alvsstatistik-html.accesskey	"H">
+
+<!-- Dokumente -->
 <!ENTITY menu-dokumente.label		"Dokumente">
 <!ENTITY menu-dokumente.accesskey	"D">
 
@@ -110,6 +136,7 @@
 <!ENTITY menu-dokumente-accountinfoblatt.label	"Account InfoBlatt">
 <!ENTITY menu-dokumente-accountinfoblatt.accesskey	"A">
 
+<!-- Extras -->
 <!ENTITY menu-extras.label		"Extras">
 <!ENTITY menu-extras.accesskey	"X">
 
@@ -121,6 +148,7 @@
 <!ENTITY menu-extras-firma.label		"Firmenverwaltung">
 <!ENTITY menu-extras-firma.accesskey	"F">
 
+<!-- BIS -->
 <!ENTITY menu-bis.label		"BIS">
 <!ENTITY menu-bis.accesskey	"I">
 <!ENTITY menu-bis.accesskey	"I">
@@ -156,3 +184,15 @@
 <!ENTITY menu-bis-studenten-export.key		"E">
 <!ENTITY menu-bis-studenten-export.label		"Meldung generieren">
 <!ENTITY menu-bis-studenten-export.accesskey	"E">
+
+<!-- Hilfe -->
+<!ENTITY menu-help.label              	"Hilfe">
+<!ENTITY menu-help.accesskey          	"H">
+
+<!ENTITY menu-help-close.key          	"H">
+<!ENTITY menu-help-close.label        	"Ueber">
+<!ENTITY menu-help-close.accesskey    	"U">
+
+<!ENTITY menu-help-todo.key          	"T">
+<!ENTITY menu-help-todo.label        	"ToDo">
+<!ENTITY menu-help-todo.accesskey    	"T">
\ No newline at end of file