diff --git a/content/notiz.xml.php b/content/notiz.xml.php index bdc50ffdc..9682875d3 100755 --- a/content/notiz.xml.php +++ b/content/notiz.xml.php @@ -42,9 +42,9 @@ echo ''; - - - + + + @@ -55,8 +55,8 @@ echo ''; @@ -127,10 +127,80 @@ echo ''; --> + + + + + + try @@ -151,11 +221,149 @@ echo ''; ]]> + + + + + + + + + + + + + + + + + + + + + 0) + bearbeiter_uid = children[0].value; + else + bearbeiter_uid = ''; + } + + var erledigt = document.getAnonymousElementByAttribute(this ,'anonid', 'checkbox-notiz-erledigt').checked; + + var projekt_kurzbz = this.getAttribute('projekt_kurzbz'); + var projektphase_id = this.getAttribute('projektphase_id'); + var projekttask_id = this.getAttribute('projekttask_id'); + var uid = this.getAttribute('uid'); + var person_id = this.getAttribute('person_id'); + var prestudent_id = this.getAttribute('prestudent_id'); + var bestellung_id = this.getAttribute('bestellung_id'); + + var soapBody = new SOAPObject("saveNotiz"); + //soapBody.appendChild(new SOAPObject("username")).val('joe'); + //soapBody.appendChild(new SOAPObject("passwort")).val('waschl'); + + var notiz = new SOAPObject("notiz"); + notiz.appendChild(new SOAPObject("notiz_id")).val(notiz_id); + notiz.appendChild(new SOAPObject("titel")).val(titel); + notiz.appendChild(new SOAPObject("text")).val(text); + notiz.appendChild(new SOAPObject("verfasser_uid")).val(verfasser_uid); + notiz.appendChild(new SOAPObject("bearbeiter_uid")).val(bearbeiter_uid); + notiz.appendChild(new SOAPObject("start")).val(start); + notiz.appendChild(new SOAPObject("ende")).val(ende); + notiz.appendChild(new SOAPObject("erledigt")).val(erledigt); + + notiz.appendChild(new SOAPObject("projekt_kurzbz")).val(projekt_kurzbz); + notiz.appendChild(new SOAPObject("projektphase_id")).val(projektphase_id); + notiz.appendChild(new SOAPObject("projekttask_id")).val(projekttask_id); + notiz.appendChild(new SOAPObject("uid")).val(uid); + notiz.appendChild(new SOAPObject("person_id")).val(person_id); + notiz.appendChild(new SOAPObject("prestudent_id")).val(prestudent_id); + notiz.appendChild(new SOAPObject("bestellung_id")).val(bestellung_id); + soapBody.appendChild(notiz); + + var sr = new SOAPRequest("saveNotiz",soapBody); + + SOAPClient.Proxy="soap/notiz.soap.php?"+gettimestamp(); + + function mycallb(obj) { + var me=obj; + this.invoke=function (respObj) { + try + { + var id = respObj.Body[0].saveNotizResponse[0].message[0].Text; + me.selectID=id; + } + catch(e) + { + try + { + var fehler = respObj.Body[0].Fault[0].faultstring[0].Text; + } + catch(e) + { + var fehler = e; + } + alert('Fehler: '+fehler); + return; + } + me.RefreshNotiz(); + } + } + + var cb=new mycallb(this); + + SOAPClient.SendRequest(sr, cb.invoke); + + ]]> + + @@ -222,11 +430,92 @@ echo ''; if(id!='') { - this.openNotiz(id); + this.DisableDetails(false); + netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect"); + //Daten holen + var url = 'rdf/notiz.rdf.php?notiz_id='+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/notiz/" + id); + + var predicateNS = "http://www.technikum-wien.at/notiz/rdf"; + + //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" )); + 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=='true') + erledigt=true; + else + erledigt=false; + + document.getAnonymousElementByAttribute(this ,'anonid', 'textbox-notiz-notiz_id').value=id; + document.getAnonymousElementByAttribute(this ,'anonid', 'textbox-notiz-titel').value=titel; + document.getAnonymousElementByAttribute(this ,'anonid', 'textbox-notiz-text').value=text; + document.getAnonymousElementByAttribute(this ,'anonid', 'box-notiz-start').value=start; + document.getAnonymousElementByAttribute(this ,'anonid', 'box-notiz-ende').value=ende; + document.getAnonymousElementByAttribute(this ,'anonid', 'textbox-notiz-verfasser').value=verfasser; + document.getAnonymousElementByAttribute(this ,'anonid', 'checkbox-notiz-erledigt').checked=erledigt; + if(bearbeiter!='') + { + menulist = document.getAnonymousElementByAttribute(this ,'anonid', 'menulist-notiz-bearbeiter'); + this.BearbeiterLoad(menulist, bearbeiter); + + var children = menulist.getElementsByAttribute('value',bearbeiter); + menulist.selectedItem=children[0]; + } + document.getAnonymousElementByAttribute(this ,'anonid', 'caption-notiz-detail').label="Bearbeiten"; } ]]> + + + + + 2) + { + var url = 'rdf/mitarbeiter.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(); + } + ]]> + + @@ -244,6 +533,15 @@ echo ''; try { + this.initialsiert=false; + var tree = document.getAnonymousElementByAttribute(this,'anonid', 'tree-notiz'); + if(tree.view) + tree.view.selection.clearSelection(); + this.DisableControls(false); + this.DisableDetails(true); + this.ResetDetails(); + + this.setAttribute('projekt_kurzbz',projekt_kurzbz); this.setAttribute('projektphase_id',projektphase_id); this.setAttribute('projekttask_id',projekttask_id); @@ -330,6 +628,7 @@ echo ''; var tree = document.getAnonymousElementByAttribute(this.notiz ,'anonid', 'tree-notiz'); if(tree.columns) tree.columns.restoreNaturalOrder(); + notiz.selectItem(); } }); @@ -341,6 +640,39 @@ echo ''; ]]> + + + + + @@ -376,6 +708,8 @@ echo ''; + this.DisableControls(true); + this.DisableDetails(true); var projekt_kurzbz = this.getAttribute('projekt_kurzbz'); var projektphase_id = this.getAttribute('projektphase_id'); var projekttask_id = this.getAttribute('projekttask_id'); @@ -389,7 +723,8 @@ echo ''; || uid!='' || person_id!='' || prestudent_id!='' || bestellung_id!='' || user!='') { this.LoadNotizTree(projekt_kurzbz,projektphase_id,projekttask_id,uid,person_id,prestudent_id,bestellung_id, user); - } + } + document.getAnonymousElementByAttribute(this ,'anonid', 'textbox-notiz-verfasser').value=getUsername(); //debug('Notiz Binding Stop'); diff --git a/soap/notiz.soap.php b/soap/notiz.soap.php index 19214b8fd..062d687fe 100755 --- a/soap/notiz.soap.php +++ b/soap/notiz.soap.php @@ -23,6 +23,7 @@ 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"); +session_start(); require_once('../config/vilesci.config.inc.php'); require_once('../include/notiz.class.php'); @@ -39,79 +40,87 @@ $SOAPServer->handle(); // WSDL Chache auf aus ini_set("soap.wsdl_cache_enabled", "0"); +function check_user($username, $passwort) +{ + if($username=='') + { + $user = get_uid(); + if($user=='') + return false; + return $user; + } + else + { + if(!checkldapuser($username,$passwort)) + return false; + else + return $username; + } +} + /** * - * Speichert die vom Webservice übergebenen Parameter in die DB - * @param string $notiz_id - * @param string $titel - * @param string $text - * @param string $verfasser_uid - * @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 - * @param string $uid - * @param string $person_id - * @param string $prestudent_id - * @param string $bestellung_id + * Speichert Notizen in die Datenbank + * + * @param string $username + * @param string $passwort + * @param complextype $notiz */ -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) +function saveNotiz($username, $passwort, $notiz) { - $user = get_uid(); - + if(!$user = check_user($username, $passwort)) + return new SoapFault("Server", "Invalid Credentials"); + $rechte = new benutzerberechtigung(); $rechte->getBerechtigungen($user); if(!$rechte->isBerechtigt('basis/notiz', null, 'sui')) return new SoapFault("Server", "Sie haben keine Berechtigung zum Speichern von Notizen"); - $notiz = new notiz(); - if($notiz_id != '') + $notiz_obj = new notiz(); + if($notiz->notiz_id != '') { - if($notiz->load($notiz_id)) + if($notiz_obj->load($notiz->notiz_id)) { - $notiz->new = false; + $notiz_obj->new = false; } else return new SoapFault("Server", "Fehler beim Laden"); } else { - $notiz->new=true; - $notiz->insertvon = $user; - $notiz->insertamum = date('Y-m-d H:i:s'); + $notiz_obj->new=true; + $notiz_obj->insertvon = $user; + $notiz_obj->insertamum = date('Y-m-d H:i:s'); } - $notiz->titel=$titel; - $notiz->text=$text; - $notiz->verfasser_uid = $verfasser_uid; - $notiz->bearbeiter_uid = $bearbeiter_uid; - $notiz->start = $start; - $notiz->ende = $ende; - $notiz->erledigt=$erledigt; + $notiz_obj->titel=$notiz->titel; + $notiz_obj->text=$notiz->text; + $notiz_obj->verfasser_uid = $notiz->verfasser_uid; + $notiz_obj->bearbeiter_uid = $notiz->bearbeiter_uid; + $notiz_obj->start = $notiz->start; + $notiz_obj->ende = $notiz->ende; + $notiz_obj->erledigt=$notiz->erledigt; - if($notiz->save()) + if($notiz_obj->save()) { - if($notiz->new) + if($notiz_obj->new) { - $notiz->projekt_kurzbz = $projekt_kurzbz; - $notiz->projektphase_id = $projektphase_id; - $notiz->projekttask_id = $projekttask_id; - $notiz->uid = $uid; - $notiz->person_id = $person_id; - $notiz->prestudent_id = $prestudent_id; - $notiz->bestellung_id = $bestellung_id; + $notiz_obj->projekt_kurzbz = $notiz->projekt_kurzbz; + $notiz_obj->projektphase_id = $notiz->projektphase_id; + $notiz_obj->projekttask_id = $notiz->projekttask_id; + $notiz_obj->uid = $notiz->uid; + $notiz_obj->person_id = $notiz->person_id; + $notiz_obj->prestudent_id = $notiz->prestudent_id; + $notiz_obj->bestellung_id = $notiz->bestellung_id; - if(!$notiz->saveZuordnung()) - return new SoapFault("Server", $notiz->errormsg); + if(!$notiz_obj->saveZuordnung()) + return new SoapFault("Server", $notiz_obj->errormsg); } - return $notiz->notiz_id; + return $notiz_obj->notiz_id; } else - return new SoapFault("Server", $notiz->errormsg); + return new SoapFault("Server", $notiz_obj->errormsg); } /** diff --git a/soap/notiz.wsdl.php b/soap/notiz.wsdl.php index e166612a7..daf4970d0 100755 --- a/soap/notiz.wsdl.php +++ b/soap/notiz.wsdl.php @@ -5,35 +5,41 @@ echo ""; ?> - - - - - - - - - - - - - - - + + + - + + + + + + + + + + + + + + + + + + + + + - @@ -68,28 +74,28 @@ xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"> " /> - + - + " /> - + - + " /> - + - + diff --git a/system/FH-Complete.txp b/system/FH-Complete.txp index 1bef14058..ba0d11c4a 100644 --- a/system/FH-Complete.txp +++ b/system/FH-Complete.txp @@ -3266,6 +3266,7 @@ {E1B0D2DB-B129-4CAF-AAA8-68AED0C3CD25} {92C7C73F-6DA9-46EB-867D-1F942EDBD429} {F1011062-F507-4859-9C8E-0EA6DF214535} + {FE526FF6-5293-4905-A790-F5E3196D20C0} 0 0 @@ -8568,6 +8569,81 @@ 0 1 + + {AF03C42F-B011-4775-9BA3-ED9C2D63F2F4} + tbl_ampel + 0 + {47413747-DEDD-42D4-8777-34417BCB64C3} + 0 + {1FF46F2E-2572-4247-86E6-036FD8A9DEBD} + 1 + 0 + 15780518 + 238 + 0 + Arial + 0 + 0 + -28 + 1861 + 10084 + 0 + 305 + 200 + 0 + 1 + 1 + 1 + 0 + + {1A59AE5E-6E8A-4206-BAA4-6BDB21F43D4D} + + 0 + 0 + 2 + 0 + 0 + 0 + 1 + + + {B9DEDF57-70C8-449B-A293-70B3FD6E5423} + tbl_ampel_benutzer + 0 + {BC624EDC-C3D8-435A-9E4F-6EA3903606C9} + 0 + {AE5C8997-821F-42C7-86A7-BD8015270945} + 1 + 0 + 15780518 + 238 + 0 + Arial + 0 + 0 + -28 + 2014 + 10249 + 0 + 461 + 200 + 0 + 1 + 1 + 1 + 0 + + {1A59AE5E-6E8A-4206-BAA4-6BDB21F43D4D} + {FE526FF6-5293-4905-A790-F5E3196D20C0} + + 0 + 0 + 2 + 0 + 0 + 0 + 1 + @@ -8593,15 +8669,15 @@ {AE958387-4CAC-43B9-8DB6-46E368970923} 3068 - 2017 + 2018 2023 - 1911 + 1914 2054 - 1911 + 1914 4082 @@ -9324,15 +9400,15 @@ {50220A2A-BBD0-4DE9-8DE1-B2496ECC6CDA} 4208 - 970 + 969 2023 - 1794 + 1792 2054 - 1794 + 1792 6362 @@ -9367,15 +9443,15 @@ {27D8F6F2-281B-4354-A269-B5112E099830} 3892 - 2700 + 2701 2023 - 1958 + 1959 2054 - 1958 + 1959 5730 @@ -9586,11 +9662,11 @@ 2023 - 1935 + 1937 2054 - 1935 + 1937 5102 @@ -9625,15 +9701,15 @@ {2A9923DB-E256-4D6E-B571-DF1E915D3735} 4037 - 1966 + 1969 2023 - 1876 + 1881 2054 - 1876 + 1881 6020 @@ -9668,15 +9744,15 @@ {8CD50CD1-71FB-4FAC-8C97-E7FB4ACCA17A} 5802 - 2229 + 2231 2023 - 1888 + 1892 2054 - 1888 + 1892 9551 @@ -9754,15 +9830,15 @@ {8CB6E293-D364-4635-99BB-B716BD683617} 6554 - 1174 + 1172 2023 - 1817 + 1814 2054 - 1817 + 1814 11055 @@ -9840,15 +9916,15 @@ {FDA5C62A-FB2F-4276-A629-056A13FE389C} 4414 - 2121 + 2123 2023 - 1899 + 1903 2054 - 1899 + 1903 6775 @@ -9883,15 +9959,15 @@ {6361673E-711F-44A1-B2A2-567CEFE5EACD} 6838 - 1421 + 1419 2023 - 1852 + 1848 2054 - 1852 + 1848 11623 @@ -15184,15 +15260,15 @@ {DA94A477-BEF7-46E1-B584-D5D3B9ACA955} 2495 - 1877 + 1874 2023 - 1864 + 1859 2054 - 1864 + 1859 2936 @@ -15270,7 +15346,7 @@ {50F56A06-2253-4C1B-B89F-1C7F3210F086} 6246 - 1308 + 1307 10469 @@ -15282,11 +15358,11 @@ 2054 - 1829 + 1826 2023 - 1829 + 1826 @@ -21959,15 +22035,15 @@ {5237A702-978B-4895-A700-E85AB4FAD842} 3790 - 1601 + 1599 2023 - 1841 + 1837 2054 - 1841 + 1837 5727 @@ -22260,15 +22336,15 @@ {3BE3FDB1-C3BD-49BF-8EEE-E16D4E577FE1} 2652 - 2038 + 2040 2023 - 1946 + 1948 2054 - 1946 + 1948 3449 @@ -23433,15 +23509,15 @@ {98394113-7DC4-4BFF-BA0E-95FC67C24A1E} 4840 - 2409 + 2410 2023 - 1923 + 1926 2054 - 1923 + 1926 7826 @@ -23476,15 +23552,15 @@ {015B4BEF-0757-4CFB-BAEE-D97CBCEDCE2F} 4057 - 981 + 980 2023 - 1805 + 1803 2054 - 1805 + 1803 6260 @@ -24004,15 +24080,15 @@ {AF996D52-5028-4F30-A83A-5F1CCD1C0B61} 2372 - 1340 + 1339 2023 - 1782 + 1781 2054 - 1782 + 1781 2890 @@ -24982,6 +25058,92 @@ + + {1A59AE5E-6E8A-4206-BAA4-6BDB21F43D4D} + fk_ampel_ampel_benutzer + 0 + {0F64FCFE-9AB2-4F15-AD87-EC8938859E96} + 0 + {E3FC2220-C7ED-49DE-9F5E-7D2589A4FD20} + 1 + 0 + 15780518 + 238 + 0 + Arial + 0 + 0 + -28 + + {AF03C42F-B011-4775-9BA3-ED9C2D63F2F4} + + + {B9DEDF57-70C8-449B-A293-70B3FD6E5423} + + 10127 + 2027 + + + 10236 + 2061 + + + 10236 + 2092 + + + 10218 + 2081 + + + 10249 + 2081 + + + + + {FE526FF6-5293-4905-A790-F5E3196D20C0} + fk_benutzer_ampel_benutzer + 0 + {906F442C-4FBF-4391-87F4-7DF6181117CA} + 0 + {F644BCC8-498F-484C-AF4A-F34DECA37F2C} + 1 + 0 + 15780518 + 238 + 0 + Arial + 0 + 0 + -28 + + {50F56A06-2253-4C1B-B89F-1C7F3210F086} + + + {B9DEDF57-70C8-449B-A293-70B3FD6E5423} + + 6036 + 1948 + + + 2023 + 1870 + + + 2054 + 1870 + + + 10218 + 2147 + + + 10249 + 2147 + + + @@ -25129,8 +25291,8 @@ 0 0 -28 - 1679 - 9789 + 97 + 9544 0 644 200 @@ -25525,8 +25687,8 @@ 0 0 -28 - 1980 - 9778 + 3042 + 9965 0 921 473 @@ -25564,8 +25726,8 @@ 0 0 -28 - 430 - 9990 + 415 + 9796 0 1017 1214 @@ -25894,8 +26056,8 @@ 0 0 -28 - 786 - 8712 + 767 + 8552 0 794 278 @@ -26602,6 +26764,7 @@ {3421DA78-A78B-4D5E-81BF-1F12D75BC5A7} {99704522-73F2-46DE-966E-EFF206DD1A41} {B1C17E11-0CBD-471C-9B9A-FCB45C7D8200} + {6D2DB2DC-B510-4B7D-AA68-B7A83812FEF9} 1 1 @@ -26664,8 +26827,8 @@ 0 0 -28 - 98 - 9879 + 121 + 10254 0 871 200 @@ -26739,8 +26902,8 @@ 0 0 -28 - 44 - 8680 + 32 + 8585 0 843 629 @@ -27104,8 +27267,8 @@ 0 0 -28 - 2662 - 9854 + 3400 + 7474 0 897 551 @@ -27174,8 +27337,8 @@ 0 0 -28 - 2880 - 8634 + 2797 + 8637 0 1092 1331 @@ -27216,8 +27379,8 @@ 0 0 -28 - 3342 - 9904 + 3900 + 9922 0 875 200 @@ -27237,6 +27400,81 @@ 1 1 + + {CCD6268A-35A8-41A4-AAF9-A091D67C536D} + tbl_ampel + 0 + {F2B733BA-E143-48B8-A3E2-961071A5C591} + 0 + {1FF46F2E-2572-4247-86E6-036FD8A9DEBD} + 1 + 0 + 15780518 + 238 + 0 + Arial + 0 + 0 + -28 + 2315 + 9924 + 0 + 801 + 473 + 0 + 1 + 1 + 1 + 1 + + {7B8CE405-BDC0-45F6-A363-B5752C604C68} + + 1 + 1 + 5 + 1 + 1 + 1 + 1 + + + {0CD0899C-7A52-4F35-AC37-1239971710E8} + tbl_ampel_benutzer + 0 + {A75D23A9-DF85-49B6-BF4C-EF5620D5C9C9} + 0 + {AE5C8997-821F-42C7-86A7-BD8015270945} + 1 + 0 + 15780518 + 238 + 0 + Arial + 0 + 0 + -28 + 1878 + 9904 + 0 + 861 + 239 + 0 + 1 + 1 + 1 + 1 + + {7B8CE405-BDC0-45F6-A363-B5752C604C68} + {6D2DB2DC-B510-4B7D-AA68-B7A83812FEF9} + + 1 + 1 + 5 + 1 + 1 + 1 + 1 + @@ -27390,8 +27628,8 @@ {003CB043-E645-44CB-A1E7-B2DAB7CD0513} - 6158 - 957 + 6062 + 949 2271 @@ -27402,12 +27640,12 @@ 1588 - 9959 - 734 + 9765 + 718 - 9990 - 734 + 9796 + 718 @@ -27691,8 +27929,8 @@ {4B8FF0F0-CE9E-4D02-B29F-73FEB38DB1AC} - 9630 - 2360 + 9723 + 2812 9594 @@ -27703,12 +27941,12 @@ 2519 - 9747 - 2295 + 9934 + 3200 - 9778 - 2295 + 9965 + 3200 @@ -28047,8 +28285,8 @@ {4B8FF0F0-CE9E-4D02-B29F-73FEB38DB1AC} - 8564 - 1811 + 8658 + 2420 7375 @@ -28059,12 +28297,12 @@ 1696 - 9747 - 2138 + 9934 + 3357 - 9778 - 2138 + 9965 + 3357 @@ -28348,8 +28586,8 @@ {003CB043-E645-44CB-A1E7-B2DAB7CD0513} - 8435 - 2008 + 8338 + 2001 7386 @@ -28360,12 +28598,12 @@ 2621 - 9959 - 1340 + 9765 + 1326 - 9990 - 1340 + 9796 + 1326 @@ -28692,8 +28930,8 @@ {C9AFAFC7-19FB-4784-A406-4B4CDEABCD21} - 7742 - 1305 + 7695 + 1299 6747 @@ -28704,12 +28942,12 @@ 2267 - 8649 - 463 + 8554 + 451 - 8680 - 463 + 8585 + 451 @@ -28907,8 +29145,8 @@ {6AEE904A-17EB-47A0-B5FD-DEAC6C762AEA} - 8536 - 1021 + 8456 + 1012 8476 @@ -28919,12 +29157,12 @@ 1239 - 8681 - 925 + 8521 + 906 - 8712 - 925 + 8552 + 906 @@ -29521,8 +29759,8 @@ {C9AFAFC7-19FB-4784-A406-4B4CDEABCD21} - 8590 - 145 + 8543 + 139 8513 @@ -29533,12 +29771,12 @@ 158 - 8649 - 254 + 8554 + 242 - 8680 - 254 + 8585 + 242 @@ -29607,24 +29845,24 @@ {3C978BA4-E261-44AB-A8AC-850BFC5A3C3B} - 9685 - 1550 + 9397 + 625 - 9657 - 1444 + 9357 + 1207 - 9688 - 1444 + 9357 + 1176 - 9758 - 1779 + 9513 + 197 - 9789 - 1779 + 9544 + 197 @@ -29736,24 +29974,24 @@ {003CB043-E645-44CB-A1E7-B2DAB7CD0513} - 10369 - 304 + 10460 + 308 - 10314 - 298 + 10690 + 321 - 10314 - 329 + 10690 + 352 - 10498 - 399 + 10304 + 384 - 10498 - 430 + 10304 + 415 @@ -29779,8 +30017,8 @@ {003CB043-E645-44CB-A1E7-B2DAB7CD0513} - 7947 - 2095 + 7850 + 2087 3431 @@ -29791,12 +30029,12 @@ 3150 - 9959 - 1037 + 9765 + 1022 - 9990 - 1037 + 9796 + 1022 @@ -29908,24 +30146,24 @@ {C9AFAFC7-19FB-4784-A406-4B4CDEABCD21} - 9228 - 880 + 9105 + 874 - 9208 + 9058 1207 - 9208 + 9058 1176 - 9102 - 704 + 9006 + 692 - 9102 - 673 + 9006 + 661 @@ -30510,16 +30748,16 @@ {CF52EB80-BE30-40A3-980C-8F262A0A0484} - 9861 - 1801 + 9764 + 1794 - 10329 - 1644 + 10135 + 1629 - 10329 - 1675 + 10135 + 1660 9593 @@ -30553,24 +30791,24 @@ {4B8FF0F0-CE9E-4D02-B29F-73FEB38DB1AC} - 10353 - 1752 + 10350 + 2276 - 10668 - 1644 + 10474 + 1629 - 10668 - 1675 + 10474 + 1660 - 10238 - 1949 + 10426 + 3011 - 10238 - 1980 + 10426 + 3042 @@ -30596,8 +30834,8 @@ {DBBBEEE5-BBA2-48F5-9350-350BBFF93EC5} - 7910 - 2882 + 7911 + 2840 7386 @@ -30608,12 +30846,12 @@ 2782 - 8603 - 3102 + 8606 + 3019 - 8634 - 3102 + 8637 + 3019 @@ -30639,24 +30877,24 @@ {1F6B4A81-9A0B-48B3-84B2-91248263F8C0} - 9715 - 3434 + 9726 + 3671 - 9726 - 3546 + 9729 + 3462 - 9757 - 3546 + 9760 + 3462 - 9873 - 3442 + 9891 + 4000 - 9904 - 3442 + 9922 + 4000 @@ -30682,8 +30920,8 @@ {DBBBEEE5-BBA2-48F5-9350-350BBFF93EC5} - 5303 - 3513 + 5304 + 3360 2172 @@ -30694,12 +30932,12 @@ 3157 - 8603 - 3989 + 8606 + 3684 - 8634 - 3989 + 8637 + 3684 @@ -30725,8 +30963,8 @@ {DBBBEEE5-BBA2-48F5-9350-350BBFF93EC5} - 7910 - 3155 + 7911 + 3113 7386 @@ -30737,12 +30975,12 @@ 3106 - 8603 - 3324 + 8606 + 3241 - 8634 - 3324 + 8637 + 3241 @@ -30768,8 +31006,8 @@ {DBBBEEE5-BBA2-48F5-9350-350BBFF93EC5} - 7910 - 3347 + 7911 + 3304 7386 @@ -30780,12 +31018,12 @@ 3267 - 8603 - 3546 + 8606 + 3462 - 8634 - 3546 + 8637 + 3462 @@ -30811,8 +31049,8 @@ {DBBBEEE5-BBA2-48F5-9350-350BBFF93EC5} - 7910 - 3537 + 7911 + 3607 7386 @@ -30823,12 +31061,98 @@ 3428 - 8603 - 3767 + 8606 + 3906 - 8634 - 3767 + 8637 + 3906 + + + + + {7B8CE405-BDC0-45F6-A363-B5752C604C68} + fk_ampel_ampel_benutzer + 0 + {AA1A4157-8BE2-45C5-B5B8-7D43EB826C5F} + 0 + {E3FC2220-C7ED-49DE-9F5E-7D2589A4FD20} + 1 + 0 + 15780518 + 238 + 0 + Arial + 0 + 0 + -28 + + {CCD6268A-35A8-41A4-AAF9-A091D67C536D} + + + {0CD0899C-7A52-4F35-AC37-1239971710E8} + + 10229 + 2156 + + + 10324 + 2315 + + + 10324 + 2284 + + + 10334 + 2148 + + + 10334 + 2117 + + + + + {6D2DB2DC-B510-4B7D-AA68-B7A83812FEF9} + fk_benutzer_ampel_benutzer + 0 + {8E353C50-1324-41BD-8399-A0D9D6F0E85D} + 0 + {F644BCC8-498F-484C-AF4A-F34DECA37F2C} + 1 + 0 + 15780518 + 238 + 0 + Arial + 0 + 0 + -28 + + {CA4F7EAC-55C4-480E-B7C9-180DB66AC5B0} + + + {0CD0899C-7A52-4F35-AC37-1239971710E8} + + 9680 + 1661 + + + 9657 + 1444 + + + 9688 + 1444 + + + 9873 + 1998 + + + 9904 + 1998 @@ -44709,6 +45033,7 @@ {980B0C1C-28D6-4B4E-84FB-BCB4F33A3490} {BABA7152-7013-4B27-8327-CE022E2A5297} {3F70B3B5-44FA-4C8D-B707-79E3DB8CA863} + {CB79BCE5-2A7D-4A17-A9DE-4E5DB0DD4A14} 1 1 @@ -44982,6 +45307,81 @@ 1 1 + + {DD6AF838-2B76-40C8-A2A6-5B253B157C25} + tbl_ampel + 0 + {702A08BF-634C-443D-8D0D-F86E00CFC8C3} + 0 + {1FF46F2E-2572-4247-86E6-036FD8A9DEBD} + 1 + 0 + 15780518 + 238 + 0 + Arial + 0 + 0 + -28 + 1861 + 10084 + 0 + 200 + 300 + 0 + 1 + 1 + 1 + 0 + + {83484ADE-6B40-490C-90EE-E08E37812569} + + 1 + 1 + 5 + 1 + 0 + 1 + 1 + + + {83E5A90A-BEBA-4E65-BEFE-A3D6A4DF0A5D} + tbl_ampel_benutzer + 0 + {2F59D7A8-75B3-475D-BE20-CD666048D8F0} + 0 + {AE5C8997-821F-42C7-86A7-BD8015270945} + 1 + 0 + 15780518 + 238 + 0 + Arial + 0 + 0 + -28 + 2014 + 10249 + 0 + 200 + 300 + 0 + 1 + 1 + 1 + 0 + + {83484ADE-6B40-490C-90EE-E08E37812569} + {CB79BCE5-2A7D-4A17-A9DE-4E5DB0DD4A14} + + 1 + 1 + 5 + 1 + 0 + 1 + 1 + @@ -45741,6 +46141,58 @@ 0 + + {83484ADE-6B40-490C-90EE-E08E37812569} + fk_ampel_ampel_benutzer + 0 + {53EDEAFC-6C0C-480A-8766-B3F48B40FC81} + 0 + {E3FC2220-C7ED-49DE-9F5E-7D2589A4FD20} + 1 + 0 + 15780518 + 238 + 0 + Arial + 0 + 0 + -28 + + {DD6AF838-2B76-40C8-A2A6-5B253B157C25} + + + {83E5A90A-BEBA-4E65-BEFE-A3D6A4DF0A5D} + + 0 + 0 + + + + {CB79BCE5-2A7D-4A17-A9DE-4E5DB0DD4A14} + fk_benutzer_ampel_benutzer + 0 + {5528233B-9692-4021-AF09-1D4871FFD98D} + 0 + {F644BCC8-498F-484C-AF4A-F34DECA37F2C} + 1 + 0 + 15780518 + 238 + 0 + Arial + 0 + 0 + -28 + + {950941FE-7219-4043-82FD-8E6AE76BD8A7} + + + {83E5A90A-BEBA-4E65-BEFE-A3D6A4DF0A5D} + + 0 + 0 + + @@ -45869,7 +46321,7 @@ Technikum Wien 2.0 2009-04-17T11:15:21.000+02:00 - 2011-10-05T14:54:06.714+02:00 + 2011-10-07T09:56:00.301+02:00 FH-Complete 2.0 <?xml-stylesheet type="text/xsl" href="FHCompleteTDM3PG83.xsl"?> @@ -46195,6 +46647,8 @@ {250AC43A-829A-467D-887D-9DEA18DD2960} {7898E917-C4F6-461E-A80F-EF59AE791E77} {2C676078-7D63-4EB7-B874-2205FCB25C45} + {1FF46F2E-2572-4247-86E6-036FD8A9DEBD} + {AE5C8997-821F-42C7-86A7-BD8015270945} 0 0 @@ -85704,6 +86158,7 @@ Studiengang>0 und Semester>0 -> News fuer bestimmtes Semester im Studie {99F4E4B3-E197-45EF-AFEE-C893735FE3F4} {C46E22BE-5FD0-4630-BD19-988C9AFDCF28} {3D35A973-7B7D-4DD5-9870-9F5F562D8130} + {F644BCC8-498F-484C-AF4A-F34DECA37F2C} @@ -85760,6 +86215,7 @@ Studiengang>0 und Semester>0 -> News fuer bestimmtes Semester im Studie {AE607AF0-799A-4AFE-8B4D-157A783182D8} {06829AC1-DD34-4898-BA1B-F43A476D7BB4} {F6581D94-8798-4820-B6B8-030D7E887D9B} + {B024C552-940F-4557-A6E9-ADE710D423E9} @@ -86248,6 +86704,7 @@ Studiengang>0 und Semester>0 -> News fuer bestimmtes Semester im Studie {AE607AF0-799A-4AFE-8B4D-157A783182D8} {06829AC1-DD34-4898-BA1B-F43A476D7BB4} {F6581D94-8798-4820-B6B8-030D7E887D9B} + {B024C552-940F-4557-A6E9-ADE710D423E9} @@ -86277,6 +86734,7 @@ Studiengang>0 und Semester>0 -> News fuer bestimmtes Semester im Studie {99F4E4B3-E197-45EF-AFEE-C893735FE3F4} {C46E22BE-5FD0-4630-BD19-988C9AFDCF28} {3D35A973-7B7D-4DD5-9870-9F5F562D8130} + {F644BCC8-498F-484C-AF4A-F34DECA37F2C} @@ -141492,6 +141950,843 @@ Wenn FALSE haengt die Anzahl der Fragen pro Level von der Gesamtzahl pro Level a + + {1FF46F2E-2572-4247-86E6-036FD8A9DEBD} + tbl_ampel + 0 + {000C72C6-701D-4163-BAF3-7A06A6221E0E} + 0 + 0 + 0 + 0 + 1 + + + + + tbl_ampel + 0 + + {E3FC2220-C7ED-49DE-9F5E-7D2589A4FD20} + + + + {208CAE3D-DBAD-42AA-A287-E95279560916} + ampel_id + 1 + {2E6C1690-CCD7-43E0-BD6E-69D1A1C1A98B} + 0 + 0 + 0 + 0 + 1 + + + + + + + 0 + + 1 + 0 + ampel_id + 0 + + + + + {372349BB-6EDE-471D-BFA6-72F7B22B7EE8} + + + {705AC408-0313-4B46-B431-2E3F626D1F9C} + + + + + + {5F0FB0CB-62A1-4BDC-A4DA-882CACFC296A} + + + + + + + + 0 + + + {4FF55BF4-80F0-4EA5-853D-10C6E2196902} + kurzbz + 2 + {A18F5644-C550-4006-BFA4-0C1C69EC08AC} + 0 + 0 + 0 + 0 + 1 + + + + + 64 + + 0 + + 0 + 0 + kurzbz + 0 + + + + + + + + + + {ECB8F02F-B683-4252-8508-ED9D064C9AF3} + + + + + + + + 0 + + + {80B9D986-981E-42E8-A04C-9D47377C9A34} + beschreibung + 3 + {C4009BE1-EBC8-4DEC-9657-E3877F409670} + 0 + 0 + 0 + 0 + 1 + + + + + + + 0 + + 0 + 0 + beschreibung + 0 + + + + + + + + + + {8D91E2A4-12F5-40E3-BAC2-BFCF7BE1C8B7} + + + + + + + + 0 + + + {1E566162-84D1-4B7C-B5B6-6A6907D7F7F5} + benutzer_select + 4 + {8C86AA58-922B-45FD-8CE6-AD9A5A83CB43} + 0 + 0 + 0 + 0 + 1 + + + + + + + 0 + + 1 + 0 + benutzer_select + 0 + + + + + + + + + + {8D91E2A4-12F5-40E3-BAC2-BFCF7BE1C8B7} + + + + + + + + 0 + + + {DC3A5953-AC9B-4252-9140-48E056BF22FE} + deadline + 5 + {A1D907CF-7588-447B-AF7E-6F6FCB720B3D} + 0 + 0 + 0 + 0 + 1 + + + + + + + 0 + + 1 + 0 + deadline + 0 + + + + + + + + + + {5EBD99F4-5263-4410-9892-11DB7C2DF84B} + + + + + + + + 0 + + + {EAD5ADE5-5EEB-4598-9583-7CC061A2DAA3} + vorlaufzeit + 6 + {1469E8CC-0866-4C1C-B449-1A1370CF24C0} + 0 + 0 + 0 + 0 + 1 + + + + in Tagen + + + 0 + + 1 + 0 + vorlaufzeit + 0 + + + + + + + + + + {3AA5E900-D254-4FBD-AD67-AD230407284C} + + + + + + + + 0 + + + {E8B72A37-1826-4B2E-9C94-D83840AE5BFC} + verfallszeit + 7 + {3E79103A-4E39-4030-A7AE-897851331F6A} + 0 + 0 + 0 + 0 + 1 + + + + in Tagen + + + 0 + + 1 + 0 + verfallszeit + 0 + + + + + + + + + + {3AA5E900-D254-4FBD-AD67-AD230407284C} + + + + + + + + 0 + + + {26A4F7B6-8002-4715-82EE-6CACB8D3D446} + insertamum + 8 + {F0B90ED1-85DF-4D4F-AB3F-431B8EC5858A} + 0 + 0 + 0 + 0 + 1 + + + + + + + 0 + + 0 + 0 + insertamum + 0 + + + + + + + + + + {342E3F36-138D-40F7-B1B2-D9489C848835} + + + + + + + + 0 + + + {07BFBDFD-F47D-41BE-9162-9F636E7F8173} + insertvon + 9 + {EA995EE6-06D9-4CB1-909F-D303CFF9C61F} + 0 + 0 + 0 + 0 + 1 + + + + + 32 + + 0 + + 0 + 0 + insertvon + 0 + + + + + + + + + + {ECB8F02F-B683-4252-8508-ED9D064C9AF3} + + + + + + + + 0 + + + {E26F7FA5-6387-4A61-8D4D-00253AEA9F75} + updateamum + 10 + {1BF3DACF-52DE-444F-84D8-0216324B3396} + 0 + 0 + 0 + 0 + 1 + + + + + + + 0 + + 0 + 0 + updateamum + 0 + + + + + + + + + + {342E3F36-138D-40F7-B1B2-D9489C848835} + + + + + + + + 0 + + + {27DE1D4F-AE3B-4430-8267-32FF1958F878} + updatevon + 11 + {011D29BB-189E-4B38-A8DD-D0C59C366203} + 0 + 0 + 0 + 0 + 1 + + + + + 32 + + 0 + + 0 + 0 + updatevon + 0 + + + + + + + + + + {ECB8F02F-B683-4252-8508-ED9D064C9AF3} + + + + + + + + 0 + + + + + {DCCCF790-2105-4A35-B52E-9DB6338E98F2} + Key41 + 0 + {22A4A348-DDD8-46F6-8995-0DF579B2A54D} + 0 + 0 + 0 + 0 + 1 + + + + + Key41 + + + {372349BB-6EDE-471D-BFA6-72F7B22B7EE8} + ampel_id + 0 + {713CB637-5A9F-4B4E-8E6F-A4D32CC23D6B} + 0 + 1 + + + + + 0 + + {208CAE3D-DBAD-42AA-A287-E95279560916} + + + {705AC408-0313-4B46-B431-2E3F626D1F9C} + + + + + {E3FC2220-C7ED-49DE-9F5E-7D2589A4FD20} + + + + + + + + {DCCCF790-2105-4A35-B52E-9DB6338E98F2} + + + + + + + + + {2DF1C1D4-044F-4F45-BF9D-A4E740C9639E} + + + 0 + + 0 + + + + + + + {AE5C8997-821F-42C7-86A7-BD8015270945} + tbl_ampel_benutzer + 0 + {7F1E29A1-9E7C-419D-88F4-07B135C25880} + 0 + 0 + 0 + 0 + 1 + + + + + tbl_ampel_benutzer + 0 + + {E3FC2220-C7ED-49DE-9F5E-7D2589A4FD20} + {F644BCC8-498F-484C-AF4A-F34DECA37F2C} + + + + {4716794B-43AF-4085-BED8-54F00F7AD07E} + ampel_benutzer_id + 1 + {2AE40F8A-87D0-4EAD-B7B7-00D6E7C239CE} + 0 + 0 + 0 + 0 + 1 + + + + + + + 0 + + 1 + 0 + ampel_benutzer_id + 0 + + + + + {70CF5C5E-D0E6-4E5F-8D36-CBF3F253DB99} + + + + + + + {5F0FB0CB-62A1-4BDC-A4DA-882CACFC296A} + + + + + + + + 0 + + + {C91ED266-D01A-4A3E-826D-A0481BB31E2C} + ampel_id + 2 + {EB39A765-58F5-4908-9E57-35AE6FDD611B} + 0 + 0 + 0 + 0 + 1 + + + + + + + 0 + + 0 + 1 + ampel_id + 0 + + + + + + + {705AC408-0313-4B46-B431-2E3F626D1F9C} + + + + + {361EF147-269D-4247-8F7C-5A3876A3999A} + + + + + + + + 0 + + + {C36CECE1-8C65-493A-86D4-8128EA7BDE62} + uid + 3 + {89E0A91B-AA28-4CAF-8E46-92EDBBEAC7ED} + 0 + 0 + 0 + 0 + 1 + + + + + 32 + + 0 + + 0 + 1 + uid + 0 + + + + + + + {B024C552-940F-4557-A6E9-ADE710D423E9} + + + + + {ECB8F02F-B683-4252-8508-ED9D064C9AF3} + + + + + + + + 0 + + + {9C415156-244D-4C71-AFD8-0EC5AF8A5181} + insertamum + 4 + {C298FE0E-8A54-4415-A642-576A229545BA} + 0 + 0 + 0 + 0 + 1 + + + + + + + 0 + + 0 + 0 + insertamum + 0 + + + + + + + + + + {342E3F36-138D-40F7-B1B2-D9489C848835} + + + + + + + + 0 + + + {D7C6791C-BBC9-4054-8544-AB1D1AA374D3} + insertvon + 5 + {B799EF8A-979D-432C-911C-278B62FD7BAF} + 0 + 0 + 0 + 0 + 1 + + + + + 32 + + 0 + + 0 + 0 + insertvon + 0 + + + + + + + + + + {ECB8F02F-B683-4252-8508-ED9D064C9AF3} + + + + + + + + 0 + + + + + {490A157F-744C-4BBD-B21C-F7229AD380FF} + Key42 + 0 + {13F3947E-A75D-4E5F-8B56-1B832F6E048D} + 0 + 0 + 0 + 0 + 1 + + + + + Key42 + + + {70CF5C5E-D0E6-4E5F-8D36-CBF3F253DB99} + ampel_benutzer_id + 0 + {A2B344FC-F1BF-4C9A-BE0E-295DEFC4498D} + 0 + 1 + + + + + 0 + + {4716794B-43AF-4085-BED8-54F00F7AD07E} + + + + + + + + + + + + {490A157F-744C-4BBD-B21C-F7229AD380FF} + + + + + + + + + {2DF1C1D4-044F-4F45-BF9D-A4E740C9639E} + + + 0 + + 0 + + + + + @@ -163956,6 +165251,122 @@ Wenn FALSE haengt die Anzahl der Fragen pro Level von der Gesamtzahl pro Level a SIMPLE 1 + + {E3FC2220-C7ED-49DE-9F5E-7D2589A4FD20} + fk_ampel_ampel_benutzer + 0 + {DBC6B468-2DD6-4E02-A563-3BC4126F6BB8} + 0 + + {1FF46F2E-2572-4247-86E6-036FD8A9DEBD} + + + {AE5C8997-821F-42C7-86A7-BD8015270945} + + 1 + + + 0 + 0 + 0 + -1 + + fk_ampel_ampel_benutzer + + 0 + 0 + 0 + 0 + + {DCCCF790-2105-4A35-B52E-9DB6338E98F2} + + + + {705AC408-0313-4B46-B431-2E3F626D1F9C} + FK ampel_id - ampel_id + 0 + {D237C552-55B2-422B-9D3F-70B4E00711D5} + 0 + 1 + + + + + + {208CAE3D-DBAD-42AA-A287-E95279560916} + + + {C91ED266-D01A-4A3E-826D-A0481BB31E2C} + + + {372349BB-6EDE-471D-BFA6-72F7B22B7EE8} + + + + + 0 + 0 + SIMPLE + 1 + + + {F644BCC8-498F-484C-AF4A-F34DECA37F2C} + fk_benutzer_ampel_benutzer + 0 + {A38E2BF8-70FC-4F18-B497-3D2AA1475434} + 0 + + {20863D57-4A76-4276-B1E9-1FF7E0B4C0BB} + + + {AE5C8997-821F-42C7-86A7-BD8015270945} + + 1 + + + 0 + 0 + 0 + -1 + + fk_benutzer_ampel_benutzer + + 0 + 0 + 0 + 0 + + {70EE0BEF-C69B-4791-AEBC-2767B8F1CFB3} + + + + {B024C552-940F-4557-A6E9-ADE710D423E9} + FK uid - uid + 0 + {B74FEC20-271D-40EA-859C-C30204AA6532} + 0 + 1 + + + + + + {FB409F67-7476-4E1F-88C7-F3E6BC9BE1C3} + + + {C36CECE1-8C65-493A-86D4-8128EA7BDE62} + + + {AA8ACCF4-983D-47F3-B631-844DA7380947} + + + + + 0 + 0 + SIMPLE + 1 + @@ -197334,6 +198745,8 @@ SELECT tbl_pruefling.prestudent_id, tbl_pruefling.pruefling_id, tbl_pruefling.st {4E1FB00A-4CD2-444B-BDE2-CE04524C814B} {6F3569D0-1CFD-4A54-89FF-9797AE4D69F2} {05A1EAFF-8F3D-4A63-8510-6A12537A3C17} + {1FF46F2E-2572-4247-86E6-036FD8A9DEBD} + {AE5C8997-821F-42C7-86A7-BD8015270945} {B0AA6162-F612-46E0-B58F-64E0CFE8C816}