From 78b429a439d7016b55ffff8117da93027087064a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20=C3=96sterreicher?= <oesi@technikum-wien.at>
Date: Thu, 3 Nov 2011 15:13:58 +0000
Subject: [PATCH] Planner - Notiz und Task Tree kann jetzt sortiert und
 editiert werden

---
 content/notiz.xml.php                       | 47 +++++++++++++--------
 content/projekt/projekttask.overlay.js.php  |  8 +++-
 content/projekt/projekttask.overlay.xul.php |  4 +-
 3 files changed, 39 insertions(+), 20 deletions(-)

diff --git a/content/notiz.xml.php b/content/notiz.xml.php
index 116b7840b..6feb1f1a8 100755
--- a/content/notiz.xml.php
+++ b/content/notiz.xml.php
@@ -58,48 +58,48 @@ echo '<?xml version="1.0" encoding="UTF-8" standalone="yes"?>';
 			datasources="rdf:null" ref="http://www.technikum-wien.at/notiz/liste"
 			onclick="document.getBindingParent(this).updateErledigt(event);"
 			onselect="document.getBindingParent(this).edit(event);"
-			editable="true"
+			flags="dont-build-content"
 			>
 			
 			<xul:treecols>
 			    <xul:treecol anonid="treecol-notiz-titel" label="Titel" flex="5" primary="true" persist="hidden width ordinal"
-					class="sortDirectionIndicator" editable="false" sortActive="true"
+					class="sortDirectionIndicator" sortActive="true"
 					sort="rdf:http://www.technikum-wien.at/notiz/rdf#titel"  />
 			    <xul:splitter class="tree-splitter"/>
 			    <xul:treecol anonid="treecol-notiz-text" label="Text" flex="2" hidden="false" persist="hidden width ordinal"
-					class="sortDirectionIndicator" editable="false" 
+					class="sortDirectionIndicator"  
 					sort="rdf:http://www.technikum-wien.at/notiz/rdf#text" />
 			    <xul:splitter class="tree-splitter"/>
 			    <xul:treecol anonid="treecol-notiz-verfasser" label="Verfasser" flex="2" hidden="false" persist="hidden width ordinal"
-					class="sortDirectionIndicator" editable="false"
+					class="sortDirectionIndicator" 
 					sort="rdf:http://www.technikum-wien.at/notiz/rdf#verfasser_uid" />
 			    <xul:splitter class="tree-splitter"/>
 			    <xul:treecol anonid="treecol-notiz-bearbeiter" label="Bearbeiter" flex="2" hidden="true" persist="hidden width ordinal"
-					class="sortDirectionIndicator" editable="false"
+					class="sortDirectionIndicator" 
 					sort="rdf:http://www.technikum-wien.at/notiz/rdf#bearbeiter_uid" />
 			    <xul:splitter class="tree-splitter"/>
 			    <xul:treecol anonid="treecol-notiz-start" label="Start" flex="2" hidden="false" persist="hidden width ordinal"
-					class="sortDirectionIndicator" editable="false"
+					class="sortDirectionIndicator" 
 					sort="rdf:http://www.technikum-wien.at/notiz/rdf#startISO" />
 			    <xul:splitter class="tree-splitter"/>
 			    <xul:treecol anonid="treecol-notiz-ende" label="Ende" flex="2" hidden="false" persist="hidden width ordinal"
-					class="sortDirectionIndicator" editable="false"
+					class="sortDirectionIndicator" 
 					sort="rdf:http://www.technikum-wien.at/notiz/rdf#endeISO" />
 			    <xul:splitter class="tree-splitter"/>
 				<xul:treecol anonid="treecol-notiz-erledigt" label="Erledigt" flex="2" hidden="false" persist="hidden width ordinal"
-					class="sortDirectionIndicator" type="checkbox" editable="true"
+					class="sortDirectionIndicator" type="checkbox"
 					sort="rdf:http://www.technikum-wien.at/notiz/rdf#erledigt_boolean" />
 			    <xul:splitter class="tree-splitter"/>
 			    <xul:treecol anonid="treecol-notiz-notiz_id" label="NotizID" flex="2" hidden="true" persist="hidden width ordinal"
-					class="sortDirectionIndicator" editable="false"
+					class="sortDirectionIndicator"
 					sort="rdf:http://www.technikum-wien.at/notiz/rdf#notiz_id" />
 			    <xul:splitter class="tree-splitter"/>
 			    <xul:treecol anonid="treecol-notiz-startISO" label="StartISO" flex="2" hidden="true" persist="hidden width ordinal"
-					class="sortDirectionIndicator" editable="false"
+					class="sortDirectionIndicator"
 					sort="rdf:http://www.technikum-wien.at/notiz/rdf#startISO" />
 			    <xul:splitter class="tree-splitter"/>
 			    <xul:treecol anonid="treecol-notiz-ende" label="EndeISO" flex="2" hidden="true" persist="hidden width ordinal"
-					class="sortDirectionIndicator" editable="false"
+					class="sortDirectionIndicator"
 					sort="rdf:http://www.technikum-wien.at/notiz/rdf#endeISO" />
 			</xul:treecols>
 		
@@ -486,21 +486,28 @@ echo '<?xml version="1.0" encoding="UTF-8" standalone="yes"?>';
 			    
 				var val = tree.view.getCellValue(row.value, col.value);
 				var text = tree.view.getCellText(row.value, col.value);
+				var newval='false';
+				if(val=='true')
+					newval='false';
+				else
+					newval='true';
 				
-				var col = tree.columns.getColumnFor(document.getAnonymousElementByAttribute(this ,'anonid', 'treecol-notiz-notiz_id'));
-				var id = tree.view.getCellText(row.value, col);
+				var col_id = tree.columns.getColumnFor(document.getAnonymousElementByAttribute(this ,'anonid', 'treecol-notiz-notiz_id'));
+				var id = tree.view.getCellText(row.value, col_id);
 				document.getAnonymousElementByAttribute(this ,'anonid', 'toolbarbutton-notiz-del').disabled=false; 
 				
 				if(text=='erledigt')
 				{
 					var soapBody = new SOAPObject("setErledigt");
 				    soapBody.appendChild(new SOAPObject("notiz_id")).val(id);
-				    soapBody.appendChild(new SOAPObject("erledigt")).val(val);
+				    soapBody.appendChild(new SOAPObject("erledigt")).val(newval);
 
 				    var sr = new SOAPRequest("setErledigt",soapBody);
 				    SOAPClient.Proxy="<?php echo APP_ROOT;?>soap/notiz.soap.php?"+gettimestamp();
-				    				    
-				    SOAPClient.SendRequest(sr,function (respObj) {
+				    
+				    function mycallb(obj) {
+					  var me=obj;
+					  this.invoke=function (respObj) {
 					    try
 						{
 							var id = respObj.Body[0].setErledigtResponse[0].message[0].Text;
@@ -511,7 +518,13 @@ echo '<?xml version="1.0" encoding="UTF-8" standalone="yes"?>';
 							alert('Fehler: '+fehler);
 							return;
 						}
-					  });
+						me.RefreshNotiz();
+					  }
+					}
+					
+					var cb=new mycallb(this);
+				
+				    SOAPClient.SendRequest(sr,cb.invoke);
 				}
 			]]>
 			</body>
diff --git a/content/projekt/projekttask.overlay.js.php b/content/projekt/projekttask.overlay.js.php
index ff6256aa3..4e91e7d61 100755
--- a/content/projekt/projekttask.overlay.js.php
+++ b/content/projekt/projekttask.overlay.js.php
@@ -645,11 +645,16 @@ function ProjekttaskUpdateErledigt(event)
 
 	if(text=='erledigt')
 	{
+		if(val=='true')
+			newval='false';
+		else
+			newval='true';
+		
 		var soapBody = new SOAPObject("setErledigt");
 		//soapBody.appendChild(new SOAPObject("username")).val('joe');
 		//soapBody.appendChild(new SOAPObject("passwort")).val('waschl');
 	    soapBody.appendChild(new SOAPObject("projekttask_id")).val(id);
-	    soapBody.appendChild(new SOAPObject("erledigt")).val(val);
+	    soapBody.appendChild(new SOAPObject("erledigt")).val(newval);
 
 	    var sr = new SOAPRequest("setErledigt",soapBody);
 	    SOAPClient.Proxy="<?php echo APP_ROOT;?>soap/projekttask.soap.php?"+gettimestamp();
@@ -659,6 +664,7 @@ function ProjekttaskUpdateErledigt(event)
 	    	try
 			{
 				var id = respObj.Body[0].setErledigtResponse[0].message[0].Text;
+				TaskTreeRefresh();
 			}
 			catch(e)
 			{
diff --git a/content/projekt/projekttask.overlay.xul.php b/content/projekt/projekttask.overlay.xul.php
index 2fc5cc40c..fb4a72571 100755
--- a/content/projekt/projekttask.overlay.xul.php
+++ b/content/projekt/projekttask.overlay.xul.php
@@ -68,7 +68,7 @@ echo '<?xul-overlay href="'.APP_ROOT.'content/projekt/mantisdetail.overlay.xul.p
 				onclick="ProjekttaskUpdateErledigt(event);"
  				persist="height"
  				context="projekttask-tree-popup"
- 				editable="true"
+ 				flags="dont-build-content"
 		>
 			<treecols>
 				<treecol id="projekttask-treecol-bezeichnung" label="Bezeichnung" flex="5" hidden="false" primary="true" persist="hidden, width, ordinal"
@@ -96,7 +96,7 @@ echo '<?xul-overlay href="'.APP_ROOT.'content/projekt/mantisdetail.overlay.xul.p
 					sort="rdf:http://www.technikum-wien.at/projekttask/rdf#mantis_id" />
 				<splitter class="tree-splitter"/>
 				<treecol id="projekttask-treecol-erledigt" label="Erledigt" flex="2" hidden="false" persist="hidden, width, ordinal"
-					class="sortDirectionIndicator" editable="true" type="checkbox"
+					class="sortDirectionIndicator" type="checkbox"
 					sort="rdf:http://www.technikum-wien.at/projekttask/rdf#erledigt" />
 				<splitter class="tree-splitter"/>
 			</treecols>