blackicedbear/FHC-Core
1
0
Fork 0
mirror of https://github.com/FH-Complete/FHC-Core.git synced 2026-07-24 10:22:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Anzeige Casetimeblock nur im aktuellen Jahr, Adaptierung berechneter Urlaubssaldo

Browse Source
This commit is contained in:
ma0068
2022-08-11 16:06:11 +02:00
parent b27b445ecc
commit dc3364204d
2 changed files with 59 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/zeitsperre.class.php
+5 -5
View File
@@ -641,7 +641,7 @@ class zeitsperre extends basis_db
* @param $freigegeben, wird nur abgefragt wenn != true
* @return true wenn ok, false im Fehlerfall
*/
public function getUrlaubstage($user, $enddatum=null, $freigegeben=false)
public function getUrlaubstage($user, $enddatum=null, $offen=false)
{
$qry = "
@@ -661,8 +661,8 @@ class zeitsperre extends basis_db
if($enddatum)
$qry.= 'AND bisDatum <= '. $this->db_add_param($enddatum);
if( $freigegeben )
$qry .= 'AND freigabeamum is not null';
if( $offen )
$qry .= 'AND freigabeamum is null';
if($enddatum)
{
@@ -677,8 +677,8 @@ class zeitsperre extends basis_db
$qry.=" AND bisDatum >=" . $this->db_add_param($enddatum)."
AND vonDatum <= " .$this->db_add_param($enddatum);
if( $freigegeben )
$qry .= 'AND freigabeamum is not null';
if( $offen )
$qry .= 'AND freigabeamum is null';
}
$qry .= ') AS countHolidays';