blackicedbear/FHC-Core
1
0
Fork 0
mirror of https://github.com/FH-Complete/FHC-Core.git synced 2026-07-19 16:02:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

add current date to DV selection query

Browse Source
This commit is contained in:
Werner Masik
2023-05-16 10:03:50 +02:00
parent 4786ff503a
commit cd66397740
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/models/vertragsbestandteil/Dienstverhaeltnis_model.php
+9 -5
View File
@@ -48,8 +48,12 @@ class Dienstverhaeltnis_model extends DB_Model
}
public function getCurrentDVByPersonUID($uid)
public function getCurrentDVByPersonUID($uid, $dateAsUnixTS)
{
$date = DateTime::createFromFormat( 'U', $dateAsUnixTS );
$datestring = $date->format("Y-m-d");
$qry = "
SELECT
dv.dienstverhaeltnis_id,
@@ -61,19 +65,19 @@ class Dienstverhaeltnis_model extends DB_Model
tbl_person.person_id,
tbl_benutzer.alias,
dv.von,
dv.bis,
dv.vertragsart_kurzbz,
dv.bis,
dv.vertragsart_kurzbz,
dv.updateamum,
dv.updatevon
FROM tbl_mitarbeiter
JOIN tbl_benutzer ON tbl_mitarbeiter.mitarbeiter_uid::text = tbl_benutzer.uid::text
JOIN tbl_person USING (person_id)
JOIN hr.tbl_dienstverhaeltnis dv ON(tbl_benutzer.uid::text = dv.mitarbeiter_uid::text)
WHERE tbl_benutzer.uid=? and (dv.von<=CURRENT_DATE::text::date and (dv.bis is null OR dv.bis>=CURRENT_DATE::text::date))
WHERE tbl_benutzer.uid=? and (dv.von<=? and (dv.bis is null OR dv.bis>=?))
ORDER BY dv.von desc
";
return $this->execQuery($qry, array($uid));
return $this->execQuery($qry, array($uid, $datestring, $datestring));
}
public function isOverlappingExistingDV($mitarbeiter_uid, $oe_kurzbz, $von, $bis)