diff --git a/cis/private/lvplan/raumsuche.php b/cis/private/lvplan/raumsuche.php index 91530af92..2a812ac24 100644 --- a/cis/private/lvplan/raumsuche.php +++ b/cis/private/lvplan/raumsuche.php @@ -42,8 +42,22 @@ echo ' '.$p->t('lvplan/reservierungsliste').' + + + + -

- - - - -
 '.$p->t('lvplan/lehrveranstaltungsplan').' >> '.$p->t('lvplan/raumsuche').'
-

+

+ '.$p->t('lvplan/lehrveranstaltungsplan').' + >> '.$p->t('lvplan/raumsuche').' +

'; echo '
@@ -155,8 +166,17 @@ if($sent) } else { - echo '
'; - echo ''; + echo '
'.$p->t('lvplan/raum').''.$p->t('global/bezeichnung').''.$p->t('global/nummer').''.$p->t('global/personen').''.$p->t('global/aktion').'
+ + + + + + + + + + '; $i=0; $datum_sec = $datum_obj->mktime_datum($datum)-1; foreach ($ort->result as $row) @@ -171,7 +191,7 @@ if($sent) echo ''; flush(); } - echo '
'.$p->t('lvplan/raum').''.$p->t('global/bezeichnung').''.$p->t('global/nummer').''.$p->t('global/personen').''.$p->t('global/aktion').'
'; + echo ''; } } } diff --git a/include/ort.class.php b/include/ort.class.php index 788940960..434c89a03 100644 --- a/include/ort.class.php +++ b/include/ort.class.php @@ -268,26 +268,38 @@ class ort extends basis_db } //stundevon ermitteln - $qry = "SELECT stunde FROM ( + $qry = "SELECT min(stunde) as stunde FROM ( SELECT stunde, extract(epoch from (beginn-('".addslashes($zeit_von)."'::time))) AS delta FROM lehre.tbl_stunde UNION SELECT stunde, extract(epoch from (ende-('".addslashes($zeit_von)."'::time))) AS delta FROM lehre.tbl_stunde - ) foo WHERE delta>=0 ORDER BY delta LIMIT 1;"; + ) foo WHERE delta>0"; if($this->db_query($qry)) if($row = $this->db_fetch_object()) $stundevon = $row->stunde; //stundebis ermitteln - $qry = "SELECT stunde FROM ( + $qry = "SELECT min(stunde) as stunde FROM ( SELECT stunde, extract(epoch from (beginn-('".addslashes($zeit_bis)."'::time))) AS delta FROM lehre.tbl_stunde UNION SELECT stunde, extract(epoch from (ende-('".addslashes($zeit_bis)."'::time))) AS delta FROM lehre.tbl_stunde - ) foo WHERE delta>=0 ORDER BY delta LIMIT 1;"; + ) foo WHERE delta>=0"; if($this->db_query($qry)) if($row = $this->db_fetch_object()) $stundebis = $row->stunde; + + if($stundevon=='') + $stundevon=1; + if($stundebis=='') + { + $stundebis=20; + $qry = "SELECT max(stunde) as max FROM lehre.tbl_stunde"; + if($this->db_query($qry)) + if($row = $this->db_fetch_object()) + $stundebis=$row->max; + } + //echo $stundevon.'-'.$stundebis; //Freie Raeume suchen $qry = "SELECT