From c1386ee2683e9e700e0a197aa7577f32a14c267b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20=C3=96sterreicher?= <oesi@technikum-wien.at>
Date: Mon, 23 Jun 2014 11:20:36 +0000
Subject: [PATCH] Notizen zu Lehreinheiten

---
 content/bindings.xml.php                      |  20 ++-
 .../lvplanung/lehrveranstaltungoverlay.js.php |  15 +-
 .../lehrveranstaltungoverlay.xul.php          |   4 +
 content/lvplanung/stpl-details-dialog.js.php  |   4 +-
 content/lvplanung/stpl-details-dialog.xul.php |  13 +-
 .../lvplanung/stpl-details-overlay.xul.php    |   2 +-
 content/lvplanung/stpl-week-overlay.js.php    |   7 +-
 content/lvplanung/stpl-week-overlay.xul.php   |  20 ++-
 content/notiz.xml.php                         |  49 ++++--
 content/notizdialog.js.php                    |  29 +++
 content/notizdialog.xul.php                   |  95 ++++++++++
 content/planner.js.php                        |   4 +-
 content/projekt/projekt.overlay.js.php        |   4 +-
 content/projekt/projektphase.overlay.js.php   |   4 +-
 content/projekt/projekttask.overlay.js.php    |   2 +-
 content/student/studentdetailoverlay.xul.php  |   4 +-
 content/student/studentenoverlay.xul.php      |   2 +-
 content/student/studentoverlay.js.php         |   2 +-
 content/tempus.js.php                         |   2 +-
 content/tempus.xul.php                        |   3 +
 include/notiz.class.php                       | 166 +++++++++++++-----
 rdf/lehreinheit-lvplan.rdf.php                |  12 +-
 rdf/notiz.rdf.php                             |  24 ++-
 skin/tempus.css                               |  17 ++
 soap/notiz.soap.php                           |  10 +-
 soap/notiz.wsdl.php                           |   1 +
 system/checksystem.php                        |  18 +-
 27 files changed, 419 insertions(+), 114 deletions(-)
 create mode 100644 content/notizdialog.js.php
 create mode 100644 content/notizdialog.xul.php

diff --git a/content/bindings.xml.php b/content/bindings.xml.php
index 2b39cad76..d208e9e75 100644
--- a/content/bindings.xml.php
+++ b/content/bindings.xml.php
@@ -596,13 +596,13 @@ echo '<?xml version="1.0" encoding="UTF-8" standalone="yes"?>';
   	<content>
 		<xul:vbox flex="1" style="margin: 5px;">
 			<xul:toolbar>
-			  <xul:toolbarbutton tooltiptext="Fett" image="../skin/images/bold.png" stlye="font-weight: bold;" oncommand="document.getBindingParent(this).setBold()"/>
-			  <xul:toolbarbutton tooltiptext="Kursiv" image="../skin/images/italic.png" style="font-style: italic;" oncommand="document.getBindingParent(this).setItalic()"/>
-			  <xul:toolbarbutton tooltiptext="Unterstrichen" image="../skin/images/underline.png" style="text-decoration: underline" oncommand="document.getBindingParent(this).setUnderline()"/>
+			  <xul:toolbarbutton tooltiptext="Fett" image="<?php echo APP_ROOT; ?>skin/images/bold.png" stlye="font-weight: bold;" oncommand="document.getBindingParent(this).setBold()"/>
+			  <xul:toolbarbutton tooltiptext="Kursiv" image="<?php echo APP_ROOT; ?>skin/images/italic.png" style="font-style: italic;" oncommand="document.getBindingParent(this).setItalic()"/>
+			  <xul:toolbarbutton tooltiptext="Unterstrichen" image="<?php echo APP_ROOT; ?>skin/images/underline.png" style="text-decoration: underline" oncommand="document.getBindingParent(this).setUnderline()"/>
 			  <xul:toolbarseparator />
-			  <xul:toolbarbutton tooltiptext="Linksbündig" image="../skin/images/justifyleft.png" oncommand="document.getBindingParent(this).setJustifyLeft()"/>
-			  <xul:toolbarbutton tooltiptext="Zentriert" image="../skin/images/justifycenter.png" oncommand="document.getBindingParent(this).setJustifyCenter()"/>
-			  <xul:toolbarbutton tooltiptext="Rechtsbündig" image="../skin/images/justifyright.png" oncommand="document.getBindingParent(this).setJustifyRight()"/>
+			  <xul:toolbarbutton tooltiptext="Linksbündig" image="<?php echo APP_ROOT; ?>skin/images/justifyleft.png" oncommand="document.getBindingParent(this).setJustifyLeft()"/>
+			  <xul:toolbarbutton tooltiptext="Zentriert" image="<?php echo APP_ROOT; ?>skin/images/justifycenter.png" oncommand="document.getBindingParent(this).setJustifyCenter()"/>
+			  <xul:toolbarbutton tooltiptext="Rechtsbündig" image="<?php echo APP_ROOT; ?>skin/images/justifyright.png" oncommand="document.getBindingParent(this).setJustifyRight()"/>
 			  <xul:toolbarseparator />
 			  <xul:toolbarbutton label="Format" type="menu">							
 			      <xul:menupopup>
@@ -667,18 +667,19 @@ echo '<?xml version="1.0" encoding="UTF-8" standalone="yes"?>';
 			</getter>
 			<setter>
 			<![CDATA[
-
 				if(val)
 				{
-					editor = document.getAnonymousElementByAttribute(this ,'anonid', 'wysiwyg-editor');
+					var editor = document.getAnonymousElementByAttribute(this ,'anonid', 'wysiwyg-editor');
 					editor.contentDocument.designMode = 'off';
 					this.disabled_state=true;
+					editor.style.backgroundColor="#EEEEEE";
 				}
 				else
 				{
-					editor = document.getAnonymousElementByAttribute(this ,'anonid', 'wysiwyg-editor');
+					var editor = document.getAnonymousElementByAttribute(this ,'anonid', 'wysiwyg-editor');
 					editor.contentDocument.designMode = 'on';	
 					this.disabled_state=false;
+					editor.style.backgroundColor="#FFFFFF";
 				}
 			]]>
 			</setter>
@@ -757,6 +758,7 @@ echo '<?xml version="1.0" encoding="UTF-8" standalone="yes"?>';
 			netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
 			editor = document.getAnonymousElementByAttribute(this ,'anonid', 'wysiwyg-editor');
 			editor.contentDocument.designMode = 'on';
+			editor.style.backgroundColor="#FFFFFF";
 			]]>
 			</body>
 		</method>		
diff --git a/content/lvplanung/lehrveranstaltungoverlay.js.php b/content/lvplanung/lehrveranstaltungoverlay.js.php
index 6ad59cf6c..64fa9d7cf 100644
--- a/content/lvplanung/lehrveranstaltungoverlay.js.php
+++ b/content/lvplanung/lehrveranstaltungoverlay.js.php
@@ -706,12 +706,15 @@ function LeAuswahl()
 			//Noten Tab aktivieren
 			LehrveranstaltungNotenDisableFields(false);
 
-			//Noten Tab ausblenden
+			//Noten Tab einblenden
 			//document.getElementById('lehrveranstaltung-tab-noten').collapsed=false;
 
 			//Noten Laden
 			LehrveranstaltungNotenLoad(lehrveranstaltung_id);
 
+			//Notizen Tab ausblenden
+			//document.getElementById('lehrveranstaltung-tab-notizen').collapsed=true;
+
 			LeDetailDisableFields(true);
 			//Details zuruecksetzen
 			LeDetailReset();
@@ -723,9 +726,12 @@ function LeAuswahl()
 			LehrveranstaltungNotenDisableFields(true);
 			LehrveranstaltungNotenTreeUnload();
 
-			//Noten Tab einblenden
+			//Noten Tab ausblenden
 			//document.getElementById('lehrveranstaltung-tab-noten').collapsed=true;
 
+			//Notizen Tab einblenden
+			//document.getElementById('lehrveranstaltung-tab-notizen').collapsed=false;
+
 			document.getElementById('lehrveranstaltung-toolbar-neu').disabled=true;
 			document.getElementById('lehrveranstaltung-toolbar-del').disabled=false;
 		}
@@ -890,6 +896,11 @@ function LeAuswahl()
 	{
 		debug(e);
 	}
+
+	// Notizen Laden
+	var lehreinheitnotiz = document.getElementById('lehrveranstaltung-box-notizen');
+	lehreinheitnotiz.LoadNotizTree('','','','','','','','',lehreinheit_id);
+
 }
 
 //******** LehreinheitMitarbeiter **********//
diff --git a/content/lvplanung/lehrveranstaltungoverlay.xul.php b/content/lvplanung/lehrveranstaltungoverlay.xul.php
index 79c0107df..5c4949108 100644
--- a/content/lvplanung/lehrveranstaltungoverlay.xul.php
+++ b/content/lvplanung/lehrveranstaltungoverlay.xul.php
@@ -229,11 +229,15 @@ echo '<?xul-overlay href="'.APP_ROOT.'content/lvplanung/lehrveranstaltungnotenov
 					<tab id="lehrveranstaltung-tab-detail" label="Details" />
 					<tab id="lehrveranstaltung-tab-lektor" label="Lektorenzuteilung" />
 					<tab id="lehrveranstaltung-tab-noten" label="Noten" />
+					<tab id="lehrveranstaltung-tab-notizen" label="Notizen" />
 				</tabs>
 				<tabpanels id="lehrveranstaltung-tabpanels-main" flex="1">
 					<vbox id="lehrveranstaltung-detail" />
 					<vbox id="lehrveranstaltung-lektorzuteilung" />
 					<vbox id="lehrveranstaltung-noten" />
+					<vbox id="lehrveranstaltung-notiz">
+						<box class="Notiz" flex="1" id="lehrveranstaltung-box-notizen"/>
+					</vbox>
 				</tabpanels>
 			</tabbox>
 		</vbox>
diff --git a/content/lvplanung/stpl-details-dialog.js.php b/content/lvplanung/stpl-details-dialog.js.php
index e6c5ce90c..c861ca1e5 100644
--- a/content/lvplanung/stpl-details-dialog.js.php
+++ b/content/lvplanung/stpl-details-dialog.js.php
@@ -30,7 +30,7 @@ loadVariables($user);
 // ****
 // * Laedt die zu bearbeitenden Daten
 // ****
-function StplDetailsInit(datum, mitarbeiter_uid)
+function StplDetailsInit(datum, mitarbeiter_uid,id)
 {
 	document.getElementById('stpl-details-dialog-box-datum').value=datum;
 	document.getElementById('stpl-details-dialog-menulist-lektor').value=mitarbeiter_uid;
@@ -45,4 +45,4 @@ function StplDetailsSpeichern()
 		window.close();
 	else
 		this.focus();
-}
\ No newline at end of file
+}
diff --git a/content/lvplanung/stpl-details-dialog.xul.php b/content/lvplanung/stpl-details-dialog.xul.php
index f58ef328f..2ab45e91b 100644
--- a/content/lvplanung/stpl-details-dialog.xul.php
+++ b/content/lvplanung/stpl-details-dialog.xul.php
@@ -37,7 +37,7 @@ echo '<?xml version="1.0" encoding="UTF-8"?>'."\n";
 echo '<?xml-stylesheet href="'.APP_ROOT.'skin/tempus.css" type="text/css"?>';
 echo '<?xml-stylesheet href="'.APP_ROOT.'content/bindings.css" type="text/css"?>';
 echo '<?xml-stylesheet href="'.APP_ROOT.'content/datepicker/datepicker.css" type="text/css"?>';
-	
+
 if(isset($_GET['id']) && is_numeric($_GET['id']))
 	$id=$_GET['id'];
 else 
@@ -60,7 +60,7 @@ $studiengang->load($stundenplan->studiengang_kz);
 
 <window id="stpl-details-dialog" title="Details"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-        onload="StplDetailsInit('<?php echo $datum_obj->convertISODate($stundenplan->datum); ?>','<?php echo $stundenplan->mitarbeiter_uid; ?>'); document.getElementById('stpl-details-dialog-textbox-titel').focus();"
+        onload="StplDetailsInit('<?php echo $datum_obj->convertISODate($stundenplan->datum); ?>','<?php echo $stundenplan->mitarbeiter_uid; ?>','<?php echo $id; ?>'); document.getElementById('stpl-details-dialog-textbox-titel').focus();"
         >
 
 <script type="application/x-javascript" src="<?php echo APP_ROOT; ?>content/lvplanung/stpl-details-dialog.js.php" />
@@ -69,11 +69,10 @@ $studiengang->load($stundenplan->studiengang_kz);
 <commandset>
   <command id="stpl-details-dialog-command-save" oncommand="StplDetailsSpeichern()"/>
 </commandset>
-
-<vbox>
-
+<vbox id="stpl-details-dialog-detail">
 <textbox id="stpl-details-dialog-textbox-id" hidden="true" value="<?php echo $id; ?>"/>
 
+
 <groupbox id="stpl-details-dialog-groupbox" flex="1">
 	<caption label="Details"/>
 		<grid id="stpl-details-dialog-grid-detail" style="overflow:auto;margin:4px;" flex="1">
@@ -240,5 +239,5 @@ $studiengang->load($stundenplan->studiengang_kz);
 		<button id="stpl-details-dialog-button-speichern" command="stpl-details-dialog-command-save" label="speichern" accesskey="s"/>
 	</hbox>
 </groupbox>
-</vbox>
-</window>
\ No newline at end of file
+</vbox>		
+</window>
diff --git a/content/lvplanung/stpl-details-overlay.xul.php b/content/lvplanung/stpl-details-overlay.xul.php
index df2c206a3..55d069d6d 100644
--- a/content/lvplanung/stpl-details-overlay.xul.php
+++ b/content/lvplanung/stpl-details-overlay.xul.php
@@ -184,4 +184,4 @@ echo '<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>';
 		</template>
 		</tree>
 	</vbox>
-</overlay>
\ No newline at end of file
+</overlay>
diff --git a/content/lvplanung/stpl-week-overlay.js.php b/content/lvplanung/stpl-week-overlay.js.php
index f393ea6ce..411a92a60 100644
--- a/content/lvplanung/stpl-week-overlay.js.php
+++ b/content/lvplanung/stpl-week-overlay.js.php
@@ -463,7 +463,7 @@ function STPLDetailEdit()
 	if(reservierung=='true')
 		alert('Reservierungen koennen hier nicht editiert werden');
 	else
-		window.open('<?php echo APP_ROOT; ?>content/lvplanung/stpl-details-dialog.xul.php?id='+id,'Details', 'height=500,width=450,left=100,top=100,hotkeys=0,resizable=yes,status=no,scrollbars=yes,toolbar=no,location=no,menubar=no,dependent=yes');
+		window.open('<?php echo APP_ROOT; ?>content/lvplanung/stpl-details-dialog.xul.php?id='+id,'Details', 'height=500,width=600,left=100,top=100,hotkeys=0,resizable=yes,status=no,scrollbars=yes,toolbar=no,location=no,menubar=no,dependent=yes');
 }
 
 // ****
@@ -667,3 +667,8 @@ function TimetableDeleteEntries()
 	if (url && doIt)
 		location.href=url;
 }
+function StplWeekOpenNotiz(item)
+{
+	var lehreinheit_id=item.getAttribute('lehreinheit_id');
+	window.open('<?php echo APP_ROOT; ?>content/notizdialog.xul.php?lehreinheit_id='+lehreinheit_id,'Details', 'height=500,width=600,left=100,top=100,hotkeys=0,resizable=yes,status=no,scrollbars=yes,toolbar=no,location=no,menubar=no,dependent=yes');
+}
diff --git a/content/lvplanung/stpl-week-overlay.xul.php b/content/lvplanung/stpl-week-overlay.xul.php
index 43f914e42..4e279df5e 100644
--- a/content/lvplanung/stpl-week-overlay.xul.php
+++ b/content/lvplanung/stpl-week-overlay.xul.php
@@ -169,25 +169,33 @@ echo '<?xul-overlay href="'.APP_ROOT.'content/lvplanung/stpl-details-overlay.xul
 	       					tooltiptext="rdf:http://www.technikum-wien.at/lehreinheit-lvplan/rdf#raumtypalternativ" />
 	    			</row>
 	    			<row>
+						<vbox flex="1">
 	    				<label value="rdf:http://www.technikum-wien.at/lehreinheit-lvplan/rdf#lehrverband"
 	    					tooltiptext="rdf:http://www.technikum-wien.at/lehreinheit-lvplan/rdf#anmerkung" />
+						</vbox>
 	    				<toolbarbutton
-		        			label="KW: rdf:http://www.technikum-wien.at/lehreinheit-lvplan/rdf#start_kw      "
+		        			label="KW: rdf:http://www.technikum-wien.at/lehreinheit-lvplan/rdf#start_kw"
 	        				tooltiptext="Zu KW rdf:http://www.technikum-wien.at/lehreinheit-lvplan/rdf#start_kw springen"
 	        				onclick="onJumpDateRel(event);"
+							class="stplweekoverlay-toolbarbutton"
 	        				kw="rdf:http://www.technikum-wien.at/lehreinheit-lvplan/rdf#start_kw"
 	       				/>
 	    			</row>
 	    			<row>
 	    				<label value="rdf:http://www.technikum-wien.at/lehreinheit-lvplan/rdf#lektor" />
-	    				<label value="WR: rdf:http://www.technikum-wien.at/lehreinheit-lvplan/rdf#wochenrythmus"
-	    					tooltiptext="Wochenrythmus"/>
+	    				<label value="WR: rdf:http://www.technikum-wien.at/lehreinheit-lvplan/rdf#wochenrythmus Bl: rdf:http://www.technikum-wien.at/lehreinheit-lvplan/rdf#stundenblockung"
+	    					tooltiptext="Wochenrythmus" />
 	    			</row>
 	    			<row>
 	    				<label value="Offen: rdf:http://www.technikum-wien.at/lehreinheit-lvplan/rdf#offenestunden / rdf:http://www.technikum-wien.at/lehreinheit-lvplan/rdf#semesterstunden"
 	    					tooltiptext="Stunden: rdf:http://www.technikum-wien.at/lehreinheit-lvplan/rdf#verplant / rdf:http://www.technikum-wien.at/lehreinheit-lvplan/rdf#semesterstunden" />
-	    				<label value="Block: rdf:http://www.technikum-wien.at/lehreinheit-lvplan/rdf#stundenblockung"
-	    					tooltiptext="Stundenblockung" />
+	    				<toolbarbutton align="start"
+		        			label="Notizen: rdf:http://www.technikum-wien.at/lehreinheit-lvplan/rdf#anzahl_notizen"
+							lehreinheit_id="rdf:http://www.technikum-wien.at/lehreinheit-lvplan/rdf#lehreinheit_id"
+	        				onclick="StplWeekOpenNotiz(this)"
+							class="stplweekoverlay-toolbarbutton"
+	       				/>
+
 	    			</row>
 	    		</rows>
 	    	</grid>
@@ -246,4 +254,4 @@ echo '<?xul-overlay href="'.APP_ROOT.'content/lvplanung/stpl-details-overlay.xul
 </toolbox>
 </vbox>
 </hbox>
-</overlay>
\ No newline at end of file
+</overlay>
diff --git a/content/notiz.xml.php b/content/notiz.xml.php
index ec0a245b4..f7373b134 100755
--- a/content/notiz.xml.php
+++ b/content/notiz.xml.php
@@ -42,9 +42,9 @@ echo '<?xml version="1.0" encoding="UTF-8" standalone="yes"?>';
 			</xul:popupset>
 			<xul:toolbox>
 				<xul:toolbar >
-					<xul:toolbarbutton anonid="toolbarbutton-notiz-neu" label="Neue Notiz" oncommand="document.getBindingParent(this).NeueNotiz()" image="../skin/images/NeuDokument.png" tooltiptext="Neue Notiz anlegen" />
-					<xul:toolbarbutton anonid="toolbarbutton-notiz-del" label="Loeschen" oncommand="document.getBindingParent(this).Loeschen()" image="../skin/images/DeleteIcon.png" disabled="true" tooltiptext="Notiz löschen"/>
-					<xul:toolbarbutton anonid="toolbarbutton-notiz-aktualisieren" label="Aktualisieren" oncommand="document.getBindingParent(this).RefreshNotiz()" image="../skin/images/refresh.png" tooltiptext="Liste neu laden"/>
+					<xul:toolbarbutton anonid="toolbarbutton-notiz-neu" label="Neue Notiz" oncommand="document.getBindingParent(this).NeueNotiz()" image="<?php echo APP_ROOT;?>skin/images/NeuDokument.png" tooltiptext="Neue Notiz anlegen" />
+					<xul:toolbarbutton anonid="toolbarbutton-notiz-del" label="Loeschen" oncommand="document.getBindingParent(this).Loeschen()" image="<?php echo APP_ROOT;?>skin/images/DeleteIcon.png" disabled="true" tooltiptext="Notiz löschen"/>
+					<xul:toolbarbutton anonid="toolbarbutton-notiz-aktualisieren" label="Aktualisieren" oncommand="document.getBindingParent(this).RefreshNotiz()" image="<?php echo APP_ROOT;?>skin/images/refresh.png" tooltiptext="Liste neu laden"/>
 					<xul:toolbarbutton anonid="toolbarbutton-notiz-filter" label="Filter" type="menu">							
 				      <xul:menupopup>
 						    <xul:menuitem label="Alle Notizen anzeigen" oncommand="document.getBindingParent(this).LoadNotizTree(document.getBindingParent(this).getAttribute('projekt_kurzbz'),document.getBindingParent(this).getAttribute('projektphase_id'),document.getBindingParent(this).getAttribute('projekttask_id'),document.getBindingParent(this).getAttribute('uid'),document.getBindingParent(this).getAttribute('person_id'),document.getBindingParent(this).getAttribute('prestudent_id'),document.getBindingParent(this).getAttribute('bestellung_id'), document.getBindingParent(this).getAttribute('user'), null);" tooltiptext="Alle Notizen anzeigen"/>
@@ -58,7 +58,7 @@ echo '<?xml version="1.0" encoding="UTF-8" standalone="yes"?>';
 			datasources="rdf:null" ref="http://www.technikum-wien.at/notiz/liste"
 			onclick="document.getBindingParent(this).updateErledigt(event);"
 			onselect="document.getBindingParent(this).edit(event);"
-			flags="dont-build-content"
+			flags="dont-build-content" style="min-height: 60px"
 			>
 			
 			<xul:treecols>
@@ -151,7 +151,7 @@ echo '<?xml version="1.0" encoding="UTF-8" standalone="yes"?>';
 						      		<xul:box class="WYSIWYG" anonid="textbox-notiz-text" flex="1"/>
 								</xul:row>
 								<xul:row>
-				      					<xul:label value="Start"/>
+				      					<xul:label value="Gültig von"/>
 				      				<xul:hbox>
 						      			<xul:box class="Datum" anonid="box-notiz-start"/>
 						      			<xul:label value="Erledigt "/>
@@ -159,13 +159,13 @@ echo '<?xml version="1.0" encoding="UTF-8" standalone="yes"?>';
 						      		</xul:hbox>
 								</xul:row>
 								<xul:row>
-									<xul:label value="Ende"/>
-									<xul:hbox flex="1">
-						      			<xul:box class="Datum" anonid="box-notiz-ende"/>
-										<xul:label value="Verfasser"/>
-							      		<xul:textbox anonid="textbox-notiz-verfasser" disabled="true"/>
-							      	</xul:hbox>
-						      	</xul:row>
+										<xul:label value="Gültig bis"/>
+										<xul:hbox>
+							      			<xul:box class="Datum" anonid="box-notiz-ende"/>
+											<xul:label value="Verfasser"/>
+											<xul:label anonid="textbox-notiz-verfasser" disabled="true"/>
+										</xul:hbox>
+								</xul:row>
 								<xul:row>
 				      				<xul:label value="Bearbeiter"/>
 				      				<xul:hbox>
@@ -189,6 +189,10 @@ echo '<?xml version="1.0" encoding="UTF-8" standalone="yes"?>';
 										
 							      	</xul:hbox>
 								</xul:row>
+								<xul:row>
+										<xul:label value="Letzte Änderung"/>
+										<xul:label anonid="label-notiz-updateamum" value=""/>
+						      	</xul:row>
 							</xul:rows>
 					</xul:grid>
 					<xul:hbox>
@@ -248,7 +252,7 @@ echo '<?xml version="1.0" encoding="UTF-8" standalone="yes"?>';
 			                    getService(Components.interfaces.nsIXULSortService);
 			sortService.sort(tree, treecol.getAttribute('sort'), direction);
 			treecol.parentNode.parentNode.builder.rebuild();
-			debug('sorted in dir:'+direction);
+
 			]]>
 			</body>
 		</method>
@@ -287,6 +291,7 @@ echo '<?xml version="1.0" encoding="UTF-8" standalone="yes"?>';
 				document.getAnonymousElementByAttribute(this ,'anonid', 'box-notiz-ende').value='';
 				document.getAnonymousElementByAttribute(this ,'anonid', 'menulist-notiz-bearbeiter').value='';
 				document.getAnonymousElementByAttribute(this ,'anonid', 'checkbox-notiz-erledigt').checked=false;
+				document.getAnonymousElementByAttribute(this ,'anonid', 'label-notiz-updateamum').value='';
 			]]>
 			</body>
 		</method>
@@ -328,6 +333,7 @@ echo '<?xml version="1.0" encoding="UTF-8" standalone="yes"?>';
 				var person_id = this.getAttribute('person_id');
 				var prestudent_id = this.getAttribute('prestudent_id');
 				var bestellung_id = this.getAttribute('bestellung_id');
+				var lehreinheit_id = this.getAttribute('lehreinheit_id');
 				
 				var soapBody = new SOAPObject("saveNotiz");
 				//soapBody.appendChild(new SOAPObject("username")).val('joe');
@@ -350,6 +356,7 @@ echo '<?xml version="1.0" encoding="UTF-8" standalone="yes"?>';
 				notiz.appendChild(new SOAPObject("person_id")).val(person_id);
 				notiz.appendChild(new SOAPObject("prestudent_id")).val(prestudent_id);
 				notiz.appendChild(new SOAPObject("bestellung_id")).val(bestellung_id);
+				notiz.appendChild(new SOAPObject("lehreinheit_id")).val(lehreinheit_id);
 				soapBody.appendChild(notiz);
 								
 				var sr = new SOAPRequest("saveNotiz",soapBody);
@@ -422,8 +429,6 @@ echo '<?xml version="1.0" encoding="UTF-8" standalone="yes"?>';
 					{
 	
 						var soapBody = new SOAPObject("deleteNotiz");
-						//soapBody.appendChild(new SOAPObject("username")).val('joe');
-						//soapBody.appendChild(new SOAPObject("passwort")).val('waschl');
 						soapBody.appendChild(new SOAPObject("notiz_id")).val(notiz_id);
 						
 						var sr = new SOAPRequest("deleteNotiz",soapBody);
@@ -554,7 +559,9 @@ echo '<?xml version="1.0" encoding="UTF-8" standalone="yes"?>';
 					ende = getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#ende" ));
 					verfasser = getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#verfasser_uid" ));
 					bearbeiter = getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#bearbeiter_uid" ));
+					updateamum = getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#updateamum" ));
 					erledigt = getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#erledigt" ));
+					
 					if(erledigt=='true')
 						erledigt=true;
 					else
@@ -567,6 +574,8 @@ echo '<?xml version="1.0" encoding="UTF-8" standalone="yes"?>';
 					document.getAnonymousElementByAttribute(this ,'anonid', 'box-notiz-ende').value=ende;
 					document.getAnonymousElementByAttribute(this ,'anonid', 'textbox-notiz-verfasser').value=verfasser;
 					document.getAnonymousElementByAttribute(this ,'anonid', 'checkbox-notiz-erledigt').checked=erledigt;
+					document.getAnonymousElementByAttribute(this ,'anonid', 'label-notiz-updateamum').value=updateamum;
+
 					if(bearbeiter!='')
 					{
 						menulist = document.getAnonymousElementByAttribute(this ,'anonid', 'menulist-notiz-bearbeiter');
@@ -636,6 +645,7 @@ echo '<?xml version="1.0" encoding="UTF-8" standalone="yes"?>';
 			<parameter name="prestudent_id"/>
 			<parameter name="bestellung_id"/>
 			<parameter name="user"/>
+			<parameter name="lehreinheit_id"/>
 			<parameter name="erledigt"/>
 			<body>
 			<![CDATA[
@@ -661,6 +671,7 @@ echo '<?xml version="1.0" encoding="UTF-8" standalone="yes"?>';
 					this.setAttribute('prestudent_id',prestudent_id);
 					this.setAttribute('bestellung_id',bestellung_id);
 					this.setAttribute('user',user);
+					this.setAttribute('lehreinheit_id',lehreinheit_id);
 					
 					//Wenn kein Erledigt Parameter uebergeben wird, dann wird die zuletzt 
 					//verwendete Einstellung verwendet
@@ -680,6 +691,7 @@ echo '<?xml version="1.0" encoding="UTF-8" standalone="yes"?>';
 					datasource = datasource+"&prestudent_id="+encodeURIComponent(prestudent_id);
 					datasource = datasource+"&bestellung_id="+encodeURIComponent(bestellung_id);
 					datasource = datasource+"&user="+encodeURIComponent(user);
+					datasource = datasource+"&lehreinheit_id="+encodeURIComponent(lehreinheit_id);
 
 					//Wenn es als Parameter uebergeben wird, ist es ein boolean, sonst ein String
 					if((typeof erledigt=="boolean" && erledigt==true) || (typeof erledigt=="string" && erledigt=='true'))
@@ -796,6 +808,7 @@ echo '<?xml version="1.0" encoding="UTF-8" standalone="yes"?>';
 				var person_id = this.getAttribute('person_id');
 				var prestudent_id = this.getAttribute('prestudent_id');
 				var bestellung_id = this.getAttribute('bestellung_id');
+				var lehreinheit_id = this.getAttribute('lehreinheit_id');
 				
 				var opener_id = this.getAttribute('id');
 				
@@ -808,6 +821,7 @@ echo '<?xml version="1.0" encoding="UTF-8" standalone="yes"?>';
 				param = param+'&person_id='+encodeURIComponent(person_id);
 				param = param+'&prestudent_id='+encodeURIComponent(prestudent_id);
 				param = param+'&bestellung_id='+encodeURIComponent(bestellung_id);
+				param = param+'&lehreinheit_id='+encodeURIComponent(lehreinheit_id);
 				
 				param = param+'&opener_id='+encodeURIComponent(opener_id);
 				if(id!=undefined)
@@ -831,11 +845,12 @@ echo '<?xml version="1.0" encoding="UTF-8" standalone="yes"?>';
 			var prestudent_id = this.getAttribute('prestudent_id');
 			var bestellung_id = this.getAttribute('bestellung_id');
 			var user = this.getAttribute('user');
+			var lehreinheit_id = this.getAttribute('lehreinheit_id');
 			
 			if(projekt_kurzbz!='' || projektphase_id!='' || projekttask_id!='' 
-			   || uid!='' || person_id!='' || prestudent_id!='' || bestellung_id!='' || user!='')
+			   || uid!='' || person_id!='' || prestudent_id!='' || bestellung_id!='' || user!='' || lehreinheit_id!='')
 			{
-				this.LoadNotizTree(projekt_kurzbz,projektphase_id,projekttask_id,uid,person_id,prestudent_id,bestellung_id, user);
+				this.LoadNotizTree(projekt_kurzbz,projektphase_id,projekttask_id,uid,person_id,prestudent_id,bestellung_id, user, lehreinheit_id);
 			}
 			document.getAnonymousElementByAttribute(this ,'anonid', 'textbox-notiz-verfasser').value=getUsername();
 		</constructor>
diff --git a/content/notizdialog.js.php b/content/notizdialog.js.php
new file mode 100644
index 000000000..b476c9859
--- /dev/null
+++ b/content/notizdialog.js.php
@@ -0,0 +1,29 @@
+<?php
+/* Copyright (C) 2014 fhcomplete.org
+ *
+ * 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: Andreas Oesterreicher <andreas.oesterreicher@technikum-wien.at> and
+ */
+?>
+
+// ****
+// * Laedt die zu bearbeitenden Daten
+// ****
+function NotizInit(projekt_kurzbz, projektphase_id, projekttask_id, uid, person_id, prestudent_id, bestellung_id, user, lehreinheit_id)
+{
+	var notizbox = document.getElementById('notiz-dialog-box-notiz');
+	notizbox.LoadNotizTree(projekt_kurzbz,projektphase_id, projekttask_id, uid, person_id, prestudent_id, bestellung_id, user, lehreinheit_id);
+}
diff --git a/content/notizdialog.xul.php b/content/notizdialog.xul.php
new file mode 100644
index 000000000..8656c89d0
--- /dev/null
+++ b/content/notizdialog.xul.php
@@ -0,0 +1,95 @@
+<?php
+/* Copyright (C) 2014 fhcomplete.org
+ *
+ * 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: Andreas Oesterreicher <andreas.oesterreicher@technikum-wien.at> and
+ */
+
+header("Cache-Control: no-cache");
+header("Cache-Control: post-check=0, pre-check=0",false);
+header("Expires Mon, 26 Jul 1997 05:00:00 GMT");
+header("Pragma: no-cache");
+header("Content-type: application/vnd.mozilla.xul+xml");
+
+include('../config/vilesci.config.inc.php');
+echo '<?xml version="1.0" encoding="UTF-8"?>'."\n";
+echo '<?xml-stylesheet href="'.APP_ROOT.'content/datepicker/datepicker.css" type="text/css"?>';
+
+echo '<?xml-stylesheet href="'.APP_ROOT.'skin/tempus.css" type="text/css"?>';
+echo '<?xml-stylesheet href="'.APP_ROOT.'content/bindings.css" type="text/css"?>';
+	
+if(isset($_GET['projekt_kurzbz']))
+	$projekt_kurzbz=$_GET['projekt_kurzbz'];
+else 
+	$projekt_kurzbz='';
+
+if(isset($_GET['projektphase_id']) && is_numeric($_GET['projektphase_id']))
+	$projektphase_id=$_GET['projektphase_id'];
+else 
+	$projektphase_id='';
+
+if(isset($_GET['projekttask_id']) && is_numeric($_GET['projekttask_id']))
+	$projekttask_id=$_GET['projekttask_id'];
+else 
+	$projekttask_id='';
+
+if(isset($_GET['uid']))
+	$uid=$_GET['uid'];
+else 
+	$uid='';	
+
+if(isset($_GET['person_id']) && is_numeric($_GET['person_id']))
+	$person_id=$_GET['person_id'];
+else 
+	$person_id='';
+
+if(isset($_GET['prestudent_id']) && is_numeric($_GET['prestudent_id']))
+	$prestudent_id=$_GET['prestudent_id'];
+else 
+	$prestudent_id='';
+
+if(isset($_GET['bestellung_id']) && is_numeric($_GET['bestellung_id']))
+	$bestellung_id=$_GET['bestellung_id'];
+else 
+	$bestellung_id='';
+
+if(isset($_GET['user']) && is_numeric($_GET['user']))
+	$user=$_GET['user'];
+else 
+	$user='';
+
+if(isset($_GET['lehreinheit_id']) && is_numeric($_GET['lehreinheit_id']))
+	$lehreinheit_id=$_GET['lehreinheit_id'];
+else 
+	$lehreinheit_id='';
+
+?>
+
+<window id="notiz-dialog" title="Notiz"
+        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+        onload="NotizInit(<?php echo "'".$projekt_kurzbz."','".$projektphase_id."','".$projekttask_id."','".$uid."','".$person_id."','".$prestudent_id."','".$bestellung_id."','".$user."','".$lehreinheit_id."'";?>)"
+        >
+
+<script type="application/x-javascript" src="<?php echo APP_ROOT; ?>content/notizdialog.js.php" />
+<script type="application/x-javascript" src="<?php echo APP_ROOT; ?>content/functions.js.php" />
+<script type="text/javascript" language="JavaScript" src="<?php echo APP_ROOT; ?>include/js/jquery.js"></script>
+<script type="text/javascript" language="JavaScript" src="<?php echo APP_ROOT; ?>include/js/jqSOAPClient.js"></script>
+<script type="text/javascript" language="JavaScript" src="<?php echo APP_ROOT; ?>include/js/jqXMLUtils.js"></script>
+
+<vbox flex="1">
+	<box class="Notiz" flex="1" id="notiz-dialog-box-notiz" />
+</vbox>
+</window>
diff --git a/content/planner.js.php b/content/planner.js.php
index a3d6ee1ae..550a96144 100755
--- a/content/planner.js.php
+++ b/content/planner.js.php
@@ -68,7 +68,7 @@ function onLoad()
   		 
   		//Notizen des Users laden
 		notiz = document.getElementById('box-notizen');
-		notiz.LoadNotizTree('','','','','','','', getUsername());
+		notiz.LoadNotizTree('','','','','','','', getUsername(),'');
 	}
 	catch(e)
 	{
@@ -88,4 +88,4 @@ function loadURL(event)
         var url = event.target.getAttribute('value');
 
         if (url) contentFrame.setAttribute('src', url);
-}
\ No newline at end of file
+}
diff --git a/content/projekt/projekt.overlay.js.php b/content/projekt/projekt.overlay.js.php
index cbf1edda1..ae977b9de 100755
--- a/content/projekt/projekt.overlay.js.php
+++ b/content/projekt/projekt.overlay.js.php
@@ -170,7 +170,7 @@ function onselectProjekt()
     
     //Notizen zu einem Projekt Laden
 	notiz = document.getElementById('box-projekt-notizen');
-	notiz.LoadNotizTree(projekt_kurzbz,'','','','','','', '');
+	notiz.LoadNotizTree(projekt_kurzbz,'','','','','','', '','');
 	
 	ressource = document.getElementById('box-projekt-ressourcen');
 	ressource.LoadRessourceTree(projekt_kurzbz,'');
@@ -422,4 +422,4 @@ function ProjektPrintProjektbeschreibung()
 		return false;
 	}
 	window.open('<?php echo APP_ROOT ?>content/projektbeschreibung.php?xsl=Projektbeschr&xml=projektbeschreibung.rdf.php&projekt_kurzbz='+id);
-}
\ No newline at end of file
+}
diff --git a/content/projekt/projektphase.overlay.js.php b/content/projekt/projektphase.overlay.js.php
index 65aa98d47..b54ff8640 100755
--- a/content/projekt/projektphase.overlay.js.php
+++ b/content/projekt/projektphase.overlay.js.php
@@ -177,7 +177,7 @@ function onselectTreeProjektphase()
     
     //Notizen zu einer Phase Laden
 	notiz = document.getElementById('box-projektphase-notizen');
-	notiz.LoadNotizTree('',projektphase_id,'','','','','', '');
+	notiz.LoadNotizTree('',projektphase_id,'','','','','', '','');
 	
 	ressource = document.getElementById('box-projekt-ressource-phase');
 	ressource.LoadRessourceTree('',projektphase_id);
@@ -423,4 +423,4 @@ function clb_deleteProjektphase(respObj)
 	datasourceTreeProjektphase.Refresh(false); //non blocking
 	ProjektmenueRefresh()
 	SetStatusBarText('Eintrag wurde entfernt');
-}
\ No newline at end of file
+}
diff --git a/content/projekt/projekttask.overlay.js.php b/content/projekt/projekttask.overlay.js.php
index 3817aefcf..9b3052fff 100755
--- a/content/projekt/projekttask.overlay.js.php
+++ b/content/projekt/projekttask.overlay.js.php
@@ -472,7 +472,7 @@ function onselectProjekttask()
 	
 	 //Notizen zu eines Tasks Laden
 	notiz = document.getElementById('box-projekttask-notizen');
-	notiz.LoadNotizTree('','',projekttask_id,'','','','', '');
+	notiz.LoadNotizTree('','',projekttask_id,'','','','', '','');
 	
 	//Mantis Tab reset
 	document.getElementById('textbox-projekttask-mantis-issue_summary').value=bezeichnung;
diff --git a/content/student/studentdetailoverlay.xul.php b/content/student/studentdetailoverlay.xul.php
index 3a3a6994d..50d267058 100644
--- a/content/student/studentdetailoverlay.xul.php
+++ b/content/student/studentdetailoverlay.xul.php
@@ -124,7 +124,7 @@ echo '<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>';
 								</template>
 							</menulist>
 							<label value="Matrikelnummer" control="student-detail-textbox-matr_nr"/>
-      						<hbox><textbox id="student-detail-textbox-matr_nr" disabled="true" maxlength="10" size="15"/></hbox>
+      						<hbox><textbox id="student-detail-textbox-matr_nr" disabled="true" maxlength="32" size="15"/></hbox>
 							<label value="Sprache" control="student-detail-menulist-sprache" />
 							<menulist id="student-detail-menulist-sprache" disabled="true"
 							          datasources="<?php echo APP_ROOT ?>rdf/sprache.rdf.php" flex="1"
@@ -199,7 +199,7 @@ echo '<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>';
 	    					<row>
 	    						<label value="UID" control="student-detail-textbox-uid"/>
 	      						<hbox><textbox id="student-detail-textbox-uid" readonly="true" maxlength="16" size="16"/></hbox>
-	    						<label value="Personenkennzeichen" control="student-detail-textbox-matrikelnummer"/>
+	    						<hbox><label id="student-detail-label-matrikelnummer" value="Personenkennzeichen" control="student-detail-textbox-matrikelnummer"/></hbox>
 	      						<hbox><textbox id="student-detail-textbox-matrikelnummer" readonly="true" maxlength="15" size="15"/></hbox>
 	      						<!--<label value="Studiengang" control="student-detail-textbox-studiengang_kz"/>-->
 	      						<textbox id="student-detail-menulist-studiengang_kz" disabled="true" hidden="true" />
diff --git a/content/student/studentenoverlay.xul.php b/content/student/studentenoverlay.xul.php
index 039ecbcf0..16647712e 100644
--- a/content/student/studentenoverlay.xul.php
+++ b/content/student/studentenoverlay.xul.php
@@ -264,7 +264,7 @@ else
 	    					class="sortDirectionIndicator"
 	    					sort="rdf:http://www.technikum-wien.at/student/rdf#dual_bezeichnung" onclick="StudentTreeSort()"/>
 	    				<splitter class="tree-splitter"/>
-						<treecol id="student-treecol-dual" label="Matrikelnummer" flex="1" hidden="true" persist="hidden, width, ordinal"
+						<treecol id="student-treecol-matrnr" label="Matrikelnummer" flex="1" hidden="true" persist="hidden, width, ordinal"
 	    					class="sortDirectionIndicator"
 	    					sort="rdf:http://www.technikum-wien.at/student/rdf#matr_nr" onclick="StudentTreeSort()"/>
 	    				<splitter class="tree-splitter"/>
diff --git a/content/student/studentoverlay.js.php b/content/student/studentoverlay.js.php
index ca9b63c33..41ee35c4e 100644
--- a/content/student/studentoverlay.js.php
+++ b/content/student/studentoverlay.js.php
@@ -1416,7 +1416,7 @@ function StudentAuswahl()
 
 	// Notizen laden
 	var studentnotiz = document.getElementById('student-box-notizen');
-	studentnotiz.LoadNotizTree('','','','',person_id,'','','');
+	studentnotiz.LoadNotizTree('','','','',person_id,'','','','');
 
 	// Selektierungsfunktion der Addons aufrufen
 	for(i in addon)
diff --git a/content/tempus.js.php b/content/tempus.js.php
index d976279f6..bf53492eb 100644
--- a/content/tempus.js.php
+++ b/content/tempus.js.php
@@ -92,7 +92,7 @@ function onLoad()
 
   		//Notizen des Users laden
 		notiz = document.getElementById('box-notizen');
-		notiz.LoadNotizTree('','','','','','','', getUsername());
+		notiz.LoadNotizTree('','','','','','','', getUsername(),'');
 
 	}
 	catch(e)
diff --git a/content/tempus.xul.php b/content/tempus.xul.php
index e2b9cb23b..8c6180aee 100644
--- a/content/tempus.xul.php
+++ b/content/tempus.xul.php
@@ -40,6 +40,9 @@ echo '<?xml-stylesheet href="datepicker/datepicker.css" type="text/css"?>';
 <script type="application/x-javascript" src="<?php echo APP_ROOT; ?>content/tempus.js.php" />
 <script type="application/x-javascript" src="chrome://global/content/nsTransferable.js"/>
 <script type="application/x-javascript" src="<?php echo APP_ROOT; ?>content/DragAndDrop.js"/>
+<script type="text/javascript" language="JavaScript" src="<?php echo APP_ROOT; ?>include/js/jquery.js"></script>
+<script type="text/javascript" language="JavaScript" src="<?php echo APP_ROOT; ?>include/js/jqSOAPClient.js"></script>
+<script type="text/javascript" language="JavaScript" src="<?php echo APP_ROOT; ?>include/js/jqXMLUtils.js"></script>
 
 <commandset id="maincommands">
   <command id="menu-file-close:command" oncommand="closeWindow();"/>
diff --git a/include/notiz.class.php b/include/notiz.class.php
index c7bb78eaf..7b9586607 100644
--- a/include/notiz.class.php
+++ b/include/notiz.class.php
@@ -63,7 +63,7 @@ class notiz extends basis_db
 			return false;
 		}
 
-		$qry = "SELECT * FROM public.tbl_notiz WHERE notiz_id='".addslashes($notiz_id)."'";
+		$qry = "SELECT * FROM public.tbl_notiz WHERE notiz_id=".$this->db_add_param($notiz_id, FHC_INTEGER);
 
 		if($this->db_query($qry))
 		{
@@ -76,7 +76,7 @@ class notiz extends basis_db
 				$this->bearbeiter_uid=$row->bearbeiter_uid;
 				$this->start=$row->start;
 				$this->ende=$row->ende;
-				$this->erledigt=($row->erledigt=='t'?true:false);
+				$this->erledigt=$this->db_parse_bool($row->erledigt);
 				$this->insertamum=$row->insertamum;
 				$this->insertvon=$row->insertvon;
 				$this->updateamum=$row->updateamum;
@@ -110,7 +110,7 @@ class notiz extends basis_db
 			return false;
 		}
 
-		$qry = "Delete FROM public.tbl_notiz WHERE notiz_id='".addslashes($notiz_id)."'";
+		$qry = "Delete FROM public.tbl_notiz WHERE notiz_id=".$this->db_add_param($notiz_id, FHC_INTEGER);
 
 		if(!$this->db_query($qry))
 		{
@@ -149,31 +149,31 @@ class notiz extends basis_db
 			$qry='BEGIN;INSERT INTO public.tbl_notiz (titel, text, verfasser_uid,
 					bearbeiter_uid, start, ende, erledigt, insertamum, insertvon,
 					updateamum, updatevon) VALUES('.
-				$this->addslashes($this->titel).', '.
-				$this->addslashes($this->text).', '.
-				$this->addslashes($this->verfasser_uid).','.
-				$this->addslashes($this->bearbeiter_uid).','.
-				$this->addslashes($this->start).','.
-				$this->addslashes($this->ende).','.
-				($this->erledigt?'true':'false').','.
-				$this->addslashes($this->insertamum).','.
-				$this->addslashes($this->insertvon).','.
-				$this->addslashes($this->updateamum).','.
-				$this->addslashes($this->updatevon).');';
+				$this->db_add_param($this->titel).', '.
+				$this->db_add_param($this->text).', '.
+				$this->db_add_param($this->verfasser_uid).','.
+				$this->db_add_param($this->bearbeiter_uid).','.
+				$this->db_add_param($this->start).','.
+				$this->db_add_param($this->ende).','.
+				$this->db_add_param($this->erledigt,FHC_BOOLEAN).','.
+				$this->db_add_param($this->insertamum).','.
+				$this->db_add_param($this->insertvon).','.
+				$this->db_add_param($this->updateamum).','.
+				$this->db_add_param($this->updatevon).');';
 		}
 		else
 		{
 			$qry='UPDATE public.tbl_notiz SET '.
-				'titel='.$this->addslashes($this->titel).', '.
-				'text='.$this->addslashes($this->text).', '.
-				'verfasser_uid='.$this->addslashes($this->verfasser_uid).', '.
-				'bearbeiter_uid='.$this->addslashes($this->bearbeiter_uid).', '.
-				'start='.$this->addslashes($this->start).', '.
-				'ende='.$this->addslashes($this->ende).', '.
-				'erledigt='.($this->erledigt?'true':'false').', '.
-				'updateamum='.$this->addslashes($this->updateamum).', '.
-				'updatevon='.$this->addslashes($this->updatevon).' '.
-				'WHERE notiz_id='.$this->addslashes($this->notiz_id).';';
+				'titel='.$this->db_add_param($this->titel).', '.
+				'text='.$this->db_add_param($this->text).', '.
+				'verfasser_uid='.$this->db_add_param($this->verfasser_uid).', '.
+				'bearbeiter_uid='.$this->db_add_param($this->bearbeiter_uid).', '.
+				'start='.$this->db_add_param($this->start).', '.
+				'ende='.$this->db_add_param($this->ende).', '.
+				'erledigt='.$this->db_add_param($this->erledigt,FHC_BOOLEAN).', '.
+				'updateamum='.$this->db_add_param($this->updateamum).', '.
+				'updatevon='.$this->db_add_param($this->updatevon).' '.
+				'WHERE notiz_id='.$this->db_add_param($this->notiz_id,FHC_INTEGER).';';
 		}
 
 		if($this->db_query($qry))
@@ -207,7 +207,7 @@ class notiz extends basis_db
 		}
 		else
 		{
-			$this->errormsg = "Fehler beim Speichern des Datensatzes".$qry;
+			$this->errormsg = 'Fehler beim Speichern des Datensatzes';
 			return false;
 		}
 	}
@@ -219,15 +219,16 @@ class notiz extends basis_db
 	public function saveZuordnung()
 	{
 		$qry = "INSERT INTO public.tbl_notizzuordnung(notiz_id, projekt_kurzbz, projektphase_id, projekttask_id, 
-						uid, person_id, prestudent_id, bestellung_id) VALUES(".
-				$this->addslashes($this->notiz_id).','.
-				$this->addslashes($this->projekt_kurzbz).','.
-				$this->addslashes($this->projektphase_id).','.
-				$this->addslashes($this->projekttask_id).','.
-				$this->addslashes($this->uid).','.
-				$this->addslashes($this->person_id).','.
-				$this->addslashes($this->prestudent_id).','.
-				$this->addslashes($this->bestellung_id).');';
+						uid, person_id, prestudent_id, bestellung_id, lehreinheit_id) VALUES(".
+				$this->db_add_param($this->notiz_id, FHC_INTEGER).','.
+				$this->db_add_param($this->projekt_kurzbz).','.
+				$this->db_add_param($this->projektphase_id, FHC_INTEGER).','.
+				$this->db_add_param($this->projekttask_id, FHC_INTEGER).','.
+				$this->db_add_param($this->uid).','.
+				$this->db_add_param($this->person_id, FHC_INTEGER).','.
+				$this->db_add_param($this->prestudent_id, FHC_INTEGER).','.
+				$this->db_add_param($this->bestellung_id, FHC_INTEGER).','.
+				$this->db_add_param($this->lehreinheit_id, FHC_INTEGER).');';
 				
 		if($this->db_query($qry))
 		{
@@ -235,10 +236,9 @@ class notiz extends basis_db
 		}
 		else
 		{
-			$this->errormsg = 'Fehler beim Speichern der Daten'.$qry;
+			$this->errormsg = 'Fehler beim Speichern der Daten';
 			return false;
 		}
-			
 	}
 
 	/**
@@ -253,9 +253,10 @@ class notiz extends basis_db
 	 * @param $prestudent_id
 	 * @param $bestellung_id
 	 * @param $user
+	 * @param $lehreinheit_id
 	 * @return boolean
 	 */
-	public function getNotiz($erledigt=null, $projekt_kurzbz=null, $projektphase_id=null, $projekttask_id=null, $uid=null, $person_id=null, $prestudent_id=null, $bestellung_id=null, $user=null)
+	public function getNotiz($erledigt=null, $projekt_kurzbz=null, $projektphase_id=null, $projekttask_id=null, $uid=null, $person_id=null, $prestudent_id=null, $bestellung_id=null, $user=null, $lehreinheit_id=null)
 	{
 		$qry = "SELECT 
 					* 
@@ -272,21 +273,24 @@ class notiz extends basis_db
 				$qry.=" AND erledigt=false";
 		}
 		if($projekt_kurzbz!='')
-			$qry.=" AND projekt_kurzbz='".addslashes($projekt_kurzbz)."'";
+			$qry.=" AND projekt_kurzbz=".$this->db_add_param($projekt_kurzbz);
 		if($projektphase_id!='')
-			$qry.=" AND projektphase_id='".addslashes($projektphase_id)."'";
+			$qry.=" AND projektphase_id=".$this->db_add_param($projektphase_id, FHC_INTEGER);
 		if($projekttask_id!='')
-			$qry.=" AND projekttask_id='".addslashes($projekttask_id)."'";
+			$qry.=" AND projekttask_id=".$this->db_add_param($projekttask_id, FHC_INTEGER);
 		if($uid!='')
-			$qry.=" AND uid='".addslashes($uid)."'";
+			$qry.=" AND uid=".$this->db_add_param($uid);
 		if($person_id!='')
-			$qry.=" AND person_id='".addslashes($person_id)."'";
+			$qry.=" AND person_id=".$this->db_add_param($person_id, FHC_INTEGER);
 		if($prestudent_id!='')
-			$qry.=" AND prestudent_id='".addslashes($prestudent_id)."'";
+			$qry.=" AND prestudent_id=".$this->db_add_param($prestudent_id, FHC_INTEGER);
 		if($bestellung_id!='')
-			$qry.=" AND bestellung_id='".addslashes($bestellung_id)."'";
+			$qry.=" AND bestellung_id=".$this->db_add_param($bestellung_id, FHC_INTEGER);
 		if($user!='')
-			$qry.=" AND (verfasser_uid='".addslashes($user)."' OR bearbeiter_uid='".addslashes($user)."')";
+			$qry.=" AND (verfasser_uid=".$this->db_add_param($user)." OR bearbeiter_uid=".$this->db_add_param($user).")";
+		if($lehreinheit_id!='')
+			$qry.=" AND lehreinheit_id=".$this->db_add_param($lehreinheit_id, FHC_INTEGER);
+
 		$qry.=' ORDER BY start, ende, titel';
 		
 		if($result = $this->db_query($qry))
@@ -302,7 +306,7 @@ class notiz extends basis_db
 				$obj->bearbeiter_uid=$row->bearbeiter_uid;
 				$obj->start=$row->start;
 				$obj->ende=$row->ende;
-				$obj->erledigt=($row->erledigt=='t'?true:false);
+				$obj->erledigt=$this->db_parse_bool($row->erledigt);
 				$obj->insertamum=$row->insertamum;
 				$obj->insertvon=$row->insertvon;
 				$obj->updateamum=$row->updateamum;
@@ -319,5 +323,73 @@ class notiz extends basis_db
 		}
 	}
 	
+	/**
+
+	 * 
+
+	 * Laedt die Notizen
+	 * @param $erledigt
+	 * @param $projekt_kurzbz
+	 * @param $projektphase_id
+	 * @param $projekttask_id
+	 * @param $uid
+	 * @param $person_id
+	 * @param $prestudent_id
+	 * @param $bestellung_id
+	 * @param $user
+	 * @param $lehreinheit_id
+	 * @return boolean
+	 */
+	public function getAnzahlNotizen($erledigt=null, $projekt_kurzbz=null, $projektphase_id=null, $projekttask_id=null, $uid=null, $person_id=null, $prestudent_id=null, $bestellung_id=null, $user=null, $lehreinheit_id=null)
+	{
+		$qry = "SELECT 
+					count(*) as anzahl
+				FROM 
+					public.tbl_notiz 
+					LEFT JOIN public.tbl_notizzuordnung USING(notiz_id)
+				WHERE 1=1";
+		
+		if(!is_null($erledigt))
+		{
+			if($erledigt)
+				$qry.=" AND erledigt=true";
+			else
+				$qry.=" AND erledigt=false";
+		}
+		if($projekt_kurzbz!='')
+			$qry.=" AND projekt_kurzbz=".$this->db_add_param($projekt_kurzbz);
+		if($projektphase_id!='')
+			$qry.=" AND projektphase_id=".$this->db_add_param($projektphase_id, FHC_INTEGER);
+		if($projekttask_id!='')
+			$qry.=" AND projekttask_id=".$this->db_add_param($projekttask_id, FHC_INTEGER);
+		if($uid!='')
+			$qry.=" AND uid=".$this->db_add_param($uid);
+		if($person_id!='')
+			$qry.=" AND person_id=".$this->db_add_param($person_id, FHC_INTEGER);
+		if($prestudent_id!='')
+			$qry.=" AND prestudent_id=".$this->db_add_param($prestudent_id, FHC_INTEGER);
+		if($bestellung_id!='')
+			$qry.=" AND bestellung_id=".$this->db_add_param($bestellung_id, FHC_INTEGER);
+		if($user!='')
+			$qry.=" AND (verfasser_uid=".$this->db_add_param($user)." OR bearbeiter_uid=".$this->db_add_param($user).")";
+		if($lehreinheit_id!='')
+			$qry.=" AND lehreinheit_id=".$this->db_add_param($lehreinheit_id, FHC_INTEGER);
+		
+		if($result = $this->db_query($qry))
+		{
+			if($row = $this->db_fetch_object($result))
+				return $row->anzahl;
+			else
+			{
+				$this->errormsg='Fehler beim Laden der Daten';
+				return false;
+			}
+		}
+		else
+		{
+			$this->errormsg = 'Fehler beim Laden der Daten';
+			return false;
+		}
+	}
 }
-?>
\ No newline at end of file
+?>
diff --git a/rdf/lehreinheit-lvplan.rdf.php b/rdf/lehreinheit-lvplan.rdf.php
index 8e229f86f..6c97c08d7 100644
--- a/rdf/lehreinheit-lvplan.rdf.php
+++ b/rdf/lehreinheit-lvplan.rdf.php
@@ -35,6 +35,7 @@ echo '<?xml version="1.0" encoding="UTF-8" standalone="yes"?>';
 require_once('../config/vilesci.config.inc.php');
 require_once('../include/functions.inc.php');
 require_once('../include/lehreinheit.class.php');
+require_once('../include/notiz.class.php');
 
 $uid=get_uid();
 $error_msg='';
@@ -144,8 +145,15 @@ if ($anz>0)
 		$gruppe_kurzbz='';
 		$i=0;
 		// IDs der Lehreinheiten
-		foreach($l->lehreinheit_id as $lva_id)
+		$leids = array_unique($l->lehreinheit_id);
+		$anzahl_notizen=0;
+		foreach($leids as $lva_id)
+		{
 			$lva_ids.='&amp;lva_id'.$i++.'='.$lva_id;
+			$notiz = new notiz();
+			$anzahl_notizen+=$notiz->getAnzahlNotizen(null, null, null, null, null, null, null, null, null, $lva_id);
+			$lehreinheitids[] = $lva_id;
+		}
 		// Lektoren
 		$lektor='';
 		$l->lektor=array_unique($l->lektor);
@@ -276,6 +284,8 @@ if ($anz>0)
 					<LVA:lehrfach_farbe>#'.$l->lehrfach_farbe[0].'</LVA:lehrfach_farbe>
 					<LVA:lva_ids>'.$lva_ids.'</LVA:lva_ids>
 					<LVA:lehrverband>'.$lehrverband.'</LVA:lehrverband>
+					<LVA:anzahl_notizen>'.$anzahl_notizen.'</LVA:anzahl_notizen>
+					<LVA:lehreinheit_id>'.$l->lehreinheit_id[0].'</LVA:lehreinheit_id>
 	      		</RDF:Description>
 			</RDF:li>';
 	}
diff --git a/rdf/notiz.rdf.php b/rdf/notiz.rdf.php
index b2f45ea9d..ee81d41ff 100644
--- a/rdf/notiz.rdf.php
+++ b/rdf/notiz.rdf.php
@@ -54,11 +54,27 @@ $uid=(isset($_GET['uid'])?$_GET['uid']:null);
 $person_id=(isset($_GET['person_id'])?$_GET['person_id']:null);
 $prestudent_id=(isset($_GET['prestudent_id'])?$_GET['prestudent_id']:null);
 $bestellung_id=(isset($_GET['bestellung_id'])?$_GET['bestellung_id']:null);
+$lehreinheit_id=(isset($_GET['lehreinheit_id'])?$_GET['lehreinheit_id']:null);
+$stundenplandev_id=(isset($_GET['stundenplandev_id'])?$_GET['stundenplandev_id']:null);
 $datum_obj = new datum();
 $user=(isset($_GET['user'])?$_GET['user']:null);
 
-if(!$notiz->getNotiz($erledigt, $projekt_kurzbz, $projektphase_id, $projekttask_id, $uid, $person_id, $prestudent_id, $bestellung_id, $user))
-	die($notiz->errormsg);
+$notiz_id = (isset($_GET['notiz_id'])?$_GET['notiz_id']:null);
+
+if(is_null($notiz_id))
+{
+	if(!$notiz->getNotiz($erledigt, $projekt_kurzbz, $projektphase_id, $projekttask_id, $uid, $person_id, $prestudent_id, $bestellung_id, $user, $lehreinheit_id, $stundenplandev_id))
+		die($notiz->errormsg);
+}
+else
+{
+	if($notiz->load($notiz_id))
+	{
+		$notiz->result[] = $notiz;
+	}
+	else
+		die($notiz->errormsg);
+}
 
 foreach($notiz->result as $row)
 {	
@@ -78,7 +94,7 @@ foreach($notiz->result as $row)
 			<NOTIZ:erledigt><![CDATA['.($row->erledigt?'true':'false').']]></NOTIZ:erledigt>
 			<NOTIZ:insertamum><![CDATA['.$row->insertamum.']]></NOTIZ:insertamum>
 			<NOTIZ:insertvon><![CDATA['.$row->insertvon.']]></NOTIZ:insertvon>
-			<NOTIZ:updateamum><![CDATA['.$row->updateamum.']]></NOTIZ:updateamum>
+			<NOTIZ:updateamum><![CDATA['.$datum_obj->formatDatum($row->updateamum,'d.m.Y H:i:s').']]></NOTIZ:updateamum>
 			<NOTIZ:updatevon><![CDATA['.$row->updatevon.']]></NOTIZ:updatevon>	
          </RDF:Description>
       </RDF:li>
@@ -87,4 +103,4 @@ foreach($notiz->result as $row)
 
 echo '  </RDF:Seq>
 </RDF:RDF>';
-?>
\ No newline at end of file
+?>
diff --git a/skin/tempus.css b/skin/tempus.css
index 809038ade..757a22236 100644
--- a/skin/tempus.css
+++ b/skin/tempus.css
@@ -134,3 +134,20 @@ treechildren::-moz-tree-checkbox(checked)
   list-style-image: url("../skin/images/cbox-check.gif");
 }
 
+
+toolbarbutton.stplweekoverlay-toolbarbutton
+{
+	-moz-appearance: none;
+	border: 0px;
+	margin:0px;
+	padding-top: 0px;
+	padding-bottom: 0px;
+}
+toolbarbutton.stplweekoverlay-toolbarbutton > .toolbarbutton-text
+{
+	text-align: left;
+}
+toolbarbutton.stplweekoverlay-toolbarbutton:hover
+{
+	border: 1px outset black;
+}
diff --git a/soap/notiz.soap.php b/soap/notiz.soap.php
index 5e137652f..e9f95fe29 100755
--- a/soap/notiz.soap.php
+++ b/soap/notiz.soap.php
@@ -50,12 +50,13 @@ ini_set("soap.wsdl_cache_enabled", "0");
  */
 function saveNotiz($username, $passwort, $notiz)
 { 	
+	
 	if(!$user = check_user($username, $passwort))
 		return new SoapFault("Server", "Invalid Credentials");	
 	
 	$rechte = new benutzerberechtigung();
 	$rechte->getBerechtigungen($user);
-		
+
 	if(!$rechte->isBerechtigt('basis/notiz', null, 'sui'))
 		return new SoapFault("Server", "Sie haben keine Berechtigung zum Speichern von Notizen");
 	
@@ -82,8 +83,10 @@ function saveNotiz($username, $passwort, $notiz)
 	$notiz_obj->bearbeiter_uid = $notiz->bearbeiter_uid;
 	$notiz_obj->start = $notiz->start;
 	$notiz_obj->ende = $notiz->ende;
-	$notiz_obj->erledigt=$notiz->erledigt;
-	
+	$notiz_obj->erledigt=($notiz->erledigt=='true'?true:false);
+	$notiz_obj->updateamum = date('Y-m-d H:i:s');
+	$notiz_obj->updatevon = $username;
+
 	if($notiz_obj->save())
 	{
 		if($notiz_obj->new)
@@ -95,6 +98,7 @@ function saveNotiz($username, $passwort, $notiz)
 			$notiz_obj->person_id = $notiz->person_id;
 			$notiz_obj->prestudent_id = $notiz->prestudent_id;
 			$notiz_obj->bestellung_id = $notiz->bestellung_id;
+			$notiz_obj->lehreinheit_id = $notiz->lehreinheit_id;
 			
 			if(!$notiz_obj->saveZuordnung())
 				return new SoapFault("Server", $notiz_obj->errormsg);
diff --git a/soap/notiz.wsdl.php b/soap/notiz.wsdl.php
index c41563876..20ea77d0c 100755
--- a/soap/notiz.wsdl.php
+++ b/soap/notiz.wsdl.php
@@ -34,6 +34,7 @@ xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/">
 			<wsdl:part name="person_id" type="xsd:string"></wsdl:part>
 			<wsdl:part name="prestudent_id" type="xsd:string"></wsdl:part>
 			<wsdl:part name="bestellung_id" type="xsd:string"></wsdl:part>
+			<wsdl:part name="lehreinheit_id" type="xsd:string"></wsdl:part>
 			</xsd:all>
 	 </xsd:complexType>
 	 
diff --git a/system/checksystem.php b/system/checksystem.php
index 6474bf211..6bacdad6d 100644
--- a/system/checksystem.php
+++ b/system/checksystem.php
@@ -1608,7 +1608,7 @@ if($result = @$db->db_query("SELECT * FROM information_schema.table_constraints
 			echo '<br>campus.tbl_pruefungsanmeldung: Fehlenden Foreign Key zu Pruefungstermin hinzugefügt';
 	}
 }
-// Ampel boolean email
+// ort_kurzbz bei pruefungstermin
 if(!$result = @$db->db_query("SELECT ort_kurzbz FROM campus.tbl_pruefungstermin"))
 {
 	$qry = "ALTER TABLE campus.tbl_pruefungstermin ADD COLUMN ort_kurzbz varchar(16);
@@ -1673,6 +1673,20 @@ if(!$result = @$db->db_query("SELECT lvs FROM lehre.tbl_lehrveranstaltung LIMIT
 		echo '<br>lehre.tbl_lehrveranstaltung: neue Spalten sws, lvs,alvs,lvps,las hinzugefuegt';
 }
 
+// Notizzuordnung fuer Lehreinheit und Stundenplandev
+if(!$result = @$db->db_query("SELECT lehreinheit_id FROM public.tbl_notizzuordnung LIMIT 1"))
+{
+	$qry = "
+		ALTER TABLE public.tbl_notizzuordnung ADD COLUMN lehreinheit_id integer;
+		ALTER TABLE public.tbl_notizzuordnung ADD CONSTRAINT fk_lehreinheit_notizzuordnung FOREIGN KEY (lehreinheit_id) REFERENCES lehre.tbl_lehreinheit(lehreinheit_id) ON DELETE CASCADE ON UPDATE CASCADE;
+	";
+
+	if(!$db->db_query($qry))
+		echo '<strong>public.tbl_notizzuordnung: '.$db->db_last_error().'</strong><br>';
+	else
+		echo '<br>public.tbl_notizzuordnung: neue Spalten lehreinheit_id hinzugefuegt';
+}
+
 
 echo '<br><br><br>';
 
@@ -1836,7 +1850,7 @@ $tabellen=array(
 	"public.tbl_log"  => array("log_id","executetime","mitarbeiter_uid","beschreibung","sql","sqlundo"),
 	"public.tbl_mitarbeiter"  => array("mitarbeiter_uid","personalnummer","telefonklappe","kurzbz","lektor","fixangestellt","bismelden","stundensatz","ausbildungcode","ort_kurzbz","standort_id","anmerkung","insertamum","insertvon","updateamum","updatevon","ext_id","kleriker"),
 	"public.tbl_notiz"  => array("notiz_id","titel","text","verfasser_uid","bearbeiter_uid","start","ende","erledigt","insertamum","insertvon","updateamum","updatevon"),
-	"public.tbl_notizzuordnung"  => array("notizzuordnung_id","notiz_id","projekt_kurzbz","projektphase_id","projekttask_id","uid","person_id","prestudent_id","bestellung_id"),
+	"public.tbl_notizzuordnung"  => array("notizzuordnung_id","notiz_id","projekt_kurzbz","projektphase_id","projekttask_id","uid","person_id","prestudent_id","bestellung_id","lehreinheit_id"),
 	"public.tbl_ort"  => array("ort_kurzbz","bezeichnung","planbezeichnung","max_person","lehre","reservieren","aktiv","lageplan","dislozierung","kosten","ausstattung","updateamum","updatevon","insertamum","insertvon","ext_id","stockwerk","standort_id","telefonklappe","content_id"),
 	"public.tbl_ortraumtyp"  => array("ort_kurzbz","hierarchie","raumtyp_kurzbz"),
 	"public.tbl_organisationseinheit" => array("oe_kurzbz", "oe_parent_kurzbz", "bezeichnung","organisationseinheittyp_kurzbz", "aktiv","mailverteiler","freigabegrenze","kurzzeichen","lehre"),