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

Keine Kollision bei Verschiebung

Browse Source
This commit is contained in:
Andreas Österreicher
2019-01-25 08:24:05 +01:00
parent 7e2336e9cc
commit 5892496706
2 changed files with 24 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/lehrstunde.class.php
+23 -9
View File
@@ -741,20 +741,34 @@ class lehrstunde extends basis_db
//Wenn eine Kollisionspruefung auf Studentenebene durchgefuehrt wird, werden die LVB nicht gecheckt
if($kollision_student=='false')
{
$sql_query.=" OR (studiengang_kz=".$this->db_add_param($this->studiengang_kz)." AND semester=".$this->db_add_param($this->sem);
// Direkte Gruppen kollidieren nicht
$direktgruppe = false;
if($this->gruppe_kurzbz!=null && $this->gruppe_kurzbz!='' && $this->gruppe_kurzbz!=' ')
{
$sql_query.=" OR (gruppe_kurzbz=".$this->db_add_param($this->gruppe_kurzbz).")";
$grp_obj = new gruppe();
$grp_obj->load($this->gruppe_kurzbz);
if($grp_obj->direktinskription)
{
$direktgruppe = true;
}
}
else
if(!$direktgruppe)
{
if ($this->ver!=null && $this->ver!='' && $this->ver!=' ')
$sql_query.=" AND (verband=".$this->db_add_param($this->ver)." OR verband IS NULL OR verband='' OR verband=' ')";
if ($this->grp!=null && $this->grp!='' && $this->grp!=' ')
$sql_query.=" AND (gruppe=".$this->db_add_param($this->grp)." OR gruppe IS NULL OR gruppe='' OR gruppe=' ')";
}
$sql_query.=" OR (studiengang_kz=".$this->db_add_param($this->studiengang_kz)." AND semester=".$this->db_add_param($this->sem);
if($this->gruppe_kurzbz!=null && $this->gruppe_kurzbz!='' && $this->gruppe_kurzbz!=' ')
{
$sql_query.=" OR (gruppe_kurzbz=".$this->db_add_param($this->gruppe_kurzbz).")";
}
else
{
if ($this->ver!=null && $this->ver!='' && $this->ver!=' ')
$sql_query.=" AND (verband=".$this->db_add_param($this->ver)." OR verband IS NULL OR verband='' OR verband=' ')";
if ($this->grp!=null && $this->grp!='' && $this->grp!=' ')
$sql_query.=" AND (gruppe=".$this->db_add_param($this->grp)." OR gruppe IS NULL OR gruppe='' OR gruppe=' ')";
}
$sql_query.=")";
$sql_query.=")";
}
}
$sql_query.=") AND unr!=".$this->db_add_param($this->unr);
skin/tempus.css
+1 -1
View File
@@ -162,7 +162,7 @@ toolbarbutton.stplweekoverlay-toolbarbutton:hover
color: #AAAAAA;
visibility:hidden;
font-size: small;
margin-top: 10px;
margin-bottom: 15px;
}
treechildren::-moz-tree-row(makeItred)