mirror of
https://github.com/FH-Complete/FHC-Core.git
synced 2026-06-01 20:29:29 +00:00
Trees sind jetzt sortierbar
This commit is contained in:
+18
-14
@@ -99,24 +99,28 @@ if(!$error)
|
||||
//Wenn die Nation Oesterreich ist, dann muss die Gemeinde in der Tabelle Gemeinde vorkommen
|
||||
if($_POST['nation']=='A')
|
||||
{
|
||||
$qry = "SELECT * FROM bis.tbl_gemeinde WHERE name='".addslashes($_POST['gemeinde'])."'";
|
||||
$qry = "SELECT * FROM bis.tbl_gemeinde WHERE lower(name)=lower('".addslashes($_POST['gemeinde'])."')";
|
||||
if($result = pg_query($conn, $qry))
|
||||
{
|
||||
if(pg_num_rows($result)==0)
|
||||
if($row = pg_fetch_object($result))
|
||||
{
|
||||
$adresse->gemeinde = $row->name;
|
||||
}
|
||||
else
|
||||
{
|
||||
$error = true;
|
||||
$errormsg = 'Gemeinde ist ungueltig';
|
||||
$return = false;
|
||||
}
|
||||
}
|
||||
else
|
||||
else
|
||||
{
|
||||
$error = true;
|
||||
$errormsg = 'Fehler beim Ermitteln der Gemeinde';
|
||||
$return = false;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
if(!$error)
|
||||
{
|
||||
if($adresse->save())
|
||||
@@ -124,7 +128,7 @@ if(!$error)
|
||||
$return = true;
|
||||
$data = $adresse->adresse_id;
|
||||
}
|
||||
else
|
||||
else
|
||||
{
|
||||
$return = false;
|
||||
$errormsg = $adresse->errormsg;
|
||||
@@ -135,12 +139,12 @@ if(!$error)
|
||||
{
|
||||
//Loescht Adressen aus der DB
|
||||
$adresse = new adresse($conn, null, true);
|
||||
|
||||
|
||||
if($adresse->delete($_POST['adresse_id']))
|
||||
{
|
||||
$return = true;
|
||||
}
|
||||
else
|
||||
else
|
||||
{
|
||||
$return = false;
|
||||
$errormsg = $adresse->errormsg;
|
||||
@@ -150,19 +154,19 @@ if(!$error)
|
||||
{
|
||||
//Speichert die Kontaktdaten in die Datenbank
|
||||
$kontakt = new kontakt($conn, null, true);
|
||||
|
||||
|
||||
if($_POST['neu']=='false')
|
||||
{
|
||||
$kontakt->load($_POST['kontakt_id']);
|
||||
$kontakt->new = false;
|
||||
}
|
||||
else
|
||||
else
|
||||
{
|
||||
$kontakt->insertamum = date('Y-m-d H:i:s');
|
||||
$kontakt->insertvon = $user;
|
||||
$kontakt->new = true;
|
||||
}
|
||||
|
||||
|
||||
$kontakt->kontakt_id = $_POST['kontakt_id'];
|
||||
$kontakt->person_id = $_POST['person_id'];
|
||||
$kontakt->anmerkung = $_POST['anmerkung'];
|
||||
@@ -172,13 +176,13 @@ if(!$error)
|
||||
$kontakt->firma_id = $_POST['firma_id'];
|
||||
$kontakt->updateamum = date('Y-m-d H:i:s');
|
||||
$kontakt->updatevon = $user;
|
||||
|
||||
|
||||
if($kontakt->save())
|
||||
{
|
||||
$return = true;
|
||||
$data = $kontakt->kontakt_id;
|
||||
}
|
||||
else
|
||||
else
|
||||
{
|
||||
$return = false;
|
||||
$errormsg = $kontakt->errormsg;
|
||||
@@ -188,7 +192,7 @@ if(!$error)
|
||||
{
|
||||
//Loescht Kontaktdaten aus der Datenbank
|
||||
$kontakt = new kontakt($conn, null, true);
|
||||
|
||||
|
||||
if($kontakt->delete($_POST['kontakt_id']))
|
||||
{
|
||||
$return = true;
|
||||
|
||||
@@ -46,7 +46,7 @@ echo '<?xul-overlay href="'.APP_ROOT.'content/lvplanung/lehrveranstaltungdetailo
|
||||
<!-- ************************ -->
|
||||
<vbox id="LehrveranstaltungEditor" flex="1" uid="" stg_kz="">
|
||||
<toolbox>
|
||||
<toolbar id="nav-toolbar">
|
||||
<toolbar id="lehrveranstaltung-nav-toolbar">
|
||||
<toolbarbutton id="lehrveranstaltung-toolbar-neu" label="Neue Lehreinheit" oncommand="LeNeu();" disabled="true" image="../skin/images/NeuDokument.png" tooltiptext="Neue Lehreinheit anlegen" />
|
||||
<toolbarbutton id="lehrveranstaltung-toolbar-del" label="Löschen" oncommand="LeDelete();" disabled="true" image="../skin/images/DeleteIcon.png" tooltiptext="Lehreinheiten löschen"/>
|
||||
<toolbarbutton id="lehrveranstaltung-toolbar-refresh" label="Aktualisieren" oncommand="LvTreeRefresh()" disabled="false" image="../skin/images/refresh.png" tooltiptext="Liste neu laden"/>
|
||||
@@ -65,6 +65,7 @@ echo '<?xul-overlay href="'.APP_ROOT.'content/lvplanung/lehrveranstaltungdetailo
|
||||
onselect="LeAuswahl(this);"
|
||||
persist="height"
|
||||
onkeypress="LvTreeKeyPress(event)"
|
||||
flags="dont-build-content"
|
||||
>
|
||||
<treecols>
|
||||
<treecol id="lehrveranstaltung-treecol-kurzbz" label="Kurzbz" flex="2" hidden="false" primary="true"
|
||||
|
||||
@@ -389,6 +389,7 @@ echo '<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>';
|
||||
<tree id="interessent-prestudent-tree-rolle" seltype="single" hidecolumnpicker="false" flex="1"
|
||||
datasources="rdf:null" ref="http://www.technikum-wien.at/prestudentrolle/liste"
|
||||
style="margin-left:10px;margin-right:10px;margin-bottom:5px;" height="100px" enableColumnDrag="true"
|
||||
flags="dont-build-content"
|
||||
>
|
||||
<treecols>
|
||||
<treecol id="interessent-prestudent-tree-rolle-rolle_kurzbz" label="Kurzbz" flex="2" hidden="false" primary="true"
|
||||
|
||||
@@ -48,7 +48,7 @@ echo '<?xul-overlay href="'.APP_ROOT.'content/student/interessentkontooverlay.xu
|
||||
<vbox id="InteressentenEditor" persist="height">
|
||||
<hbox>
|
||||
<toolbox flex="1">
|
||||
<toolbar id="nav-toolbar">
|
||||
<toolbar id="interessent-nav-toolbar">
|
||||
<toolbarbutton id="interessent-toolbar-neu" label="Neu" oncommand="InteressentNeu()" disabled="false" image="../skin/images/NeuDokument.png" tooltiptext="Interessent neu anlegen" />
|
||||
<toolbarbutton id="interessent-toolbar-zubewerber" label="-> Bewerber" oncommand="InteressentzuBewerber()" disabled="false" tooltiptext="Interessent zum Bewerber machen" />
|
||||
<toolbarbutton id="interessent-toolbar-zustudent" label="-> Student" oncommand="InteressentzuStudent()" disabled="false" tooltiptext="Bewerber zu Studenten machen" />
|
||||
|
||||
@@ -62,6 +62,7 @@ echo '<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>';
|
||||
style="margin-left:10px;margin-right:10px;margin-bottom:5px;margin-top: 10px;" height="100px" enableColumnDrag="true"
|
||||
onselect="InteressentKontoAuswahl()"
|
||||
context="interessent-konto-tree-popup"
|
||||
flags="dont-build-content"
|
||||
>
|
||||
|
||||
<treecols>
|
||||
|
||||
@@ -54,6 +54,7 @@ echo '<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>';
|
||||
style="margin-left:10px;margin-right:10px;margin-bottom:5px;margin-top: 10px;" height="100px" enableColumnDrag="true"
|
||||
onselect="StudentBetriebsmittelAuswahl()"
|
||||
context="student-betriebsmittel-tree-popup"
|
||||
flags="dont-build-content"
|
||||
>
|
||||
|
||||
<treecols>
|
||||
|
||||
@@ -432,6 +432,7 @@ echo '<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>';
|
||||
<tree id="student-prestudent-tree-rolle" seltype="single" hidecolumnpicker="false" flex="1"
|
||||
datasources="rdf:null" ref="http://www.technikum-wien.at/prestudentrolle/liste"
|
||||
style="margin-left:10px;margin-right:10px;margin-bottom:5px;" height="100px" enableColumnDrag="true"
|
||||
flags="dont-build-content"
|
||||
>
|
||||
<treecols>
|
||||
<treecol id="student-prestudent-tree-rolle-rolle_kurzbz" label="Kurzbz" flex="2" hidden="false" primary="true"
|
||||
@@ -453,16 +454,18 @@ echo '<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>';
|
||||
</treecols>
|
||||
|
||||
<template>
|
||||
<treechildren flex="1" >
|
||||
<treeitem uri="rdf:*">
|
||||
<treerow>
|
||||
<treecell label="rdf:http://www.technikum-wien.at/prestudentrolle/rdf#rolle_kurzbz"/>
|
||||
<treecell label="rdf:http://www.technikum-wien.at/prestudentrolle/rdf#studiensemester_kurzbz"/>
|
||||
<treecell label="rdf:http://www.technikum-wien.at/prestudentrolle/rdf#ausbildungssemester"/>
|
||||
<treecell label="rdf:http://www.technikum-wien.at/prestudentrolle/rdf#datum"/>
|
||||
</treerow>
|
||||
</treeitem>
|
||||
</treechildren>
|
||||
<rule>
|
||||
<treechildren flex="1" >
|
||||
<treeitem uri="rdf:*">
|
||||
<treerow>
|
||||
<treecell label="rdf:http://www.technikum-wien.at/prestudentrolle/rdf#rolle_kurzbz"/>
|
||||
<treecell label="rdf:http://www.technikum-wien.at/prestudentrolle/rdf#studiensemester_kurzbz"/>
|
||||
<treecell label="rdf:http://www.technikum-wien.at/prestudentrolle/rdf#ausbildungssemester"/>
|
||||
<treecell label="rdf:http://www.technikum-wien.at/prestudentrolle/rdf#datum"/>
|
||||
</treerow>
|
||||
</treeitem>
|
||||
</treechildren>
|
||||
</rule>
|
||||
</template>
|
||||
</tree>
|
||||
</groupbox>
|
||||
|
||||
@@ -56,7 +56,7 @@ echo '<?xul-overlay href="'.APP_ROOT.'content/student/studentnotenoverlay.xul.ph
|
||||
</popupset>
|
||||
<hbox>
|
||||
<toolbox flex="1">
|
||||
<toolbar id="nav-toolbar">
|
||||
<toolbar id="student-nav-toolbar">
|
||||
<!--<toolbarbutton id="student-toolbar-neu" label="Neuer Student" oncommand="StudentNeu();" disabled="true" image="../skin/images/NeuDokument.png" tooltiptext="Student neu anlegen" />-->
|
||||
<!--<toolbarbutton id="student-toolbar-del" label="Löschen" oncommand="StudentDelete();" disabled="true" image="../skin/images/DeleteIcon.png" tooltiptext="Student löschen"/>-->
|
||||
<toolbarbutton id="student-toolbar-refresh" label="Aktualisieren" oncommand="StudentTreeRefresh()" disabled="false" image="../skin/images/refresh.png" tooltiptext="Liste neu laden"/>
|
||||
|
||||
@@ -55,6 +55,7 @@ echo '<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>';
|
||||
style="margin-left:10px;margin-right:10px;margin-bottom:5px;margin-top: 10px;" height="100px" enableColumnDrag="true"
|
||||
onselect="StudentIOAuswahl()"
|
||||
context="student-io-tree-popup"
|
||||
flags="dont-build-content"
|
||||
>
|
||||
|
||||
<treecols>
|
||||
|
||||
@@ -62,6 +62,7 @@ echo '<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>';
|
||||
style="margin-left:10px;margin-right:10px;margin-bottom:5px;margin-top: 10px;" height="100px" enableColumnDrag="true"
|
||||
onselect="StudentKontoAuswahl()"
|
||||
context="student-konto-tree-popup"
|
||||
flags="dont-build-content"
|
||||
>
|
||||
|
||||
<treecols>
|
||||
|
||||
@@ -48,6 +48,7 @@ echo "<?xml-stylesheet href=\"".APP_ROOT."content/bindings.css\" type=\"text/css
|
||||
style="margin-left:10px;margin-right:10px;margin-bottom:5px;margin-top: 10px;" height="100%" enableColumnDrag="true"
|
||||
onselect="StudentNotenAuswahl()"
|
||||
context="student-noten-tree-popup"
|
||||
flags="dont-build-content"
|
||||
>
|
||||
|
||||
<treecols>
|
||||
@@ -115,6 +116,7 @@ echo "<?xml-stylesheet href=\"".APP_ROOT."content/bindings.css\" type=\"text/css
|
||||
<tree id="student-lvgesamtnoten-tree" seltype="multi" hidecolumnpicker="false" flex="1"
|
||||
datasources="rdf:null" ref="http://www.technikum-wien.at/lvgesamtnote/liste"
|
||||
style="margin-left:10px;margin-right:10px;margin-bottom:5px;margin-top: 10px;" height="100%" enableColumnDrag="true"
|
||||
flags="dont-build-content"
|
||||
>
|
||||
|
||||
<treecols>
|
||||
|
||||
@@ -49,6 +49,7 @@ echo '<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>';
|
||||
style="margin-left:10px;margin-right:10px;margin-bottom:5px;" height="100px" enableColumnDrag="true"
|
||||
ondblclick="StudentZeugnisAnzeigen()"
|
||||
context="student-zeugnis-tree-popup"
|
||||
flags="dont-build-content"
|
||||
>
|
||||
|
||||
<treecols>
|
||||
|
||||
Reference in New Issue
Block a user