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 = '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 = '
+
+
+
+
+
+
+
+
+
+
+
+
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 '';
';
//debug('Notiz Binding Stop');
-
-
- this.openNotiz(this.value);
-
-
+
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 '
-
+