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

Adapted: getVorgesetzteByDate to retrieve only the latest Vorgesetzte by a specific date

Browse Source 
Added order by and limit to get only one and the most actual Vorgesetzte by given date.
Changed name. Before it was getVorgesetzteMonatTimesheet, but it is also used independently from timesheet.
This commit is contained in:
Cris
2024-01-10 14:31:26 +01:00
parent 5452dc6fe3
commit 97a020460d
1 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/mitarbeiter.class.php
+15 -6
View File
@@ -1122,9 +1122,12 @@ class mitarbeiter extends benutzer
/**
* Gibt ein Array mit den UIDs der Vorgesetzten zum Zeitpunkt des korrespondierenden Timesheets zurück
* @param $uid
* @param $date
* @param null $limit LIMIT = 1 liefert bei mehreren Vorgesetzten den letzten (aktuellsten) zurück.
* @return uid
*/
public function getVorgesetzteMonatTimesheet($uid, $timesheetDate)
public function getVorgesetzteByDate($uid, $date, $limit = null)
{
$return=false;
@@ -1134,15 +1137,21 @@ class mitarbeiter extends benutzer
public.tbl_benutzerfunktion
WHERE
funktion_kurzbz='Leitung' AND
(datum_von is null OR datum_von<=".$this->db_add_param($timesheetDate).") AND
(datum_bis is null OR datum_bis>=".$this->db_add_param($timesheetDate).") AND
(datum_von is null OR datum_von<=".$this->db_add_param($date).") AND
(datum_bis is null OR datum_bis>=".$this->db_add_param($date).") AND
oe_kurzbz in (SELECT oe_kurzbz
FROM public.tbl_benutzerfunktion
WHERE
funktion_kurzbz='oezuordnung' AND uid=".$this->db_add_param($uid)." AND
(datum_von is null OR (datum_von<= ".$this->db_add_param($timesheetDate).")) AND
(datum_bis is null OR (datum_bis>=".$this->db_add_param($timesheetDate)."))
);";
(datum_von is null OR (datum_von<= ".$this->db_add_param($date).")) AND
(datum_bis is null OR (datum_bis>=".$this->db_add_param($date)."))
)
ORDER BY datum_von DESC ";
if (is_numeric($limit))
{
$qry .= 'LIMIT '. $this->db_add_param($limit);
}
if($this->db_query($qry))
{