mirror of
https://github.com/FH-Complete/FHC-Core.git
synced 2026-06-01 20:29:29 +00:00
Wochenstunden zu Funktionen hinzugefuegt
This commit is contained in:
Andreas Österreicher
@@ -418,6 +418,7 @@ if(!$error)
|
||||
$benutzerfunktion->datum_von = $_POST['datum_von'];
|
||||
$benutzerfunktion->datum_bis = $_POST['datum_bis'];
|
||||
$benutzerfunktion->bezeichnung = $_POST['bezeichnung'];
|
||||
$benutzerfunktion->wochenstunden = $_POST['wochenstunden'];
|
||||
|
||||
if($benutzerfunktion->save())
|
||||
{
|
||||
@@ -610,4 +611,4 @@ echo '<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
|
||||
</RDF:Seq>
|
||||
</RDF:RDF>
|
||||
';
|
||||
?>
|
||||
?>
|
||||
|
||||
@@ -187,6 +187,7 @@ function FunktionNeu()
|
||||
document.getElementById('funktion-box-datum_von').value=Tag+'.'+Monat+'.'+Jahr;
|
||||
document.getElementById('funktion-box-datum_bis').value='';
|
||||
document.getElementById('funktion-textbox-bezeichnung').value='';
|
||||
document.getElementById('funktion-textbox-wochenstunden').value='';
|
||||
FunktionToggleFachbereich();
|
||||
}
|
||||
|
||||
@@ -260,6 +261,7 @@ function FunktionDetailSpeichern()
|
||||
var datum_von = document.getElementById('funktion-box-datum_von').value;
|
||||
var datum_bis = document.getElementById('funktion-box-datum_bis').value;
|
||||
var bezeichnung = document.getElementById('funktion-textbox-bezeichnung').value;
|
||||
var wochenstunden = document.getElementById('funktion-textbox-wochenstunden').value;
|
||||
|
||||
//Bei Mitarbeitern wird kein Studiengang mitgeschickt
|
||||
if(window.parent.document.getElementById('main-content-tabs').selectedItem==window.parent.document.getElementById('tab-mitarbeiter'))
|
||||
@@ -287,7 +289,8 @@ function FunktionDetailSpeichern()
|
||||
req.add('datum_von', ConvertDateToISO(datum_von));
|
||||
req.add('datum_bis', ConvertDateToISO(datum_bis));
|
||||
req.add('bezeichnung', bezeichnung);
|
||||
|
||||
req.add('wochenstunden', wochenstunden);
|
||||
|
||||
var response = req.executePOST();
|
||||
|
||||
var val = new ParseReturnValue(response)
|
||||
@@ -349,6 +352,7 @@ function FunktionBearbeiten()
|
||||
var datum_von = getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#datum_von" ));
|
||||
var datum_bis = getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#datum_bis" ));
|
||||
var bezeichnung = getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#bezeichnung" ));
|
||||
var wochenstunden = getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#wochenstunden" ));
|
||||
|
||||
document.getElementById('funktion-menulist-fachbereich').value=fachbereich_kurzbz;
|
||||
document.getElementById('funktion-menulist-oe_kurzbz').value=oe_kurzbz;
|
||||
@@ -359,6 +363,7 @@ function FunktionBearbeiten()
|
||||
document.getElementById('funktion-box-datum_von').value=datum_von;
|
||||
document.getElementById('funktion-box-datum_bis').value=datum_bis;
|
||||
document.getElementById('funktion-textbox-bezeichnung').value=bezeichnung;
|
||||
document.getElementById('funktion-textbox-wochenstunden').value=wochenstunden;
|
||||
|
||||
FunktionBezeichnungChanged=true;
|
||||
FunktionDetailDisableFields(false);
|
||||
@@ -390,6 +395,7 @@ function FunktionDetailDisableFields(val)
|
||||
document.getElementById('funktion-box-datum_von').disabled=val;
|
||||
document.getElementById('funktion-box-datum_bis').disabled=val;
|
||||
document.getElementById('funktion-textbox-bezeichnung').disabled=val;
|
||||
document.getElementById('funktion-textbox-wochenstunden').disabled=val;
|
||||
}
|
||||
|
||||
// ****
|
||||
@@ -410,6 +416,7 @@ function FunktionDetailResetFields()
|
||||
document.getElementById('funktion-box-datum_von').value=Tag+'.'+Monat+'.'+Jahr;
|
||||
document.getElementById('funktion-box-datum_bis').value='';
|
||||
document.getElementById('funktion-textbox-bezeichnung').value='';
|
||||
document.getElementById('funktion-textbox-wochenstunden').value='';
|
||||
FunktionBezeichnungChanged=false;
|
||||
}
|
||||
|
||||
@@ -463,4 +470,4 @@ function FunktionToggleFachbereich()
|
||||
function FunktionBezeichnungChange()
|
||||
{
|
||||
FunktionBezeichnungChanged=true;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -105,6 +105,10 @@ else
|
||||
class="sortDirectionIndicator"
|
||||
sort="rdf:http://www.technikum-wien.at/bnfunktion/rdf#datum_bis_iso" onclick="FunktionTreeSort()"/>
|
||||
<splitter class="tree-splitter"/>
|
||||
<treecol id="funktion-treecol-wochenstunden" label="Wochenstunden" flex="1" hidden="false"
|
||||
class="sortDirectionIndicator"
|
||||
sort="rdf:http://www.technikum-wien.at/bnfunktion/rdf#wochenstunden" onclick="FunktionTreeSort()"/>
|
||||
<splitter class="tree-splitter"/>
|
||||
</treecols>
|
||||
|
||||
<template>
|
||||
@@ -123,6 +127,7 @@ else
|
||||
<treecell label="rdf:http://www.technikum-wien.at/bnfunktion/rdf#funktion_kurzbz" />
|
||||
<treecell label="rdf:http://www.technikum-wien.at/bnfunktion/rdf#datum_von" />
|
||||
<treecell label="rdf:http://www.technikum-wien.at/bnfunktion/rdf#datum_bis" />
|
||||
<treecell label="rdf:http://www.technikum-wien.at/bnfunktion/rdf#wochenstunden" />
|
||||
</treerow>
|
||||
</treeitem>
|
||||
</treechildren>
|
||||
@@ -235,6 +240,13 @@ else
|
||||
<label value="Bezeichnung" control="funktion-textbox-bezeichnung"/>
|
||||
<textbox id="funktion-textbox-bezeichnung" disabled="true" maxlength="64" onchange="FunktionBezeichnungChange()"/>
|
||||
</row>
|
||||
<row>
|
||||
<label value="Wochenstunden" control="funktion-textbox-wochenstunden"/>
|
||||
<hbox>
|
||||
<textbox id="funktion-textbox-wochenstunden" disabled="true" maxlength="6" size="6"/>
|
||||
<spacer flex="1" />
|
||||
</hbox>
|
||||
</row>
|
||||
<row>
|
||||
<label value="Gültig von" control="funktion-box-datum_von"/>
|
||||
<hbox>
|
||||
@@ -257,4 +269,4 @@ else
|
||||
<spacer/>
|
||||
</vbox>
|
||||
</hbox>
|
||||
</window>
|
||||
</window>
|
||||
|
||||
@@ -46,6 +46,7 @@ class benutzerfunktion extends basis_db
|
||||
public $datum_von; // date
|
||||
public $datum_bis; // date
|
||||
public $bezeichnung; // varchar(64)
|
||||
public $wochenstunden; // numeric(5,2)
|
||||
|
||||
|
||||
/**
|
||||
@@ -92,6 +93,7 @@ class benutzerfunktion extends basis_db
|
||||
$pfunktion_obj->datum_von = $row->datum_von;
|
||||
$pfunktion_obj->datum_bis = $row->datum_bis;
|
||||
$pfunktion_obj->bezeichnung = $row->bezeichnung;
|
||||
$pfunktion_obj->wochenstunden = $row->wochenstunden;
|
||||
|
||||
$this->result[] = $pfunktion_obj;
|
||||
}
|
||||
@@ -150,6 +152,8 @@ class benutzerfunktion extends basis_db
|
||||
$this->datum_von = $row->datum_von;
|
||||
$this->datum_bis = $row->datum_bis;
|
||||
$this->bezeichnung = $row->bezeichnung;
|
||||
$this->wochenstunden = $row->wochenstunden;
|
||||
|
||||
return true;
|
||||
}
|
||||
else
|
||||
@@ -206,6 +210,7 @@ class benutzerfunktion extends basis_db
|
||||
$obj->datum_von = $row->datum_von;
|
||||
$obj->datum_bis = $row->datum_bis;
|
||||
$obj->bezeichnung = $row->bezeichnung;
|
||||
$obj->wochenstunden = $row->wochenstunden;
|
||||
|
||||
$this->result[] = $obj;
|
||||
|
||||
@@ -255,6 +260,7 @@ class benutzerfunktion extends basis_db
|
||||
$this->datum_von = $row->datum_von;
|
||||
$this->datum_bis = $row->datum_bis;
|
||||
$this->bezeichnung = $row->bezeichnung;
|
||||
$this->wochenstunden = $row->wochenstunden;
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -316,7 +322,7 @@ class benutzerfunktion extends basis_db
|
||||
}
|
||||
}
|
||||
$qry = 'BEGIN;INSERT INTO public.tbl_benutzerfunktion (fachbereich_kurzbz, uid, oe_kurzbz, funktion_kurzbz, insertamum, insertvon,
|
||||
updateamum, updatevon, semester, datum_von, datum_bis, bezeichnung) VALUES ('.
|
||||
updateamum, updatevon, semester, datum_von, datum_bis, bezeichnung, wochenstunden) VALUES ('.
|
||||
$this->db_add_param($this->fachbereich_kurzbz).', '.
|
||||
$this->db_add_param($this->uid).', '.
|
||||
$this->db_add_param($this->oe_kurzbz).', '.
|
||||
@@ -328,7 +334,8 @@ class benutzerfunktion extends basis_db
|
||||
$this->db_add_param($this->semester).','.
|
||||
$this->db_add_param($this->datum_von).','.
|
||||
$this->db_add_param($this->datum_bis).','.
|
||||
$this->db_add_param($this->bezeichnung).'); ';
|
||||
$this->db_add_param($this->bezeichnung).','.
|
||||
$this->db_add_param($this->wochenstunden).'); ';
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -354,7 +361,8 @@ class benutzerfunktion extends basis_db
|
||||
'datum_von='.$this->db_add_param($this->datum_von).', '.
|
||||
'datum_bis='.$this->db_add_param($this->datum_bis).', '.
|
||||
'bezeichnung='.$this->db_add_param($this->bezeichnung).', '.
|
||||
'semester='.$this->db_add_param($this->semester).' '.
|
||||
'semester='.$this->db_add_param($this->semester).', '.
|
||||
'wochenstunden='.$this->db_add_param($this->wochenstunden).' '.
|
||||
'WHERE benutzerfunktion_id = '.$this->db_add_param($this->benutzerfunktion_id, FHC_INTEGER).';';
|
||||
}
|
||||
|
||||
@@ -437,6 +445,7 @@ class benutzerfunktion extends basis_db
|
||||
$obj->datum_von = $row->datum_von;
|
||||
$obj->datum_bis = $row->datum_bis;
|
||||
$obj->bezeichnung = $row->bezeichnung;
|
||||
$obj->wochenstunden = $row->wochenstunden;
|
||||
|
||||
$this->result[] = $obj;
|
||||
|
||||
@@ -450,4 +459,4 @@ class benutzerfunktion extends basis_db
|
||||
}
|
||||
}
|
||||
}
|
||||
?>
|
||||
?>
|
||||
|
||||
@@ -56,16 +56,17 @@ $fkt->getAll();
|
||||
foreach ($fkt->result as $row)
|
||||
$fkt_arr[$row->funktion_kurzbz] = $row->beschreibung;
|
||||
|
||||
$db = new basis_db();
|
||||
|
||||
if($uid!='')
|
||||
{
|
||||
$qry = "SELECT * FROM public.tbl_benutzerfunktion WHERE uid='".addslashes($uid)."' ORDER BY funktion_kurzbz";
|
||||
$qry = "SELECT * FROM public.tbl_benutzerfunktion WHERE uid=".$db->db_add_param($uid)." ORDER BY funktion_kurzbz";
|
||||
}
|
||||
else
|
||||
{
|
||||
$qry = "SELECT * FROM public.tbl_benutzerfunktion WHERE benutzerfunktion_id='".addslashes($benutzerfunktion_id)."'";
|
||||
$qry = "SELECT * FROM public.tbl_benutzerfunktion WHERE benutzerfunktion_id=".$db->db_add_param($benutzerfunktion_id);
|
||||
}
|
||||
|
||||
$db = new basis_db();
|
||||
if($db->db_query($qry))
|
||||
{
|
||||
while($row = $db->db_fetch_object())
|
||||
@@ -87,10 +88,11 @@ if($db->db_query($qry))
|
||||
<BNFUNKTION:datum_bis><![CDATA['.$datum_obj->convertISODate($row->datum_bis).']]></BNFUNKTION:datum_bis>
|
||||
<BNFUNKTION:datum_bis_iso><![CDATA['.$row->datum_bis.']]></BNFUNKTION:datum_bis_iso>
|
||||
<BNFUNKTION:bezeichnung><![CDATA['.$row->bezeichnung.']]></BNFUNKTION:bezeichnung>
|
||||
<BNFUNKTION:wochenstunden><![CDATA['.$row->wochenstunden.']]></BNFUNKTION:wochenstunden>
|
||||
</RDF:Description>
|
||||
</RDF:li>';
|
||||
}
|
||||
}
|
||||
?>
|
||||
</RDF:Seq>
|
||||
</RDF:RDF>
|
||||
</RDF:RDF>
|
||||
|
||||
+119
-37
@@ -34590,7 +34590,7 @@
|
||||
<Left>2907</Left>
|
||||
<z>0</z>
|
||||
<Width>599</Width>
|
||||
<Height>629</Height>
|
||||
<Height>668</Height>
|
||||
<dz>0</dz>
|
||||
<RecalculateSizes>1</RecalculateSizes>
|
||||
<UseWorkSpaceRecalculateSizes>1</UseWorkSpaceRecalculateSizes>
|
||||
@@ -36332,8 +36332,8 @@
|
||||
<WorkSpaceShape2>
|
||||
<Id>{2E5D944C-5C5D-4F01-9057-73779D9CDCAA}</Id>
|
||||
</WorkSpaceShape2>
|
||||
<NamePositionX>1195</NamePositionX>
|
||||
<NamePositionY>279</NamePositionY>
|
||||
<NamePositionX>1194</NamePositionX>
|
||||
<NamePositionY>286</NamePositionY>
|
||||
<Points>
|
||||
<Point>
|
||||
<x>1102</x>
|
||||
@@ -36345,11 +36345,11 @@
|
||||
</Point>
|
||||
<Point>
|
||||
<x>2876</x>
|
||||
<y>337</y>
|
||||
<y>350</y>
|
||||
</Point>
|
||||
<Point>
|
||||
<x>2907</x>
|
||||
<y>337</y>
|
||||
<y>350</y>
|
||||
</Point>
|
||||
</Points>
|
||||
</WorkSpaceLinePERRelationPG83>
|
||||
@@ -36461,8 +36461,8 @@
|
||||
<WorkSpaceShape2>
|
||||
<Id>{2E5D944C-5C5D-4F01-9057-73779D9CDCAA}</Id>
|
||||
</WorkSpaceShape2>
|
||||
<NamePositionX>1731</NamePositionX>
|
||||
<NamePositionY>771</NamePositionY>
|
||||
<NamePositionX>1732</NamePositionX>
|
||||
<NamePositionY>784</NamePositionY>
|
||||
<Points>
|
||||
<Point>
|
||||
<x>2058</x>
|
||||
@@ -36474,11 +36474,11 @@
|
||||
</Point>
|
||||
<Point>
|
||||
<x>2876</x>
|
||||
<y>546</y>
|
||||
<y>572</y>
|
||||
</Point>
|
||||
<Point>
|
||||
<x>2907</x>
|
||||
<y>546</y>
|
||||
<y>572</y>
|
||||
</Point>
|
||||
</Points>
|
||||
</WorkSpaceLinePERRelationPG83>
|
||||
@@ -37677,8 +37677,8 @@
|
||||
<WorkSpaceShape2>
|
||||
<Id>{2E5D944C-5C5D-4F01-9057-73779D9CDCAA}</Id>
|
||||
</WorkSpaceShape2>
|
||||
<NamePositionX>3954</NamePositionX>
|
||||
<NamePositionY>1170</NamePositionY>
|
||||
<NamePositionX>3953</NamePositionX>
|
||||
<NamePositionY>1189</NamePositionY>
|
||||
<Points>
|
||||
<Point>
|
||||
<x>3972</x>
|
||||
@@ -37690,11 +37690,11 @@
|
||||
</Point>
|
||||
<Point>
|
||||
<x>3206</x>
|
||||
<y>787</y>
|
||||
<y>826</y>
|
||||
</Point>
|
||||
<Point>
|
||||
<x>3206</x>
|
||||
<y>756</y>
|
||||
<y>795</y>
|
||||
</Point>
|
||||
</Points>
|
||||
</WorkSpaceLinePERRelationPG83>
|
||||
@@ -38193,8 +38193,8 @@
|
||||
<WorkSpaceShape2>
|
||||
<Id>{2E5D944C-5C5D-4F01-9057-73779D9CDCAA}</Id>
|
||||
</WorkSpaceShape2>
|
||||
<NamePositionX>7147</NamePositionX>
|
||||
<NamePositionY>708</NamePositionY>
|
||||
<NamePositionX>7146</NamePositionX>
|
||||
<NamePositionY>718</NamePositionY>
|
||||
<Points>
|
||||
<Point>
|
||||
<x>8451</x>
|
||||
@@ -38206,11 +38206,11 @@
|
||||
</Point>
|
||||
<Point>
|
||||
<x>3537</x>
|
||||
<y>442</y>
|
||||
<y>461</y>
|
||||
</Point>
|
||||
<Point>
|
||||
<x>3506</x>
|
||||
<y>442</y>
|
||||
<y>461</y>
|
||||
</Point>
|
||||
</Points>
|
||||
</WorkSpaceLinePERRelationPG83>
|
||||
@@ -40407,7 +40407,7 @@
|
||||
<Left>1335</Left>
|
||||
<z>0</z>
|
||||
<Width>599</Width>
|
||||
<Height>629</Height>
|
||||
<Height>668</Height>
|
||||
<dz>0</dz>
|
||||
<RecalculateSizes>1</RecalculateSizes>
|
||||
<UseWorkSpaceRecalculateSizes>1</UseWorkSpaceRecalculateSizes>
|
||||
@@ -41180,7 +41180,7 @@
|
||||
<Id>{D328CB7A-43A5-4C04-8CD6-2C8960DC8C17}</Id>
|
||||
</WorkSpaceShape2>
|
||||
<NamePositionX>1687</NamePositionX>
|
||||
<NamePositionY>690</NamePositionY>
|
||||
<NamePositionY>688</NamePositionY>
|
||||
<Points>
|
||||
<Point>
|
||||
<x>1634</x>
|
||||
@@ -41200,11 +41200,11 @@
|
||||
</Point>
|
||||
<Point>
|
||||
<x>1634</x>
|
||||
<y>701</y>
|
||||
<y>740</y>
|
||||
</Point>
|
||||
<Point>
|
||||
<x>1634</x>
|
||||
<y>670</y>
|
||||
<y>709</y>
|
||||
</Point>
|
||||
</Points>
|
||||
</WorkSpaceLinePERRelationPG83>
|
||||
@@ -41230,7 +41230,7 @@
|
||||
<WorkSpaceShape2>
|
||||
<Id>{D328CB7A-43A5-4C04-8CD6-2C8960DC8C17}</Id>
|
||||
</WorkSpaceShape2>
|
||||
<NamePositionX>2401</NamePositionX>
|
||||
<NamePositionX>2406</NamePositionX>
|
||||
<NamePositionY>503</NamePositionY>
|
||||
<Points>
|
||||
<Point>
|
||||
@@ -41251,11 +41251,11 @@
|
||||
</Point>
|
||||
<Point>
|
||||
<x>1965</x>
|
||||
<y>356</y>
|
||||
<y>375</y>
|
||||
</Point>
|
||||
<Point>
|
||||
<x>1934</x>
|
||||
<y>356</y>
|
||||
<y>375</y>
|
||||
</Point>
|
||||
</Points>
|
||||
</WorkSpaceLinePERRelationPG83>
|
||||
@@ -41383,8 +41383,8 @@
|
||||
<WorkSpaceShape2>
|
||||
<Id>{D328CB7A-43A5-4C04-8CD6-2C8960DC8C17}</Id>
|
||||
</WorkSpaceShape2>
|
||||
<NamePositionX>774</NamePositionX>
|
||||
<NamePositionY>315</NamePositionY>
|
||||
<NamePositionX>767</NamePositionX>
|
||||
<NamePositionY>320</NamePositionY>
|
||||
<Points>
|
||||
<Point>
|
||||
<x>722</x>
|
||||
@@ -41404,11 +41404,11 @@
|
||||
</Point>
|
||||
<Point>
|
||||
<x>1304</x>
|
||||
<y>356</y>
|
||||
<y>375</y>
|
||||
</Point>
|
||||
<Point>
|
||||
<x>1335</x>
|
||||
<y>356</y>
|
||||
<y>375</y>
|
||||
</Point>
|
||||
</Points>
|
||||
</WorkSpaceLinePERRelationPG83>
|
||||
@@ -60513,7 +60513,7 @@
|
||||
<Left>912</Left>
|
||||
<z>0</z>
|
||||
<Width>576</Width>
|
||||
<Height>200</Height>
|
||||
<Height>239</Height>
|
||||
<dz>0</dz>
|
||||
<RecalculateSizes>1</RecalculateSizes>
|
||||
<UseWorkSpaceRecalculateSizes>1</UseWorkSpaceRecalculateSizes>
|
||||
@@ -61115,8 +61115,8 @@
|
||||
<WorkSpaceShape2>
|
||||
<Id>{92DECA91-4DE9-4E41-A357-E3069F1DE138}</Id>
|
||||
</WorkSpaceShape2>
|
||||
<NamePositionX>1480</NamePositionX>
|
||||
<NamePositionY>1070</NamePositionY>
|
||||
<NamePositionX>1481</NamePositionX>
|
||||
<NamePositionY>1083</NamePositionY>
|
||||
<Points>
|
||||
<Point>
|
||||
<x>1673</x>
|
||||
@@ -61128,11 +61128,11 @@
|
||||
</Point>
|
||||
<Point>
|
||||
<x>1519</x>
|
||||
<y>1031</y>
|
||||
<y>1057</y>
|
||||
</Point>
|
||||
<Point>
|
||||
<x>1488</x>
|
||||
<y>1031</y>
|
||||
<y>1057</y>
|
||||
</Point>
|
||||
</Points>
|
||||
</WorkSpaceLinePERRelationPG83>
|
||||
@@ -61202,7 +61202,7 @@
|
||||
<Id>{92DECA91-4DE9-4E41-A357-E3069F1DE138}</Id>
|
||||
</WorkSpaceShape2>
|
||||
<NamePositionX>2058</NamePositionX>
|
||||
<NamePositionY>594</NamePositionY>
|
||||
<NamePositionY>601</NamePositionY>
|
||||
<Points>
|
||||
<Point>
|
||||
<x>2827</x>
|
||||
@@ -61214,11 +61214,11 @@
|
||||
</Point>
|
||||
<Point>
|
||||
<x>1519</x>
|
||||
<y>965</y>
|
||||
<y>978</y>
|
||||
</Point>
|
||||
<Point>
|
||||
<x>1488</x>
|
||||
<y>965</y>
|
||||
<y>978</y>
|
||||
</Point>
|
||||
</Points>
|
||||
</WorkSpaceLinePERRelationPG83>
|
||||
@@ -62401,7 +62401,7 @@
|
||||
<Company>FH Technikum Wien</Company>
|
||||
<Version>3.0</Version>
|
||||
<CreatedDate>2009-04-17T11:15:21.000+02:00</CreatedDate>
|
||||
<ModifiedDate>2014-09-24T17:34:36.599+02:00</ModifiedDate>
|
||||
<ModifiedDate>2014-10-07T16:31:09.401+02:00</ModifiedDate>
|
||||
<Project>FH-Complete 3.0</Project>
|
||||
<Description><?xml-stylesheet type="text/xsl" href="FHCompleteTDM3PG83.xsl"?>
|
||||
</Description>
|
||||
@@ -106394,6 +106394,47 @@ art=tbl_benutzerrolle.art & tbl_rolleberechtigung.art</Comments>
|
||||
<ArrDims></ArrDims>
|
||||
<IsArray>0</IsArray>
|
||||
</PERAttributePG83>
|
||||
<PERAttributePG83 ObjectType="2003" CSAOName="PERAttributePG83">
|
||||
<Id>{FD867D0C-827C-4ECF-AE07-760B66F79969}</Id>
|
||||
<Name>wochenstunden</Name>
|
||||
<Ordinal>0</Ordinal>
|
||||
<HistoryID>{29C03EFD-A80C-41F7-AE55-35513E56298A}</HistoryID>
|
||||
<GlobalOrder>0</GlobalOrder>
|
||||
<RNOffset>0</RNOffset>
|
||||
<RNLength>0</RNLength>
|
||||
<IgnoreNC>0</IgnoreNC>
|
||||
<GenerateCode>1</GenerateCode>
|
||||
<BeforeScript></BeforeScript>
|
||||
<AfterScript></AfterScript>
|
||||
<Notes></Notes>
|
||||
<Comments></Comments>
|
||||
<DataTypeParam1>5</DataTypeParam1>
|
||||
<DataTypeParam2>2</DataTypeParam2>
|
||||
<KeepForeignKey>0</KeepForeignKey>
|
||||
<DefaultValue></DefaultValue>
|
||||
<NotNull>0</NotNull>
|
||||
<Migrated>0</Migrated>
|
||||
<Caption>wochenstunden</Caption>
|
||||
<Unique>0</Unique>
|
||||
<OriginalName></OriginalName>
|
||||
<CheckConstraint></CheckConstraint>
|
||||
<CheckConstraintName></CheckConstraintName>
|
||||
<KeyConstraintItems/>
|
||||
<PKForeignKeys/>
|
||||
<FKForeignKeys/>
|
||||
<DictType/>
|
||||
<Domain/>
|
||||
<DataType>
|
||||
<Id>{E62BD1D3-18CA-4571-9A16-606FF04DC894}</Id>
|
||||
</DataType>
|
||||
<UserDataType/>
|
||||
<IndexItems/>
|
||||
<Default/>
|
||||
<CheckConstraints/>
|
||||
<KeyConstraint/>
|
||||
<ArrDims></ArrDims>
|
||||
<IsArray>0</IsArray>
|
||||
</PERAttributePG83>
|
||||
</Attributes>
|
||||
<Keys>
|
||||
<PERKeyConstraintPG83 ObjectType="2010" CSAOName="PERKeyConstraintPG83">
|
||||
@@ -184111,6 +184152,47 @@ Storno
|
||||
<ArrDims></ArrDims>
|
||||
<IsArray>0</IsArray>
|
||||
</PERAttributePG83>
|
||||
<PERAttributePG83 ObjectType="2003" CSAOName="PERAttributePG83">
|
||||
<Id>{8AE661C1-F009-4DB2-9C1C-0B1CA9926CD2}</Id>
|
||||
<Name>ext_id</Name>
|
||||
<Ordinal>0</Ordinal>
|
||||
<HistoryID>{C3FD03EC-1900-4F36-A858-6A2388B328A0}</HistoryID>
|
||||
<GlobalOrder>0</GlobalOrder>
|
||||
<RNOffset>0</RNOffset>
|
||||
<RNLength>0</RNLength>
|
||||
<IgnoreNC>0</IgnoreNC>
|
||||
<GenerateCode>1</GenerateCode>
|
||||
<BeforeScript></BeforeScript>
|
||||
<AfterScript></AfterScript>
|
||||
<Notes></Notes>
|
||||
<Comments></Comments>
|
||||
<DataTypeParam1></DataTypeParam1>
|
||||
<DataTypeParam2></DataTypeParam2>
|
||||
<KeepForeignKey>0</KeepForeignKey>
|
||||
<DefaultValue></DefaultValue>
|
||||
<NotNull>0</NotNull>
|
||||
<Migrated>0</Migrated>
|
||||
<Caption>ext_id</Caption>
|
||||
<Unique>0</Unique>
|
||||
<OriginalName></OriginalName>
|
||||
<CheckConstraint></CheckConstraint>
|
||||
<CheckConstraintName></CheckConstraintName>
|
||||
<KeyConstraintItems/>
|
||||
<PKForeignKeys/>
|
||||
<FKForeignKeys/>
|
||||
<DictType/>
|
||||
<Domain/>
|
||||
<DataType>
|
||||
<Id>{F6C99ABF-677B-48C6-920E-F375B79C336D}</Id>
|
||||
</DataType>
|
||||
<UserDataType/>
|
||||
<IndexItems/>
|
||||
<Default/>
|
||||
<CheckConstraints/>
|
||||
<KeyConstraint/>
|
||||
<ArrDims></ArrDims>
|
||||
<IsArray>0</IsArray>
|
||||
</PERAttributePG83>
|
||||
</Attributes>
|
||||
<Keys>
|
||||
<PERKeyConstraintPG83 ObjectType="2010" CSAOName="PERKeyConstraintPG83">
|
||||
|
||||
+41
-18
@@ -1703,24 +1703,33 @@ if(!$result = @$db->db_query("SELECT lehreinheit_id FROM public.tbl_notizzuordnu
|
||||
// Tabelle public.tbl_filter
|
||||
if(!$result = @$db->db_query("SELECT filter_id FROM public.tbl_filter LIMIT 1;"))
|
||||
{
|
||||
$qry = 'CREATE TABLE public.tbl_filter
|
||||
$qry = "CREATE TABLE public.tbl_filter
|
||||
(
|
||||
filter_id serial,
|
||||
kurzbz character varying(32),
|
||||
sql text,
|
||||
valuename character varying(512),
|
||||
showvalue boolean DEFAULT true,
|
||||
insertamum Timestamp DEFAULT now(),
|
||||
insertvon Character varying(32),
|
||||
updateamum Timestamp DEFAULT now(),
|
||||
updatevon Character varying(32),
|
||||
CONSTRAINT tbl_filter_pkey PRIMARY KEY (filter_id)
|
||||
)
|
||||
WITH (
|
||||
OIDS=FALSE
|
||||
filter_id bigint,
|
||||
kurzbz character varying(32),
|
||||
sql text,
|
||||
valuename character varying(512),
|
||||
showvalue boolean DEFAULT true,
|
||||
insertamum Timestamp DEFAULT now(),
|
||||
insertvon Character varying(32),
|
||||
updateamum Timestamp DEFAULT now(),
|
||||
updatevon Character varying(32)
|
||||
);
|
||||
|
||||
ALTER TABLE public.tbl_filter ADD CONSTRAINT pk_filter PRIMARY KEY (filter_id);
|
||||
|
||||
CREATE SEQUENCE public.seq_filter_filter_id
|
||||
INCREMENT BY 1
|
||||
NO MAXVALUE
|
||||
NO MINVALUE
|
||||
CACHE 1;
|
||||
|
||||
';
|
||||
ALTER TABLE public.tbl_filter ALTER COLUMN filter_id SET DEFAULT nextval('public.seq_filter_filter_id');
|
||||
|
||||
GRANT SELECT, UPDATE, INSERT, DELETE ON public.tbl_filter TO vilesci;
|
||||
GRANT SELECT, UPDATE on public.seq_filter_filter_id TO vilesci;
|
||||
";
|
||||
|
||||
if(!$db->db_query($qry))
|
||||
echo '<strong>public.tbl_filter: '.$db->db_last_error().'</strong><br>';
|
||||
else
|
||||
@@ -1778,7 +1787,8 @@ if(!$result = @$db->db_query("SELECT vertrag_id FROM lehre.tbl_vertrag;"))
|
||||
vertragsstatus_kurzbz varchar(32) NOT NULL,
|
||||
vertrag_id bigint NOT NULL,
|
||||
uid varchar(32),
|
||||
datum timestamp NOT NULL
|
||||
datum timestamp NOT NULL,
|
||||
ext_id bigint
|
||||
);
|
||||
|
||||
ALTER TABLE lehre.tbl_vertrag_vertragsstatus ADD CONSTRAINT pk_vertrag_vertragstatus PRIMARY KEY (vertragsstatus_kurzbz, vertrag_id);
|
||||
@@ -1899,6 +1909,16 @@ if(!$result = @$db->db_query("SELECT anwesenheit_id FROM campus.tbl_anwesenheit"
|
||||
echo ' campus.tbl_anwesenheit: Tabelle campus.tbl_anwesenheit hinzugefuegt!<br>';
|
||||
}
|
||||
|
||||
// Tabelle public.tbl_benutzerfunktion Spalte wochenstunden
|
||||
if(!$result = @$db->db_query("SELECT wochenstunden FROM public.tbl_benutzerfunktion"))
|
||||
{
|
||||
$qry = "ALTER TABLE public.tbl_benutzerfunktion ADD COLUMN wochenstunden numeric(5,2);";
|
||||
|
||||
if(!$db->db_query($qry))
|
||||
echo '<strong>public.tbl_benutzerfunktion '.$db->db_last_error().'</strong><br>';
|
||||
else
|
||||
echo ' public.tbl_benutzerfunktion: Spalte wochenstunden hinzugefuegt!<br>';
|
||||
}
|
||||
echo '<br><br><br>';
|
||||
|
||||
$tabellen=array(
|
||||
@@ -2027,7 +2047,7 @@ $tabellen=array(
|
||||
"lehre.tbl_stundenplan" => array("stundenplan_id","unr","mitarbeiter_uid","datum","stunde","ort_kurzbz","gruppe_kurzbz","titel","anmerkung","lehreinheit_id","studiengang_kz","semester","verband","gruppe","fix","updateamum","updatevon","insertamum","insertvon"),
|
||||
"lehre.tbl_stundenplandev" => array("stundenplandev_id","lehreinheit_id","unr","studiengang_kz","semester","verband","gruppe","gruppe_kurzbz","mitarbeiter_uid","ort_kurzbz","datum","stunde","titel","anmerkung","fix","updateamum","updatevon","insertamum","insertvon","ext_id"),
|
||||
"lehre.tbl_vertrag" => array("vertrag_id","person_id","vertragstyp_kurzbz","bezeichnung","betrag","insertamum","insertvon","updateamum","updatevon","ext_id"),
|
||||
"lehre.tbl_vertrag_vertragsstatus" => array("vertragsstatus_kurzbz","vertrag_id","uid","datum"),
|
||||
"lehre.tbl_vertrag_vertragsstatus" => array("vertragsstatus_kurzbz","vertrag_id","uid","datum","ext_id"),
|
||||
"lehre.tbl_vertragstyp" => array("vertragstyp_kurzbz","bezeichnung"),
|
||||
"lehre.tbl_vertragsstatus" => array("vertragsstatus_kurzbz","bezeichnung"),
|
||||
"lehre.tbl_zeitfenster" => array("wochentag","stunde","ort_kurzbz","studiengang_kz","gewicht"),
|
||||
@@ -2041,7 +2061,7 @@ $tabellen=array(
|
||||
"public.tbl_aufnahmeschluessel" => array("aufnahmeschluessel"),
|
||||
"public.tbl_bankverbindung" => array("bankverbindung_id","person_id","name","anschrift","bic","blz","iban","kontonr","typ","verrechnung","updateamum","updatevon","insertamum","insertvon","ext_id","oe_kurzbz"),
|
||||
"public.tbl_benutzer" => array("uid","person_id","aktiv","alias","insertamum","insertvon","updateamum","updatevon","ext_id","updateaktivvon","updateaktivam","aktivierungscode"),
|
||||
"public.tbl_benutzerfunktion" => array("benutzerfunktion_id","fachbereich_kurzbz","uid","oe_kurzbz","funktion_kurzbz","semester", "datum_von","datum_bis", "updateamum","updatevon","insertamum","insertvon","ext_id","bezeichnung"),
|
||||
"public.tbl_benutzerfunktion" => array("benutzerfunktion_id","fachbereich_kurzbz","uid","oe_kurzbz","funktion_kurzbz","semester", "datum_von","datum_bis", "updateamum","updatevon","insertamum","insertvon","ext_id","bezeichnung","wochenstunden"),
|
||||
"public.tbl_benutzergruppe" => array("uid","gruppe_kurzbz","studiensemester_kurzbz","updateamum","updatevon","insertamum","insertvon","ext_id"),
|
||||
"public.tbl_buchungstyp" => array("buchungstyp_kurzbz","beschreibung","standardbetrag","standardtext","aktiv","credit_points"),
|
||||
"public.tbl_dokument" => array("dokument_kurzbz","bezeichnung","ext_id"),
|
||||
@@ -2231,6 +2251,8 @@ $berechtigungen = array(
|
||||
array('basis/testtool','Administrationseite, Gebiete löschen/zurücksetzen'),
|
||||
array('basis/variable','Variablenverwaltung'),
|
||||
array('basis/vilesci','Grundrecht, um in VileSci irgendwelche Menüpunkte zu sehen'),
|
||||
array('buchung/typen','Verwaltung von Buchungstypen'),
|
||||
array('buchung/mitarbeiter','Verwaltung von Buchungen fuer Mitarbeiter'),
|
||||
array('inout/incoming','Incomingverwaltung'),
|
||||
array('inout/outgoing','Outgoingverwaltung'),
|
||||
array('inout/uebersicht','Verbandsanzeige fuer Incoming/Outgoing im FAS'),
|
||||
@@ -2281,6 +2303,7 @@ $berechtigungen = array(
|
||||
array('system/loginasuser','Berechtigung zum Einloggen als anderer User'),
|
||||
array('user','Normale User ohne besonere Rechte'),
|
||||
array('veranstaltung','Berechtigungen fuer Veranstaltungen wie Jahresplan'),
|
||||
array('vertrag/typen','Verwalten von Vertragstypen'),
|
||||
array('wawi/berichte','Alle Berichte anzeigen'),
|
||||
array('wawi/bestellung','Bestellungen verwalten'),
|
||||
array('wawi/bestellung_advanced','Bestellungen editieren nach dem Abschicken'),
|
||||
|
||||
Reference in New Issue
Block a user