From 88330724a3d43ba56e2305bc15c4c334eda651b1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20=C3=96sterreicher?= <oesi@technikum-wien.at>
Date: Wed, 14 Sep 2011 14:48:04 +0000
Subject: [PATCH] =?UTF-8?q?Planner:=20-=20bestehende=20Dokumente=20zu=20Pr?=
 =?UTF-8?q?ojekt=20zuweisen=20-=20Mantis=20Eintr=C3=A4ge=20Update=20Datenb?=
 =?UTF-8?q?ank:=20-=20Erledigt=20f=C3=BCr=20Tasks=20hinzugef=C3=BCgt=20-?=
 =?UTF-8?q?=20Budget=20f=C3=BCr=20Projekte=20hinzugef=C3=BCgt=20-=20NN=20b?=
 =?UTF-8?q?ei=20Notizbearbeiter=20entfernt?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 content/notiz.window.js.php                   |  67 +++-
 content/notiz.window.xul.php                  |  26 ++
 content/notiz.xml.php                         |   7 +-
 content/planner.overlay.js.php                |   4 +
 content/planner.overlay.xul.php               |   2 +-
 content/projekt/gantt.css                     |   1 -
 content/projekt/mantisdetail.overlay.xul.php  |  26 +-
 content/projekt/projekt.window.js.php         |   8 +-
 content/projekt/projekt.window.xul.php        |   2 +-
 .../projekt/projektdokument.overlay.js.php    |  26 ++
 .../projekt/projektdokument.overlay.xul.php   |   1 +
 content/projekt/projektdokument.window.js.php | 106 ++++++
 .../projekt/projektdokument.window.xul.php    |  88 +++++
 content/projekt/projektphase.window.js.php    |  64 +---
 content/projekt/projektphase.window.xul.php   |   1 +
 content/projekt/projekttask.overlay.js.php    | 327 ++++++++++++------
 .../projekt/projekttaskdetail.overlay.xul.php |   4 +-
 content/projekt/ressource.js.php              |   2 +
 include/dms.class.php                         |  44 ++-
 include/mantis.class.php                      |  91 +++--
 include/notiz.class.php                       |   3 +-
 rdf/dms.rdf.php                               |   5 +
 rdf/mantis.rdf.php                            |   3 +-
 skin/planner.css                              |  30 --
 soap/notiz.soap.php                           |   4 +-
 soap/notiz.wsdl.php                           |   1 +
 soap/projekt.soap.php                         |  15 +
 soap/projekt.wsdl.php                         |  24 +-
 soap/projekttask.soap.php                     |  20 ++
 soap/projekttask.wsdl.php                     |  55 ++-
 system/checksystem.php                        |  19 +-
 31 files changed, 780 insertions(+), 296 deletions(-)
 create mode 100755 content/projekt/projektdokument.window.js.php
 create mode 100755 content/projekt/projektdokument.window.xul.php

diff --git a/content/notiz.window.js.php b/content/notiz.window.js.php
index 8701721b6..3696d67ac 100755
--- a/content/notiz.window.js.php
+++ b/content/notiz.window.js.php
@@ -49,7 +49,13 @@ function NotizInit(id)
 		text = getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#text" ));
 		start = getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#start" ));
 		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" ));
+		erledigt = getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#erledigt" ));
+		if(erledigt=='Ja')
+			erledigt=true;
+		else
+			erledigt=false;
 	}
 	else
 	{
@@ -59,6 +65,9 @@ function NotizInit(id)
 		start='';
 		ende='';
 		id='';
+		verfasser=getUsername();
+		bearbeiter='';
+		erledigt=false;
 	}		
 	
 	document.getElementById('notiz-textbox-notiz_id').value=id;
@@ -66,6 +75,15 @@ function NotizInit(id)
 	document.getElementById('notiz-textbox-text').value=text;
 	document.getElementById('notiz-box-start').value=start;
 	document.getElementById('notiz-box-ende').value=ende;
+	document.getElementById('notiz-textbox-verfasser').value=verfasser;
+	document.getElementById('notiz-checkbox-erledigt').checked=erledigt;
+	if(bearbeiter!='')
+	{
+		menulist = document.getElementById('notiz-menulist-bearbeiter');
+		NotizMenulistMitarbeiterLoad(menulist, bearbeiter);
+		MenulistSelectItemOnValue('notiz-menulist-bearbeiter', bearbeiter);
+	}
+
 }
 
 // ****
@@ -81,8 +99,9 @@ function NotizSpeichern()
 	var text = document.getElementById('notiz-textbox-text').value;
 	var start = document.getElementById('notiz-box-start').iso;
 	var ende = document.getElementById('notiz-box-ende').iso;
-	var verfasser_uid = getUsername();
-	var bearbeiter_uid = getUsername();
+	var verfasser_uid = document.getElementById('notiz-textbox-verfasser').value;
+	var bearbeiter_uid = MenulistGetSelectedValue('notiz-menulist-bearbeiter');
+	var erledigt = document.getElementById('notiz-checkbox-erledigt').checked;
 	
 	var soapBody = new SOAPObject("saveNotiz");
 	soapBody.appendChild(new SOAPObject("notiz_id")).val(notiz_id);
@@ -92,6 +111,7 @@ function NotizSpeichern()
 	soapBody.appendChild(new SOAPObject("bearbeiter_uid")).val(bearbeiter_uid);
 	soapBody.appendChild(new SOAPObject("start")).val(start);
 	soapBody.appendChild(new SOAPObject("ende")).val(ende);
+	soapBody.appendChild(new SOAPObject("erledigt")).val(erledigt);
 
 	soapBody.appendChild(new SOAPObject("projekt_kurzbz")).val(projekt_kurzbz);
 	soapBody.appendChild(new SOAPObject("projektphase_id")).val(projektphase_id);
@@ -121,4 +141,43 @@ function clb_saveNotiz(respObj)
 		alert('Fehler: '+fehler);
 		return;
 	}	
-}
\ No newline at end of file
+}
+
+
+// ****
+// * Laedt dynamisch die Personen fuer das DropDown Menue
+// * Es muessen mindestens 3 Zeichen in das DropDown Menue eingegeben werden
+// ****
+function NotizMenulistMitarbeiterLoad(menulist, filter)
+{
+	netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+
+	if(typeof(filter)=='undefined')
+		v = menulist.value;
+	else
+		v = filter;
+
+	if(v.length>2)
+	{		
+		var url = '<?php echo APP_ROOT; ?>rdf/mitarbeiter.rdf.php?filter='+encodeURIComponent(v)+'&'+gettimestamp();
+		//nurmittitel=&
+		var oldDatasources = menulist.database.GetDataSources();
+		while(oldDatasources.hasMoreElements())
+		{
+			menulist.database.RemoveDataSource(oldDatasources.getNext());
+		}
+		//Refresh damit die entfernten DS auch wirklich entfernt werden
+		menulist.builder.rebuild();
+	
+		var rdfService = Components.classes["@mozilla.org/rdf/rdf-service;1"].getService(Components.interfaces.nsIRDFService);
+		if(typeof(filter)=='undefined')
+			var datasource = rdfService.GetDataSource(url);
+		else
+			var datasource = rdfService.GetDataSourceBlocking(url);
+		datasource.QueryInterface(Components.interfaces.nsIRDFRemoteDataSource);
+		datasource.QueryInterface(Components.interfaces.nsIRDFXMLSink);
+		menulist.database.AddDataSource(datasource);
+		if(typeof(filter)!='undefined')
+			menulist.builder.rebuild();
+	}
+}
diff --git a/content/notiz.window.xul.php b/content/notiz.window.xul.php
index a7af878f1..4c105373b 100755
--- a/content/notiz.window.xul.php
+++ b/content/notiz.window.xul.php
@@ -89,6 +89,32 @@ var opener_id = '<?php echo (isset($_GET['opener_id'])?addslashes($_GET['opener_
       				<label value="Ende" control="notiz-box-ende"/>
 		      		<box class="Datum" id="notiz-box-ende"/>
 				</row>
+				<row>
+      				<label value="Erledigt" control="notiz-checkbox-erledigt"/>
+		      		<checkbox id="notiz-checkbox-erledigt"/>
+				</row>
+				<row>
+      				<label value="Bearbeiter" control="notiz-menulist-bearbeiter"/>
+		      		<menulist id="notiz-menulist-bearbeiter"
+										  editable="true"
+								          datasources="rdf:null" flex="1"
+								          ref="http://www.technikum-wien.at/mitarbeiter/liste" 
+								          oninput="NotizMenulistMitarbeiterLoad(this);"
+								          oncommand=""
+								         >
+						<template>
+						<menupopup>
+							<menuitem value="rdf:http://www.technikum-wien.at/mitarbeiter/rdf#uid"
+				        		      label="rdf:http://www.technikum-wien.at/mitarbeiter/rdf#vorname rdf:http://www.technikum-wien.at/mitarbeiter/rdf#nachname ( rdf:http://www.technikum-wien.at/mitarbeiter/rdf#uid )"
+							  		  uri="rdf:*"/>
+						</menupopup>
+						</template>
+					</menulist>
+				</row>
+				<row>
+      				<label value="Verfasser" control="notiz-textbox-verfasser"/>
+		      		<textbox id="notiz-textbox-verfasser" disabled="true"/>
+				</row>
 			</rows>
 	</grid>
 	<hbox>
diff --git a/content/notiz.xml.php b/content/notiz.xml.php
index 5d8ab4997..94a881980 100755
--- a/content/notiz.xml.php
+++ b/content/notiz.xml.php
@@ -49,6 +49,7 @@ echo '<?xml version="1.0" encoding="UTF-8" standalone="yes"?>';
 			<xul:tree anonid="tree-notiz"
 			seltype="single" hidecolumnpicker="false" flex="1"
 			datasources="rdf:null" ref="http://www.technikum-wien.at/notiz/liste"
+			ondblclick="document.getBindingParent(this).openNotiz(document.getBindingParent(this).value);"
 			>
 			<xul:treecols>
 			    <xul:treecol anonid="treecol-notiz-titel" label="Titel" flex="5" primary="true" persist="hidden width ordinal"
@@ -301,10 +302,6 @@ echo '<?xml version="1.0" encoding="UTF-8" standalone="yes"?>';
 			//debug('Notiz Binding Stop');
 		</destructor>
 	</implementation>
-	<handlers>
-		<handler event="dblclick">
-	      	this.openNotiz(this.value);
-	    </handler>
-	</handlers>
+	
   </binding>
 </bindings>
diff --git a/content/planner.overlay.js.php b/content/planner.overlay.js.php
index c2367016a..4b8025237 100755
--- a/content/planner.overlay.js.php
+++ b/content/planner.overlay.js.php
@@ -176,6 +176,7 @@ function treeProjektmenueSelect()
 	if(projekt_phase_id!='' || projekt_kurzbz!='')
 	{
 		document.getElementById('toolbarbutton-projektdokument-neu').disabled=false;
+		document.getElementById('toolbarbutton-projektdokument-zuweisung').disabled=false;
 		try
 		{
 		
@@ -215,7 +216,10 @@ function treeProjektmenueSelect()
 		}
 	}
 	else
+	{
 		document.getElementById('toolbarbutton-projektdokument-neu').disabled=true;
+		document.getElementById('toolbarbutton-projektdokument-zuweisung').disabled=true;		
+	}
 
 	//Notizen Laden
 	if(projekt_phase_id!='')
diff --git a/content/planner.overlay.xul.php b/content/planner.overlay.xul.php
index 767937248..2ef72bf7e 100755
--- a/content/planner.overlay.xul.php
+++ b/content/planner.overlay.xul.php
@@ -127,7 +127,7 @@ echo '<?xul-overlay href="'.APP_ROOT.'content/projekt/bestellung.overlay.xul.php
 </vbox>
 
 <vbox id="box-notiz">
-	<box class="Notiz" projekt_kurzbz="Abgabetool" flex="1" id="box-notizen"/>
+	<box class="Notiz" flex="1" id="box-notizen"/>
 </vbox>
 
 <vbox id="box-ressourcemenue">
diff --git a/content/projekt/gantt.css b/content/projekt/gantt.css
index 7f464e069..1334d6b7d 100755
--- a/content/projekt/gantt.css
+++ b/content/projekt/gantt.css
@@ -3,7 +3,6 @@ svg-shape {
 	-moz-user-focus: normal;
 	stroke-width: 4px;
 	font-family: Lucida Grande,Geneva,Verdana,Arial,Helvetica,sans-serif;
-	font-style: bold;
 	font-variant: normal;
 	line-height: normal;
         font-size: 32px;
diff --git a/content/projekt/mantisdetail.overlay.xul.php b/content/projekt/mantisdetail.overlay.xul.php
index 1589219f4..45d95eae3 100755
--- a/content/projekt/mantisdetail.overlay.xul.php
+++ b/content/projekt/mantisdetail.overlay.xul.php
@@ -38,8 +38,6 @@ echo '<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>';
 	<!-- *  Mantisdetail   * -->
 	<!-- ************************ -->
 	<vbox id="box-projekttask-mantis" flex="1">
-		<description>Issue</description>
-			
 		<grid id="grid-projekttask-mantis" style="overflow:auto;margin:4px;" flex="1">
 		  	<columns  >
 				<column flex="1"/>
@@ -50,15 +48,24 @@ echo '<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>';
 			<rows>
 				<row>
 					<label value="Mantis ID" control="textbox-projekttask-mantis-mantis_id"/>
-					<textbox id="textbox-projekttask-mantis-mantis_id"/>
+					<textbox id="textbox-projekttask-mantis-mantis_id" disabled="true"/>
 					<label value="last_updated" control="textbox-projekttask-mantis-issue_last_updated"/>
    					<textbox id="textbox-projekttask-mantis-issue_last_updated"/>
 				</row>
 				<row>
 					<label value="Summary" control="textbox-projekttask-mantis-issue_summary"/>
-					<textbox id="textbox-projekttask-mantis-issue_summary"/>
+					<vbox>
+						<textbox id="textbox-projekttask-mantis-issue_summary"/>
+						<spacer />
+					</vbox>
 					<label value="Description" control="textbox-projekttask-mantis-issue_description"/>
-   					<textbox id="textbox-projekttask-mantis-issue_description"/>
+   					<textbox id="textbox-projekttask-mantis-issue_description" multiline="true"/>
+				</row>
+				<row>
+					<label value="Steps to Reproduce" control="textbox-projekttask-mantis-steps_to_reproduce"/>
+   					<textbox id="textbox-projekttask-mantis-issue_steps_to_reproduce" multiline="true"/>
+					<label value="Additional Information" control="textbox-projekttask-mantis-issue_additional_information"/>
+   					<textbox id="textbox-projekttask-mantis-issue_additional_information" multiline="true"/>
 				</row>
 				<row>
 					<label value="View_state_id" control="textbox-projekttask-mantis-issue_view_state_id"/>
@@ -138,11 +145,6 @@ echo '<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>';
 					<label value="Resolution_name" control="textbox-projekttask-mantis-issue_resolution_name"/>
    					<textbox id="textbox-projekttask-mantis-issue_resolution_name"/>
 				</row> 
-				<row>
-					<label value="Attachments" control="textbox-projekttask-mantis-issue_attachments"/>
-   					<textbox id="textbox-projekttask-mantis-issue_attachments"/>
-				</row>
-				
 			</rows>
 		</grid>
 		<hbox>
@@ -150,8 +152,4 @@ echo '<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>';
 			<button id="button-projekttask-mantis-speichern" oncommand="saveProjekttaskMantis()" label="Speichern" />
 		</hbox>
 	</vbox>
-	
-	<vbox id="projekttask-mantis" flex="1">
-	<description>Mantis Details</description>
-	</vbox>
 </overlay>
\ No newline at end of file
diff --git a/content/projekt/projekt.window.js.php b/content/projekt/projekt.window.js.php
index f904f5074..45762d636 100755
--- a/content/projekt/projekt.window.js.php
+++ b/content/projekt/projekt.window.js.php
@@ -127,11 +127,13 @@ function clb_saveProjekt(respObj)
     try
     {
         var msg = respObj.Body[0].saveProjektResponse[0].message[0].Text;
-	alert('Antwort: '+msg);
+		window.opener.ProjektmenueRefresh();
+		window.opener.ProjektTreeRefresh();
+		window.close();
     }
     catch(e)
     {
-	var fehler = respObj.Body[0].Fault[0].faultstring[0].Text;
-	alert('Fehler: '+fehler);
+		var fehler = respObj.Body[0].Fault[0].faultstring[0].Text;
+		alert('Fehler: '+fehler);
     }
 }
\ No newline at end of file
diff --git a/content/projekt/projekt.window.xul.php b/content/projekt/projekt.window.xul.php
index 539b7472a..f5b03fc72 100755
--- a/content/projekt/projekt.window.xul.php
+++ b/content/projekt/projekt.window.xul.php
@@ -28,7 +28,7 @@ header("Content-type: application/vnd.mozilla.xul+xml");
 require_once('../../config/vilesci.config.inc.php');
 
 echo '<?xml version="1.0" encoding="UTF-8"?>'."\n";
-	
+echo '<?xml-stylesheet href="'.APP_ROOT.'skin/planner.css" type="text/css"?>';
 if(isset($_GET['oe']))
 	$oe=$_GET['oe'];
 else 
diff --git a/content/projekt/projektdokument.overlay.js.php b/content/projekt/projektdokument.overlay.js.php
index 4191625f5..238b83903 100755
--- a/content/projekt/projektdokument.overlay.js.php
+++ b/content/projekt/projektdokument.overlay.js.php
@@ -195,4 +195,30 @@ function ProjektDokumentNeueVersion()
 	}
 		
 	window.open(url);
+}
+
+function ProjektDokumentZuweisen()
+{
+	var tree=document.getElementById('tree-projektmenue');
+	
+	if(tree.currentIndex==-1)
+	{
+		alert('Bitte markieren Sie zuerst ein Projekt oder eine Phase');
+		return false;
+	}
+	
+	var projekt_kurzbz=getTreeCellText(tree, "treecol-projektmenue-projekt_kurzbz", tree.currentIndex);
+	var projekt_phase_id=getTreeCellText(tree, "treecol-projektmenue-projekt_phase_id", tree.currentIndex);
+
+	if(projekt_phase_id!='')
+		var url = '<?php echo APP_ROOT;?>content/projekt/projektdokument.window.xul.php?projektphase_id='+projekt_phase_id;
+	else if(projekt_kurzbz!='')
+		var url = '<?php echo APP_ROOT;?>content/projekt/projektdokument.window.xul.php?projekt_kurzbz='+projekt_kurzbz;
+	else
+	{
+		alert('Bitte zuerst eine Phase oder ein Projekt markieren');
+		return false;
+	}
+		
+	window.open(url,'Zuteilung', 'height=384,width=512,resizable=yes,status=no,scrollbars=yes,toolbar=no,location=no,menubar=no');
 }
\ No newline at end of file
diff --git a/content/projekt/projektdokument.overlay.xul.php b/content/projekt/projektdokument.overlay.xul.php
index 48e05f753..e18e5e356 100755
--- a/content/projekt/projektdokument.overlay.xul.php
+++ b/content/projekt/projektdokument.overlay.xul.php
@@ -50,6 +50,7 @@ echo '<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>';
 		<toolbox>
 			<toolbar id="toolbar-projektdokument-main">
 				<toolbarbutton id="toolbarbutton-projektdokument-neu" label="Neues Dokument hinzufügen" oncommand="ProjektDokumentNeu();" disabled="true" image="../skin/images/NeuDokument.png" tooltiptext="Neues Dokument hochladen" />
+				<toolbarbutton id="toolbarbutton-projektdokument-zuweisung" label="Dokument zuweisen" oncommand="ProjektDokumentZuweisen();" disabled="true" image="../skin/images/liste.gif" tooltiptext="Ein bereits hochgeladenes Dokument zuweisen" />
 				<toolbarbutton id="toolbarbutton-projektdokument-del" label="Loeschen" oncommand="ProjektDokumentDelete();" disabled="true" image="../skin/images/DeleteIcon.png" tooltiptext="Dokument löschen"/>
 				<toolbarbutton id="toolbarbutton-projektdokument-refresh" label="Aktualisieren" oncommand="ProjektDokumentTreeRefresh()" disabled="false" image="../skin/images/refresh.png" tooltiptext="Liste neu laden"/>
 			</toolbar>
diff --git a/content/projekt/projektdokument.window.js.php b/content/projekt/projektdokument.window.js.php
new file mode 100755
index 000000000..d8792b146
--- /dev/null
+++ b/content/projekt/projektdokument.window.js.php
@@ -0,0 +1,106 @@
+<?php
+/* Copyright (C) 2006 Technikum-Wien
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
+ *
+ * Authors: Christian Paminger <christian.paminger@technikum-wien.at>,
+ *          Andreas Oesterreicher <andreas.oesterreicher@technikum-wien.at> and
+ *          Rudolf Hangl <rudolf.hangl@technikum-wien.at>.
+ */
+
+require_once('../../config/vilesci.config.inc.php');
+
+?>
+var projekt_kurzbz='';
+var projektphase_id='';
+// ****
+// * Laedt die zu bearbeitenden Daten
+// ****
+function initProjektdokument(kurzbz, id)
+{
+	projekt_kurzbz = kurzbz;
+	projektphase_id=id;
+}
+
+// ****
+// * Speichern der Daten
+// ****
+function saveZuordnung()
+{
+   var dms_id = MenulistGetSelectedValue('projektdokument-menulist-dokument');
+    // Variablen checken
+    
+    // SOAP-Action
+    var soapBody = new SOAPObject("saveProjektdokumentZuordnung");
+    soapBody.appendChild(new SOAPObject("projekt_kurzbz")).val(projekt_kurzbz);
+    soapBody.appendChild(new SOAPObject("projektphase_id")).val(projektphase_id);
+    soapBody.appendChild(new SOAPObject("dms_id")).val(dms_id);
+    
+    var sr = new SOAPRequest("saveProjektdokumentZuordnung",soapBody);
+    SOAPClient.Proxy="<?php echo APP_ROOT;?>soap/projekt.soap.php?"+gettimestamp();
+    SOAPClient.SendRequest(sr, clb_saveZuordnung);
+}
+
+function clb_saveZuordnung(respObj)
+{
+    try
+    {
+        var msg = respObj.Body[0].saveProjektdokumentZuordnungResponse[0].message[0].Text;
+		window.opener.ProjektDokumentTreeRefresh();
+		window.close();
+    }
+    catch(e)
+    {
+		var fehler = respObj.Body[0].Fault[0].faultstring[0].Text;
+		alert('Fehler: '+fehler);
+    }
+}
+
+// ****
+// * Laedt dynamisch die Personen fuer das DropDown Menue
+// * Es muessen mindestens 3 Zeichen in das DropDown Menue eingegeben werden
+// ****
+function ProjektdokumentMenulistDokumentLoad(menulist, filter)
+{
+	netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+
+	if(typeof(filter)=='undefined')
+		v = menulist.value;
+	else
+		v = filter;
+
+	if(v.length>2)
+	{		
+		var url = '<?php echo APP_ROOT; ?>rdf/dms.rdf.php?filter='+encodeURIComponent(v)+'&'+gettimestamp();
+		var oldDatasources = menulist.database.GetDataSources();
+		while(oldDatasources.hasMoreElements())
+		{
+			menulist.database.RemoveDataSource(oldDatasources.getNext());
+		}
+		//Refresh damit die entfernten DS auch wirklich entfernt werden
+		menulist.builder.rebuild();
+	
+		var rdfService = Components.classes["@mozilla.org/rdf/rdf-service;1"].getService(Components.interfaces.nsIRDFService);
+		if(typeof(filter)=='undefined')
+			var datasource = rdfService.GetDataSource(url);
+		else
+			var datasource = rdfService.GetDataSourceBlocking(url);
+		datasource.QueryInterface(Components.interfaces.nsIRDFRemoteDataSource);
+		datasource.QueryInterface(Components.interfaces.nsIRDFXMLSink);
+		menulist.database.AddDataSource(datasource);
+		if(typeof(filter)!='undefined')
+			menulist.builder.rebuild();
+	}
+}
diff --git a/content/projekt/projektdokument.window.xul.php b/content/projekt/projektdokument.window.xul.php
new file mode 100755
index 000000000..c938965e2
--- /dev/null
+++ b/content/projekt/projektdokument.window.xul.php
@@ -0,0 +1,88 @@
+<?php
+/* Copyright (C) 2006 Technikum-Wien
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
+ *
+ * Authors: Christian Paminger <christian.paminger@technikum-wien.at>,
+ *          Andreas Oesterreicher <andreas.oesterreicher@technikum-wien.at> and
+ *          Rudolf Hangl <rudolf.hangl@technikum-wien.at>.
+ */
+
+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");
+require_once('../../config/vilesci.config.inc.php');
+
+echo '<?xml version="1.0" encoding="UTF-8"?>'."\n";
+echo '<?xml-stylesheet href="'.APP_ROOT.'skin/planner.css" type="text/css"?>';
+if(isset($_GET['projekt_kurzbz']))
+	$projekt_kurzbz=$_GET['projekt_kurzbz'];
+else 
+	$projekt_kurzbz='';
+//echo $oe;
+if(isset($_GET['projektphase_id']))
+	$projektphase_id=$_GET['projektphase_id'];
+else 
+	$projektphase_id='';
+?>
+
+<window id="window-projektdokument-zuweisen" title="Dokument zu Projekt zuweisen"
+        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+        onload="initProjektdokument(<?php echo ($projekt_kurzbz!=''?"'".$projekt_kurzbz."'":"''").','.($projektphase_id!=''?"'".$projektphase_id."'":"''"); ?>)"
+        >
+	<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>
+	<script type="text/javascript" language="JavaScript" src="<?php echo APP_ROOT; ?>content/projekt/projektdokument.window.js.php" />
+	<script type="text/javascript" language="JavaScript" src="<?php echo APP_ROOT; ?>content/functions.js"></script>
+<vbox>
+
+<checkbox id="checkbox-projekt-neu" hidden="true"/>
+
+<groupbox id="groupbox-projektdokument" flex="1">
+	<caption label="Dokument suchen"/>
+		<grid id="grid-projektdokument-detail" style="overflow:auto;margin:4px;" flex="1">
+		  	<columns  >
+				<column flex="1"/>
+				<column flex="5"/>
+			</columns>
+			<rows>
+				<label value="Dokument" control="projektdokument-menulist-dokument" />
+				    <menulist id="projektdokument-menulist-dokument"
+							editable="true"
+							datasources="rdf:null" flex="1"
+							ref="http://www.technikum-wien.at/dms/liste" 
+							oninput="ProjektdokumentMenulistDokumentLoad(this);"
+							oncommand=""
+							>
+						<template>
+						<menupopup>
+							<menuitem value="rdf:http://www.technikum-wien.at/dms/rdf#dms_id"
+				        		      label="rdf:http://www.technikum-wien.at/dms/rdf#name"
+							  		  uri="rdf:*"/>
+						</menupopup>
+						</template>
+					</menulist>
+		</rows>
+	</grid>
+	<hbox>
+		<spacer flex="1" />
+		<button id="button-projektdokument-zuweisen" oncommand="saveZuordnung()" label="Zuweisen" />
+	</hbox>
+</groupbox>
+</vbox>
+</window>
\ No newline at end of file
diff --git a/content/projekt/projektphase.window.js.php b/content/projekt/projektphase.window.js.php
index c19e45b72..f4b648a7f 100755
--- a/content/projekt/projektphase.window.js.php
+++ b/content/projekt/projektphase.window.js.php
@@ -34,61 +34,7 @@ function initProjektphase(projektphase_id)
 {
 	netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
 	
-	/*if(projekt_kurzbz!='')
-	{
-                //Daten holen
-		var url = '<?php echo APP_ROOT ?>rdf/bankverbindung.rdf.php?bankverbindung_id='+bankverbindung_id+'&'+gettimestamp();
-			
-		var rdfService = Components.classes["@mozilla.org/rdf/rdf-service;1"].
-	                   getService(Components.interfaces.nsIRDFService);
-	    
-	    var dsource = rdfService.GetDataSourceBlocking(url);
-	    
-		var subject = rdfService.GetResource("http://www.technikum-wien.at/bankverbindung/" + bankverbindung_id);
 	
-		var predicateNS = "http://www.technikum-wien.at/bankverbindung/rdf";
-	
-		//RDF parsen
-	
-		person_id = getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#person_id" ));
-		name = getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#name" ));
-		anschrift = getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#anschrift" ));
-		bic = getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#bic" ));
-		blz = getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#blz" ));
-		iban = getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#iban" ));
-		kontonr = getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#kontonr" ));
-		typ = getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#typ" ));
-		verrechnung = getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#verrechnung" ));
-		neu = false;
-	}
-	else
-	{
-		//Defaultwerte bei Neuem Datensatz
-		neu = true;
-		name='';
-		anschrift='';
-		bic='';
-		blz='';
-		iban='';
-		kontonr='';
-		typ='p';
-		verrechnung='Ja';
-	}		
-	
-	document.getElementById('bankverbindung-checkbox-neu').checked=neu;
-	document.getElementById('bankverbindung-textbox-person_id').value=person_id;
-	document.getElementById('bankverbindung-textbox-bankverbindung_id').value=bankverbindung_id;
-	document.getElementById('bankverbindung-textbox-name').value=name;
-	document.getElementById('bankverbindung-textbox-anschrift').value=anschrift;
-	document.getElementById('bankverbindung-textbox-bic').value=bic;
-	document.getElementById('bankverbindung-textbox-blz').value=blz;
-	document.getElementById('bankverbindung-textbox-iban').value=iban;
-	document.getElementById('bankverbindung-textbox-kontonr').value=kontonr;
-	document.getElementById('bankverbindung-menulist-typ').value=typ;
-	if(verrechnung=='Ja')
-		document.getElementById('bankverbindung-checkbox-verrechnung').checked=true;
-	else
-		document.getElementById('bankverbindung-checkbox-verrechnung').checked=false;	*/
 }
 
 // ****
@@ -130,12 +76,14 @@ function clb_saveProjektphase(respObj)
 {
     try
     {
-        var msg = respObj.Body[0].SaveProjektphaseResponse[0].message[0].Text;
-	alert('Antwort: '+msg);
+    	netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+        var msg = respObj.Body[0].saveProjektphaseResponse[0].message[0].Text;
+		window.opener.ProjektphaseTreeRefresh();
+		window.close();
     }
     catch(e)
     {
-	var fehler = respObj.Body[0].Fault[0].faultstring[0].Text;
-	alert('Fehler: '+fehler);
+		var fehler = respObj.Body[0].Fault[0].faultstring[0].Text;
+		alert('Fehler: '+fehler);
     }
 }
\ No newline at end of file
diff --git a/content/projekt/projektphase.window.xul.php b/content/projekt/projektphase.window.xul.php
index d2ad15ecb..9de211a4b 100755
--- a/content/projekt/projektphase.window.xul.php
+++ b/content/projekt/projektphase.window.xul.php
@@ -28,6 +28,7 @@ header("Content-type: application/vnd.mozilla.xul+xml");
 require_once('../../config/vilesci.config.inc.php');
 
 echo '<?xml version="1.0" encoding="UTF-8"?>'."\n";
+echo '<?xml-stylesheet href="'.APP_ROOT.'skin/planner.css" type="text/css"?>';
 	
 // projektphase_id wenn das Formular zum bearbeiten verwendet wird
 if(isset($_GET['projektphase_id']))
diff --git a/content/projekt/projekttask.overlay.js.php b/content/projekt/projekttask.overlay.js.php
index 405ca5b07..c44bd521a 100755
--- a/content/projekt/projekttask.overlay.js.php
+++ b/content/projekt/projekttask.overlay.js.php
@@ -338,122 +338,219 @@ function onselectProjekttask()
 	document.getElementById('textbox-projekttask-detail-beschreibung').value=beschreibung;
 	document.getElementById('textbox-projekttask-detail-aufwand').value=aufwand;
 	document.getElementById('textbox-projekttask-detail-mantis_id').value=mantis_id;
-        // Mantis Tab reset
-        document.getElementById('textbox-projekttask-mantis-mantis_id').value='';
-        document.getElementById('textbox-projekttask-mantis-issue_summary').value=bezeichnung;
-        document.getElementById('textbox-projekttask-mantis-issue_description').value=beschreibung;
-        document.getElementById('textbox-projekttask-mantis-issue_view_state_id').value='';
-        document.getElementById('textbox-projekttask-mantis-issue_view_state_name').value='';
-        document.getElementById('textbox-projekttask-mantis-issue_last_updated').value='';
-        document.getElementById('textbox-projekttask-mantis-issue_project_id').value='';
-        document.getElementById('textbox-projekttask-mantis-issue_project_name').value='';
-        document.getElementById('textbox-projekttask-mantis-issue_category').value='';
-        document.getElementById('textbox-projekttask-mantis-issue_priority_id').value='';
-        document.getElementById('textbox-projekttask-mantis-issue_priority_name').value='';
-        document.getElementById('textbox-projekttask-mantis-issue_severity_id').value='';
-        document.getElementById('textbox-projekttask-mantis-issue_severity_name').value='';
-        document.getElementById('textbox-projekttask-mantis-issue_status_id').value='';
-        document.getElementById('textbox-projekttask-mantis-issue_status_name').value='';
-        document.getElementById('textbox-projekttask-mantis-issue_reporter_id').value='';
-        document.getElementById('textbox-projekttask-mantis-issue_reporter_name').value='';
-        document.getElementById('textbox-projekttask-mantis-issue_reporter_real_name').value='';
-        document.getElementById('textbox-projekttask-mantis-issue_reporter_email').value='';
-        document.getElementById('textbox-projekttask-mantis-issue_reproducibility_id').value='';
-        document.getElementById('textbox-projekttask-mantis-issue_reproducibility_name').value='';
-        document.getElementById('textbox-projekttask-mantis-issue_date_submitted').value='';
-        document.getElementById('textbox-projekttask-mantis-issue_sponsorship_total').value='';
-        document.getElementById('textbox-projekttask-mantis-issue_projection_id').value='';
-        document.getElementById('textbox-projekttask-mantis-issue_projection_name').value='';
-        document.getElementById('textbox-projekttask-mantis-issue_eta_id').value='';
-        document.getElementById('textbox-projekttask-mantis-issue_eta_name').value='';
-        document.getElementById('textbox-projekttask-mantis-issue_resolution_id').value='';
-        document.getElementById('textbox-projekttask-mantis-issue_resolution_name').value='';
-        document.getElementById('textbox-projekttask-mantis-issue_attachments').value='';
-        document.getElementById('textbox-projekttask-mantis-issue_due_date').value='';
-            
+	
+	//Mantis Tab reset
+	document.getElementById('textbox-projekttask-mantis-mantis_id').value='';
+	document.getElementById('textbox-projekttask-mantis-issue_summary').value=bezeichnung;
+	document.getElementById('textbox-projekttask-mantis-issue_description').value=beschreibung;
+	document.getElementById('textbox-projekttask-mantis-issue_view_state_id').value='';
+	document.getElementById('textbox-projekttask-mantis-issue_view_state_name').value='';
+	document.getElementById('textbox-projekttask-mantis-issue_last_updated').value='';
+	document.getElementById('textbox-projekttask-mantis-issue_project_id').value='';
+    document.getElementById('textbox-projekttask-mantis-issue_project_name').value='';
+    document.getElementById('textbox-projekttask-mantis-issue_category').value='';
+    document.getElementById('textbox-projekttask-mantis-issue_priority_id').value='';
+    document.getElementById('textbox-projekttask-mantis-issue_priority_name').value='';
+	document.getElementById('textbox-projekttask-mantis-issue_severity_id').value='';
+    document.getElementById('textbox-projekttask-mantis-issue_severity_name').value='';
+    document.getElementById('textbox-projekttask-mantis-issue_status_id').value='';
+    document.getElementById('textbox-projekttask-mantis-issue_status_name').value='';
+    document.getElementById('textbox-projekttask-mantis-issue_reporter_id').value='';
+    document.getElementById('textbox-projekttask-mantis-issue_reporter_name').value='';
+	document.getElementById('textbox-projekttask-mantis-issue_reporter_real_name').value='';
+    document.getElementById('textbox-projekttask-mantis-issue_reporter_email').value='';
+    document.getElementById('textbox-projekttask-mantis-issue_reproducibility_id').value='';
+    document.getElementById('textbox-projekttask-mantis-issue_reproducibility_name').value='';
+	document.getElementById('textbox-projekttask-mantis-issue_date_submitted').value='';
+    document.getElementById('textbox-projekttask-mantis-issue_sponsorship_total').value='';
+    document.getElementById('textbox-projekttask-mantis-issue_projection_id').value='';
+    document.getElementById('textbox-projekttask-mantis-issue_projection_name').value='';
+    document.getElementById('textbox-projekttask-mantis-issue_eta_id').value='';
+    document.getElementById('textbox-projekttask-mantis-issue_eta_name').value='';
+    document.getElementById('textbox-projekttask-mantis-issue_resolution_id').value='';
+    document.getElementById('textbox-projekttask-mantis-issue_resolution_name').value='';
+    document.getElementById('textbox-projekttask-mantis-issue_due_date').value='';
+	document.getElementById('textbox-projekttask-mantis-issue_steps_to_reproduce').value='';
+	document.getElementById('textbox-projekttask-mantis-issue_additional_information').value='';
         
-        // ---------------------------------------------------------------------------------------------
-        // Mantis
-        //alert('|'+mantis_id+'|');
-        if (mantis_id!='')
-        {
-            //alert('|'+mantis_id+'|');
-            var req = new phpRequest('../rdf/mantis.rdf.php','','');
-            req.add('issue_id',mantis_id);
-            response = req.execute();
-            // Datasource holen
-            dsource=parseRDFString(response, 'http://www.technikum-wien.at/mantis/alle-issues');
-            dsource=dsource.QueryInterface(Components.interfaces.nsIRDFDataSource);
-            rdfService = Components.classes["@mozilla.org/rdf/rdf-service;1"].
-                       getService(Components.interfaces.nsIRDFService);
-            subject = rdfService.GetResource("http://www.technikum-wien.at/mantis/" + mantis_id);
-            predicateNS = "http://www.technikum-wien.at/mantis/rdf";
+    //Mantis
+	if (mantis_id!='')
+    {
+    	var req = new phpRequest('../rdf/mantis.rdf.php','','');
+        req.add('issue_id',mantis_id);
+        response = req.execute();
+        //Datasource holen
+        dsource=parseRDFString(response, 'http://www.technikum-wien.at/mantis/alle-issues');
+        dsource=dsource.QueryInterface(Components.interfaces.nsIRDFDataSource);
+        rdfService = Components.classes["@mozilla.org/rdf/rdf-service;1"].
+		           getService(Components.interfaces.nsIRDFService);
+        subject = rdfService.GetResource("http://www.technikum-wien.at/mantis/" + mantis_id);
+        predicateNS = "http://www.technikum-wien.at/mantis/rdf";
     
-            //Daten holen
-            var issue_id = getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#issue_id" ));
-            var issue_summary=getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#issue_summary" ));
-            var issue_description=getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#issue_description" ));
-            var issue_view_state_id=getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#issue_view_state_id" ));
-            var issue_view_state_name=getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#issue_view_state_name" ));
-            var issue_last_updated=getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#issue_last_updated" ));
-            var issue_project_id=getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#issue_project_id" ));
-            var issue_project_name=getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#issue_project_name" ));
-            var issue_category=getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#issue_category" ));
-            var issue_priority_id=getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#issue_priority_id" ));
-            var issue_priority_name=getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#issue_priority_name" ));
-            var issue_severity_id=getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#issue_severity_id" ));
-            var issue_severity_name=getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#issue_severity_name" ));
-            var issue_status_id=getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#issue_status_id" ));
-            var issue_status_name=getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#issue_status_name" ));
-            var issue_reporter_id=getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#issue_reporter_id" ));
-            var issue_reporter_name=getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#issue_reporter_name" ));
-            var issue_reporter_real_name=getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#issue_reporter_real_name" ));
-            var issue_reporter_email=getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#issue_reporter_email" ));
-            var issue_reproducibility_id=getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#issue_reproducibility_id" ));
-            var issue_reproducibility_name=getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#issue_reproducibility_name" ));
-            var issue_date_submitted=getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#issue_date_submitted" ));
-            var issue_sponsorship_total=getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#issue_sponsorship_total" ));
-            var issue_projection_id=getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#issue_projection_id" ));
-            var issue_projection_name=getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#issue_projection_name" ));
-            var issue_eta_id=getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#issue_eta_id" ));
-            var issue_eta_name=getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#issue_eta_name" ));
-            var issue_resolution_id=getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#issue_resolution_id" ));
-            var issue_resolution_name=getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#issue_resolution_name" ));
-            var issue_attachments=getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#issue_attachments" ));
-            var issue_due_date=getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#issue_due_date" ));			 		 
-            
-            //Daten den Feldern zuweisen
-            document.getElementById('textbox-projekttask-mantis-mantis_id').value=mantis_id;
-            document.getElementById('textbox-projekttask-mantis-issue_summary').value=issue_summary;
-            document.getElementById('textbox-projekttask-mantis-issue_description').value=issue_description;
-            document.getElementById('textbox-projekttask-mantis-issue_view_state_id').value=issue_view_state_id;
-            document.getElementById('textbox-projekttask-mantis-issue_view_state_name').value=issue_view_state_name;
-            document.getElementById('textbox-projekttask-mantis-issue_last_updated').value=issue_last_updated;
-            document.getElementById('textbox-projekttask-mantis-issue_project_id').value=issue_project_id;
-            document.getElementById('textbox-projekttask-mantis-issue_project_name').value=issue_project_name;
-            document.getElementById('textbox-projekttask-mantis-issue_category').value=issue_category;
-            document.getElementById('textbox-projekttask-mantis-issue_priority_id').value=issue_priority_id;
-            document.getElementById('textbox-projekttask-mantis-issue_priority_name').value=issue_priority_name;
-            document.getElementById('textbox-projekttask-mantis-issue_severity_id').value=issue_severity_id;
-            document.getElementById('textbox-projekttask-mantis-issue_severity_name').value=issue_severity_name;
-            document.getElementById('textbox-projekttask-mantis-issue_status_id').value=issue_status_id;
-            document.getElementById('textbox-projekttask-mantis-issue_status_name').value=issue_status_name;
-            document.getElementById('textbox-projekttask-mantis-issue_reporter_id').value=issue_reporter_id;
-            document.getElementById('textbox-projekttask-mantis-issue_reporter_name').value=issue_reporter_name;
-            document.getElementById('textbox-projekttask-mantis-issue_reporter_real_name').value=issue_reporter_real_name;
-            document.getElementById('textbox-projekttask-mantis-issue_reporter_email').value=issue_reporter_email;
-            document.getElementById('textbox-projekttask-mantis-issue_reproducibility_id').value=issue_reproducibility_id;
-            document.getElementById('textbox-projekttask-mantis-issue_reproducibility_name').value=issue_reproducibility_name;
-            document.getElementById('textbox-projekttask-mantis-issue_date_submitted').value=issue_date_submitted;
-            document.getElementById('textbox-projekttask-mantis-issue_sponsorship_total').value=issue_sponsorship_total;
-            document.getElementById('textbox-projekttask-mantis-issue_projection_id').value=issue_projection_id;
-            document.getElementById('textbox-projekttask-mantis-issue_projection_name').value=issue_projection_name;
-            document.getElementById('textbox-projekttask-mantis-issue_eta_id').value=issue_eta_id;
-            document.getElementById('textbox-projekttask-mantis-issue_eta_name').value=issue_eta_name;
-            document.getElementById('textbox-projekttask-mantis-issue_resolution_id').value=issue_resolution_id;
-            document.getElementById('textbox-projekttask-mantis-issue_resolution_name').value=issue_resolution_name;
-            document.getElementById('textbox-projekttask-mantis-issue_attachments').value=issue_attachments;
-            document.getElementById('textbox-projekttask-mantis-issue_due_date').value=issue_due_date;
-        }
+        //Daten holen
+        var issue_id = getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#issue_id" ));
+        var issue_summary=getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#issue_summary" ));
+        var issue_description=getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#issue_description" ));
+        var issue_view_state_id=getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#issue_view_state_id" ));
+        var issue_view_state_name=getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#issue_view_state_name" ));
+        var issue_last_updated=getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#issue_last_updated" ));
+        var issue_project_id=getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#issue_project_id" ));
+        var issue_project_name=getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#issue_project_name" ));
+        var issue_category=getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#issue_category" ));
+		var issue_priority_id=getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#issue_priority_id" ));
+		var issue_priority_name=getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#issue_priority_name" ));
+		var issue_severity_id=getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#issue_severity_id" ));
+		var issue_severity_name=getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#issue_severity_name" ));
+		var issue_status_id=getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#issue_status_id" ));
+		var issue_status_name=getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#issue_status_name" ));
+		var issue_reporter_id=getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#issue_reporter_id" ));
+		var issue_reporter_name=getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#issue_reporter_name" ));
+		var issue_reporter_real_name=getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#issue_reporter_real_name" ));
+		var issue_reporter_email=getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#issue_reporter_email" ));
+		var issue_reproducibility_id=getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#issue_reproducibility_id" ));
+		var issue_reproducibility_name=getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#issue_reproducibility_name" ));
+		var issue_date_submitted=getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#issue_date_submitted" ));
+		var issue_sponsorship_total=getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#issue_sponsorship_total" ));
+		var issue_projection_id=getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#issue_projection_id" ));
+		var issue_projection_name=getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#issue_projection_name" ));
+		var issue_eta_id=getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#issue_eta_id" ));
+		var issue_eta_name=getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#issue_eta_name" ));
+		var issue_resolution_id=getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#issue_resolution_id" ));
+		var issue_resolution_name=getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#issue_resolution_name" ));
+		var issue_due_date=getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#issue_due_date" ));			 		 
+		var issue_steps_to_reproduce=getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#issue_steps_to_reproduce" ));
+		var issue_additional_information=getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#issue_additional_information" ));
+		
+		//Daten den Feldern zuweisen
+		document.getElementById('textbox-projekttask-mantis-mantis_id').value=mantis_id;
+		document.getElementById('textbox-projekttask-mantis-issue_summary').value=issue_summary;
+		document.getElementById('textbox-projekttask-mantis-issue_description').value=issue_description;
+		document.getElementById('textbox-projekttask-mantis-issue_view_state_id').value=issue_view_state_id;
+		document.getElementById('textbox-projekttask-mantis-issue_view_state_name').value=issue_view_state_name;
+		document.getElementById('textbox-projekttask-mantis-issue_last_updated').value=issue_last_updated;
+		document.getElementById('textbox-projekttask-mantis-issue_project_id').value=issue_project_id;
+		document.getElementById('textbox-projekttask-mantis-issue_project_name').value=issue_project_name;
+		document.getElementById('textbox-projekttask-mantis-issue_category').value=issue_category;
+		document.getElementById('textbox-projekttask-mantis-issue_priority_id').value=issue_priority_id;
+		document.getElementById('textbox-projekttask-mantis-issue_priority_name').value=issue_priority_name;
+		document.getElementById('textbox-projekttask-mantis-issue_severity_id').value=issue_severity_id;
+		document.getElementById('textbox-projekttask-mantis-issue_severity_name').value=issue_severity_name;
+		document.getElementById('textbox-projekttask-mantis-issue_status_id').value=issue_status_id;
+		document.getElementById('textbox-projekttask-mantis-issue_status_name').value=issue_status_name;
+		document.getElementById('textbox-projekttask-mantis-issue_reporter_id').value=issue_reporter_id;
+		document.getElementById('textbox-projekttask-mantis-issue_reporter_name').value=issue_reporter_name;
+		document.getElementById('textbox-projekttask-mantis-issue_reporter_real_name').value=issue_reporter_real_name;
+		document.getElementById('textbox-projekttask-mantis-issue_reporter_email').value=issue_reporter_email;
+		document.getElementById('textbox-projekttask-mantis-issue_reproducibility_id').value=issue_reproducibility_id;
+		document.getElementById('textbox-projekttask-mantis-issue_reproducibility_name').value=issue_reproducibility_name;
+		document.getElementById('textbox-projekttask-mantis-issue_date_submitted').value=issue_date_submitted;
+		document.getElementById('textbox-projekttask-mantis-issue_sponsorship_total').value=issue_sponsorship_total;
+		document.getElementById('textbox-projekttask-mantis-issue_projection_id').value=issue_projection_id;
+		document.getElementById('textbox-projekttask-mantis-issue_projection_name').value=issue_projection_name;
+		document.getElementById('textbox-projekttask-mantis-issue_eta_id').value=issue_eta_id;
+		document.getElementById('textbox-projekttask-mantis-issue_eta_name').value=issue_eta_name;
+		document.getElementById('textbox-projekttask-mantis-issue_resolution_id').value=issue_resolution_id;
+		document.getElementById('textbox-projekttask-mantis-issue_resolution_name').value=issue_resolution_name;
+		document.getElementById('textbox-projekttask-mantis-issue_due_date').value=issue_due_date;
+		document.getElementById('textbox-projekttask-mantis-issue_steps_to_reproduce').value=issue_steps_to_reproduce;
+		document.getElementById('textbox-projekttask-mantis-issue_additional_information').value=issue_additional_information;
+	}
+}
+
+// ****
+// * Speichert die Mantis-Details
+// ****
+function saveProjekttaskMantis()
+{
+	//Werte holen
+	mantis_id = document.getElementById('textbox-projekttask-mantis-mantis_id').value;
+	issue_summary=document.getElementById('textbox-projekttask-mantis-issue_summary').value;
+	issue_description=document.getElementById('textbox-projekttask-mantis-issue_description').value;
+	issue_view_state_id=document.getElementById('textbox-projekttask-mantis-issue_view_state_id').value;
+	issue_view_state_name=document.getElementById('textbox-projekttask-mantis-issue_view_state_name').value;
+	issue_last_updated=document.getElementById('textbox-projekttask-mantis-issue_last_updated').value;
+	issue_project_id=document.getElementById('textbox-projekttask-mantis-issue_project_id').value;
+	issue_project_name=document.getElementById('textbox-projekttask-mantis-issue_project_name').value;
+	issue_category=document.getElementById('textbox-projekttask-mantis-issue_category').value;
+	issue_priority_id=document.getElementById('textbox-projekttask-mantis-issue_priority_id').value;
+	issue_priority_name=document.getElementById('textbox-projekttask-mantis-issue_priority_name').value;
+	issue_severity_id=document.getElementById('textbox-projekttask-mantis-issue_severity_id').value;
+	issue_severity_name=document.getElementById('textbox-projekttask-mantis-issue_severity_name').value;
+	issue_status_id=document.getElementById('textbox-projekttask-mantis-issue_status_id').value;
+	issue_status_name=document.getElementById('textbox-projekttask-mantis-issue_status_name').value;
+	issue_reporter_id=document.getElementById('textbox-projekttask-mantis-issue_reporter_id').value;
+	issue_reporter_name=document.getElementById('textbox-projekttask-mantis-issue_reporter_name').value;
+	issue_reporter_real_name=document.getElementById('textbox-projekttask-mantis-issue_reporter_real_name').value;
+	issue_reporter_email=document.getElementById('textbox-projekttask-mantis-issue_reporter_email').value;
+	issue_reproducibility_id=document.getElementById('textbox-projekttask-mantis-issue_reproducibility_id').value;
+	issue_reproducibility_name=document.getElementById('textbox-projekttask-mantis-issue_reproducibility_name').value;
+	issue_date_submitted=document.getElementById('textbox-projekttask-mantis-issue_date_submitted').value;
+	issue_sponsorship_total=document.getElementById('textbox-projekttask-mantis-issue_sponsorship_total').value;
+	issue_projection_id=document.getElementById('textbox-projekttask-mantis-issue_projection_id').value;
+	issue_projection_name=document.getElementById('textbox-projekttask-mantis-issue_projection_name').value;
+	issue_eta_id=document.getElementById('textbox-projekttask-mantis-issue_eta_id').value;
+	issue_eta_name=document.getElementById('textbox-projekttask-mantis-issue_eta_name').value;
+	issue_resolution_id=document.getElementById('textbox-projekttask-mantis-issue_resolution_id').value;
+	issue_resolution_name=document.getElementById('textbox-projekttask-mantis-issue_resolution_name').value;
+	issue_due_date=document.getElementById('textbox-projekttask-mantis-issue_due_date').value;
+	issue_steps_to_reproduce=document.getElementById('textbox-projekttask-mantis-issue_steps_to_reproduce').value;
+	issue_additional_information=document.getElementById('textbox-projekttask-mantis-issue_additional_information').value;
+
+	var soapBody = new SOAPObject("saveMantis");
+	soapBody.appendChild(new SOAPObject("mantis_id")).val(mantis_id);
+	soapBody.appendChild(new SOAPObject("issue_summary")).val(issue_summary);
+	soapBody.appendChild(new SOAPObject("issue_description")).val(issue_description);
+	soapBody.appendChild(new SOAPObject("issue_view_state_id")).val(issue_view_state_id);
+	soapBody.appendChild(new SOAPObject("issue_view_state_name")).val(issue_view_state_name);
+	soapBody.appendChild(new SOAPObject("issue_last_updated")).val(issue_last_updated);
+	soapBody.appendChild(new SOAPObject("issue_project_id")).val(issue_project_id);
+	soapBody.appendChild(new SOAPObject("issue_project_name")).val(issue_project_name);
+	soapBody.appendChild(new SOAPObject("issue_category")).val(issue_category);
+	soapBody.appendChild(new SOAPObject("issue_priority_id")).val(issue_priority_id);
+	soapBody.appendChild(new SOAPObject("issue_priority_name")).val(issue_priority_name);
+	soapBody.appendChild(new SOAPObject("issue_severity_id")).val(issue_severity_id);
+	soapBody.appendChild(new SOAPObject("issue_severity_name")).val(issue_severity_name);
+	soapBody.appendChild(new SOAPObject("issue_status_id")).val(issue_status_id);
+	soapBody.appendChild(new SOAPObject("issue_status_name")).val(issue_status_name);
+	soapBody.appendChild(new SOAPObject("issue_reporter_id")).val(issue_reporter_id);
+	soapBody.appendChild(new SOAPObject("issue_reporter_name")).val(issue_reporter_name);
+	soapBody.appendChild(new SOAPObject("issue_reporter_real_name")).val(issue_reporter_real_name);
+	soapBody.appendChild(new SOAPObject("issue_reporter_email")).val(issue_reporter_email);
+	soapBody.appendChild(new SOAPObject("issue_reproducibility_id")).val(issue_reproducibility_id);
+	soapBody.appendChild(new SOAPObject("issue_reproducibility_name")).val(issue_reproducibility_name);
+	soapBody.appendChild(new SOAPObject("issue_date_submitted")).val(issue_date_submitted);
+	soapBody.appendChild(new SOAPObject("issue_sponsorship_total")).val(issue_sponsorship_total);
+	soapBody.appendChild(new SOAPObject("issue_projection_id")).val(issue_projection_id);
+	soapBody.appendChild(new SOAPObject("issue_projection_name")).val(issue_projection_name);
+	soapBody.appendChild(new SOAPObject("issue_eta_id")).val(issue_eta_id);
+	soapBody.appendChild(new SOAPObject("issue_eta_name")).val(issue_eta_name);
+	soapBody.appendChild(new SOAPObject("issue_resolution_id")).val(issue_resolution_id);
+	soapBody.appendChild(new SOAPObject("issue_resolution_name")).val(issue_resolution_name);
+	soapBody.appendChild(new SOAPObject("issue_due_date")).val(issue_due_date);
+	soapBody.appendChild(new SOAPObject("issue_steps_to_reproduce")).val(issue_steps_to_reproduce);
+	soapBody.appendChild(new SOAPObject("issue_additional_information")).val(issue_additional_information);
+		
+	var sr = new SOAPRequest("saveMantis",soapBody);
+
+	SOAPClient.Proxy="<?php echo APP_ROOT;?>soap/projekttask.soap.php?"+gettimestamp();
+	SOAPClient.SendRequest(sr, clb_saveProjekttaskMantis);
+}
+
+// ****
+// * Callback Funktion nach Speichern eines Mantis Eitnrags
+// ****
+function clb_saveProjekttaskMantis(respObj)
+{
+	try
+	{
+		var id = respObj.Body[0].saveMantisResponse[0].message[0].Text;
+		alert('OK:'+id);
+	}
+	catch(e)
+	{
+		var fehler = respObj.Body[0].Fault[0].faultstring[0].Text;
+		alert('Fehler: '+fehler);
+		return;
+	}
 }
                                 
\ No newline at end of file
diff --git a/content/projekt/projekttaskdetail.overlay.xul.php b/content/projekt/projekttaskdetail.overlay.xul.php
index 68d81268e..c6b867573 100755
--- a/content/projekt/projekttaskdetail.overlay.xul.php
+++ b/content/projekt/projekttaskdetail.overlay.xul.php
@@ -38,8 +38,6 @@ echo '<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>';
 	<!-- *  Projekttaskdetail   * -->
 	<!-- ************************ -->
 	<vbox id="box-projekttask-detail" flex="1">
-		<description>Task Details</description>
-			
 		<grid id="grid-projekttask-detail" style="overflow:auto;margin:4px;" flex="1">
 		  	<columns  >
 				<column flex="1"/>
@@ -48,7 +46,7 @@ echo '<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>';
 			<rows>
 				<row>
 					<label value="Task ID" control="textbox-projekttask-detail-projekttask_id "/>
-					<textbox id="textbox-projekttaskdetail-projekttask_id"/>
+					<textbox id="textbox-projekttaskdetail-projekttask_id" disabled="true"/>
 				</row>
 				<row>
 					<label value="Projektphase ID" control="textbox-projekttask-detail-projektphase_id"/>
diff --git a/content/projekt/ressource.js.php b/content/projekt/ressource.js.php
index 0e55da8cb..9a6625419 100644
--- a/content/projekt/ressource.js.php
+++ b/content/projekt/ressource.js.php
@@ -566,6 +566,7 @@ function RessourceRefresh()
 function RessourceTreeSelectRessource()
 {
 
+/*
 	var tree=document.getElementById('tree-ressourcemenue');
 	var items = tree.view.rowCount; //Anzahl der Zeilen ermitteln
 
@@ -595,6 +596,7 @@ function RessourceTreeSelectRessource()
 			}
 	   	}
 	}
+	*/
 }
 
 
diff --git a/include/dms.class.php b/include/dms.class.php
index a956e972a..8a2bbd94e 100644
--- a/include/dms.class.php
+++ b/include/dms.class.php
@@ -103,6 +103,10 @@ class dms extends basis_db
 		}
 	}
 	
+	/**
+	 * Speichert einenen DMS Eintrag
+	 * @param $new
+	 */
 	public function save($new=null)
 	{
 		if(is_null($new))
@@ -150,19 +154,19 @@ class dms extends basis_db
 		else
 		{
 			$qry = "UPDATE campus.tbl_dms SET".
-				" oe_kurzbz=".$this->addslashes($this->oe_kurzbz).",".
-				" dokument_kurzbz=".$this->addslashes($this->dokument_kurzbz).",".
-				" kategorie_kurzbz=".$this->addslashes($this->kategorie_kurzbz)." ". 
-			" WHERE dms_id='".addslashes($this->dms_id)."';".
-			"UPDATE campus.tbl_dms_version SET".
-				" filename=".$this->addslashes($this->filename).",".
-				" mimetype=".$this->addslashes($this->mimetype).",".
-				" name=".$this->addslashes($this->name).",".
-				" beschreibung=".$this->addslashes($this->beschreibung).",".
-				" letzterzugriff=".$this->addslashes($this->letzterzugriff).",".
-				" updateamum=".$this->addslashes($this->updateamum).",".
-				" updatevon=".$this->addslashes($this->updatevon).
-				" WHERE dms_id='".addslashes($this->dms_id)."' AND version='".addslashes($this->version)."';";
+						" oe_kurzbz=".$this->addslashes($this->oe_kurzbz).",".
+						" dokument_kurzbz=".$this->addslashes($this->dokument_kurzbz).",".
+						" kategorie_kurzbz=".$this->addslashes($this->kategorie_kurzbz)." ". 
+					"WHERE dms_id='".addslashes($this->dms_id)."';".
+					"UPDATE campus.tbl_dms_version SET".
+						" filename=".$this->addslashes($this->filename).",".
+						" mimetype=".$this->addslashes($this->mimetype).",".
+						" name=".$this->addslashes($this->name).",".
+						" beschreibung=".$this->addslashes($this->beschreibung).",".
+						" letzterzugriff=".$this->addslashes($this->letzterzugriff).",".
+						" updateamum=".$this->addslashes($this->updateamum).",".
+						" updatevon=".$this->addslashes($this->updatevon).
+						" WHERE dms_id='".addslashes($this->dms_id)."' AND version='".addslashes($this->version)."';";
 		}
 		
 		if($this->db_query($qry))
@@ -226,7 +230,9 @@ class dms extends basis_db
 	}
 	
 	/**
-	 * Laedt alle Kategorien
+	 * Laedt die Kategorien
+	 * @param $parent_kategorie_kurzbz Wenn die Parent Kategorie übergeben wird, werden nur die direkten 
+	 *        Unterkategorien geladen
 	 * @return boolean
 	 */
 	public function getKategorie($parent_kategorie_kurzbz='')
@@ -347,11 +353,11 @@ class dms extends basis_db
 		}
 	}
 	
-/**
- * 
- * lädt alle Versionen zu einer übergebenen ID
- * @param $id der zu ladenden Dokumente
- */
+	/**
+	 * 
+	 * lädt alle Versionen zu einer übergebenen ID
+	 * @param $id der zu ladenden Dokumente
+	 */
 	public function getAllVersions($id)
 	{
 		if(!is_numeric($id))
diff --git a/include/mantis.class.php b/include/mantis.class.php
index 341326f6d..dd3a31b2e 100755
--- a/include/mantis.class.php
+++ b/include/mantis.class.php
@@ -1,5 +1,5 @@
 <?php
-/* Copyright (C) 2007 Technikum-Wien
+/* Copyright (C) 2011 FH Technikum-Wien
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as
@@ -15,63 +15,64 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
  *
- * Authors: Christian Paminger <christian.paminger@technikum-wien.at>
+ * Authors: Christian Paminger <christian.paminger@technikum-wien.at>,
+ * 			Andreas Österreicher <andreas.oesterreicher@technikum-wien.at>
  */
-/****************************************************************************
+/**
  * @class 			Mantis
  * @author	 		Christian Paminger
  * @date	 		2011/8/22
  * @version			$Revision: 1.3 $
  * Update: 			22.08.2011 von Christian Paminger
  * @brief  			Klasse fuer die Schnittstelle zum Mantis BTS
- * Abhaengig:	 		von basis_db.class.php
- *****************************************************************************/
+ * Abhaengig:	 	von basis_db.class.php
+ */
 require_once(dirname(__FILE__).'/basis_db.class.php');
-//require_once('nusoap.php');
-//require_once(dirname(__FILE__).'/globals.inc.php'); 
 
 class mantis extends basis_db
 {
-	public $issue_id;			// @brief Connection zur Datenbank
-	public $issue_view_state;			// @brief Return Linefeed
-	public $issue_last_updated; 			// @brief Typ des Plans (Student, Lektor, Verband, Ort)
-	public $issue_project;			// @brief Benutzergruppe
-	public $issue_category;		// @brief id in der Datenbank des Benutzers
-	public $issue_priority;			// @brief Link auf eigene Seite
-	public $issue_severity;		// @brief Link auf den kalender
-	public $issue_status;			// @brief Kennzahl des Studiengangs
-	public $issue_reporter;		// @brief Bezeichnung Studiengang
-	public $issue_summary;		// @brief Kurzbezeichnung Studiengang
-	public $issue_reproducibility;		// @brief lange Kurzbezeichnung Studiengang
-	public $issue_date_submitted;			// @brief Semester
-	public $issue_sponsorship_total;			// @brief Verband (A,B,C,...)
-	public $issue_projection;			// @brief Gruppe (1,2)
-	public $issue_eta;		// @brief Account Name der Person (PK)
-	public $issue_resolution;		// @brief Titel der Person
-	public $issue_description;		// @brief Titel der Person
-	public $issue_attachments;		// @brief Personendaten
-	public $issue_due_date;		// @brief Personendaten
+	public $issue_id;					//ID
+	public $issue_view_state;			//Anzeigestatus
+	public $issue_last_updated;			//Letzte Aktualisierung
+	public $issue_project;				//Projekt
+	public $issue_category;				//Kategorie
+	public $issue_priority;				//Prioritaet
+	public $issue_severity;				//Auswirkung
+	public $issue_status;				//Status
+	public $issue_reporter;				//Reporter
+	public $issue_summary;				//Zusammendassung
+	public $issue_reproducibility;		//Reproduzierbar
+	public $issue_date_submitted;		//Meldungsdatum
+	public $issue_sponsorship_total;	
+	public $issue_projection;			//Projektion
+	public $issue_eta;					//Aufwand
+	public $issue_resolution;			//Lösung
+	public $issue_description;			//Beschreibung
+	public $issue_attachments;			//Anhang
+	public $issue_due_date;
+	public $issue_steps_to_reproduce;
+	public $issue_additional_information;
 	
 	public $soapClient;
 	public $errormsg;
 
 	/**
 	 * Konstruktor
-	 * @param $type
 	 */
 	public function __construct()
 	{
 		parent::__construct();
-		//echo 'Init SoapClient-Method!<br />';
 		$this->initSoapClient();
 	}
 
+	/**
+	 * Initialsiert den Soap Client
+	 */
 	public function initSoapClient()
 	{
 		try 
 		{ 
-			//echo 'Init SoapClient!<br />';
-			$this->soapClient = new SoapClient('http://localhost/mantis/api/soap/mantisconnect.php?wsdl'); 
+			$this->soapClient = new SoapClient(MANTIS_PFAD); 
 		}
 		catch (Exception $e)
 		{ 
@@ -79,17 +80,39 @@ class mantis extends basis_db
 		}
 	}
 
-	// Neues Ticket anlegen
+	/**
+	 * Ticket Update
+	 */
+	public function updateIssue()
+	{
+		$issue = array('summary'=>$this->issue_summary,
+					'project'=>array('id'=>$this->issue_project->id),
+					'category'=>$this->issue_category,
+					'description'=>$this->issue_description,
+					'steps_to_reproduce'=>$this->issue_steps_to_reproduce,
+					'additional_information'=>$this->issue_additional_information,
+				);				
+				
+		$params=array('username' => MANTIS_USERNAME, 'password' => MANTIS_PASSWORT,'issueId' => $this->issue_id, $issue);
+		$result = $this->soapClient->__soapCall('mc_issue_update',$params);
+		return $result;
+	}
+	
+	/**
+	 * Neues Ticket anlegen
+	 */
 	public function insertIssue()
 	{
 		$result = $this->soapClient->__soapCall('mc_version',array());
 		return $result;
 	}
 	
-	// Ticket holen
+	/**
+	 * Ticket holen
+	 */
 	public function getIssue($issue_id=1)
 	{
-		$params=array('username' => 'pam', 'password' => '','issue_id' => $issue_id);
+		$params=array('username' => MANTIS_USERNAME, 'password' => MANTIS_PASSWORT,'issue_id' => $issue_id);
 		$result = $this->soapClient->__soapCall('mc_issue_get',$params);
 		
 		$this->issue_id = $result->id;			
@@ -123,6 +146,8 @@ class mantis extends basis_db
 		$this->issue_description = $result->description;	
 		$this->issue_attachments = $result->attachments;	
 		$this->issue_due_date = $result->due_date;	
+		$this->issue_steps_to_reproduce = $result->steps_to_reproduce;
+		$this->issue_additional_information = $result->additional_information;
 		
 		return true;
 	}
diff --git a/include/notiz.class.php b/include/notiz.class.php
index d336a198c..3177201a5 100644
--- a/include/notiz.class.php
+++ b/include/notiz.class.php
@@ -21,7 +21,7 @@ require_once(dirname(__FILE__).'/basis_db.class.php');
 
 class notiz extends basis_db
 {
-	public $new;       		// boolean
+	public $new;
 	public $result=array();
 
 	//Tabellenspalten
@@ -256,6 +256,7 @@ class notiz extends basis_db
 			$qry.=" AND prestudent_id='".addslashes($prestudent_id)."'";
 		if($bestellung_id!='')
 			$qry.=" AND bestellung_id='".addslashes($bestellung_id)."'";
+		$qry.=' ORDER BY start, ende, titel';
 		
 		if($result = $this->db_query($qry))
 		{
diff --git a/rdf/dms.rdf.php b/rdf/dms.rdf.php
index 43bfa6488..060dccb81 100755
--- a/rdf/dms.rdf.php
+++ b/rdf/dms.rdf.php
@@ -39,6 +39,11 @@ elseif(isset($_GET['projektphase_id']))
 	$projektphase_id = $_GET['projektphase_id'];
 	$dms->getDokumenteProjektphase($projektphase_id);
 }
+elseif(isset($_GET['filter']))
+{
+	$filter = $_GET['filter'];
+	$dms->search($filter);
+}
 else
 	die('projekt_kurzbz oder projektphase_id muss uebergeben werden');
 
diff --git a/rdf/mantis.rdf.php b/rdf/mantis.rdf.php
index 4f3a56641..2cf621ce7 100755
--- a/rdf/mantis.rdf.php
+++ b/rdf/mantis.rdf.php
@@ -81,8 +81,9 @@ $mantis->getIssue($issue_id);
 		    <MANTIS:issue_eta_name><?php echo $mantis->issue_eta->name;  ?></MANTIS:issue_eta_name>
 		    <MANTIS:issue_resolution_id><?php echo $mantis->issue_resolution->id;  ?></MANTIS:issue_resolution_id>
 		    <MANTIS:issue_resolution_name><?php echo $mantis->issue_resolution->name;  ?></MANTIS:issue_resolution_name>
-		    <MANTIS:issue_attachments><?php echo $mantis->issue_attachments;  ?></MANTIS:issue_attachments>
 		    <MANTIS:issue_due_date><?php echo $mantis->issue_due_date;  ?></MANTIS:issue_due_date>
+		    <MANTIS:issue_steps_to_reproduce><?php echo $mantis->issue_steps_to_reproduce;  ?></MANTIS:issue_steps_to_reproduce>
+		    <MANTIS:issue_additional_information><?php echo $mantis->issue_additional_information;  ?></MANTIS:issue_additional_information>
 	    </RDF:Description>
 	</RDF:li>
     </RDF:Seq>
diff --git a/skin/planner.css b/skin/planner.css
index 8c1189936..1bb2f020c 100755
--- a/skin/planner.css
+++ b/skin/planner.css
@@ -1,9 +1,5 @@
 @import url("chrome://global/skin/");
 
-label.kalenderwoche
-{
-	font-size: medium;
-}
 button
 {
 	font-size: x-small;
@@ -29,28 +25,6 @@ menupopup
 {
 	border: 1px solid black;
 }
-grid.lvaStundenplan
-{
-	font-size: x-small;
-}
-grid.lvaStundenplan button
-{
-	font-size: x-small;
-	border: 0px;
-  	border-top: 0px;
-  	border-bottom: 0px;
-  	border-left: 0px;
-  	border-right: 0px;
-  	border-top-width: 0px;
-  	border-bottom-width: 0px;
-  	border-left-width: 0px;
-  	border-right-width: 0px;
-  	padding-top: 0px;
-  	padding-bottom: 0px;
-  	padding-left: 0px;
-  	padding-right: 0px;
-}
-
 
 tree treecol {
 	background-color: #FFFFCC; 
@@ -62,10 +36,6 @@ tree {
 	font-family:Arial;	
 }
 
-box.studentDetail {
-    -moz-binding: url('lehrveranstaltungbinding.xml.php#studentDetail');
-}
-
 label,textbox {
 	font-size:9pt;
 	font-family:Arial;
diff --git a/soap/notiz.soap.php b/soap/notiz.soap.php
index ba4528ec6..c43792ddf 100755
--- a/soap/notiz.soap.php
+++ b/soap/notiz.soap.php
@@ -48,6 +48,7 @@ ini_set("soap.wsdl_cache_enabled", "0");
  * @param string $bearbeiter_uid
  * @param string $start
  * @param string $ende
+ * @param boolean $erledigt
  * @param string $projekt_kurzbz
  * @param string $projektphase_id
  * @param string $projekttask_id
@@ -56,7 +57,7 @@ ini_set("soap.wsdl_cache_enabled", "0");
  * @param string $prestudent_id
  * @param string $bestellung_id
  */
-function saveNotiz($notiz_id, $titel, $text, $verfasser_uid, $bearbeiter_uid, $start, $ende, $projekt_kurzbz, $projektphase_id, $projekttask_id, $uid, $person_id, $prestudent_id, $bestellung_id)
+function saveNotiz($notiz_id, $titel, $text, $verfasser_uid, $bearbeiter_uid, $start, $ende, $erledigt, $projekt_kurzbz, $projektphase_id, $projekttask_id, $uid, $person_id, $prestudent_id, $bestellung_id)
 { 	
 	$user = get_uid();
 		
@@ -89,6 +90,7 @@ function saveNotiz($notiz_id, $titel, $text, $verfasser_uid, $bearbeiter_uid, $s
 	$notiz->bearbeiter_uid = $bearbeiter_uid;
 	$notiz->start = $start;
 	$notiz->ende = $ende;
+	$notiz->erledigt=$erledigt;
 	
 	if($notiz->save())
 	{
diff --git a/soap/notiz.wsdl.php b/soap/notiz.wsdl.php
index 387d12cb7..bd82277e7 100755
--- a/soap/notiz.wsdl.php
+++ b/soap/notiz.wsdl.php
@@ -20,6 +20,7 @@ xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/">
 		<wsdl:part name="bearbeiter_uid" type="xsd:string"></wsdl:part>
 		<wsdl:part name="start" type="xsd:string"></wsdl:part>
 		<wsdl:part name="ende" type="xsd:string"></wsdl:part>
+		<wsdl:part name="erledigt" type="xsd:boolean"></wsdl:part>
 		<wsdl:part name="projekt_kurzbz" type="xsd:string"></wsdl:part>
 		<wsdl:part name="projektphase_id" type="xsd:string"></wsdl:part>
 		<wsdl:part name="projekttask_id" type="xsd:string"></wsdl:part>
diff --git a/soap/projekt.soap.php b/soap/projekt.soap.php
index 5a0dbb252..6d03bc026 100755
--- a/soap/projekt.soap.php
+++ b/soap/projekt.soap.php
@@ -28,9 +28,11 @@ require_once('../config/vilesci.config.inc.php');
 require_once('../include/basis_db.class.php');
 require_once('../include/projekt.class.php');
 require_once('../include/datum.class.php');
+require_once('../include/dms.class.php');
 
 $SOAPServer = new SoapServer(APP_ROOT."/soap/projekt.wsdl.php?".microtime());
 $SOAPServer->addFunction("saveProjekt");
+$SOAPServer->addFunction("saveProjektdokumentZuordnung");
 $SOAPServer->handle();
 
 // WSDL Chache auf aus
@@ -69,6 +71,19 @@ function saveProjekt($projekt_kurzbz, $nummer, $titel, $beschreibung, $beginn, $
 	else
 		return new SoapFault("Server", $projekt->errormsg);
 }
+
+/**
+ * Speichert die Zuordnung eines Dokuments zu einem Projekt oder einer Phase
+ */
+function saveProjektdokumentZuordnung($projekt_kurzbz, $projektphase_id, $dms_id)
+{
+	$dms = new dms();
+	
+	if($dms->saveProjektzuordnung($dms_id, $projekt_kurzbz, $projektphase_id))
+		return true;
+	else
+		return new SoapFault("Server", $dms->errormsg);
+}
 ?>
 
 
diff --git a/soap/projekt.wsdl.php b/soap/projekt.wsdl.php
index 5957c7cde..66ea68a85 100755
--- a/soap/projekt.wsdl.php
+++ b/soap/projekt.wsdl.php
@@ -23,8 +23,15 @@ xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/">
        <wsdl:part name="oe_kurzbz" type="xsd:string"></wsdl:part>
        <wsdl:part name="neu" type="xsd:boolean"></wsdl:part>
   	</wsdl:message>
-
- 	<wsdl:message name="SaveProjektResponse">
+  	<wsdl:message name="SaveProjektResponse">
+       <wsdl:part name="message" type="xsd:string"></wsdl:part>
+  	</wsdl:message>
+	<wsdl:message name="SaveProjektdokumentZuordnungRequest">
+       <wsdl:part name="projekt_kurzbz" type="xsd:string"></wsdl:part>
+       <wsdl:part name="projektphase_id" type="xsd:string"></wsdl:part>
+       <wsdl:part name="dms_id" type="xsd:string"></wsdl:part>
+  	</wsdl:message>
+ 	<wsdl:message name="SaveProjektdokumentZuordnungResponse">
        <wsdl:part name="message" type="xsd:string"></wsdl:part>
   	</wsdl:message>
    
@@ -33,6 +40,10 @@ xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/">
            <wsdl:input message="tns:SaveProjektRequest"></wsdl:input>
            <wsdl:output message="tns:SaveProjektResponse"></wsdl:output>        
        </wsdl:operation>
+       <wsdl:operation name="saveProjektdokumentZuordnung">
+           <wsdl:input message="tns:SaveProjektdokumentZuordnungRequest"></wsdl:input>
+           <wsdl:output message="tns:SaveProjektdokumentZuordnungResponse"></wsdl:output>        
+       </wsdl:operation>
    </wsdl:portType>
 
    <wsdl:binding name="ConfigBinding" type="tns:ConfigPortType">
@@ -46,6 +57,15 @@ xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/">
                <soap:body use="encoded" namespace="http://localhost/soap/" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
            </wsdl:output>
        </wsdl:operation> 
+       <wsdl:operation name="saveProjektdokumentZuordnung">
+           <soap:operation soapAction="<?php echo APP_ROOT."soap/saveProjektdokumentZuordnung";?>" />
+           <wsdl:input> 
+               <soap:body use="encoded" namespace="http://localhost/soap/" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" />
+           </wsdl:input>
+           <wsdl:output>
+               <soap:body use="encoded" namespace="http://localhost/soap/" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
+           </wsdl:output>
+       </wsdl:operation> 
    </wsdl:binding>  
  
    <wsdl:service name="Projekt">
diff --git a/soap/projekttask.soap.php b/soap/projekttask.soap.php
index ba6cb3a5c..6d1b452fe 100644
--- a/soap/projekttask.soap.php
+++ b/soap/projekttask.soap.php
@@ -30,10 +30,12 @@ require_once('../include/projekttask.class.php');
 require_once('../include/benutzer.class.php');
 require_once('../include/datum.class.php');
 require_once('../include/functions.inc.php');
+require_once('../include/mantis.class.php');
 
 $SOAPServer = new SoapServer(APP_ROOT."/soap/projekttask.wsdl.php?".microtime());
 $SOAPServer->addFunction("saveProjekttask");
 $SOAPServer->addFunction("deleteProjekttask");
+$SOAPServer->addFunction("saveMantis");
 $SOAPServer->handle();
 
 // WSDL Chache auf aus
@@ -99,6 +101,24 @@ function deleteProjekttask($projekttask_id)
 	else
 		return new SoapFault("Server", $projekttask->errormsg);
 }
+
+function saveMantis($mantis_id, $issue_summary, $issue_description, $issue_view_state_id, $issue_view_state_name, $issue_last_udpated, $issue_project_id, $issue_projekt_name, $issue_category, $issue_priority_id, $issue_priority_name, $issue_severity_id, $issue_severity_name, $issue_status_id, $issue_status_name, $issue_reporter_name, $issue_reporter_real_name, $issue_reporter_email, $issue_reproducibility_id, $issue_reproducibility_name, $issue_date_submitted, $issue_sponsorship_total, $issue_projection_id, $issue_projection_name, $issue_eta_id, $issue_eta_name, $issue_resolution_id, $issue_resolution_name, $issue_due_date, $issue_steps_to_reproduce, $issue_additional_information)
+{
+	$mantis = new mantis();
+	
+	$mantis->issue_id = $mantis_id;
+	$mantis->issue_summary = $issue_summary;
+	$mantis->issue_description = $issue_description;
+	$mantis->issue_project->id = $issue_project_id;
+	$mantis->issue_category = $issue_category;
+	$mantis->issue_steps_to_reproduce = $issue_steps_to_reproduce;
+	$mantis->issue_additional_information = $issue_additional_information;
+	
+	if($mantis->updateIssue())
+		return 'ok';
+	else
+		return new SoapFault("Server", 'Fehler:'.$mantis->errormsg);	
+}
 ?>
 
 
diff --git a/soap/projekttask.wsdl.php b/soap/projekttask.wsdl.php
index 181db197d..ecd8cad14 100644
--- a/soap/projekttask.wsdl.php
+++ b/soap/projekttask.wsdl.php
@@ -32,8 +32,46 @@ xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/">
     <wsdl:message name="DeleteProjekttaskResponse">
   		<wsdl:part name="message" type="xsd:string"></wsdl:part>
   	</wsdl:message>
- 
- <wsdl:portType name="ConfigPortType" >
+  	
+  	<wsdl:message name="SaveMantisRequest">
+		<wsdl:part name="mantis_id" type="xsd:string"></wsdl:part>
+		<wsdl:part name="issue_summary" type="xsd:string"></wsdl:part>
+		<wsdl:part name="issue_description" type="xsd:string"></wsdl:part>
+		<wsdl:part name="issue_view_state_id" type="xsd:string"></wsdl:part>
+		<wsdl:part name="issue_view_state_name" type="xsd:string"></wsdl:part>
+		<wsdl:part name="issue_last_updated" type="xsd:string"></wsdl:part>
+		<wsdl:part name="issue_project_id" type="xsd:string"></wsdl:part>
+		<wsdl:part name="issue_project_name" type="xsd:string"></wsdl:part>
+		<wsdl:part name="issue_category" type="xsd:string"></wsdl:part>
+		<wsdl:part name="issue_priority_id" type="xsd:string"></wsdl:part>
+		<wsdl:part name="issue_priority_name" type="xsd:string"></wsdl:part>
+		<wsdl:part name="issue_severity_id" type="xsd:string"></wsdl:part>
+		<wsdl:part name="issue_severity_name" type="xsd:string"></wsdl:part>
+		<wsdl:part name="issue_status_id" type="xsd:string"></wsdl:part>
+		<wsdl:part name="issue_status_name" type="xsd:string"></wsdl:part>
+		<wsdl:part name="issue_reporter_name" type="xsd:string"></wsdl:part>
+		<wsdl:part name="issue_reporter_real_name" type="xsd:string"></wsdl:part>
+		<wsdl:part name="issue_reporter_email" type="xsd:string"></wsdl:part>
+		<wsdl:part name="issue_reproducibility_id" type="xsd:string"></wsdl:part>
+		<wsdl:part name="issue_reproducibility_name" type="xsd:string"></wsdl:part>
+		<wsdl:part name="issue_date_submitted" type="xsd:string"></wsdl:part>
+		<wsdl:part name="issue_sponsorship_total" type="xsd:string"></wsdl:part>
+		<wsdl:part name="issue_projection_id" type="xsd:string"></wsdl:part>
+		<wsdl:part name="issue_projection_name" type="xsd:string"></wsdl:part>
+		<wsdl:part name="issue_eta_id" type="xsd:string"></wsdl:part>
+		<wsdl:part name="issue_eta_name" type="xsd:string"></wsdl:part>
+		<wsdl:part name="issue_resolution_id" type="xsd:string"></wsdl:part>
+		<wsdl:part name="issue_resolution_name" type="xsd:string"></wsdl:part>
+		<wsdl:part name="issue_due_date" type="xsd:string"></wsdl:part>
+		<wsdl:part name="issue_steps_to_reproduce" type="xsd:string"></wsdl:part>
+		<wsdl:part name="issue_additional_information" type="xsd:string"></wsdl:part>
+    </wsdl:message>
+    
+	<wsdl:message name="SaveMantisResponse">
+       <wsdl:part name="message" type="xsd:string"></wsdl:part>
+  	</wsdl:message>
+  	
+	<wsdl:portType name="ConfigPortType" >
        <wsdl:operation name="saveProjekttask">
            <wsdl:input message="tns:SaveProjekttaskRequest"></wsdl:input>
            <wsdl:output message="tns:SaveProjekttaskResponse"></wsdl:output>        
@@ -42,6 +80,10 @@ xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/">
            <wsdl:input message="tns:DeleteProjekttaskRequest"></wsdl:input>
            <wsdl:output message="tns:DeleteProjekttaskResponse"></wsdl:output>        
        </wsdl:operation>
+       <wsdl:operation name="saveMantis">
+           <wsdl:input message="tns:SaveMantisRequest"></wsdl:input>
+           <wsdl:output message="tns:SaveMantisResponse"></wsdl:output>        
+       </wsdl:operation>
    </wsdl:portType>
 
    <wsdl:binding name="ConfigBinding" type="tns:ConfigPortType">
@@ -64,6 +106,15 @@ xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/">
                <soap:body use="encoded" namespace="http://localhost/soap/" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
            </wsdl:output>
        </wsdl:operation> 
+       <wsdl:operation name="saveMantis">
+           <soap:operation soapAction="<?php echo APP_ROOT."soap/saveMantis";?>" />
+           <wsdl:input> 
+               <soap:body use="encoded" namespace="http://localhost/soap/" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" />
+           </wsdl:input>
+           <wsdl:output>
+               <soap:body use="encoded" namespace="http://localhost/soap/" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
+           </wsdl:output>
+       </wsdl:operation> 
    </wsdl:binding>  
  
    <wsdl:service name="Projekttask">
diff --git a/system/checksystem.php b/system/checksystem.php
index 90f7af1f4..49a555373 100644
--- a/system/checksystem.php
+++ b/system/checksystem.php
@@ -2753,6 +2753,21 @@ if(!$result = @$db->db_query("SELECT 1 FROM fue.tbl_ressource LIMIT 1;"))
 	else 
 		echo 'Projekt Ressoruce: Ressourcen hinzugefuegt!<br>';
 }
+
+//fue.tbl_projekt neue Spalte budget
+if(!$result = @$db->db_query("SELECT budget FROM fue.tbl_projekt LIMIT 1;"))
+{
+	$qry = "ALTER TABLE fue.tbl_projekt ADD COLUMN budget numeric(12,2);
+			ALTER TABLE fue.tbl_projekttask ADD COLUMN erledigt boolean DEFAULT false;
+			ALTER TABLE public.tbl_notiz ALTER COLUMN bearbeiter_uid DROP NOT NULL;
+			";
+			
+	if(!$db->db_query($qry))
+		echo '<strong>fue.tbl_projekt: '.$db->db_last_error().'</strong><br>';
+	else 
+		echo 'fue.tbl_projekt: Spalte budget hinzugefuegt!<br>
+				fue.tbl_projekttask: Spalte erledigt hinzugefuegt!<br>';
+}
 echo '<br>';
 
 $tabellen=array(
@@ -2811,9 +2826,9 @@ $tabellen=array(
 	"campus.tbl_zeitsperretyp"  => array("zeitsperretyp_kurzbz","beschreibung","farbe"),
 	"campus.tbl_zeitwunsch"  => array("stunde","mitarbeiter_uid","tag","gewicht","updateamum","updatevon","insertamum","insertvon"),
 	"fue.tbl_aktivitaet"  => array("aktivitaet_kurzbz","beschreibung"),
-	"fue.tbl_projekt"  => array("projekt_kurzbz","nummer","titel","beschreibung","beginn","ende","oe_kurzbz"),
+	"fue.tbl_projekt"  => array("projekt_kurzbz","nummer","titel","beschreibung","beginn","ende","oe_kurzbz","budget"),
 	"fue.tbl_projektphase"  => array("projektphase_id","projekt_kurzbz","projektphase_fk","bezeichnung","beschreibung","start","ende","budget","insertamum","insertvon","updateamum","updatevon","personentage"),
-	"fue.tbl_projekttask"  => array("projekttask_id","projektphase_id","bezeichnung","beschreibung","aufwand","mantis_id","insertamum","insertvon","updateamum","updatevon","projekttask_fk"),
+	"fue.tbl_projekttask"  => array("projekttask_id","projektphase_id","bezeichnung","beschreibung","aufwand","mantis_id","insertamum","insertvon","updateamum","updatevon","projekttask_fk","erledigt"),
 	"fue.tbl_projekt_dokument"  => array("projekt_dokument_id","projektphase_id","projekt_kurzbz","dms_id"),
 	"fue.tbl_projekt_ressource"  => array("projekt_ressource_id","projekt_kurzbz","projektphase_id","ressource_id","funktion_kurzbz","beschreibung"),
 	"fue.tbl_ressource"  => array("ressource_id","student_uid","mitarbeiter_uid","betriebsmittel_id","firma_id","bezeichnung","beschreibung","insertamum","insertvon","updateamum","updatevon"),