diff --git a/content/notiz.window.js.php b/content/notiz.window.js.php
index 39ef4ecf2..502a4b32d 100755
--- a/content/notiz.window.js.php
+++ b/content/notiz.window.js.php
@@ -46,15 +46,24 @@ function NotizInit(id)
//RDF parsen
titel = getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#titel" ));
+ text = getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#text" ));
+ start = getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#start" ));
+ ende = getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#ende" ));
}
else
{
//Defaultwerte bei Neuem Datensatz
titel='';
+ text='';
+ start='';
+ ende='';
}
document.getElementById('notiz-textbox-titel').value=titel;
+ document.getElementById('notiz-textbox-text').value=text;
+ document.getElementById('notiz-box-start').value=start;
+ document.getElementById('notiz-box-ende').value=ende;
}
// ****
diff --git a/content/notiz.window.xul.php b/content/notiz.window.xul.php
index 1605ead41..009563f80 100755
--- a/content/notiz.window.xul.php
+++ b/content/notiz.window.xul.php
@@ -31,7 +31,8 @@ echo ''."\n";
echo '';
echo '';
-
+echo '';
+
if(isset($_GET['id']) && is_numeric($_GET['id']))
$id=$_GET['id'];
else
@@ -63,6 +64,18 @@ else
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/content/notiz.xml.php b/content/notiz.xml.php
index 474956d49..a6ca5a6ed 100755
--- a/content/notiz.xml.php
+++ b/content/notiz.xml.php
@@ -47,7 +47,7 @@ echo '';
@@ -104,8 +104,10 @@ echo '';
+
@@ -133,7 +135,7 @@ echo '';
@@ -141,7 +143,7 @@ echo '';
@@ -158,7 +160,7 @@ echo '';
';
datasource = datasource+"&person_id="+encodeURIComponent(person_id);
datasource = datasource+"&prestudent_id="+encodeURIComponent(prestudent_id);
datasource = datasource+"&bestellung_id="+encodeURIComponent(bestellung_id);
-
+ //debug('Source:'+datasource);
var tree = document.getAnonymousElementByAttribute(this ,'anonid', 'tree-notiz');
//Alte DS entfernen
@@ -186,43 +188,41 @@ echo '';
this.TreeNotizDatasource.QueryInterface(Components.interfaces.nsIRDFRemoteDataSource);
this.TreeNotizDatasource.QueryInterface(Components.interfaces.nsIRDFXMLSink);
tree.database.AddDataSource(this.TreeNotizDatasource);
- if(addobserver)
- {
- this.TreeNotizDatasource.addXMLSinkObserver({
- notiz: this,
- onBeginLoad: function(aSink)
- {},
-
- onInterrupt: function(aSink)
- {},
-
- onResume: function(aSink)
- {},
-
- onEndLoad: function(aSink)
- {
- netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-
- //aSink.removeXMLSinkObserver(this);
- debug('onEndLoad start Rebuild');
- var tree = document.getAnonymousElementByAttribute(this.notiz ,'anonid', 'tree-notiz');
- tree.builder.rebuild();
- },
-
- onError: function(aSink, aStatus, aErrorMsg)
- { alert("error! " + aErrorMsg); }
- });
- tree.builder.addListener({
- willRebuild : function(builder)
- {
- },
- didRebuild : function(builder)
- {
- debug("didrebuild");
- //builder.removeListener(this);
- }
- });
- }
+
+ this.TreeNotizDatasource.addXMLSinkObserver({
+ notiz: this,
+ onBeginLoad: function(aSink)
+ {},
+
+ onInterrupt: function(aSink)
+ {},
+
+ onResume: function(aSink)
+ {},
+
+ onEndLoad: function(aSink)
+ {
+ netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+
+ //aSink.removeXMLSinkObserver(this);
+ //debug('onEndLoad start Rebuild');
+ var tree = document.getAnonymousElementByAttribute(this.notiz ,'anonid', 'tree-notiz');
+ tree.builder.rebuild();
+ },
+
+ onError: function(aSink, aStatus, aErrorMsg)
+ { alert("error! " + aErrorMsg); }
+ });
+ tree.builder.addListener({
+ willRebuild : function(builder)
+ {
+ },
+ didRebuild : function(builder)
+ {
+ //debug("didrebuild");
+ //builder.removeListener(this);
+ }
+ });
}
catch(e)
{
@@ -256,7 +256,7 @@ echo '';
this.LoadNotizTree(projekt_kurzbz,projektphase_id,projekttask_id,uid,person_id,prestudent_id,bestellung_id, true);
- debug('Notiz Binding Stop');
+ //debug('Notiz Binding Stop');
diff --git a/content/planner.overlay.js.php b/content/planner.overlay.js.php
index 346479b8c..c2367016a 100755
--- a/content/planner.overlay.js.php
+++ b/content/planner.overlay.js.php
@@ -216,8 +216,20 @@ function treeProjektmenueSelect()
}
else
document.getElementById('toolbarbutton-projektdokument-neu').disabled=true;
-
-
+
+ //Notizen Laden
+ if(projekt_phase_id!='')
+ {
+ //Notizen zu einer Phase Laden
+ notiz = document.getElementById('box-notizen');
+ notiz.LoadNotizTree('',projekt_phase_id,'','','','','', '');
+ }
+ else if(projekt_kurzbz!='')
+ {
+ //Notizen zu einem Projekt Laden
+ notiz = document.getElementById('box-notizen');
+ notiz.LoadNotizTree(projekt_kurzbz,'','','','','','', '');
+ }
if(projekt_kurzbz!='')
{
//Neu Button bei Tasks aktivieren
diff --git a/content/planner.overlay.xul.php b/content/planner.overlay.xul.php
index aef88f9cb..0ab4dd944 100755
--- a/content/planner.overlay.xul.php
+++ b/content/planner.overlay.xul.php
@@ -127,7 +127,7 @@ echo '';
-
+
diff --git a/content/projekt/projektphase.overlay.js.php b/content/projekt/projektphase.overlay.js.php
index ec2503007..099ba61d2 100755
--- a/content/projekt/projektphase.overlay.js.php
+++ b/content/projekt/projektphase.overlay.js.php
@@ -133,6 +133,10 @@ function onselectTreeProjektphase()
document.getElementById('textbox-projektphase-detail-budget').value=budget;
document.getElementById('textbox-projektphase-detail-personentage').value=personentage;
document.getElementById('checkbox-projektphase-detail-neu').checked=false;
+
+ //Notizen zu einer Phase Laden
+ notiz = document.getElementById('box-projektphase-notizen');
+ notiz.LoadNotizTree('',projektphase_id,'','','','','', '');
}
// ****
// * Asynchroner (Nicht blockierender) Refresh des Trees
diff --git a/content/projekt/projektphase.overlay.xul.php b/content/projekt/projektphase.overlay.xul.php
index cda11d607..1622020e6 100755
--- a/content/projekt/projektphase.overlay.xul.php
+++ b/content/projekt/projektphase.overlay.xul.php
@@ -134,10 +134,12 @@ echo '
+
+