From b4adcab348e7a573a94f62c20fbcbce69ba99bff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20=C3=96sterreicher?= <oesi@technikum-wien.at>
Date: Thu, 29 Oct 2009 09:48:34 +0000
Subject: [PATCH] =?UTF-8?q?Men=C3=BCpunkt=20f=C3=BCr=20Studentenmeldung=20?=
 =?UTF-8?q?unterscheidet=20nun=20zwischen=20"normaler"=20und=20Lergangsmel?=
 =?UTF-8?q?dung.=20Der=20Men=C3=BCpunkt=20Plausibilit=C3=A4tspr=C3=BCfung?=
 =?UTF-8?q?=20wurde=20entfernt=20da=20er=20das=20selbe=20Ergebnis=20liefer?=
 =?UTF-8?q?t=20wie=20"Meldung=20generieren"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 content/fas.xul.php       |  7 -------
 content/fasoverlay.js.php | 36 ++++++++++++------------------------
 locale/de-AT/fas.dtd      |  4 ----
 3 files changed, 12 insertions(+), 35 deletions(-)

diff --git a/content/fas.xul.php b/content/fas.xul.php
index 4e9229c1f..f29e61e9c 100644
--- a/content/fas.xul.php
+++ b/content/fas.xul.php
@@ -129,7 +129,6 @@ echo '<?xul-overlay href="'.APP_ROOT.'content/fasoverlay.xul.php"?>';
   <command id="menu-bis-mitarbeiter-export:command" oncommand="BISMitarbeiterExport();"/>
   <command id="menu-bis-mitarbeiter-checkverwendung:command" oncommand="BISMitarbeiterCheckVerwendung();"/>
   <command id="menu-bis-mitarbeiter-checkfunktion:command" oncommand="BISMitarbeiterCheckFunktion();"/>
-  <command id="menu-bis-studenten-plausibilitaetspruefung:command" oncommand="BISStudentenPlausicheck();"/>
   <command id="menu-bis-studenten-export:command" oncommand="BISStudentenExport();"/>
   <command id="menu-help-about:command" oncommand="OpenAboutDialog()"/>
   <command id="menu-help-manual:command" oncommand="OpenManual()"/>
@@ -661,12 +660,6 @@ echo '<?xul-overlay href="'.APP_ROOT.'content/fasoverlay.xul.php"?>';
 			</menu>
 			<menu id="menu-bis-studenten" label="&menu-bis-studenten.label;" accesskey="&menu-bis-studenten.accesskey;">
          		<menupopup id="menu-bis-studenten-popup">
-         			<menuitem
-		               id        =  "menu-bis-studenten-plausibilitaetspruefung"
-		               key       =  "menu-bis-studenten-plausibilitaetspruefung:key"
-		               label     = "&menu-bis-studenten-plausibilitaetspruefung.label;"
-		               command   =  "menu-bis-studenten-plausibilitaetspruefung:command"
-		               accesskey = "&menu-bis-studenten-plausibilitaetspruefung.accesskey;"/>
 		            <menuitem
 		               id        =  "menu-bis-studenten-export"
 		               key       =  "menu-bis-studenten-export:key"
diff --git a/content/fasoverlay.js.php b/content/fasoverlay.js.php
index b03dc5ca8..08f8cd00d 100644
--- a/content/fasoverlay.js.php
+++ b/content/fasoverlay.js.php
@@ -1229,29 +1229,6 @@ function BISMitarbeiterCheckFunktion()
 	window.open('<?php echo APP_ROOT ?>vilesci/bis/checkfunktion.php','CheckFunktion','');
 }
 
-// ****
-// * oeffnet Script zum Checken der Studentendaten
-// ****
-function BISStudentenPlausicheck()
-{
-	var tree=document.getElementById('tree-verband');
-
-	//Wenn nichts markiert wurde -> beenden
-	if(tree.currentIndex==-1)
-	{
-		alert('Bitte einen Studiengang auswaehlen');
-		return;
-	}
-
-	col = tree.columns ? tree.columns["stg_kz"] : "stg_kz";
-	var stg_kz=tree.view.getCellText(tree.currentIndex,col);
-
-	if(stg_kz!='')
-		window.open('<?php echo APP_ROOT ?>vilesci/bis/studentenmeldung.php?plausi=J&stg_kz='+stg_kz,'Datencheck','');
-	else
-		alert('Bitte einen Studiengang auswaehlen');
-}
-
 // ****
 // * oeffnet Script zum BIS-Export der Studentendaten
 // ****
@@ -1270,9 +1247,20 @@ function BISStudentenExport()
 	var stg_kz=tree.view.getCellText(tree.currentIndex,col);
 
 	if(stg_kz!='')
-		window.open('<?php echo APP_ROOT ?>vilesci/bis/studentenmeldung.php?stg_kz='+stg_kz,'StudentenMeldung','');
+	{
+		if(stg_kz>=0)
+		{
+			window.open('<?php echo APP_ROOT ?>vilesci/bis/studentenmeldung.php?stg_kz='+stg_kz,'StudentenMeldung','');
+		}
+		else
+		{
+			window.open('<?php echo APP_ROOT ?>vilesci/bis/lehrgangsmeldung.php?stg_kz='+stg_kz,'Lehrgangsmeldung','');
+		}
+	}
 	else
+	{
 		alert('Bitte einen Studiengang auswaehlen');
+	}
 }
 
 // ****
diff --git a/locale/de-AT/fas.dtd b/locale/de-AT/fas.dtd
index bcac4907d..481a8330e 100644
--- a/locale/de-AT/fas.dtd
+++ b/locale/de-AT/fas.dtd
@@ -304,10 +304,6 @@
 <!ENTITY menu-bis-studenten.label		"Studenten">
 <!ENTITY menu-bis-studenten.accesskey	"S">
 
-<!ENTITY menu-bis-studenten-plausibilitaetspruefung.key			"P">
-<!ENTITY menu-bis-studenten-plausibilitaetspruefung.label		"Plausibilitätsprüfung">
-<!ENTITY menu-bis-studenten-plausibilitaetspruefung.accesskey	"P">
-
 <!ENTITY menu-bis-studenten-export.key		"E">
 <!ENTITY menu-bis-studenten-export.label		"Meldung generieren">
 <!ENTITY menu-bis-studenten-export.accesskey	"E">