From c4d04d60a6b4fb5763d49bf482c671eccbbc12b6 Mon Sep 17 00:00:00 2001
From: Gerald Raab <raab@technikum-wien.at>
Date: Wed, 13 Jul 2016 13:51:33 +0200
Subject: [PATCH 1/9] set zeugnisnote from pruefung, add reihungstest_datum to
 student-list in fas

---
 .../pruefung/pruefungsbewertung.json.php      | 30 ++++++++++++++++++-
 content/student/studentenoverlay.xul.php      |  5 ++++
 rdf/student.rdf.php                           | 10 +++++--
 3 files changed, 42 insertions(+), 3 deletions(-)
 mode change 100644 => 100755 content/student/studentenoverlay.xul.php

diff --git a/cis/private/lehre/pruefung/pruefungsbewertung.json.php b/cis/private/lehre/pruefung/pruefungsbewertung.json.php
index 0ff901e0c..6e5aad377 100755
--- a/cis/private/lehre/pruefung/pruefungsbewertung.json.php
+++ b/cis/private/lehre/pruefung/pruefungsbewertung.json.php
@@ -5,13 +5,19 @@ header( 'Cache-Control: no-store, no-cache, must-revalidate' );
 header( 'Pragma: no-cache' );
 header('Content-Type: text/html;charset=UTF-8');
 
-require_once('../../../../config/cis.config.inc.php');
+require_once('../../../../config/global.config.inc.php');
+if (defined('CIS_PRUEFUNG_SET_ZEUGNISNOTE') && CIS_PRUEFUNG_SET_ZEUGNISNOTE)
+	require_once('../../../../config/vilesci.config.inc.php');
+else
+	require_once('../../../../config/cis.config.inc.php');
+
 require_once('../../../../include/functions.inc.php');
 require_once('../../../../include/pruefungCis.class.php');
 require_once('../../../../include/lehrveranstaltung.class.php');
 require_once('../../../../include/benutzerberechtigung.class.php');
 require_once('../../../../include/studiensemester.class.php');
 require_once('../../../../include/note.class.php');
+require_once('../../../../include/zeugnisnote.class.php');
 require_once('../../../../include/pruefung.class.php');
 require_once('../../../../include/pruefungsanmeldung.class.php');
 require_once('../../../../include/student.class.php');
@@ -271,6 +277,28 @@ function saveBeurteilung($lehrveranstaltung_id, $student_uid, $mitarbeiter_uid,
 		$data['error']='true';
 		$data['errormsg']=$pruefung->errormsg;
 	    }
+		if (defined('CIS_PRUEFUNG_SET_ZEUGNISNOTE') && CIS_PRUEFUNG_SET_ZEUGNISNOTE)
+		{
+			$zeugnisnote = new zeugnisnote();
+			$zeugnisnote->new = true;
+			$zeugnisnote->lehrveranstaltung_id = $lehrveranstaltung_id;
+			$zeugnisnote->student_uid = $student_uid;
+			$zeugnisnote->studiensemester_kurzbz = $pruefungCis->studiensemester_kurzbz;
+			$zeugnisnote->note = $note;
+			$zeugnisnote->benotungsdatum = $pruefung->datum;
+			$zeugnisnote->insertamum = date('Y-m-d H:i:s');
+			$zeugnisnote->insertvon = $uid;
+			$zeugnisnote_check = new zeugnisnote();
+			if (!$zeugnisnote_check->load($zeugnisnote->lehrveranstaltung_id, $zeugnisnote->student_uid, $zeugnisnote->studiensemester_kurzbz))
+			{
+				$zeugnisnote->save(true);
+			}
+			else
+			{
+				$data['error'] = 'true';
+				$data['errormsg'] = 'Existing Grade';
+			}
+		}
 	}
 	else
 	{
diff --git a/content/student/studentenoverlay.xul.php b/content/student/studentenoverlay.xul.php
old mode 100644
new mode 100755
index 2efe9be9e..6431e8f43
--- a/content/student/studentenoverlay.xul.php
+++ b/content/student/studentenoverlay.xul.php
@@ -284,6 +284,10 @@ else
 	    					class="sortDirectionIndicator"
 	    					sort="rdf:http://www.technikum-wien.at/student/rdf#punkte3" onclick="StudentTreeSort()"/>
 	    				<splitter class="tree-splitter"/>
+						<treecol id="student-treecol-rt_datum" label="RT Datum" flex="1" hidden="true" persist="hidden, width, ordinal"
+							class="sortDirectionIndicator"
+							sort="rdf:http://www.technikum-wien.at/student/rdf#rt_datum" onclick="StudentTreeSort()"/>
+						<splitter class="tree-splitter"/>
 	    				<treecol id="student-treecol-dual" label="Dual" flex="1" hidden="true" persist="hidden, width, ordinal"
 	    					class="sortDirectionIndicator"
 	    					sort="rdf:http://www.technikum-wien.at/student/rdf#dual_bezeichnung" onclick="StudentTreeSort()"/>
@@ -344,6 +348,7 @@ else
 	           							<treecell label="rdf:http://www.technikum-wien.at/student/rdf#punkte1" />
 	           							<treecell label="rdf:http://www.technikum-wien.at/student/rdf#punkte2" />
 									<treecell label="rdf:http://www.technikum-wien.at/student/rdf#punkte3" />
+									<treecell label="rdf:http://www.technikum-wien.at/student/rdf#rt_datum" />
 	           							<treecell label="rdf:http://www.technikum-wien.at/student/rdf#dual_bezeichnung" />
 									<treecell label="rdf:http://www.technikum-wien.at/student/rdf#matr_nr" />
 									<treecell label="rdf:http://www.technikum-wien.at/student/rdf#studienplan_bezeichnung" />
diff --git a/rdf/student.rdf.php b/rdf/student.rdf.php
index 1f56ae3e9..ef30125a0 100755
--- a/rdf/student.rdf.php
+++ b/rdf/student.rdf.php
@@ -46,6 +46,7 @@ require_once('../include/lehrveranstaltung.class.php');
 require_once('../include/mitarbeiter.class.php');
 require_once('../include/organisationsform.class.php');
 require_once('../include/konto.class.php');
+require_once('../include/reihungstest.class.php');
 
 // *********** Funktionen *************************
 function convdate($date)
@@ -147,7 +148,8 @@ function draw_content_liste($row)
 	$status = $prestudent->status_kurzbz;
 	$orgform = $prestudent->orgform_kurzbz;
 	$studienplan_bezeichnung=$prestudent->studienplan_bezeichnung;
-
+	$reihungstest = new reihungstest($row->reihungstest_id);
+	$rt_datum = $reihungstest->datum;
 	echo '
 	  <RDF:li>
       	<RDF:Description  id="'.$row->prestudent_id.'"  about="'.$rdf_url.'/'.$row->prestudent_id.'" >
@@ -186,6 +188,7 @@ function draw_content_liste($row)
 		<STUDENT:punkte1><![CDATA['.$row->rt_punkte1.']]></STUDENT:punkte1>
 		<STUDENT:punkte2><![CDATA['.$row->rt_punkte2.']]></STUDENT:punkte2>
 		<STUDENT:punkte3><![CDATA['.$row->rt_punkte3.']]></STUDENT:punkte3>
+		<STUDENT:rt_datum><![CDATA['.$rt_datum.']]></STUDENT:rt_datum>
 		<STUDENT:dual><![CDATA['.($row->dual=='t'?'true':'false').']]></STUDENT:dual>
 		<STUDENT:dual_bezeichnung><![CDATA['.($row->dual=='t'?'Ja':'Nein').']]></STUDENT:dual_bezeichnung>
 		<STUDENT:matr_nr><![CDATA['.$row->matr_nr.']]></STUDENT:matr_nr>
@@ -301,6 +304,8 @@ function draw_content($row)
 function draw_prestudent($row)
 {
 	global $rdf_url, $datum_obj, $stg_arr;
+	$reihungstest = new reihungstest($row->reihungstest_id);
+	$rt_datum = $reihungstest->datum;
 	if($row->prestudent_id!='')
 	{
 	echo '
@@ -332,6 +337,7 @@ function draw_prestudent($row)
 			<STUDENT:punkte1><![CDATA['.$row->rt_punkte1.']]></STUDENT:punkte1>
 			<STUDENT:punkte2><![CDATA['.$row->rt_punkte2.']]></STUDENT:punkte2>
 			<STUDENT:punkte3><![CDATA['.$row->rt_punkte3.']]></STUDENT:punkte3>
+			<STUDENT:rt_datum><![CDATA['.$rt_datum.']]></STUDENT:rt_datum>
 			<STUDENT:bismelden><![CDATA['.($row->bismelden?'true':'false').']]></STUDENT:bismelden>
 			<STUDENT:dual><![CDATA['.($row->dual?'true':'false').']]></STUDENT:dual>
 			<STUDENT:dual_bezeichnung><![CDATA['.($row->dual?'Ja':'Nein').']]></STUDENT:dual_bezeichnung>
@@ -458,7 +464,7 @@ if($xmlformat=='rdf')
 						(SELECT rt_punkte1 as punkte FROM public.tbl_prestudent WHERE prestudent_id=tbl_student.prestudent_id) as rt_punkte1,
 						(SELECT rt_punkte2 as punkte FROM public.tbl_prestudent WHERE prestudent_id=tbl_student.prestudent_id) as rt_punkte2,
 						(SELECT rt_punkte3 as punkte FROM public.tbl_prestudent WHERE prestudent_id=tbl_student.prestudent_id) as rt_punkte3,
-						 tbl_prestudent.dual as dual, p.matr_nr
+						 tbl_prestudent.dual as dual, tbl_prestudent.reihungstest_id, p.matr_nr
 						FROM public.tbl_student
 							JOIN public.tbl_benutzer ON (student_uid=uid) JOIN public.tbl_person p USING (person_id)  JOIN public.tbl_prestudent USING(prestudent_id) ";
 		if($gruppe_kurzbz!=null)

From c01175fa5c36e333c3cf5e45535bd84cd6e91a90 Mon Sep 17 00:00:00 2001
From: Gerald Raab <raab@technikum-wien.at>
Date: Wed, 13 Jul 2016 14:12:25 +0200
Subject: [PATCH 2/9] reihungstestanmeldung in fas-list

---
 content/student/studentenoverlay.xul.php | 5 +++++
 rdf/student.rdf.php                      | 4 +++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/content/student/studentenoverlay.xul.php b/content/student/studentenoverlay.xul.php
index 6431e8f43..895f38950 100755
--- a/content/student/studentenoverlay.xul.php
+++ b/content/student/studentenoverlay.xul.php
@@ -288,6 +288,10 @@ else
 							class="sortDirectionIndicator"
 							sort="rdf:http://www.technikum-wien.at/student/rdf#rt_datum" onclick="StudentTreeSort()"/>
 						<splitter class="tree-splitter"/>
+						<treecol id="student-treecol-rt_anmeldung" label="RT Anmeldung" flex="1" hidden="true" persist="hidden, width, ordinal"
+							class="sortDirectionIndicator"
+							sort="rdf:http://www.technikum-wien.at/student/rdf#rt_anmeldung" onclick="StudentTreeSort()"/>
+						<splitter class="tree-splitter"/>
 	    				<treecol id="student-treecol-dual" label="Dual" flex="1" hidden="true" persist="hidden, width, ordinal"
 	    					class="sortDirectionIndicator"
 	    					sort="rdf:http://www.technikum-wien.at/student/rdf#dual_bezeichnung" onclick="StudentTreeSort()"/>
@@ -349,6 +353,7 @@ else
 	           							<treecell label="rdf:http://www.technikum-wien.at/student/rdf#punkte2" />
 									<treecell label="rdf:http://www.technikum-wien.at/student/rdf#punkte3" />
 									<treecell label="rdf:http://www.technikum-wien.at/student/rdf#rt_datum" />
+									<treecell label="rdf:http://www.technikum-wien.at/student/rdf#rt_anmeldung" />
 	           							<treecell label="rdf:http://www.technikum-wien.at/student/rdf#dual_bezeichnung" />
 									<treecell label="rdf:http://www.technikum-wien.at/student/rdf#matr_nr" />
 									<treecell label="rdf:http://www.technikum-wien.at/student/rdf#studienplan_bezeichnung" />
diff --git a/rdf/student.rdf.php b/rdf/student.rdf.php
index ef30125a0..44dc8e6ae 100755
--- a/rdf/student.rdf.php
+++ b/rdf/student.rdf.php
@@ -189,6 +189,7 @@ function draw_content_liste($row)
 		<STUDENT:punkte2><![CDATA['.$row->rt_punkte2.']]></STUDENT:punkte2>
 		<STUDENT:punkte3><![CDATA['.$row->rt_punkte3.']]></STUDENT:punkte3>
 		<STUDENT:rt_datum><![CDATA['.$rt_datum.']]></STUDENT:rt_datum>
+		<STUDENT:rt_anmeldung><![CDATA['.$row->anmeldungreihungstest.']]></STUDENT:rt_anmeldung>
 		<STUDENT:dual><![CDATA['.($row->dual=='t'?'true':'false').']]></STUDENT:dual>
 		<STUDENT:dual_bezeichnung><![CDATA['.($row->dual=='t'?'Ja':'Nein').']]></STUDENT:dual_bezeichnung>
 		<STUDENT:matr_nr><![CDATA['.$row->matr_nr.']]></STUDENT:matr_nr>
@@ -338,6 +339,7 @@ function draw_prestudent($row)
 			<STUDENT:punkte2><![CDATA['.$row->rt_punkte2.']]></STUDENT:punkte2>
 			<STUDENT:punkte3><![CDATA['.$row->rt_punkte3.']]></STUDENT:punkte3>
 			<STUDENT:rt_datum><![CDATA['.$rt_datum.']]></STUDENT:rt_datum>
+			<STUDENT:rt_anmeldung><![CDATA['.$row->anmeldungreihungstest.']]></STUDENT:rt_anmeldung>
 			<STUDENT:bismelden><![CDATA['.($row->bismelden?'true':'false').']]></STUDENT:bismelden>
 			<STUDENT:dual><![CDATA['.($row->dual?'true':'false').']]></STUDENT:dual>
 			<STUDENT:dual_bezeichnung><![CDATA['.($row->dual?'Ja':'Nein').']]></STUDENT:dual_bezeichnung>
@@ -464,7 +466,7 @@ if($xmlformat=='rdf')
 						(SELECT rt_punkte1 as punkte FROM public.tbl_prestudent WHERE prestudent_id=tbl_student.prestudent_id) as rt_punkte1,
 						(SELECT rt_punkte2 as punkte FROM public.tbl_prestudent WHERE prestudent_id=tbl_student.prestudent_id) as rt_punkte2,
 						(SELECT rt_punkte3 as punkte FROM public.tbl_prestudent WHERE prestudent_id=tbl_student.prestudent_id) as rt_punkte3,
-						 tbl_prestudent.dual as dual, tbl_prestudent.reihungstest_id, p.matr_nr
+						 tbl_prestudent.dual as dual, tbl_prestudent.reihungstest_id, tbl_prestudent.anmeldungreihungstest, p.matr_nr
 						FROM public.tbl_student
 							JOIN public.tbl_benutzer ON (student_uid=uid) JOIN public.tbl_person p USING (person_id)  JOIN public.tbl_prestudent USING(prestudent_id) ";
 		if($gruppe_kurzbz!=null)

From bbcb945bf13feb84c9437b2d07204cd85c32b78f Mon Sep 17 00:00:00 2001
From: paolo <bison.paolo@gmail.com>
Date: Wed, 13 Jul 2016 17:08:08 +0200
Subject: [PATCH 3/9] phpCI fixes for master branch

---
 .gitmodules | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.gitmodules b/.gitmodules
index 41511b610..b1bb210a9 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -4,3 +4,6 @@
 [submodule "submodules/pivottable"]
 	path = submodules/pivottable
 	url = https://github.com/nicolaskruchten/pivottable.git
+[submodule "submodules/tablesorter"]
+	path = submodules/tablesorter
+	url = https://github.com/test/tablesorter.git

From c2ed1ad122168ab33a648f49211af7ee045abbe4 Mon Sep 17 00:00:00 2001
From: paolo <bison.paolo@gmail.com>
Date: Wed, 13 Jul 2016 17:09:35 +0200
Subject: [PATCH 4/9] phpCI fixes for branch master

---
 .gitmodules            | 3 ---
 submodules/tablesorter | 1 -
 2 files changed, 4 deletions(-)
 delete mode 160000 submodules/tablesorter

diff --git a/.gitmodules b/.gitmodules
index b1bb210a9..41511b610 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -4,6 +4,3 @@
 [submodule "submodules/pivottable"]
 	path = submodules/pivottable
 	url = https://github.com/nicolaskruchten/pivottable.git
-[submodule "submodules/tablesorter"]
-	path = submodules/tablesorter
-	url = https://github.com/test/tablesorter.git
diff --git a/submodules/tablesorter b/submodules/tablesorter
deleted file mode 160000
index b70ba2498..000000000
--- a/submodules/tablesorter
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit b70ba2498dd23d9d97605ff386cdd67ff6bd9140

From fe643a0f68e99a71006cf9414165896e5edf706d Mon Sep 17 00:00:00 2001
From: oesi <oesi@technikum-wien.at>
Date: Wed, 27 Jul 2016 10:30:54 +0200
Subject: [PATCH 5/9] =?UTF-8?q?Anpassungen=20f=C3=BCr=20User=20Syncro=20mi?=
 =?UTF-8?q?t=20Moodle=203.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 include/moodle24_user.class.php | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/include/moodle24_user.class.php b/include/moodle24_user.class.php
index 810039730..e28bf7a21 100644
--- a/include/moodle24_user.class.php
+++ b/include/moodle24_user.class.php
@@ -63,6 +63,13 @@ class moodle24_user extends basis_db
 			$client = new SoapClient($this->serverurl);
 			$response = $client->fhcomplete_user_get_users(array(array('key'=>'username', 'value'=>$uid)));
 
+			if(is_object($response))
+			{
+				$response_obj = $response;
+				unset($response);
+				$response['users']=$response_obj->users;
+			}
+
 			if(isset($response['users'][0]))
 			{
 				$this->mdl_user_id = $response['users'][0]['id'];

From caae236c3b656fc619cdb63f6091d39a57e393f3 Mon Sep 17 00:00:00 2001
From: Werner Masik <werner@gefi.at>
Date: Thu, 28 Jul 2016 11:06:44 +0200
Subject: [PATCH 6/9] =?UTF-8?q?Lieferbedingungen=20hinzugef=C3=BCgt?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 include/firma.class.php | 174 +++++++++++++++++++++++++++++++++++++---
 1 file changed, 163 insertions(+), 11 deletions(-)

diff --git a/include/firma.class.php b/include/firma.class.php
index 671333e36..ab26d6472 100644
--- a/include/firma.class.php
+++ b/include/firma.class.php
@@ -36,6 +36,7 @@ class firma extends basis_db
 	public $firma_id;		// integer
 	public $name;			// string
 	public $anmerkung;		// string
+    public $lieferbedingungen;	// string
 	public $ext_id;			// integer
 	public $insertamum;		// timestamp
 	public $insertvon;		// bigint
@@ -56,7 +57,7 @@ class firma extends basis_db
 
 	public $bezeichnung; 		// string
 	public $kundennummer; 		// integer
-	public $oe_aktiv; 			// boolean
+	public $oe_aktiv; 		// boolean
 	public $mailverteiler; 		// string
 	public $tags = array();
 
@@ -95,6 +96,7 @@ class firma extends basis_db
 				$this->firma_id = $row->firma_id;
 				$this->name = $row->name;
 				$this->anmerkung = $row->anmerkung;
+                $this->lieferbedingungen = $row->lieferbedingungen;
 				$this->firmentyp_kurzbz = $row->firmentyp_kurzbz;
 				$this->updateamum = $row->updateamum;
 				$this->updatevon = $row->updatevon;
@@ -147,7 +149,11 @@ class firma extends basis_db
 			$this->errormsg = 'Anmerkung darf nicht länger als 256 Zeichen sein';
 			return false;
 		}
-
+                if(mb_strlen($this->lieferbedingungen)>256)
+		{
+			$this->errormsg = 'Lieferbedingungen darf nicht länger als 256 Zeichen sein';
+			return false;
+		}
 		$this->errormsg = '';
 		return true;
 	}
@@ -167,11 +173,12 @@ class firma extends basis_db
 		if($this->new)
 		{
 			//Neuen Datensatz einfuegen
-			$qry='INSERT INTO public.tbl_firma (name,  anmerkung,
+			$qry='INSERT INTO public.tbl_firma (name,  anmerkung, lieferbedingungen,
 					firmentyp_kurzbz, updateamum, updatevon, insertamum, insertvon, schule,steuernummer,
 					gesperrt,aktiv,finanzamt) VALUES('.
 			     $this->db_add_param($this->name).', '.
 			     $this->db_add_param($this->anmerkung).', '.
+                 $this->db_add_param($this->lieferbedingungen).', '.
 			     $this->db_add_param($this->firmentyp_kurzbz).', '.
 			     $this->db_add_param($this->updateamum).', '.
 			     $this->db_add_param($this->updatevon).', '.
@@ -197,6 +204,7 @@ class firma extends basis_db
 				'firma_id='.$this->db_add_param($this->firma_id).', '.
 				'name='.$this->db_add_param($this->name).', '.
 				'anmerkung='.$this->db_add_param($this->anmerkung).', '.
+                'lieferbedingungen='.$this->db_add_param($this->lieferbedingungen).', '.
 				'updateamum= now(), '.
 		     	'updatevon='.$this->db_add_param($this->updatevon).', '.
 		     	'firmentyp_kurzbz='.$this->db_add_param($this->firmentyp_kurzbz).', '.
@@ -368,14 +376,14 @@ class firma extends basis_db
 			$qry = "
 
 				SELECT
-					firma_id, name, anmerkung, firmentyp_kurzbz, updateamum, updatevon, insertamum, insertvon,
+					firma_id, name, anmerkung, lieferbedingungen, firmentyp_kurzbz, updateamum, updatevon, insertamum, insertvon,
 					ext_id, schule, steuernummer, gesperrt, aktiv, finanzamt, '1' as sort
 				FROM public.tbl_firma
 				WHERE
 				UPPER(trim(public.tbl_firma.name)) like '".$this->db_escape($matchcode)."%'
 				UNION
 				SELECT
-					firma_id, name, anmerkung, firmentyp_kurzbz, updateamum, updatevon, insertamum, insertvon,
+					firma_id, name, anmerkung, lieferbedingungen, firmentyp_kurzbz, updateamum, updatevon, insertamum, insertvon,
 					ext_id, schule, steuernummer, gesperrt, aktiv, finanzamt, '2' as sort
 				FROM public.tbl_firma
 				WHERE
@@ -398,6 +406,7 @@ class firma extends basis_db
 				$fa->firma_id = $row->firma_id;
 				$fa->name = $row->name;
 				$fa->anmerkung = $row->anmerkung;
+				$fa->lieferbedingungen = $row->lieferbedingungen;
 				$fa->firmentyp_kurzbz = $row->firmentyp_kurzbz;
 				$fa->updateamum = $row->updateamum;
 				$fa->updatevon = $row->updatevon;
@@ -450,14 +459,19 @@ class firma extends basis_db
 
 	/**
 	 * Laedt alle Firmen eines bestimmen Firmentyps
+	 * @param boolean $aktiv Default NULL
 	 * @return true wenn ok, false im Fehlerfall
 	 */
-	public function getFirmen($firmentyp_kurzbz='')
+	public function getFirmen($firmentyp_kurzbz='', $aktiv=null)
 	{
 		$qry = "SElECT * FROM public.tbl_firma";
 
 		if($firmentyp_kurzbz!='')
 			$qry.=" WHERE firmentyp_kurzbz=".$this->db_add_param($firmentyp_kurzbz);
+
+		if(!is_null($aktiv))
+		        $qry.=" AND aktiv=".$this->db_add_param($aktiv, FHC_BOOLEAN);
+
 		$qry.=" ORDER BY name;";
 
 		if($this->db_query($qry))
@@ -469,6 +483,7 @@ class firma extends basis_db
 				$fa->firma_id = $row->firma_id;
 				$fa->name = $row->name;
 				$fa->anmerkung = $row->anmerkung;
+				$fa->lieferbedingungen = $row->lieferbedingungen;
 				$fa->firmentyp_kurzbz = $row->firmentyp_kurzbz;
 				$fa->updateamum = $row->updateamum;
 				$fa->updatevon = $row->updatevon;
@@ -492,6 +507,144 @@ class firma extends basis_db
 		}
 	}
 
+	public function getLatestChanges($tage = 7) {
+		$this->result = array();
+		$this->errormsg = '';
+
+		$qry ="SELECT * FROM (SElECT ";		
+		$qry.=" distinct on(firma_id)";
+		$qry.=" tbl_firma.firma_id,tbl_firma.* ,tbl_standort.kurzbz,tbl_standort.adresse_id,tbl_standort.standort_id,tbl_standort.bezeichnung  ";
+		$qry.=" ,person_id,	tbl_adresse.name as adress_name, strasse, plz, ort, gemeinde,nation,typ,heimatadresse,zustelladresse  ";
+		$qry.=" FROM public.tbl_firma";
+		$qry.=" LEFT JOIN public.tbl_standort USING(firma_id) ";
+		$qry.=" LEFT JOIN public.tbl_adresse  on ( tbl_adresse.adresse_id=tbl_standort.adresse_id ) ";
+		$qry.=" WHERE 1=1";
+		$qry.=")  as a  WHERE (updateamum is not null and updateamum > (now()::date - $tage)) or insertamum > (now()::date - $tage)  ORDER BY name;";
+		//echo $qry;
+		if($this->db_query($qry))
+		{
+			while($row = $this->db_fetch_object())
+			{
+				$fa = new firma();
+
+				$fa->firma_id = $row->firma_id;
+				$fa->name = $row->name;
+				$fa->anmerkung = $row->anmerkung;
+				$fa->lieferbedingungen = $row->lieferbedingungen;
+				$fa->firmentyp_kurzbz = $row->firmentyp_kurzbz;
+				$fa->updateamum = $row->updateamum;
+				$fa->updatevon = $row->updatevon;
+				$fa->insertamum = $row->insertamum;
+				$fa->insertvon = $row->insertvon;
+				$fa->ext_id = $row->ext_id;
+				$fa->schule = $this->db_parse_bool($row->schule);
+				$fa->steuernummer = $row->steuernummer;
+				$fa->gesperrt = $this->db_parse_bool($row->gesperrt);
+				$fa->aktiv = $this->db_parse_bool($row->aktiv);
+				$fa->finanzamt = $row->finanzamt;
+				$fa->kurzbz = $row->kurzbz;
+				$fa->adresse_id = $row->adresse_id;
+				$fa->standort_id = $row->standort_id;
+				$fa->bezeichnung = $row->bezeichnung;
+				$fa->person_id = $row->person_id;
+				$fa->adresse_id = $row->adresse_id;
+				$fa->strasse = $row->strasse;
+				$fa->plz = $row->plz;
+				$fa->ort = $row->ort;
+				$fa->gemeinde = $row->gemeinde;
+				$fa->nation = $row->nation;
+				$fa->typ = $row->typ;
+				$fa->adress_name = $row->adress_name;
+				$fa->heimatadresse = $this->db_parse_bool($row->heimatadresse);
+				$fa->zustelladresse = $this->db_parse_bool($row->zustelladresse);
+
+				$this->result[] = $fa;
+			}
+			return true;
+		}
+		else
+		{
+			$this->errormsg = 'Fehler beim Laden des Datensatzes';
+			return false;
+		}
+	}
+
+
+	/**
+	 * Suche nur nach Firmennamen für die abgespeckte Firmenverwaltung 
+	 * @return true wenn ok, false im Fehlerfall
+	 */
+	public function searchByName($filter) 
+	{
+		$this->result = array();
+		$this->errormsg = '';
+
+		$qry ="SELECT * FROM (SElECT ";		
+		$qry.=" distinct on(firma_id)";
+		$qry.=" tbl_firma.firma_id,tbl_firma.* ,tbl_standort.kurzbz,tbl_standort.adresse_id,tbl_standort.standort_id,tbl_standort.bezeichnung  ";
+		$qry.=" ,person_id,	tbl_adresse.name as adress_name, strasse, plz, ort, gemeinde,nation,typ,heimatadresse,zustelladresse  ";
+		$qry.=" FROM public.tbl_firma";
+		$qry.=" LEFT JOIN public.tbl_standort USING(firma_id) ";
+		$qry.=" LEFT JOIN public.tbl_adresse  on ( tbl_adresse.adresse_id=tbl_standort.adresse_id ) ";
+		$qry.=" WHERE 1=1";
+
+		if($filter!='')
+			$qry.= " and ( lower(tbl_firma.name) like lower('%".$this->db_escape($filter)."%')
+					
+				   ) ";
+		
+		//if($filter=='' && $firmentyp_kurzbz=='')
+		//	$qry.=" limit 500 ";
+		$qry.=") as a ORDER BY name;";
+
+		if($this->db_query($qry))
+		{
+			while($row = $this->db_fetch_object())
+			{
+				$fa = new firma();
+
+				$fa->firma_id = $row->firma_id;
+				$fa->name = $row->name;
+				$fa->anmerkung = $row->anmerkung;
+				$fa->lieferbedingungen = $row->lieferbedingungen;
+				$fa->firmentyp_kurzbz = $row->firmentyp_kurzbz;
+				$fa->updateamum = $row->updateamum;
+				$fa->updatevon = $row->updatevon;
+				$fa->insertamum = $row->insertamum;
+				$fa->insertvon = $row->insertvon;
+				$fa->ext_id = $row->ext_id;
+				$fa->schule = $this->db_parse_bool($row->schule);
+				$fa->steuernummer = $row->steuernummer;
+				$fa->gesperrt = $this->db_parse_bool($row->gesperrt);
+				$fa->aktiv = $this->db_parse_bool($row->aktiv);
+				$fa->finanzamt = $row->finanzamt;
+				$fa->kurzbz = $row->kurzbz;
+				$fa->adresse_id = $row->adresse_id;
+				$fa->standort_id = $row->standort_id;
+				$fa->bezeichnung = $row->bezeichnung;
+				$fa->person_id = $row->person_id;
+				$fa->adresse_id = $row->adresse_id;
+				$fa->strasse = $row->strasse;
+				$fa->plz = $row->plz;
+				$fa->ort = $row->ort;
+				$fa->gemeinde = $row->gemeinde;
+				$fa->nation = $row->nation;
+				$fa->typ = $row->typ;
+				$fa->adress_name = $row->adress_name;
+				$fa->heimatadresse = $this->db_parse_bool($row->heimatadresse);
+				$fa->zustelladresse = $this->db_parse_bool($row->zustelladresse);
+
+				$this->result[] = $fa;
+			}
+			return true;
+		}
+		else
+		{
+			$this->errormsg = 'Fehler beim Laden des Datensatzes';
+			return false;
+		}
+	}
+
 	/**
 	 * Laedt alle Firmen Standorte, und Adressen nach Suchstring und/oder eines bestimmen Firmentyps
 	 * @return true wenn ok, false im Fehlerfall
@@ -543,6 +696,7 @@ class firma extends basis_db
 				$fa->firma_id = $row->firma_id;
 				$fa->name = $row->name;
 				$fa->anmerkung = $row->anmerkung;
+				$fa->lieferbedingungen = $row->lieferbedingungen;
 				$fa->firmentyp_kurzbz = $row->firmentyp_kurzbz;
 				$fa->updateamum = $row->updateamum;
 				$fa->updatevon = $row->updatevon;
@@ -657,6 +811,7 @@ class firma extends basis_db
 				$fa->firma_id = $row->firma_id;
 				$fa->name = $row->name;
 				$fa->anmerkung = $row->anmerkung;
+				$fa->lieferbedingungen = $row->lieferbedingungen;
 				$fa->firmentyp_kurzbz = $row->firmentyp_kurzbz;
 				$fa->updateamum = $row->updateamum;
 				$fa->updatevon = $row->updatevon;
@@ -742,11 +897,7 @@ class firma extends basis_db
 			$this->errormsg = 'Organisationseinheit/Firma_id ist ungueltig';
 			return false;
 		}
-		$qry = "delete from public.tbl_firma_organisationseinheit WHERE firma_organisationseinheit_id>0";
-		if ($firma_organisationseinheit_id)
-			$qry.=" and firma_organisationseinheit_id=".$this->db_add_param($firma_organisationseinheit_id, FHC_INTEGER);
-
-        $qry.=';';
+		$qry = "DELETE FROM public.tbl_firma_organisationseinheit WHERE firma_organisationseinheit_id=".$this->db_add_param($firma_organisationseinheit_id, FHC_INTEGER);
 
 		if($this->db_query($qry))
 			return true;
@@ -926,6 +1077,7 @@ class firma extends basis_db
 				$fi->firma_id = $row->firma_id;
 				$fi->name = $row->name;
 				$fi->anmerkung = $row->anmerkung;
+                $fi->lieferbedingungen = $row->lieferbedingungen;
 				$fi->firmentyp_kurzbz = $row->firmentyp_kurzbz;
 				$fi->updateamum = $row->updateamum;
 				$fi->updatevon = $row->updatevon;

From caf69b4d0b4fd2c1f17296a945b735468d238169 Mon Sep 17 00:00:00 2001
From: Werner Masik <werner@gefi.at>
Date: Thu, 28 Jul 2016 16:58:24 +0200
Subject: [PATCH 7/9] =?UTF-8?q?Pfad=20f=C3=BCr=20Dokumente=20hinzugef?=
 =?UTF-8?q?=C3=BCgt?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 config/wawi.config-default.inc.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/config/wawi.config-default.inc.php b/config/wawi.config-default.inc.php
index 95c7215d0..05d257c2f 100644
--- a/config/wawi.config-default.inc.php
+++ b/config/wawi.config-default.inc.php
@@ -97,4 +97,7 @@ define('MAIL_ZENTRALEINKAUF','info@technikum-wien.at');
 //Gibt an welche Funktion zur generierung des PDF Files herangezogen wird
 //moegliche Werte: FOP | XSLFO2PDF
 define ('PDF_CREATE_FUNCTION','XSLFO2PDF');
+
+// Ordner für DMS Dokumente 
+define('DMS_PATH','/var/www/fhcomplete/dms/');
 ?>

From 7b89d4dbbea45f2de75530f0f65ff714379c6dc2 Mon Sep 17 00:00:00 2001
From: oesi <oesi@technikum-wien.at>
Date: Mon, 1 Aug 2016 14:25:06 +0200
Subject: [PATCH 8/9] =?UTF-8?q?Bugfix=20f=C3=BCr=20das=20L=C3=B6schen=20vo?=
 =?UTF-8?q?n=20Kursen=20mit=20Moodle=203.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 include/moodle24_course.class.php | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/include/moodle24_course.class.php b/include/moodle24_course.class.php
index 5e2c943cd..8f43c5413 100644
--- a/include/moodle24_course.class.php
+++ b/include/moodle24_course.class.php
@@ -734,6 +734,15 @@ class moodle24_course extends basis_db
 		$data = array($mdl_course_id);
 
 		$response = $client->core_course_delete_courses(array($mdl_course_id));
+
+		if(is_object($response))
+		{
+			$response_obj = $response;
+			unset($response);
+			if(isset($response_obj->warnings) && isset($response_obj->warnings->message))
+				$response[0] = $response_obj->warnings->message;
+		}
+
 		if(isset($response[0]))
 		{
             $this->errormsg = $response[0];

From 0f48d7996a64814b585a1f9f8c1b4944ca87a468 Mon Sep 17 00:00:00 2001
From: oesi <oesi@technikum-wien.at>
Date: Mon, 1 Aug 2016 16:46:34 +0200
Subject: [PATCH 9/9] =?UTF-8?q?Config=20Eintrag=20f=C3=BCr=20Menu=20damit?=
 =?UTF-8?q?=20keine=20Links=20angezeigt=20werden=20bei=20Modulen=20ohne=20?=
 =?UTF-8?q?Lehrauftrag?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 cis/menu.php                                                | 1 +
 cms/menu/menu_addon_lehrveranstaltungen_studienplan.inc.php | 6 +++++-
 config/global.config-default.inc.php                        | 3 +++
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/cis/menu.php b/cis/menu.php
index 5627f7b3b..089271e44 100644
--- a/cis/menu.php
+++ b/cis/menu.php
@@ -23,6 +23,7 @@
  */
 
 require_once('../config/cis.config.inc.php');
+require_once('../config/global.config.inc.php');
 require_once('../include/functions.inc.php');
 require_once('../cms/menu.inc.php');
 require_once('../include/phrasen.class.php');
diff --git a/cms/menu/menu_addon_lehrveranstaltungen_studienplan.inc.php b/cms/menu/menu_addon_lehrveranstaltungen_studienplan.inc.php
index a9d11ccfd..0455b87c6 100644
--- a/cms/menu/menu_addon_lehrveranstaltungen_studienplan.inc.php
+++ b/cms/menu/menu_addon_lehrveranstaltungen_studienplan.inc.php
@@ -329,7 +329,11 @@ class menu_addon_lehrveranstaltungen_studienplan extends menu_addon
 				$bold='font-weight:bold;';
 			else
 				$bold='';
-			$this->block.= "<li style='display:inline-block;white-space: nowrap;padding: 0px; margin:0px; $bold'><a title=\"".$row->bezeichnung_arr[$sprache]."\" href=\"private/lehre/lesson.php?lvid=$row->lehrveranstaltung_id&studiensemester_kurzbz=$studiensemester_kurzbz\" target=\"content\">".$this->CutString($row->bezeichnung_arr[$sprache], 21).' '.$row->lehrform_kurzbz."</a></li>";
+			if(!$row->lehrauftrag && defined('CIS_LEHRVERANSTALTUNG_MODULE_LINK') && !CIS_LEHRVERANSTALTUNG_MODULE_LINK) 
+				$this->block.= "<li style='display:inline-block;white-space: nowrap;padding: 0px; margin:0px; color:#b2b2b2; $bold'>".$this->CutString($row->bezeichnung_arr[$sprache], 21).' '.$row->lehrform_kurzbz."</li>";
+			else
+				$this->block.= "<li style='display:inline-block;white-space: nowrap;padding: 0px; margin:0px; $bold'><a title=\"".$row->bezeichnung_arr[$sprache]."\" href=\"private/lehre/lesson.php?lvid=$row->lehrveranstaltung_id&studiensemester_kurzbz=$studiensemester_kurzbz\" target=\"content\">".$this->CutString($row->bezeichnung_arr[$sprache], 21).' '.$row->lehrform_kurzbz."</a></li>";
+
 			if(isset($row->childs))
 				$this->printTree($row->childs, $sprache, $studiensemester_kurzbz);
 		}
diff --git a/config/global.config-default.inc.php b/config/global.config-default.inc.php
index 75a31a31c..e9183f358 100644
--- a/config/global.config-default.inc.php
+++ b/config/global.config-default.inc.php
@@ -25,6 +25,9 @@ define('CIS_LEHRVERANSTALTUNG_SEMESTERINFO_ANZEIGEN',true);
 define('CIS_LEHRVERANSTALTUNG_LEHRFACH_ANZEIGEN',false);
 define('CIS_LEHRVERANSTALTUNG_GESAMTNOTE_ANZEIGEN', true);
 
+// Im CIS Menue Links bei Modulen anzeigen wenn Lehrauftrag
+define('CIS_LEHRVERANSTALTUNG_MODULE_LINK',true);
+
 // Legt fest, ob bei den LV-Infos der Block mit den Terminen zu den einzelnen LVs (laut Stundenplan) angezeigt werden soll
 define ('CIS_LVINFO_TERMINE_ANZEIGEN', false);