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

Adaptierungen Zeiterfassungen von Sprint177

Browse Source
This commit is contained in:
ma0068
2022-02-03 14:49:29 +01:00
parent 06408ba66e
commit 615a55eccc
4 changed files with 129 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/zeitsperre.class.php
+10 -7
View File
@@ -368,10 +368,10 @@ class zeitsperre extends basis_db
*
* @param $user
* @param $datum
* @param $stunde
* @param $stunde optional, wird nur abgefragt, wenn != null
* @return true wenn ok, false im Fehlerfall
*/
public function getSperreByDate($user, $datum, $stunde)
public function getSperreByDate($user, $datum, $stunde=null)
{
$qry = "
SELECT
@@ -380,16 +380,19 @@ class zeitsperre extends basis_db
campus.tbl_zeitsperre
WHERE
vondatum<=".$this->db_add_param($datum)."
AND bisdatum>=".$this->db_add_param($datum)." AND
((vondatum=".$this->db_add_param($datum)." AND vonstunde<=".$this->db_add_param($stunde).") OR vonstunde is null OR vondatum<>".$this->db_add_param($datum).") AND
((bisdatum=".$this->db_add_param($datum)." AND bisstunde>=".$this->db_add_param($stunde).") OR bisstunde is null OR bisdatum<>".$this->db_add_param($datum).") AND
mitarbeiter_uid=".$this->db_add_param($user);
AND bisdatum>=".$this->db_add_param($datum);
if(!is_null($stunde))
$qry.=" AND
((vondatum=".$this->db_add_param($datum)." AND vonstunde<=".$this->db_add_param($stunde).") OR vonstunde is null OR vondatum<>".$this->db_add_param($datum).") AND
((bisdatum=".$this->db_add_param($datum)." AND bisstunde>=".$this->db_add_param($stunde).") OR bisstunde is null OR bisdatum<>".$this->db_add_param($datum).")";
$qry .= "AND mitarbeiter_uid=".$this->db_add_param($user);
if($result = $this->db_query($qry))
{
while($row = $this->db_fetch_object($result))
{
$obj = new zeitsperre();
$obj->zeitsperre_id = $row->zeitsperre_id;