From 30bf99406365de6114cd435a860c6fdcd08cfeaf Mon Sep 17 00:00:00 2001
From: oesi <oesi@technikum-wien.at>
Date: Fri, 22 Sep 2017 11:20:00 +0200
Subject: [PATCH 1/4] =?UTF-8?q?Beim=20Anlegen=20von=20Nachpr=C3=BCfungen?=
 =?UTF-8?q?=20=C3=BCbers=20CIS=20werden=20jetzt=20bevorzugt=20Pr=C3=BCfung?=
 =?UTF-8?q?slehreinheiten=20zugeordnet?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 cis/private/lehre/benotungstool/nachpruefungeintragen.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/cis/private/lehre/benotungstool/nachpruefungeintragen.php b/cis/private/lehre/benotungstool/nachpruefungeintragen.php
index a7417f157..f1afe0420 100755
--- a/cis/private/lehre/benotungstool/nachpruefungeintragen.php
+++ b/cis/private/lehre/benotungstool/nachpruefungeintragen.php
@@ -139,7 +139,7 @@ if (isset($_REQUEST["submit"]) && ($_REQUEST["student_uid"] != '')  )
 	// Die Pruefung muss einer Lehreinheit zugeordnet werden
 	// deshalb wird hier versucht eine passende Lehreinheit zu ermitteln.
 	$le_arr = array();
-	$qry_stud = "SELECT DISTINCT lehreinheit_id, lehrform_kurzbz
+	$qry_stud = "SELECT lehreinheit_id, lehrform_kurzbz
 		FROM
 			campus.vw_student_lehrveranstaltung
 			JOIN campus.vw_student using(uid)
@@ -147,7 +147,7 @@ if (isset($_REQUEST["submit"]) && ($_REQUEST["student_uid"] != '')  )
 			studiensemester_kurzbz = ".$db->db_add_param($stsem)."
 			AND lehrveranstaltung_id = ".$db->db_add_param($lvid, FHC_INTEGER)."
 			AND uid=".$db->db_add_param($student_uid)."
-		ORDER BY lehrform_kurzbz DESC";
+		ORDER BY CASE WHEN lehrform_kurzbz='PRF' THEN '0' ELSE lehrform_kurzbz END";
 
 	if($result_stud = $db->db_query($qry_stud))
 	{

From 8c722f46d7ea2ac492879fe3e38d46793c9dd114 Mon Sep 17 00:00:00 2001
From: oesi <oesi@technikum-wien.at>
Date: Fri, 22 Sep 2017 15:07:39 +0200
Subject: [PATCH 2/4] =?UTF-8?q?Studiengangskennzahl=20zu=20News=20XML=20hi?=
 =?UTF-8?q?nzugef=C3=BCgt=20damit=20dies=20bei=20der=20Anzeige=20der=20Stu?=
 =?UTF-8?q?diengangsleitungen=20beruecksichtigt=20werden=20kann?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 cms/news.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/cms/news.php b/cms/news.php
index 1c6905299..67a9d001b 100755
--- a/cms/news.php
+++ b/cms/news.php
@@ -179,7 +179,7 @@ function getStgContent($studiengang_kz, $semester, $sprache)
 	$p = new phrasen($sprache);
 	
 	$xml = '<stg_extras>';
-	
+	$xml .= '<stg_kz>'.$studiengang_kz.'</stg_kz>';
 	$studiengang = new studiengang();
 	$studiengang->load($studiengang_kz);
 	
@@ -441,4 +441,4 @@ function getStgContent($studiengang_kz, $semester, $sprache)
 	$xml.='</stg_extras>';
 	return $xml;
 }
-?>
\ No newline at end of file
+?>

From 39544f95ef204cb38258c5e284dff428843f3ca8 Mon Sep 17 00:00:00 2001
From: Andreas Oesterreicher <oesi@technikum-wien.at>
Date: Fri, 22 Sep 2017 16:57:41 +0200
Subject: [PATCH 3/4] Fixed broken Drag&Drop Fixed broken styling

---
 vilesci/stammdaten/organisationseinheiten.php | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/vilesci/stammdaten/organisationseinheiten.php b/vilesci/stammdaten/organisationseinheiten.php
index 1ba07642c..48291c8c3 100644
--- a/vilesci/stammdaten/organisationseinheiten.php
+++ b/vilesci/stammdaten/organisationseinheiten.php
@@ -43,12 +43,11 @@ echo '
 		<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 		<link href="../../skin/vilesci.css" rel="stylesheet" type="text/css">
 		<link rel="stylesheet" type="text/css" href="../../skin/jquery-ui-1.9.2.custom.min.css">
-<script type="text/javascript" src="../../vendor/jquery/jqueryV1/jquery-1.12.4.min.js"></script>
-<script type="text/javascript" src="../../vendor/christianbach/tablesorter/jquery.tablesorter.min.js"></script>
-<script type="text/javascript" src="../../vendor/components/jqueryui/jquery-ui.min.js"></script>
-<script type="text/javascript" src="../../include/js/jquery.ui.datepicker.translation.js"></script>
-<script type="text/javascript" src="../../vendor/jquery/sizzle/sizzle.js"></script>
-		<script src="../../vendor/components/jqueryui/jquery-ui.min.js" language="Javascript"></script>
+		<script type="text/javascript" src="../../vendor/jquery/jqueryV1/jquery-1.12.4.min.js"></script>
+		<script type="text/javascript" src="../../vendor/christianbach/tablesorter/jquery.tablesorter.min.js"></script>
+		<script type="text/javascript" src="../../vendor/components/jqueryui/jquery-ui.min.js"></script>
+		<script type="text/javascript" src="../../include/js/jquery.ui.datepicker.translation.js"></script>
+		<script type="text/javascript" src="../../vendor/jquery/sizzle/sizzle.js"></script>
 
 		<script language="Javascript">
 			$(function() {
@@ -62,7 +61,7 @@ echo '
 					},
 					drop: function(event, ui) {
 						$(this).css("color","#0086cc");
-						var kurzbz = encodeURIComponent(ui.helper[0].id);
+						var kurzbz = encodeURIComponent(ui.helper.context.id);
 						var parent_kurzbz = encodeURIComponent(this.id);
 						window.location.href="'.$_SERVER['PHP_SELF'].'?action=updateparent&kurzbz="+kurzbz+"&parent_kurzbz="+parent_kurzbz;
 					}
@@ -78,6 +77,11 @@ echo '
 			padding: 2px;
 		}
 
+		a.Item
+		{
+			background: none;
+			border: none;
+		}
 		a.Item:hover
 		{
 			color:#0086cc;

From 1bd6e1c707953c04a69983261a4e183844e150a8 Mon Sep 17 00:00:00 2001
From: Andreas Oesterreicher <oesi@technikum-wien.at>
Date: Fri, 22 Sep 2017 17:02:14 +0200
Subject: [PATCH 4/4] Using DMS Path instead of hardcoded Path

---
 system/dmsfaker.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/system/dmsfaker.php b/system/dmsfaker.php
index 5001bba8a..bb519f274 100644
--- a/system/dmsfaker.php
+++ b/system/dmsfaker.php
@@ -35,7 +35,7 @@ if(!$rechte->isBerechtigt('system/developer',null,'suid'))
 $anzahl_neu=0;
 $anzahl_vorhanden=0;
 $qry = "SELECT filename FROM campus.tbl_dms_version";
-$path = '/var/fhcomplete/dms/';
+$path = DMS_PATH;
 chdir($path);
 if($result = $db->db_query($qry))
 {