From acdeed9fe5adf53cbaf89bf5e17118548c1e7395 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20=C3=96sterreicher?= <oesi@technikum-wien.at>
Date: Thu, 15 Sep 2011 14:27:40 +0000
Subject: [PATCH]

---
 content/projekt/mantisdetail.overlay.xul.php | 107 ++---
 content/projekt/projekttask.overlay.js.php   |  75 ++--
 include/mantis.class.php                     |  15 +-
 rdf/mantis.rdf.php                           |  64 +--
 skin/styles/tw.css                           |  13 +-
 soap/projekttask.soap.php                    |  56 ++-
 soap/projekttask.wsdl.php                    |   1 +
 system/FH-Complete.txp                       | 447 ++++++++++++++-----
 8 files changed, 521 insertions(+), 257 deletions(-)

diff --git a/content/projekt/mantisdetail.overlay.xul.php b/content/projekt/mantisdetail.overlay.xul.php
index 45d95eae3..09913eb0f 100755
--- a/content/projekt/mantisdetail.overlay.xul.php
+++ b/content/projekt/mantisdetail.overlay.xul.php
@@ -50,100 +50,107 @@ echo '<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>';
 					<label value="Mantis ID" control="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"/>
+   					<textbox id="textbox-projekttask-mantis-issue_last_updated" disabled="true"/>
 				</row>
 				<row>
-					<label value="Summary" control="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" 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"/>
-   					<textbox id="textbox-projekttask-mantis-issue_view_state_id"/>
-					<label value="View_state_name" control="textbox-projekttask-mantis-issue_view_state_name"/>
-   					<textbox id="textbox-projekttask-mantis-issue_view_state_name"/>
-				</row>
-				<row>
-					<label value="Project_id" control="textbox-projekttask-mantis-issue_project_id"/>
+					<label value="Projekt ID" control="textbox-projekttask-mantis-issue_project_id"/>
    					<textbox id="textbox-projekttask-mantis-issue_project_id"/>
-					<label value="Project_name" control="textbox-projekttask-mantis-issue_project_name"/>
-   					<textbox id="textbox-projekttask-mantis-issue_project_name"/>
+   					<label value="Projekt Name" control="textbox-projekttask-mantis-issue_project_name"/>
+   					<textbox id="textbox-projekttask-mantis-issue_project_name" disabled="true"/>
+				</row>
+				<row>
+					<label value="Zusammenfassung" control="textbox-projekttask-mantis-issue_summary"/>
+					<textbox id="textbox-projekttask-mantis-issue_summary"/>
+					<label value="Kategorie" control="textbox-projekttask-mantis-issue_category"/>
+   					<textbox id="textbox-projekttask-mantis-issue_category" disabled="true"/>
+									
+				</row>
+				<row>
+					<label value="Beschreibung" control="textbox-projekttask-mantis-issue_description"/>
+   					<textbox id="textbox-projekttask-mantis-issue_description" multiline="true"/>
+   					<label value="Status" control="textbox-projekttask-mantis-issue_status_name"/>
+   					<vbox>
+   						<textbox id="textbox-projekttask-mantis-issue_status_name" disabled="true"/>
+   						<spacer />
+   					</vbox>
+				</row>
+				<row>
+					<label value="Schritte zur Reproduktion" control="textbox-projekttask-mantis-steps_to_reproduce"/>
+   					<textbox id="textbox-projekttask-mantis-issue_steps_to_reproduce" multiline="true"/>
+   					<label value="Priorität" control="textbox-projekttask-mantis-issue_priority_name"/>
+   					<vbox>
+   						<textbox id="textbox-projekttask-mantis-issue_priority_name" disabled="true"/>
+   						<spacer />
+   					</vbox>
+				</row>
+				<row>
+					<label value="Zusätzliche Informationen" control="textbox-projekttask-mantis-issue_additional_information"/>
+   					<textbox id="textbox-projekttask-mantis-issue_additional_information" multiline="true"/>
 				</row> 		
 				<row>
-					<label value="Category" control="textbox-projekttask-mantis-issue_category"/>
-   					<textbox id="textbox-projekttask-mantis-issue_category"/>
+					<label value="View_state_id" control="textbox-projekttask-mantis-issue_view_state_id"/>
+   					<textbox id="textbox-projekttask-mantis-issue_view_state_id" disabled="true"/>
 					<label value="Due_date" control="textbox-projekttask-mantis-issue_due_date"/>
-   					<textbox id="textbox-projekttask-mantis-issue_due_date"/>
+   					<textbox id="textbox-projekttask-mantis-issue_due_date" disabled="true"/>
 				</row>
 				<row>
 					<label value="Priority_id" control="textbox-projekttask-mantis-issue_priority_id"/>
-   					<textbox id="textbox-projekttask-mantis-issue_priority_id"/>
-					<label value="Priority_name" control="textbox-projekttask-mantis-issue_priority_name"/>
-   					<textbox id="textbox-projekttask-mantis-issue_priority_name"/>
+   					<textbox id="textbox-projekttask-mantis-issue_priority_id" disabled="true"/>
+					
 				</row>
 				<row>
 					<label value="Severity_id" control="textbox-projekttask-mantis-issue_severity_id"/>
-   					<textbox id="textbox-projekttask-mantis-issue_severity_id"/>
+   					<textbox id="textbox-projekttask-mantis-issue_severity_id" disabled="true"/>
 					<label value="Severity_name" control="textbox-projekttask-mantis-issue_severity_name"/>
-   					<textbox id="textbox-projekttask-mantis-issue_severity_name"/>
+   					<textbox id="textbox-projekttask-mantis-issue_severity_name" disabled="true"/>
 				</row>
 				<row>
 					<label value="Status_id" control="textbox-projekttask-mantis-issue_status_id"/>
-   					<textbox id="textbox-projekttask-mantis-issue_status_id"/>
-					<label value="Status_name" control="textbox-projekttask-mantis-issue_status_name"/>
-   					<textbox id="textbox-projekttask-mantis-issue_status_name"/>
+   					<textbox id="textbox-projekttask-mantis-issue_status_id" disabled="true"/>
+					<label value="View_state_name" control="textbox-projekttask-mantis-issue_view_state_name"/>
+   					<textbox id="textbox-projekttask-mantis-issue_view_state_name" disabled="true"/>
 				</row>
 				<row>
 					<label value="Reporter_id" control="textbox-projekttask-mantis-issue_reporter_id"/>
-   					<textbox id="textbox-projekttask-mantis-issue_reporter_id"/>
+   					<textbox id="textbox-projekttask-mantis-issue_reporter_id" disabled="true"/>
 					<label value="Reporter_name" control="textbox-projekttask-mantis-issue_reporter_name"/>
-   					<textbox id="textbox-projekttask-mantis-issue_reporter_name"/>
+   					<textbox id="textbox-projekttask-mantis-issue_reporter_name" disabled="true"/>
 				</row>
 				<row>
 					<label value="Reporter_real_name" control="textbox-projekttask-mantis-issue_reporter_real_name"/>
-   					<textbox id="textbox-projekttask-mantis-issue_reporter_real_name"/>
+   					<textbox id="textbox-projekttask-mantis-issue_reporter_real_name" disabled="true"/>
 					<label value="Reporter_email" control="textbox-projekttask-mantis-issue_reporter_email"/>
-   					<textbox id="textbox-projekttask-mantis-issue_reporter_email"/>
+   					<textbox id="textbox-projekttask-mantis-issue_reporter_email" disabled="true"/>
 				</row>
 				<row>
 					<label value="Reproducibility_id" control="textbox-projekttask-mantis-issue_reproducibility_id"/>
-   					<textbox id="textbox-projekttask-mantis-issue_reproducibility_id"/>
+   					<textbox id="textbox-projekttask-mantis-issue_reproducibility_id" disabled="true"/>
 					<label value="Reproducibility_name" control="textbox-projekttask-mantis-issue_reproducibility_name"/>
-   					<textbox id="textbox-projekttask-mantis-issue_reproducibility_name"/>
+   					<textbox id="textbox-projekttask-mantis-issue_reproducibility_name" disabled="true"/>
 				</row> 
 				<row>
 					<label value="Date_submitted" control="textbox-projekttask-mantis-issue_date_submitted"/>
-   					<textbox id="textbox-projekttask-mantis-issue_date_submitted"/>
+   					<textbox id="textbox-projekttask-mantis-issue_date_submitted" disabled="true"/>
 					<label value="Sponsorship_total" control="textbox-projekttask-mantis-issue_sponsorship_total"/>
-   					<textbox id="textbox-projekttask-mantis-issue_sponsorship_total"/>
+   					<textbox id="textbox-projekttask-mantis-issue_sponsorship_total" disabled="true"/>
 				</row>
 				<row>
 					<label value="Projection_id" control="textbox-projekttask-mantis-issue_projection_id"/>
-   					<textbox id="textbox-projekttask-mantis-issue_projection_id"/>
+   					<textbox id="textbox-projekttask-mantis-issue_projection_id" disabled="true"/>
 					<label value="Projection_name" control="textbox-projekttask-mantis-issue_projection_name"/>
-   					<textbox id="textbox-projekttask-mantis-issue_projection_name"/>
+   					<textbox id="textbox-projekttask-mantis-issue_projection_name" disabled="true"/>
 				</row>
 				<row>
 					<label value="eta_id" control="textbox-projekttask-mantis-issue_eta_id"/>
-   					<textbox id="textbox-projekttask-mantis-issue_eta_id"/>
+   					<textbox id="textbox-projekttask-mantis-issue_eta_id" disabled="true"/>
 					<label value="eta_name" control="textbox-projekttask-mantis-issue_eta_name"/>
-   					<textbox id="textbox-projekttask-mantis-issue_eta_name"/>
+   					<textbox id="textbox-projekttask-mantis-issue_eta_name" disabled="true"/>
 				</row>
 				<row>
 					<label value="Resolution_id" control="textbox-projekttask-mantis-issue_resolution_id"/>
-   					<textbox id="textbox-projekttask-mantis-issue_resolution_id"/>
+   					<textbox id="textbox-projekttask-mantis-issue_resolution_id" disabled="true"/>
 					<label value="Resolution_name" control="textbox-projekttask-mantis-issue_resolution_name"/>
-   					<textbox id="textbox-projekttask-mantis-issue_resolution_name"/>
+   					<textbox id="textbox-projekttask-mantis-issue_resolution_name" disabled="true"/>
 				</row> 
 			</rows>
 		</grid>
diff --git a/content/projekt/projekttask.overlay.js.php b/content/projekt/projekttask.overlay.js.php
index c44bd521a..25161f35e 100755
--- a/content/projekt/projekttask.overlay.js.php
+++ b/content/projekt/projekttask.overlay.js.php
@@ -340,15 +340,16 @@ function onselectProjekttask()
 	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_project_id').value='1';
+    document.getElementById('textbox-projekttask-mantis-issue_category').value='General';
+	
+	document.getElementById('textbox-projekttask-mantis-mantis_id').value='';
 	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='';
@@ -463,40 +464,42 @@ function onselectProjekttask()
 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 projekttask_id = document.getElementById('textbox-projekttaskdetail-projekttask_id').value;
+	var mantis_id = document.getElementById('textbox-projekttask-mantis-mantis_id').value;
+	var issue_summary=document.getElementById('textbox-projekttask-mantis-issue_summary').value;
+	var issue_description=document.getElementById('textbox-projekttask-mantis-issue_description').value;
+	var issue_view_state_id=document.getElementById('textbox-projekttask-mantis-issue_view_state_id').value;
+	var issue_view_state_name=document.getElementById('textbox-projekttask-mantis-issue_view_state_name').value;
+	var issue_last_updated=document.getElementById('textbox-projekttask-mantis-issue_last_updated').value;
+	var issue_project_id=document.getElementById('textbox-projekttask-mantis-issue_project_id').value;
+	var issue_project_name=document.getElementById('textbox-projekttask-mantis-issue_project_name').value;
+	var issue_category=document.getElementById('textbox-projekttask-mantis-issue_category').value;
+	var issue_priority_id=document.getElementById('textbox-projekttask-mantis-issue_priority_id').value;
+	var issue_priority_name=document.getElementById('textbox-projekttask-mantis-issue_priority_name').value;
+	var issue_severity_id=document.getElementById('textbox-projekttask-mantis-issue_severity_id').value;
+	var issue_severity_name=document.getElementById('textbox-projekttask-mantis-issue_severity_name').value;
+	var issue_status_id=document.getElementById('textbox-projekttask-mantis-issue_status_id').value;
+	var issue_status_name=document.getElementById('textbox-projekttask-mantis-issue_status_name').value;
+	var issue_reporter_id=document.getElementById('textbox-projekttask-mantis-issue_reporter_id').value;
+	var issue_reporter_name=document.getElementById('textbox-projekttask-mantis-issue_reporter_name').value;
+	var issue_reporter_real_name=document.getElementById('textbox-projekttask-mantis-issue_reporter_real_name').value;
+	var issue_reporter_email=document.getElementById('textbox-projekttask-mantis-issue_reporter_email').value;
+	var issue_reproducibility_id=document.getElementById('textbox-projekttask-mantis-issue_reproducibility_id').value;
+	var issue_reproducibility_name=document.getElementById('textbox-projekttask-mantis-issue_reproducibility_name').value;
+	var issue_date_submitted=document.getElementById('textbox-projekttask-mantis-issue_date_submitted').value;
+	var issue_sponsorship_total=document.getElementById('textbox-projekttask-mantis-issue_sponsorship_total').value;
+	var issue_projection_id=document.getElementById('textbox-projekttask-mantis-issue_projection_id').value;
+	var issue_projection_name=document.getElementById('textbox-projekttask-mantis-issue_projection_name').value;
+	var issue_eta_id=document.getElementById('textbox-projekttask-mantis-issue_eta_id').value;
+	var issue_eta_name=document.getElementById('textbox-projekttask-mantis-issue_eta_name').value;
+	var issue_resolution_id=document.getElementById('textbox-projekttask-mantis-issue_resolution_id').value;
+	var issue_resolution_name=document.getElementById('textbox-projekttask-mantis-issue_resolution_name').value;
+	var issue_due_date=document.getElementById('textbox-projekttask-mantis-issue_due_date').value;
+	var issue_steps_to_reproduce=document.getElementById('textbox-projekttask-mantis-issue_steps_to_reproduce').value;
+	var issue_additional_information=document.getElementById('textbox-projekttask-mantis-issue_additional_information').value;
 
 	var soapBody = new SOAPObject("saveMantis");
+	soapBody.appendChild(new SOAPObject("projekttask_id")).val(projekttask_id);
 	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);
@@ -544,7 +547,7 @@ function clb_saveProjekttaskMantis(respObj)
 	try
 	{
 		var id = respObj.Body[0].saveMantisResponse[0].message[0].Text;
-		alert('OK:'+id);
+		TaskTreeRefresh()
 	}
 	catch(e)
 	{
diff --git a/include/mantis.class.php b/include/mantis.class.php
index dd3a31b2e..5bf84dc91 100755
--- a/include/mantis.class.php
+++ b/include/mantis.class.php
@@ -103,7 +103,16 @@ class mantis extends basis_db
 	 */
 	public function insertIssue()
 	{
-		$result = $this->soapClient->__soapCall('mc_version',array());
+		$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, $issue);
+		$result = $this->soapClient->__soapCall('mc_issue_add',$params);
 		return $result;
 	}
 	
@@ -146,8 +155,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;
+		$this->issue_steps_to_reproduce = (isset($result->steps_to_reproduce)?$result->steps_to_reproduce:'');
+		$this->issue_additional_information = (isset($result->additional_information)?$result->additional_information:'');
 		
 		return true;
 	}
diff --git a/rdf/mantis.rdf.php b/rdf/mantis.rdf.php
index 2cf621ce7..a7079746f 100755
--- a/rdf/mantis.rdf.php
+++ b/rdf/mantis.rdf.php
@@ -52,38 +52,38 @@ $mantis->getIssue($issue_id);
     <RDF:Seq about="<?php echo $rdf_url ?>/alle-issues">
 	<RDF:li>
 	    <RDF:Description  id="<?php echo $mantis->issue_id; ?>"  about="<?php echo $rdf_url.'/'.$mantis->issue_id; ?>" >
-		    <MANTIS:issue_id><?php echo $mantis->issue_id;  ?></MANTIS:issue_id>
-		    <MANTIS:issue_summary><?php echo $mantis->issue_summary;  ?></MANTIS:issue_summary>
-		    <MANTIS:issue_description><?php echo $mantis->issue_description;  ?></MANTIS:issue_description>
-		    <MANTIS:issue_view_state_id><?php echo $mantis->issue_view_state->id;  ?></MANTIS:issue_view_state_id>
-		    <MANTIS:issue_view_state_name><?php echo $mantis->issue_view_state->name;  ?></MANTIS:issue_view_state_name>
-		    <MANTIS:issue_last_updated><?php echo $mantis->issue_last_updated;  ?></MANTIS:issue_last_updated>
-		    <MANTIS:issue_project_id><?php echo $mantis->issue_project->id;  ?></MANTIS:issue_project_id>
-		    <MANTIS:issue_project_name><?php echo $mantis->issue_project->name;  ?></MANTIS:issue_project_name>
-		    <MANTIS:issue_category><?php echo $mantis->issue_category;  ?></MANTIS:issue_category>
-		    <MANTIS:issue_priority_id><?php echo $mantis->issue_priority->id;  ?></MANTIS:issue_priority_id>
-		    <MANTIS:issue_priority_name><?php echo $mantis->issue_priority->name;  ?></MANTIS:issue_priority_name>
-		    <MANTIS:issue_severity_id><?php echo $mantis->issue_severity->id;  ?></MANTIS:issue_severity_id>
-		    <MANTIS:issue_severity_name><?php echo $mantis->issue_severity->name;  ?></MANTIS:issue_severity_name>
-		    <MANTIS:issue_status_id><?php echo $mantis->issue_status->id;  ?></MANTIS:issue_status_id>
-		    <MANTIS:issue_status_name><?php echo $mantis->issue_status->name;  ?></MANTIS:issue_status_name>
-		    <MANTIS:issue_reporter_id><?php echo $mantis->issue_reporter->id;  ?></MANTIS:issue_reporter_id>
-		    <MANTIS:issue_reporter_name><?php echo $mantis->issue_reporter->name;  ?></MANTIS:issue_reporter_name>
-		    <MANTIS:issue_reporter_real_name><?php echo $mantis->issue_reporter->real_name;  ?></MANTIS:issue_reporter_real_name>
-		    <MANTIS:issue_reporter_email><?php echo $mantis->issue_reporter->email;  ?></MANTIS:issue_reporter_email>
-		    <MANTIS:issue_reproducibility_id><?php echo $mantis->issue_reproducibility->id;  ?></MANTIS:issue_reproducibility_id>
-		    <MANTIS:issue_reproducibility_name><?php echo $mantis->issue_reproducibility->name;  ?></MANTIS:issue_reproducibility_name>
-		    <MANTIS:issue_date_submitted><?php echo $mantis->issue_date_submitted;  ?></MANTIS:issue_date_submitted>
-		    <MANTIS:issue_sponsorship_total><?php echo $mantis->issue_sponsorship_total;  ?></MANTIS:issue_sponsorship_total>
-		    <MANTIS:issue_projection_id><?php echo $mantis->issue_projection->id;  ?></MANTIS:issue_projection_id>
-		    <MANTIS:issue_projection_name><?php echo $mantis->issue_projection->name;  ?></MANTIS:issue_projection_name>
-		    <MANTIS:issue_eta_id><?php echo $mantis->issue_eta->id;  ?></MANTIS:issue_eta_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_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>
+		    <MANTIS:issue_id><![CDATA[<?php echo $mantis->issue_id;  ?>]]></MANTIS:issue_id>
+		    <MANTIS:issue_summary><![CDATA[<?php echo $mantis->issue_summary;  ?>]]></MANTIS:issue_summary>
+		    <MANTIS:issue_description><![CDATA[<?php echo $mantis->issue_description;  ?>]]></MANTIS:issue_description>
+		    <MANTIS:issue_view_state_id><![CDATA[<?php echo $mantis->issue_view_state->id;  ?>]]></MANTIS:issue_view_state_id>
+		    <MANTIS:issue_view_state_name><![CDATA[<?php echo $mantis->issue_view_state->name;  ?>]]></MANTIS:issue_view_state_name>
+		    <MANTIS:issue_last_updated><![CDATA[<?php echo $mantis->issue_last_updated;  ?>]]></MANTIS:issue_last_updated>
+		    <MANTIS:issue_project_id><![CDATA[<?php echo $mantis->issue_project->id;  ?>]]></MANTIS:issue_project_id>
+		    <MANTIS:issue_project_name><![CDATA[<?php echo $mantis->issue_project->name;  ?>]]></MANTIS:issue_project_name>
+		    <MANTIS:issue_category><![CDATA[<?php echo $mantis->issue_category;  ?>]]></MANTIS:issue_category>
+		    <MANTIS:issue_priority_id><![CDATA[<?php echo $mantis->issue_priority->id;  ?>]]></MANTIS:issue_priority_id>
+		    <MANTIS:issue_priority_name><![CDATA[<?php echo $mantis->issue_priority->name;  ?>]]></MANTIS:issue_priority_name>
+		    <MANTIS:issue_severity_id><![CDATA[<?php echo $mantis->issue_severity->id;  ?>]]></MANTIS:issue_severity_id>
+		    <MANTIS:issue_severity_name><![CDATA[<?php echo $mantis->issue_severity->name;  ?>]]></MANTIS:issue_severity_name>
+		    <MANTIS:issue_status_id><![CDATA[<?php echo $mantis->issue_status->id;  ?>]]></MANTIS:issue_status_id>
+		    <MANTIS:issue_status_name><![CDATA[<?php echo $mantis->issue_status->name;  ?>]]></MANTIS:issue_status_name>
+		    <MANTIS:issue_reporter_id><![CDATA[<?php echo $mantis->issue_reporter->id;  ?>]]></MANTIS:issue_reporter_id>
+		    <MANTIS:issue_reporter_name><![CDATA[<?php echo $mantis->issue_reporter->name;  ?>]]></MANTIS:issue_reporter_name>
+		    <MANTIS:issue_reporter_real_name><![CDATA[<?php echo $mantis->issue_reporter->real_name;  ?>]]></MANTIS:issue_reporter_real_name>
+		    <MANTIS:issue_reporter_email><![CDATA[<?php echo $mantis->issue_reporter->email;  ?>]]></MANTIS:issue_reporter_email>
+		    <MANTIS:issue_reproducibility_id><![CDATA[<?php echo $mantis->issue_reproducibility->id;  ?>]]></MANTIS:issue_reproducibility_id>
+		    <MANTIS:issue_reproducibility_name><![CDATA[<?php echo $mantis->issue_reproducibility->name;  ?>]]></MANTIS:issue_reproducibility_name>
+		    <MANTIS:issue_date_submitted><![CDATA[<?php echo $mantis->issue_date_submitted;  ?>]]></MANTIS:issue_date_submitted>
+		    <MANTIS:issue_sponsorship_total><![CDATA[<?php echo $mantis->issue_sponsorship_total;  ?>]]></MANTIS:issue_sponsorship_total>
+		    <MANTIS:issue_projection_id><![CDATA[<?php echo $mantis->issue_projection->id;  ?>]]></MANTIS:issue_projection_id>
+		    <MANTIS:issue_projection_name><![CDATA[<?php echo $mantis->issue_projection->name;  ?>]]></MANTIS:issue_projection_name>
+		    <MANTIS:issue_eta_id><![CDATA[<?php echo $mantis->issue_eta->id;  ?>]]></MANTIS:issue_eta_id>
+		    <MANTIS:issue_eta_name><![CDATA[<?php echo $mantis->issue_eta->name;  ?>]]></MANTIS:issue_eta_name>
+		    <MANTIS:issue_resolution_id><![CDATA[<?php echo $mantis->issue_resolution->id;  ?>]]></MANTIS:issue_resolution_id>
+		    <MANTIS:issue_resolution_name><![CDATA[<?php echo $mantis->issue_resolution->name;  ?>]]></MANTIS:issue_resolution_name>
+		    <MANTIS:issue_due_date><![CDATA[<?php echo $mantis->issue_due_date;  ?>]]></MANTIS:issue_due_date>
+		    <MANTIS:issue_steps_to_reproduce><![CDATA[<?php echo $mantis->issue_steps_to_reproduce;  ?>]]></MANTIS:issue_steps_to_reproduce>
+		    <MANTIS:issue_additional_information><![CDATA[<?php echo $mantis->issue_additional_information;  ?>]]></MANTIS:issue_additional_information>
 	    </RDF:Description>
 	</RDF:li>
     </RDF:Seq>
diff --git a/skin/styles/tw.css b/skin/styles/tw.css
index 40c8d6aa0..433a93e26 100644
--- a/skin/styles/tw.css
+++ b/skin/styles/tw.css
@@ -540,6 +540,17 @@ font.ContentHeader
 	padding: 0px 10px 0px 10px;
 }
 
+/* Margin von ersten und letzten P tag entfernen, da sonst
+   breite Raender entstehen koenne*/
+#news .news .text p:first-child
+{
+	margin-top:0px;
+
+}
+#news .news .text p:last-child
+{
+	margin-bottom:0px;
+}
 
 /* Images */
 img.testtoolfrage
@@ -680,4 +691,4 @@ option.inactive
 .diff-addedline
 {
 	background-color: lightgreen;
-}
\ No newline at end of file
+}
diff --git a/soap/projekttask.soap.php b/soap/projekttask.soap.php
index 6d1b452fe..673fdd6e4 100644
--- a/soap/projekttask.soap.php
+++ b/soap/projekttask.soap.php
@@ -102,22 +102,54 @@ function deleteProjekttask($projekttask_id)
 		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)
+function saveMantis($projekttask_id, $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';
+	if($mantis_id!='')
+	{
+		//Update
+		
+		$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);	
+	}
 	else
-		return new SoapFault("Server", 'Fehler:'.$mantis->errormsg);	
+	{
+		//Neu
+		$mantis->issue_summary = $issue_summary;
+		$mantis->issue_description = $issue_description;
+		$mantis->issue_project->id = $issue_project_id;
+		$mantis->issue_steps_to_reproduce = $issue_steps_to_reproduce;
+		$mantis->issue_additional_information = $issue_additional_information;
+		$mantis->issue_category = $issue_category;
+		
+		if($id = $mantis->insertIssue())
+		{
+			$projekttask = new projekttask();
+			//Mantis ID zu Projekttask speichern 
+			if($projekttask->load($projekttask_id))
+			{
+				$projekttask->new=false;
+				$projekttask->mantis_id=$id;
+				if($projekttask->save())
+					return 'ok';
+				else
+					return new SoapFault("Server", 'Fehler:'.$projekttask->errormsg);		
+			}
+		}
+		else
+			return new SoapFault("Server", 'Fehler:'.$mantis->errormsg);
+	}
 }
 ?>
 
diff --git a/soap/projekttask.wsdl.php b/soap/projekttask.wsdl.php
index ecd8cad14..98fd09be6 100644
--- a/soap/projekttask.wsdl.php
+++ b/soap/projekttask.wsdl.php
@@ -34,6 +34,7 @@ xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/">
   	</wsdl:message>
   	
   	<wsdl:message name="SaveMantisRequest">
+  		<wsdl:part name="projekttask_id" type="xsd:string"></wsdl:part>
 		<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>
diff --git a/system/FH-Complete.txp b/system/FH-Complete.txp
index 20ca53e3d..ab9ab8330 100644
--- a/system/FH-Complete.txp
+++ b/system/FH-Complete.txp
@@ -43177,7 +43177,7 @@
 					<Left>54</Left>
 					<z>0</z>
 					<Width>794</Width>
-					<Height>317</Height>
+					<Height>356</Height>
 					<dz>0</dz>
 					<RecalculateSizes>1</RecalculateSizes>
 					<UseWorkSpaceRecalculateSizes>1</UseWorkSpaceRecalculateSizes>
@@ -43386,7 +43386,7 @@
 					<Left>56</Left>
 					<z>0</z>
 					<Width>820</Width>
-					<Height>473</Height>
+					<Height>512</Height>
 					<dz>0</dz>
 					<RecalculateSizes>1</RecalculateSizes>
 					<UseWorkSpaceRecalculateSizes>1</UseWorkSpaceRecalculateSizes>
@@ -43740,15 +43740,15 @@
 						<Id>{0E058C3F-E002-4DE4-A099-651D67DDCBEC}</Id>
 					</WorkSpaceShape2>
 					<NamePositionX>773</NamePositionX>
-					<NamePositionY>1040</NamePositionY>
+					<NamePositionY>1049</NamePositionY>
 					<Points>
 						<Point>
 							<x>848</x>
-							<y>938</y>
+							<y>957</y>
 						</Point>
 						<Point>
 							<x>879</x>
-							<y>938</y>
+							<y>957</y>
 						</Point>
 						<Point>
 							<x>1131</x>
@@ -43783,7 +43783,7 @@
 						<Id>{6704B70E-0AB9-410E-AEDB-795DE7375F92}</Id>
 					</WorkSpaceShape2>
 					<NamePositionX>958</NamePositionX>
-					<NamePositionY>1401</NamePositionY>
+					<NamePositionY>1414</NamePositionY>
 					<Points>
 						<Point>
 							<x>1162</x>
@@ -43795,11 +43795,11 @@
 						</Point>
 						<Point>
 							<x>907</x>
-							<y>1544</y>
+							<y>1570</y>
 						</Point>
 						<Point>
 							<x>876</x>
-							<y>1544</y>
+							<y>1570</y>
 						</Point>
 					</Points>
 				</WorkSpaceLinePERRelationPG83>
@@ -43869,15 +43869,15 @@
 						<Id>{69408933-7B12-47CF-A4BF-073FDC6F95DA}</Id>
 					</WorkSpaceShape2>
 					<NamePositionX>889</NamePositionX>
-					<NamePositionY>674</NamePositionY>
+					<NamePositionY>678</NamePositionY>
 					<Points>
 						<Point>
 							<x>848</x>
-							<y>858</y>
+							<y>868</y>
 						</Point>
 						<Point>
 							<x>879</x>
-							<y>858</y>
+							<y>868</y>
 						</Point>
 						<Point>
 							<x>1099</x>
@@ -44126,36 +44126,36 @@
 					<WorkSpaceShape2>
 						<Id>{6704B70E-0AB9-410E-AEDB-795DE7375F92}</Id>
 					</WorkSpaceShape2>
-					<NamePositionX>701</NamePositionX>
-					<NamePositionY>1701</NamePositionY>
+					<NamePositionX>748</NamePositionX>
+					<NamePositionY>1750</NamePositionY>
 					<Points>
 						<Point>
 							<x>876</x>
-							<y>1387</y>
+							<y>1400</y>
 						</Point>
 						<Point>
 							<x>907</x>
-							<y>1387</y>
+							<y>1400</y>
 						</Point>
 						<Point>
 							<x>907</x>
-							<y>1387</y>
+							<y>1400</y>
 						</Point>
 						<Point>
 							<x>907</x>
-							<y>1733</y>
+							<y>1772</y>
 						</Point>
 						<Point>
 							<x>466</x>
-							<y>1733</y>
+							<y>1772</y>
 						</Point>
 						<Point>
 							<x>466</x>
-							<y>1733</y>
+							<y>1772</y>
 						</Point>
 						<Point>
 							<x>466</x>
-							<y>1702</y>
+							<y>1741</y>
 						</Point>
 					</Points>
 				</WorkSpaceLinePERRelationPG83>
@@ -44182,15 +44182,15 @@
 						<Id>{05D38B22-230A-490A-AE08-48BD19868B8F}</Id>
 					</WorkSpaceShape2>
 					<NamePositionX>940</NamePositionX>
-					<NamePositionY>1490</NamePositionY>
+					<NamePositionY>1504</NamePositionY>
 					<Points>
 						<Point>
 							<x>848</x>
-							<y>1017</y>
+							<y>1046</y>
 						</Point>
 						<Point>
 							<x>879</x>
-							<y>1017</y>
+							<y>1046</y>
 						</Point>
 						<Point>
 							<x>1201</x>
@@ -44362,7 +44362,7 @@
 					<Top>47</Top>
 					<Left>1305</Left>
 					<z>0</z>
-					<Width>753</Width>
+					<Width>804</Width>
 					<Height>512</Height>
 					<dz>0</dz>
 					<RecalculateSizes>1</RecalculateSizes>
@@ -44401,7 +44401,7 @@
 					<Top>743</Top>
 					<Left>1274</Left>
 					<z>0</z>
-					<Width>796</Width>
+					<Width>848</Width>
 					<Height>395</Height>
 					<dz>0</dz>
 					<RecalculateSizes>1</RecalculateSizes>
@@ -44445,8 +44445,8 @@
 					<Top>610</Top>
 					<Left>2473</Left>
 					<z>0</z>
-					<Width>753</Width>
-					<Height>395</Height>
+					<Width>794</Width>
+					<Height>356</Height>
 					<dz>0</dz>
 					<RecalculateSizes>1</RecalculateSizes>
 					<UseWorkSpaceRecalculateSizes>1</UseWorkSpaceRecalculateSizes>
@@ -44484,8 +44484,8 @@
 					<Top>1122</Top>
 					<Left>2477</Left>
 					<z>0</z>
-					<Width>754</Width>
-					<Height>512</Height>
+					<Width>801</Width>
+					<Height>551</Height>
 					<dz>0</dz>
 					<RecalculateSizes>1</RecalculateSizes>
 					<UseWorkSpaceRecalculateSizes>1</UseWorkSpaceRecalculateSizes>
@@ -44523,8 +44523,8 @@
 					<Top>1761</Top>
 					<Left>2477</Left>
 					<z>0</z>
-					<Width>771</Width>
-					<Height>434</Height>
+					<Width>820</Width>
+					<Height>512</Height>
 					<dz>0</dz>
 					<RecalculateSizes>1</RecalculateSizes>
 					<UseWorkSpaceRecalculateSizes>1</UseWorkSpaceRecalculateSizes>
@@ -44562,7 +44562,7 @@
 					<Top>43</Top>
 					<Left>44</Left>
 					<z>0</z>
-					<Width>834</Width>
+					<Width>899</Width>
 					<Height>473</Height>
 					<dz>0</dz>
 					<RecalculateSizes>1</RecalculateSizes>
@@ -44601,7 +44601,7 @@
 					<Top>1334</Top>
 					<Left>1236</Left>
 					<z>0</z>
-					<Width>918</Width>
+					<Width>959</Width>
 					<Height>1292</Height>
 					<dz>0</dz>
 					<RecalculateSizes>1</RecalculateSizes>
@@ -44638,7 +44638,7 @@
 					<Top>1466</Top>
 					<Left>180</Left>
 					<z>0</z>
-					<Width>965</Width>
+					<Width>1017</Width>
 					<Height>1175</Height>
 					<dz>0</dz>
 					<RecalculateSizes>1</RecalculateSizes>
@@ -44675,7 +44675,7 @@
 					<Top>559</Top>
 					<Left>45</Left>
 					<z>0</z>
-					<Width>915</Width>
+					<Width>965</Width>
 					<Height>824</Height>
 					<dz>0</dz>
 					<RecalculateSizes>1</RecalculateSizes>
@@ -44709,11 +44709,11 @@
 					<FontStyle>0</FontStyle>
 					<FormatLocked>0</FormatLocked>
 					<FontHeight>-28</FontHeight>
-					<Top>311</Top>
-					<Left>2703</Left>
+					<Top>325</Top>
+					<Left>2518</Left>
 					<z>0</z>
-					<Width>200</Width>
-					<Height>300</Height>
+					<Width>882</Width>
+					<Height>200</Height>
 					<dz>0</dz>
 					<RecalculateSizes>1</RecalculateSizes>
 					<UseWorkSpaceRecalculateSizes>1</UseWorkSpaceRecalculateSizes>
@@ -44748,11 +44748,11 @@
 					<FontStyle>0</FontStyle>
 					<FormatLocked>0</FormatLocked>
 					<FontHeight>-28</FontHeight>
-					<Top>205</Top>
-					<Left>2223</Left>
+					<Top>31</Top>
+					<Left>2179</Left>
 					<z>0</z>
-					<Width>200</Width>
-					<Height>300</Height>
+					<Width>824</Width>
+					<Height>200</Height>
 					<dz>0</dz>
 					<RecalculateSizes>1</RecalculateSizes>
 					<UseWorkSpaceRecalculateSizes>1</UseWorkSpaceRecalculateSizes>
@@ -44785,11 +44785,11 @@
 					<FontStyle>0</FontStyle>
 					<FormatLocked>0</FormatLocked>
 					<FontHeight>-28</FontHeight>
-					<Top>660</Top>
-					<Left>1616</Left>
+					<Top>2435</Top>
+					<Left>2152</Left>
 					<z>0</z>
-					<Width>200</Width>
-					<Height>300</Height>
+					<Width>837</Width>
+					<Height>473</Height>
 					<dz>0</dz>
 					<RecalculateSizes>1</RecalculateSizes>
 					<UseWorkSpaceRecalculateSizes>1</UseWorkSpaceRecalculateSizes>
@@ -44822,11 +44822,11 @@
 					<FontStyle>0</FontStyle>
 					<FormatLocked>0</FormatLocked>
 					<FontHeight>-28</FontHeight>
-					<Top>2555</Top>
-					<Left>2965</Left>
+					<Top>2541</Top>
+					<Left>3048</Left>
 					<z>0</z>
-					<Width>200</Width>
-					<Height>300</Height>
+					<Width>871</Width>
+					<Height>278</Height>
 					<dz>0</dz>
 					<RecalculateSizes>1</RecalculateSizes>
 					<UseWorkSpaceRecalculateSizes>1</UseWorkSpaceRecalculateSizes>
@@ -44869,23 +44869,23 @@
 					<WorkSpaceShape2>
 						<Id>{CCD12E07-139E-4901-BAFD-9ADFDE1519B5}</Id>
 					</WorkSpaceShape2>
-					<NamePositionX>1408</NamePositionX>
+					<NamePositionX>1434</NamePositionX>
 					<NamePositionY>620</NamePositionY>
 					<Points>
 						<Point>
-							<x>1682</x>
+							<x>1707</x>
 							<y>559</y>
 						</Point>
 						<Point>
-							<x>1682</x>
+							<x>1707</x>
 							<y>590</y>
 						</Point>
 						<Point>
-							<x>1672</x>
+							<x>1698</x>
 							<y>712</y>
 						</Point>
 						<Point>
-							<x>1672</x>
+							<x>1698</x>
 							<y>743</y>
 						</Point>
 					</Points>
@@ -44912,15 +44912,15 @@
 					<WorkSpaceShape2>
 						<Id>{6796A1AC-54A7-4EF0-8B39-1A30C6393C40}</Id>
 					</WorkSpaceShape2>
-					<NamePositionX>897</NamePositionX>
+					<NamePositionX>930</NamePositionX>
 					<NamePositionY>103</NamePositionY>
 					<Points>
 						<Point>
-							<x>878</x>
+							<x>943</x>
 							<y>161</y>
 						</Point>
 						<Point>
-							<x>909</x>
+							<x>974</x>
 							<y>161</y>
 						</Point>
 						<Point>
@@ -44955,15 +44955,15 @@
 					<WorkSpaceShape2>
 						<Id>{6796A1AC-54A7-4EF0-8B39-1A30C6393C40}</Id>
 					</WorkSpaceShape2>
-					<NamePositionX>884</NamePositionX>
+					<NamePositionX>917</NamePositionX>
 					<NamePositionY>227</NamePositionY>
 					<Points>
 						<Point>
-							<x>878</x>
+							<x>943</x>
 							<y>280</y>
 						</Point>
 						<Point>
-							<x>909</x>
+							<x>974</x>
 							<y>280</y>
 						</Point>
 						<Point>
@@ -44998,23 +44998,23 @@
 					<WorkSpaceShape2>
 						<Id>{CCD12E07-139E-4901-BAFD-9ADFDE1519B5}</Id>
 					</WorkSpaceShape2>
-					<NamePositionX>2075</NamePositionX>
-					<NamePositionY>671</NamePositionY>
+					<NamePositionX>2101</NamePositionX>
+					<NamePositionY>661</NamePositionY>
 					<Points>
 						<Point>
 							<x>2473</x>
-							<y>808</y>
+							<y>788</y>
 						</Point>
 						<Point>
 							<x>2442</x>
-							<y>808</y>
+							<y>788</y>
 						</Point>
 						<Point>
-							<x>2101</x>
+							<x>2153</x>
 							<y>842</y>
 						</Point>
 						<Point>
-							<x>2070</x>
+							<x>2122</x>
 							<y>842</y>
 						</Point>
 					</Points>
@@ -45041,24 +45041,24 @@
 					<WorkSpaceShape2>
 						<Id>{CCD12E07-139E-4901-BAFD-9ADFDE1519B5}</Id>
 					</WorkSpaceShape2>
-					<NamePositionX>2241</NamePositionX>
-					<NamePositionY>997</NamePositionY>
+					<NamePositionX>2267</NamePositionX>
+					<NamePositionY>1057</NamePositionY>
 					<Points>
 						<Point>
 							<x>2477</x>
-							<y>1378</y>
+							<y>1398</y>
 						</Point>
 						<Point>
 							<x>2446</x>
-							<y>1378</y>
+							<y>1398</y>
 						</Point>
 						<Point>
-							<x>2101</x>
-							<y>940</y>
+							<x>2153</x>
+							<y>1039</y>
 						</Point>
 						<Point>
-							<x>2070</x>
-							<y>940</y>
+							<x>2122</x>
+							<y>1039</y>
 						</Point>
 					</Points>
 				</WorkSpaceLinePERRelationPG83>
@@ -45084,24 +45084,24 @@
 					<WorkSpaceShape2>
 						<Id>{CCD12E07-139E-4901-BAFD-9ADFDE1519B5}</Id>
 					</WorkSpaceShape2>
-					<NamePositionX>2360</NamePositionX>
-					<NamePositionY>1626</NamePositionY>
+					<NamePositionX>2606</NamePositionX>
+					<NamePositionY>1453</NamePositionY>
 					<Points>
 						<Point>
-							<x>2477</x>
-							<y>1978</y>
+							<x>2887</x>
+							<y>1761</y>
 						</Point>
 						<Point>
-							<x>2446</x>
-							<y>1978</y>
+							<x>2887</x>
+							<y>1730</y>
 						</Point>
 						<Point>
-							<x>2101</x>
-							<y>1039</y>
+							<x>2153</x>
+							<y>940</y>
 						</Point>
 						<Point>
-							<x>2070</x>
-							<y>1039</y>
+							<x>2122</x>
+							<y>940</y>
 						</Point>
 					</Points>
 				</WorkSpaceLinePERRelationPG83>
@@ -45127,15 +45127,15 @@
 					<WorkSpaceShape2>
 						<Id>{CCD12E07-139E-4901-BAFD-9ADFDE1519B5}</Id>
 					</WorkSpaceShape2>
-					<NamePositionX>976</NamePositionX>
+					<NamePositionX>1008</NamePositionX>
 					<NamePositionY>560</NamePositionY>
 					<Points>
 						<Point>
-							<x>878</x>
+							<x>943</x>
 							<y>398</y>
 						</Point>
 						<Point>
-							<x>909</x>
+							<x>974</x>
 							<y>398</y>
 						</Point>
 						<Point>
@@ -45170,23 +45170,23 @@
 					<WorkSpaceShape2>
 						<Id>{CCD12E07-139E-4901-BAFD-9ADFDE1519B5}</Id>
 					</WorkSpaceShape2>
-					<NamePositionX>1583</NamePositionX>
+					<NamePositionX>1607</NamePositionX>
 					<NamePositionY>1176</NamePositionY>
 					<Points>
 						<Point>
-							<x>1695</x>
+							<x>1716</x>
 							<y>1334</y>
 						</Point>
 						<Point>
-							<x>1695</x>
+							<x>1716</x>
 							<y>1303</y>
 						</Point>
 						<Point>
-							<x>1672</x>
+							<x>1698</x>
 							<y>1169</y>
 						</Point>
 						<Point>
-							<x>1672</x>
+							<x>1698</x>
 							<y>1138</y>
 						</Point>
 					</Points>
@@ -45213,15 +45213,15 @@
 					<WorkSpaceShape2>
 						<Id>{CCD12E07-139E-4901-BAFD-9ADFDE1519B5}</Id>
 					</WorkSpaceShape2>
-					<NamePositionX>668</NamePositionX>
+					<NamePositionX>682</NamePositionX>
 					<NamePositionY>1402</NamePositionY>
 					<Points>
 						<Point>
-							<x>662</x>
+							<x>688</x>
 							<y>1466</y>
 						</Point>
 						<Point>
-							<x>662</x>
+							<x>688</x>
 							<y>1435</y>
 						</Point>
 						<Point>
@@ -45256,15 +45256,15 @@
 					<WorkSpaceShape2>
 						<Id>{CCD12E07-139E-4901-BAFD-9ADFDE1519B5}</Id>
 					</WorkSpaceShape2>
-					<NamePositionX>831</NamePositionX>
+					<NamePositionX>856</NamePositionX>
 					<NamePositionY>954</NamePositionY>
 					<Points>
 						<Point>
-							<x>960</x>
+							<x>1010</x>
 							<y>971</y>
 						</Point>
 						<Point>
-							<x>991</x>
+							<x>1041</x>
 							<y>971</y>
 						</Point>
 						<Point>
@@ -45299,9 +45299,26 @@
 					<WorkSpaceShape2>
 						<Id>{67A93D9F-EE70-46AE-A284-2150C9850034}</Id>
 					</WorkSpaceShape2>
-					<NamePositionX>0</NamePositionX>
-					<NamePositionY>0</NamePositionY>
-					<Points/>
+					<NamePositionX>2892</NamePositionX>
+					<NamePositionY>763</NamePositionY>
+					<Points>
+						<Point>
+							<x>2878</x>
+							<y>1122</y>
+						</Point>
+						<Point>
+							<x>2878</x>
+							<y>1091</y>
+						</Point>
+						<Point>
+							<x>3106</x>
+							<y>556</y>
+						</Point>
+						<Point>
+							<x>3106</x>
+							<y>525</y>
+						</Point>
+					</Points>
 				</WorkSpaceLinePERRelationPG83>
 				<WorkSpaceLinePERRelationPG83 ObjectType="2504" CSAOName="WorkSpaceLinePERRelationPG83">
 					<Id>{1C6747FB-F45D-49FA-8C64-B4CBE9039C29}</Id>
@@ -45325,9 +45342,26 @@
 					<WorkSpaceShape2>
 						<Id>{67A93D9F-EE70-46AE-A284-2150C9850034}</Id>
 					</WorkSpaceShape2>
-					<NamePositionX>0</NamePositionX>
-					<NamePositionY>0</NamePositionY>
-					<Points/>
+					<NamePositionX>2741</NamePositionX>
+					<NamePositionY>507</NamePositionY>
+					<Points>
+						<Point>
+							<x>2870</x>
+							<y>610</y>
+						</Point>
+						<Point>
+							<x>2870</x>
+							<y>579</y>
+						</Point>
+						<Point>
+							<x>2812</x>
+							<y>556</y>
+						</Point>
+						<Point>
+							<x>2812</x>
+							<y>525</y>
+						</Point>
+					</Points>
 				</WorkSpaceLinePERRelationPG83>
 				<WorkSpaceLinePERRelationPG83 ObjectType="2504" CSAOName="WorkSpaceLinePERRelationPG83">
 					<Id>{C579419E-DD10-4884-8312-AE127D785B8E}</Id>
@@ -45351,9 +45385,26 @@
 					<WorkSpaceShape2>
 						<Id>{67A93D9F-EE70-46AE-A284-2150C9850034}</Id>
 					</WorkSpaceShape2>
-					<NamePositionX>0</NamePositionX>
-					<NamePositionY>0</NamePositionY>
-					<Points/>
+					<NamePositionX>2675</NamePositionX>
+					<NamePositionY>218</NamePositionY>
+					<Points>
+						<Point>
+							<x>2591</x>
+							<y>231</y>
+						</Point>
+						<Point>
+							<x>2591</x>
+							<y>262</y>
+						</Point>
+						<Point>
+							<x>2959</x>
+							<y>294</y>
+						</Point>
+						<Point>
+							<x>2959</x>
+							<y>325</y>
+						</Point>
+					</Points>
 				</WorkSpaceLinePERRelationPG83>
 				<WorkSpaceLinePERRelationPG83 ObjectType="2504" CSAOName="WorkSpaceLinePERRelationPG83">
 					<Id>{AF8B80D5-4540-47AB-9FEA-9DA2D50B0F1E}</Id>
@@ -45377,9 +45428,26 @@
 					<WorkSpaceShape2>
 						<Id>{BCA2883D-D53D-41D4-AEBB-DCC3B508E0D7}</Id>
 					</WorkSpaceShape2>
-					<NamePositionX>0</NamePositionX>
-					<NamePositionY>0</NamePositionY>
-					<Points/>
+					<NamePositionX>2401</NamePositionX>
+					<NamePositionY>2003</NamePositionY>
+					<Points>
+						<Point>
+							<x>3297</x>
+							<y>2017</y>
+						</Point>
+						<Point>
+							<x>3328</x>
+							<y>2017</y>
+						</Point>
+						<Point>
+							<x>2446</x>
+							<y>2017</y>
+						</Point>
+						<Point>
+							<x>2477</x>
+							<y>2017</y>
+						</Point>
+					</Points>
 				</WorkSpaceLinePERRelationPG83>
 				<WorkSpaceLinePERRelationPG83 ObjectType="2504" CSAOName="WorkSpaceLinePERRelationPG83">
 					<Id>{81891195-F5F6-4157-AB35-7E9EC70DC385}</Id>
@@ -45403,9 +45471,26 @@
 					<WorkSpaceShape2>
 						<Id>{1846AFD4-B1B3-4081-8385-F8313E3FD3BC}</Id>
 					</WorkSpaceShape2>
-					<NamePositionX>0</NamePositionX>
-					<NamePositionY>0</NamePositionY>
-					<Points/>
+					<NamePositionX>3077</NamePositionX>
+					<NamePositionY>1693</NamePositionY>
+					<Points>
+						<Point>
+							<x>2870</x>
+							<y>966</y>
+						</Point>
+						<Point>
+							<x>2870</x>
+							<y>997</y>
+						</Point>
+						<Point>
+							<x>3484</x>
+							<y>2510</y>
+						</Point>
+						<Point>
+							<x>3484</x>
+							<y>2541</y>
+						</Point>
+					</Points>
 				</WorkSpaceLinePERRelationPG83>
 				<WorkSpaceLinePERRelationPG83 ObjectType="2504" CSAOName="WorkSpaceLinePERRelationPG83">
 					<Id>{5145BCB9-1849-4DE6-AF56-C20619C6FD62}</Id>
@@ -45429,9 +45514,26 @@
 					<WorkSpaceShape2>
 						<Id>{1846AFD4-B1B3-4081-8385-F8313E3FD3BC}</Id>
 					</WorkSpaceShape2>
-					<NamePositionX>0</NamePositionX>
-					<NamePositionY>0</NamePositionY>
-					<Points/>
+					<NamePositionX>2848</NamePositionX>
+					<NamePositionY>2109</NamePositionY>
+					<Points>
+						<Point>
+							<x>2878</x>
+							<y>1673</y>
+						</Point>
+						<Point>
+							<x>2878</x>
+							<y>1704</y>
+						</Point>
+						<Point>
+							<x>3017</x>
+							<y>2634</y>
+						</Point>
+						<Point>
+							<x>3048</x>
+							<y>2634</y>
+						</Point>
+					</Points>
 				</WorkSpaceLinePERRelationPG83>
 				<WorkSpaceLinePERRelationPG83 ObjectType="2504" CSAOName="WorkSpaceLinePERRelationPG83">
 					<Id>{24E696D6-9D09-44AF-A7AA-814BAF043104}</Id>
@@ -45455,9 +45557,26 @@
 					<WorkSpaceShape2>
 						<Id>{1846AFD4-B1B3-4081-8385-F8313E3FD3BC}</Id>
 					</WorkSpaceShape2>
-					<NamePositionX>0</NamePositionX>
-					<NamePositionY>0</NamePositionY>
-					<Points/>
+					<NamePositionX>2918</NamePositionX>
+					<NamePositionY>2639</NamePositionY>
+					<Points>
+						<Point>
+							<x>2989</x>
+							<y>2672</y>
+						</Point>
+						<Point>
+							<x>3020</x>
+							<y>2672</y>
+						</Point>
+						<Point>
+							<x>3017</x>
+							<y>2726</y>
+						</Point>
+						<Point>
+							<x>3048</x>
+							<y>2726</y>
+						</Point>
+					</Points>
 				</WorkSpaceLinePERRelationPG83>
 			</LineList>
 			<Page>
@@ -45587,7 +45706,7 @@
 			<Company>Technikum Wien</Company>
 			<Version>2.0</Version>
 			<CreatedDate>2009-04-17T11:15:21.000+02:00</CreatedDate>
-			<ModifiedDate>2011-09-02T12:06:04.131+02:00</ModifiedDate>
+			<ModifiedDate>2011-09-14T10:37:33.221+02:00</ModifiedDate>
 			<Project>FH-Complete 2.0</Project>
 			<Description>&lt;?xml-stylesheet type="text/xsl" href="FHCompleteTDM3PG83.xsl"?&gt;
 </Description>
@@ -64210,6 +64329,47 @@ Studiengang&gt;0 und Semester&gt;0 -&gt; News fuer bestimmtes Semester im Studie
 					<ArrDims></ArrDims>
 					<IsArray>0</IsArray>
 				</PERAttributePG83>
+				<PERAttributePG83 ObjectType="2003" CSAOName="PERAttributePG83">
+					<Id>{D1616BA9-E6BA-479A-843E-95D7C6215BDC}</Id>
+					<Name>budget</Name>
+					<Ordinal>0</Ordinal>
+					<HistoryID>{EB55133E-50FA-43BE-B049-BD771F992239}</HistoryID>
+					<GlobalOrder>0</GlobalOrder>
+					<RNOffset>0</RNOffset>
+					<RNLength>0</RNLength>
+					<IgnoreNC>0</IgnoreNC>
+					<GenerateCode>1</GenerateCode>
+					<BeforeScript></BeforeScript>
+					<AfterScript></AfterScript>
+					<Notes></Notes>
+					<Comments></Comments>
+					<DataTypeParam1>12</DataTypeParam1>
+					<DataTypeParam2>2</DataTypeParam2>
+					<KeepForeignKey>0</KeepForeignKey>
+					<DefaultValue></DefaultValue>
+					<NotNull>0</NotNull>
+					<Migrated>0</Migrated>
+					<Caption>budget</Caption>
+					<Unique>0</Unique>
+					<OriginalName></OriginalName>
+					<CheckConstraint></CheckConstraint>
+					<CheckConstraintName></CheckConstraintName>
+					<KeyConstraintItems/>
+					<PKForeignKeys/>
+					<FKForeignKeys/>
+					<DictType/>
+					<Domain/>
+					<DataType>
+						<Id>{E62BD1D3-18CA-4571-9A16-606FF04DC894}</Id>
+					</DataType>
+					<UserDataType/>
+					<IndexItems/>
+					<Default/>
+					<CheckConstraints/>
+					<KeyConstraint/>
+					<ArrDims></ArrDims>
+					<IsArray>0</IsArray>
+				</PERAttributePG83>
 			</Attributes>
 			<Keys>
 				<PERKeyConstraintPG83 ObjectType="2010" CSAOName="PERKeyConstraintPG83">
@@ -138191,6 +138351,47 @@ Wenn FALSE haengt die Anzahl der Fragen pro Level von der Gesamtzahl pro Level a
 					<ArrDims></ArrDims>
 					<IsArray>0</IsArray>
 				</PERAttributePG83>
+				<PERAttributePG83 ObjectType="2003" CSAOName="PERAttributePG83">
+					<Id>{0630BC1D-C122-414F-93D5-81C818283045}</Id>
+					<Name>erledigt</Name>
+					<Ordinal>0</Ordinal>
+					<HistoryID>{DE8F1DEC-D0EA-4577-8CEB-662590D7CA12}</HistoryID>
+					<GlobalOrder>0</GlobalOrder>
+					<RNOffset>0</RNOffset>
+					<RNLength>0</RNLength>
+					<IgnoreNC>0</IgnoreNC>
+					<GenerateCode>1</GenerateCode>
+					<BeforeScript></BeforeScript>
+					<AfterScript></AfterScript>
+					<Notes></Notes>
+					<Comments></Comments>
+					<DataTypeParam1></DataTypeParam1>
+					<DataTypeParam2></DataTypeParam2>
+					<KeepForeignKey>0</KeepForeignKey>
+					<DefaultValue></DefaultValue>
+					<NotNull>1</NotNull>
+					<Migrated>0</Migrated>
+					<Caption>erledigt</Caption>
+					<Unique>0</Unique>
+					<OriginalName></OriginalName>
+					<CheckConstraint></CheckConstraint>
+					<CheckConstraintName></CheckConstraintName>
+					<KeyConstraintItems/>
+					<PKForeignKeys/>
+					<FKForeignKeys/>
+					<DictType/>
+					<Domain/>
+					<DataType>
+						<Id>{D64069A5-B04A-490B-B0A2-5144DEA81A2E}</Id>
+					</DataType>
+					<UserDataType/>
+					<IndexItems/>
+					<Default/>
+					<CheckConstraints/>
+					<KeyConstraint/>
+					<ArrDims></ArrDims>
+					<IsArray>0</IsArray>
+				</PERAttributePG83>
 			</Attributes>
 			<Keys>
 				<PERKeyConstraintPG83 ObjectType="2010" CSAOName="PERKeyConstraintPG83">
@@ -138470,7 +138671,7 @@ Wenn FALSE haengt die Anzahl der Fragen pro Level von der Gesamtzahl pro Level a
 					<DataTypeParam2></DataTypeParam2>
 					<KeepForeignKey>0</KeepForeignKey>
 					<DefaultValue></DefaultValue>
-					<NotNull>1</NotNull>
+					<NotNull>0</NotNull>
 					<Migrated>1</Migrated>
 					<Caption>bearbeiter_uid</Caption>
 					<Unique>0</Unique>