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

Browse Source
This commit is contained in:
Andreas Österreicher
2008-10-09 09:00:04 +00:00
parent 3fadcd7bc7
commit 6c8cf24d02
13 changed files with 99 additions and 165 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/globals.inc.php
+2 -2
View File
@@ -12,8 +12,8 @@
$cfgStdBgcolor[1]="#FF2200";
$cfgStdBgcolor[2]="#FF9922";
$cfgStdBgcolor[3]="#FFFF55";
$cfgStdBgcolor[4]="#88FF88";
$cfgStdBgcolor[5]="#AAFFAA";
$cfgStdBgcolor[4]="#C0ECC3";
$cfgStdBgcolor[5]="#48FA66";
$cfgStdBgcolor[6]="#CCFFCC";
// Wochentage auf Deutsch (Zeitwunsch)
include/lehrstunde.class.php
+1 -1
View File
@@ -556,7 +556,7 @@ class lehrstunde
FROM campus.tbl_zeitsperre
WHERE mitarbeiter_uid='$this->lektor_uid'
AND (vondatum<'$this->datum' OR (vondatum='$this->datum' AND (vonstunde<=$this->stunde OR vonstunde IS NULL)))
AND (bisdatum>'$this->datum' OR (bisdatum='$this->datum' AND (bisstunde>=$this->stunde OR vonstunde IS NULL)));";
AND (bisdatum>'$this->datum' OR (bisdatum='$this->datum' AND (bisstunde>=$this->stunde OR bisstunde IS NULL)));";
//echo $sql_query.'<br>';
if (! $erg_zs=pg_query($this->conn, $sql_query))
{
include/wochenplan.class.php
+2 -2
View File
@@ -682,7 +682,7 @@ class wochenplan
// Kontext Menue
echo '<popupset>
<popup id="stplPopupMenue">
<menuitem label="Raumvorschlag" oncommand="StplSearchRoom(event);" />
<menuitem label="Raumvorschlag" oncommand="StplSearchRoom(document.popupNode);" />
<menuitem label="Entfernen" oncommand="onStplDelete(\'stpl_delete_single\');" />
</popup>
</popupset>';
@@ -1102,7 +1102,7 @@ class wochenplan
// Raeume die in Frage kommen, aufgrund der Raumtypen
$sql_query="SELECT DISTINCT ort_kurzbz FROM public.tbl_ort
WHERE aktiv AND ort_kurzbz NOT LIKE '\\\\_%' ORDER BY ort_kurzbz"; // NATURAL JOIN tbl_ortraumtyp WHERE $rtype hierarchie
WHERE aktiv AND lehre AND ort_kurzbz NOT LIKE '\\\\_%' ORDER BY ort_kurzbz"; // NATURAL JOIN tbl_ortraumtyp WHERE $rtype hierarchie
//echo $sql_query;
if(!$result=pg_exec($this->conn, $sql_query))
die(pg_last_error($this->conn));