mirror of
https://github.com/FH-Complete/FHC-Core.git
synced 2026-06-01 20:29:29 +00:00
Merge branch 'feature-25900/krankenstaende_abteilung_und_unternehmen_hinzufuegen'
This commit is contained in:
@@ -1705,5 +1705,33 @@ class mitarbeiter extends benutzer
|
||||
}
|
||||
}
|
||||
|
||||
public function getMitarbeiterKostenstelle($von, $bis, $uid = null)
|
||||
{
|
||||
if (is_null($uid))
|
||||
$uid = $this->uid;
|
||||
|
||||
$qry = "
|
||||
SELECT o.oe_kurzbz AS standardkostenstelle, o.bezeichnung
|
||||
FROM public.tbl_benutzerfunktion bf
|
||||
JOIN public.tbl_organisationseinheit o USING(oe_kurzbz)
|
||||
WHERE bf.funktion_kurzbz = 'kstzuordnung'
|
||||
AND (bf.datum_bis IS NULL OR datum_bis >= ". $this->db_add_param($von). ")
|
||||
AND (bf.datum_von IS NULL OR datum_von <= ". $this->db_add_param($bis). ")
|
||||
AND bf.uid = ". $this->db_add_param($uid);
|
||||
|
||||
if ($result = $this->db_query($qry))
|
||||
{
|
||||
while($row = $this->db_fetch_object($result))
|
||||
{
|
||||
$obj = new StdClass();
|
||||
$obj->oekurzbz = $row->standardkostenstelle;
|
||||
$obj->bezeichnung = $row->bezeichnung;
|
||||
|
||||
$this->result []= $obj;
|
||||
}
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
?>
|
||||
|
||||
@@ -938,5 +938,42 @@ class organisationseinheit extends basis_db
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
public function getOERoot($oe_kurzbz)
|
||||
{
|
||||
$qry = '
|
||||
WITH RECURSIVE organizations(rid, oe_kurzbz, oe_parent_kurzbz) AS
|
||||
(
|
||||
SELECT 1 AS rid, o.oe_kurzbz, o.oe_parent_kurzbz
|
||||
FROM public.tbl_organisationseinheit o
|
||||
WHERE o.oe_kurzbz = '. $this->db_add_param($oe_kurzbz). '
|
||||
UNION ALL
|
||||
SELECT rid + 1 AS rid, oe.oe_kurzbz, oe.oe_parent_kurzbz
|
||||
FROM organizations org, public.tbl_organisationseinheit oe
|
||||
WHERE oe.oe_kurzbz = org.oe_parent_kurzbz
|
||||
AND oe.aktiv = TRUE
|
||||
)
|
||||
SELECT oe_kurzbz
|
||||
FROM organizations orgs
|
||||
ORDER BY rid DESC
|
||||
LIMIT 1
|
||||
';
|
||||
|
||||
if($this->db_query($qry))
|
||||
{
|
||||
if($row = $this->db_fetch_object())
|
||||
{
|
||||
$this->oe_kurzbz = $row->oe_kurzbz;
|
||||
return true;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
$this->errormsg = 'Fehler beim Laden der Organisationseinheiten';
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
?>
|
||||
|
||||
Reference in New Issue
Block a user