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

Merge branch 'feature-3878/temput_ganztaegige_zeitsperren_erzeugen_keine_kollision'

Browse Source
This commit is contained in:
Andreas Österreicher
2023-03-13 16:24:45 +01:00
parent 6e1c602658 012e7b9691
commit e67e7309cb
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/lehreinheit.class.php
+4 -4
View File
@@ -663,10 +663,10 @@ class lehreinheit extends basis_db
$sql_lkt=mb_substr($sql_lkt,3);
$sql_query="SELECT * FROM campus.tbl_zeitsperre
WHERE ($sql_lkt) AND
( (vondatum<".$this->db_add_param($datum)." AND bisdatum>".$this->db_add_param($datum).")
OR (vondatum=".$this->db_add_param($datum)." AND bisdatum=".$this->db_add_param($datum)." AND vonstunde<=".$this->db_add_param($stunde)." AND bisstunde>=".$this->db_add_param($stunde).")
OR (vondatum=".$this->db_add_param($datum)." AND bisdatum>".$this->db_add_param($datum)." AND vonstunde<=".$this->db_add_param($stunde).")
OR (vondatum<".$this->db_add_param($datum)." AND bisdatum=".$this->db_add_param($datum)." AND bisstunde>=".$this->db_add_param($stunde).") )";
(vondatum <= ".$this->db_add_param($datum)." AND
bisdatum >= ".$this->db_add_param($datum)." AND
(vonstunde <= ". $this->db_add_param($stunde)." OR vonstunde IS NULL) AND
(bisstunde >= ". $this->db_add_param($stunde)." OR bisstunde IS NULL))";
//echo $sql_query.'<br>';
if (!$this->db_query($sql_query))
{