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

adapt overlapping DVs Check to not consider current DV if edited, but consider karenzen

Browse Source
This commit is contained in:
Harald Bamberger
2023-05-25 15:47:16 +02:00
parent 4f6c60af3a
commit 92672aaacf
2 changed files with 22 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/libraries/vertragsbestandteil/VertragsbestandteilLib.php
+2 -1
View File
@@ -254,7 +254,8 @@ class VertragsbestandteilLib
$dv->getMitarbeiter_uid(),
$dv->getOe_kurzbz(),
$dv->getVon(),
$dv->getBis()
$dv->getBis(),
$dv->getDienstverhaeltnis_id()
);
}
}
application/models/vertragsbestandteil/Dienstverhaeltnis_model.php
+20 -3
View File
@@ -80,8 +80,10 @@ class Dienstverhaeltnis_model extends DB_Model
return $this->execQuery($qry, array($uid, $datestring, $datestring));
}
public function isOverlappingExistingDV($mitarbeiter_uid, $oe_kurzbz, $von, $bis)
public function isOverlappingExistingDV($mitarbeiter_uid, $oe_kurzbz, $von, $bis, $dvid=null)
{
$dvidclause = (intval($dvid) > 0) ? 'AND dv.dienstverhaeltnis_id != ' . $dvid : '';
$query = <<<EOSQL
SELECT
count(*) AS dvcount
@@ -94,11 +96,26 @@ class Dienstverhaeltnis_model extends DB_Model
AND
?::date <= COALESCE(dv.bis, '2170-12-31'::date)
AND
COALESCE(?::date, '2170-12-31'::date) >= dv.von
COALESCE(?::date, '2170-12-31'::date) >= dv.von
AND (
SELECT
COUNT(*) AS karenzen
FROM
hr.tbl_vertragsbestandteil vb
WHERE
vb.dienstverhaeltnis_id = dv.dienstverhaeltnis_id
AND
vb.vertragsbestandteiltyp_kurzbz = 'karenz'
AND
?::date >= COALESCE(vb.von, '1970-01-01'::date)
AND
COALESCE(?::date, '2170-12-31'::date) <= COALESCE(vb.bis, '2170-12-31')
) = 0
{$dvidclause}
EOSQL;
$ret = $this->execReadOnlyQuery($query,
array($mitarbeiter_uid, $oe_kurzbz, $von, $bis));
array($mitarbeiter_uid, $oe_kurzbz, $von, $bis, $von, $bis));
if( ($dvcount = getData($ret)) && ($dvcount[0]->dvcount > 0) ) {
return true;