blackicedbear/FHC-Core
1
0
Fork 0
mirror of https://github.com/FH-Complete/FHC-Core.git synced 2026-06-20 13:39:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

codex/Bisverwendung_model: getVerwendungen ordered by beginn by default

Browse Source 
resource/Mitarbeiter_model: possible to retrieve Vorgesetzte within a timespan
This commit is contained in:
alex
2020-08-01 08:20:52 +02:00
parent 40766e7161
commit bd388a03ad
2 changed files with 24 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/models/codex/Bisverwendung_model.php
+1 -1
View File
@@ -68,7 +68,7 @@ class Bisverwendung_model extends DB_Model
$params[] = $ende;
}
$qry .= ' ORDER BY ende, beginn';
$qry .= ' ORDER BY beginn, ende';
return $this->execQuery($qry, $params);
}
application/models/ressource/Mitarbeiter_model.php
+23 -6
View File
@@ -95,24 +95,41 @@ class Mitarbeiter_model extends DB_Model
* Gibt ein Array mit den UIDs der Vorgesetzten zurück
* @return object
*/
public function getVorgesetzte($uid)
public function getVorgesetzte($uid, $datum_von = null, $datum_bis = null)
{
$datum_von_var = isset($datum_von) ? '?' : 'now()';
$datum_bis_var = isset($datum_bis) ? '?' : 'now()';
$qry = "SELECT
DISTINCT uid as vorgesetzter
FROM
public.tbl_benutzerfunktion
WHERE
funktion_kurzbz='Leitung' AND
(datum_von is null OR datum_von<=now()) AND
(datum_bis is null OR datum_bis>=now()) AND
(datum_von is null OR datum_von<=%s) AND
(datum_bis is null OR datum_bis>=%s) AND
oe_kurzbz in (SELECT oe_kurzbz
FROM public.tbl_benutzerfunktion
WHERE
funktion_kurzbz='oezuordnung' AND uid=? AND
(datum_von is null OR datum_von<=now()) AND
(datum_bis is null OR datum_bis>=now())
(datum_von is null OR datum_von<=%s) AND
(datum_bis is null OR datum_bis>=%s)
);";
return $this->execQuery($qry, array($uid));
$qry = sprintf($qry, $datum_von_var, $datum_bis_var, $datum_von_var, $datum_bis_var);
$params = array();
if (isset($datum_von))
$params[] = $datum_von;
if (isset($datum_bis))
$params[] = $datum_bis;
$params[] = $uid;
if (isset($datum_von))
$params[] = $datum_von;
if (isset($datum_bis))
$params[] = $datum_bis;
return $this->execQuery($qry, $params);
}
}