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

Merge branch 'feature-4834/Zeitaufzeichnung_OhneUeberlappung'

Browse Source
This commit is contained in:
Andreas Österreicher
2019-11-06 10:22:39 +01:00
parent 557906c4dd 6997791794
commit a1eec8e551
5 changed files with 269 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/zeitaufzeichnung.class.php
+16 -5
View File
@@ -172,17 +172,28 @@ class zeitaufzeichnung extends basis_db
}
}
}
if ($this->aktivitaet_kurzbz != 'Ersatzruhe')
if ($this->aktivitaet_kurzbz != 'Ersatzruhe' && $this->aktivitaet_kurzbz != 'DienstreiseMT')
{
$check_qry = "SELECT count(*) from campus.tbl_zeitaufzeichnung where uid=".$this->db_add_param($this->uid)." and aktivitaet_kurzbz = 'Ersatzruhe' and (start < ".$this->db_add_param($this->ende)." and ende > ".$this->db_add_param($this->start).")";
$check_qry = "SELECT count(*) from campus.tbl_zeitaufzeichnung where uid=".$this->db_add_param($this->uid)." and aktivitaet_kurzbz != 'DienstreiseMT' and (start < ".$this->db_add_param($this->ende)." and ende > ".$this->db_add_param($this->start).")";
if($this->db_query($check_qry))
{
if($row = $this->db_fetch_object())
{
if ($row->count)
if ($this->new)
{
$this->errormsg = 'Eintrag darf nicht mit Ersatzruhe Überlappen!';
return false;
if ($row->count)
{
$this->errormsg = 'Einträge dürfen nicht Überlappen!';
return false;
}
}
else
{
if ($row->count > 1)
{
$this->errormsg = 'Einträge dürfen nicht Überlappen!';
return false;
}
}
}
}