From e61ce52f36501c1e422facba83be2ddee7d1e24f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20=C3=96sterreicher?= <oesi@technikum-wien.at>
Date: Fri, 18 Apr 2008 11:50:57 +0000
Subject: [PATCH]

---
 content/ToDo_FASo.html                        |  4 ++
 rdf/diplomasupplement.xml.php                 | 14 ++++++-
 .../admin/xslvorlagen/diploma_supplement.xsl  |  4 +-
 vilesci/stammdaten/firma_uebersicht.php       | 41 +++++++++++++++++--
 4 files changed, 55 insertions(+), 8 deletions(-)

diff --git a/content/ToDo_FASo.html b/content/ToDo_FASo.html
index 32a4398bd..8061bb3d3 100644
--- a/content/ToDo_FASo.html
+++ b/content/ToDo_FASo.html
@@ -429,6 +429,10 @@ Seamonkey Version nicht m&ouml;glich<br>
 <hr>
 <h2>Erledigte Anforderungen</h2>
 <ul>
+  <li>Suche f&uuml;r die Firmenverwaltung wurde hinzugef&uuml;gt<br>
+18.04.2008 oesi<br>
+    <br>
+  </li>
   <li>Tree f&uuml;r die Lehrverb&auml;nde ist jetzt sortierbar<br>
 16.04.2008 oesi<br>
     <br>
diff --git a/rdf/diplomasupplement.xml.php b/rdf/diplomasupplement.xml.php
index 7df2a082f..fcc31bc21 100644
--- a/rdf/diplomasupplement.xml.php
+++ b/rdf/diplomasupplement.xml.php
@@ -69,7 +69,12 @@ if (isset($_REQUEST["xmlformat"]) && $_REQUEST["xmlformat"] == "xml")
 		}
 		else
 			die('Student not found'.$uid_arr[$i]);
-		
+			
+		//Bei DEW und DPW werden 60 ECTS angerechnet
+		if($row->studiengang_kz==92 || $row->studiengang_kz==91)
+			$angerechnete_sws=60;
+		else 
+			$angerechnete_sws=0;
 		echo '	<supplement>';
 		echo '		<nachname><![CDATA['.$row->nachname.']]></nachname>';
 		echo '		<vorname>'.$row->vorname.'</vorname>';
@@ -81,7 +86,12 @@ if (isset($_REQUEST["xmlformat"]) && $_REQUEST["xmlformat"] == "xml")
 		echo '		<studiengang_bezeichnung_englisch>'.$row->english.'</studiengang_bezeichnung_englisch>';
 		echo '		<semester>'.$row->max_semester.'</semester>';
 		echo '		<jahre>'.($row->max_semester/2.0).'</jahre>';
-		echo '		<ects>'.($row->max_semester*30).'</ects>';
+		echo '		<ects>'.($row->max_semester*30+$angerechnete_sws).'</ects>';
+		if($angerechnete_sws!=0)
+			echo '		<ects_angerechnet>('.$angerechnete_sws.' ECTS angerechnet/credited)</ects_angerechnet>';
+		else
+			echo '		<ects_angerechnet></ects_angerechnet>';
+			
 		if($row->organisationsform=='b')
 			echo '		<studienart>Berufbegleitendes Studium/Part-time degree programm</studienart>';
 		else 
diff --git a/vilesci/admin/xslvorlagen/diploma_supplement.xsl b/vilesci/admin/xslvorlagen/diploma_supplement.xsl
index 3920a952e..3a20c8935 100644
--- a/vilesci/admin/xslvorlagen/diploma_supplement.xsl
+++ b/vilesci/admin/xslvorlagen/diploma_supplement.xsl
@@ -243,14 +243,14 @@
 							<fo:table-row  line-height="10pt">
 								<fo:table-cell border-width="0.2mm" border-style="solid" ><fo:block font-size="8pt"> 4.3 \n \n \n</fo:block></fo:table-cell>
 								<fo:table-cell border-width="0.2mm" border-style="solid" ><fo:block font-size="8pt"> Angaben zum Studium (z.B absolvierte Module und Einheiten) \n und erzielte Noten/Bewertungen/ECTS Anrechnungspunkte \n Program details (courses, modules or units studied, individual \n grades obtained)</fo:block></fo:table-cell>
-								<fo:table-cell border-width="0.2mm" border-style="solid" ><fo:block font-size="8pt"><xsl:value-of select="ects" /> ECTS \n Siehe "Semesterzeugnisse" \n See "semester transcripts" \n</fo:block></fo:table-cell>
+								<fo:table-cell border-width="0.2mm" border-style="solid" ><fo:block font-size="8pt"> <xsl:value-of select="ects" /> ECTS <xsl:value-of select="ects_angerechnet" />\n Siehe "Semesterzeugnisse" \n See "semester transcripts" \n</fo:block></fo:table-cell>
 							</fo:table-row>
 							<fo:table-row  line-height="10pt">
 								<fo:table-cell border-width="0.2mm" border-style="solid" ><fo:block font-size="8pt"> 4.4 \n \n \n \n \n \n \n \n \n \n \n \n \n</fo:block></fo:table-cell>
 								<fo:table-cell border-width="0.2mm" border-style="solid" ><fo:block font-size="8pt"> Notenskala \n Grading scheme, grade translation \n and grade distribution guidance \n \n \n \n \n \n \n \n \n \n \n</fo:block></fo:table-cell>
 								<fo:table-cell border-width="0.2mm" border-style="solid" >
 									<fo:block font-size="8pt">
-										<fo:inline text-decoration="underline">Einzelbeurteilung/Grades</fo:inline>
+										<fo:inline text-decoration="underline"> Einzelbeurteilung/Grades</fo:inline>
 										\n 1=Sehr gut/Excellent  \n 2=Gut/Good  \n 3=Befriedigend/Satisfactory  \n 4=Genügend/Sufficient \n 5=Nicht Genügend/Unsatisfactory \n \n TG=Teilgenommen/Participated \n AR=Angerechnet/Credited \n \n Gesamtbeurteilung/Overall assessment: \n -Bestanden (pass) \n -Mit gutem Erfolg bestanden (pass with merit) \n -Mit ausgezeichnetem Erfolg bestanden (pass with distinction)
 									</fo:block>
 								</fo:table-cell>
diff --git a/vilesci/stammdaten/firma_uebersicht.php b/vilesci/stammdaten/firma_uebersicht.php
index c2eba9362..50e237e04 100644
--- a/vilesci/stammdaten/firma_uebersicht.php
+++ b/vilesci/stammdaten/firma_uebersicht.php
@@ -1,14 +1,42 @@
 <?php
+/* Copyright (C) 2006 Technikum-Wien
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
+ *
+ * Authors: Christian Paminger <christian.paminger@technikum-wien.at>,
+ *          Andreas Oesterreicher <andreas.oesterreicher@technikum-wien.at> and
+ *          Rudolf Hangl <rudolf.hangl@technikum-wien.at> and
+ *			Gerald Raab <gerald.raab@technikum-wien.at>.
+ */
+
 	require_once('../config.inc.php');
 	require_once('../../include/functions.inc.php');
     require_once('../../include/firma.class.php');
+    
 	if (!$conn = pg_pconnect(CONN_STRING))
 	   	die('Es konnte keine Verbindung zum Server aufgebaut werden.');
     
+	$filter = (isset($_GET['filter'])?$_GET['filter']:'');
+	
 	$htmlstr = "";
-	
-	$sql_query = "SELECT * FROM public.tbl_firma";
-	
+
+	if($filter=='')
+		$sql_query = "SELECT * FROM public.tbl_firma";
+	else 
+		$sql_query = "SELECT * FROM public.tbl_firma WHERE lower(name) like lower('%$filter%') OR lower(adresse) like lower('%$filter%') OR lower(anmerkung) like lower('%$filter%')";
+		
     if(!$erg=pg_query($conn, $sql_query))
 	{
 		$errormsg='Fehler beim Laden der Firma';
@@ -63,7 +91,12 @@
 	echo '<h3>Übersicht</h3>';
 	echo '</td><td align="right">';
 	echo "<input type='button' onclick='parent.detail_firma.location=\"firma_details.php?neu=true\"' value='Neue Firma anlegen'/>";
-	echo '</td></tr></table><br />';
+	echo '</td></tr></table>';
+	//Suche
+	echo '<form action="'.$_SERVER['PHP_SELF'].'" method="GET">';
+	echo '<input type="text" name="filter" value="'.$filter.'">';
+	echo '<input type="submit" value="Suchen">';
+	echo '</form>';
 	
 	echo $htmlstr;
 ?>