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

- Fehlerkorrektur bei Raumsuche

Browse Source 
- Ergebnisliste ist sortierbar
This commit is contained in:
Andreas Österreicher
2012-04-19 14:02:38 +00:00
parent 3144285171
commit 0f6d189a2e
2 changed files with 46 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cis/private/lvplan/raumsuche.php
+30 -10
View File
@@ -42,8 +42,22 @@ echo '
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<title>'.$p->t('lvplan/reservierungsliste').'</title>
<link rel="stylesheet" href="../../../skin/tablesort.css" type="text/css"/>
<link rel="stylesheet" href="../../../skin/jquery.css" type="text/css"/>
<link rel="stylesheet" href="../../../skin/fhcomplete.css" type="text/css"/>
<link rel="stylesheet" href="../../../skin/style.css.php" type="text/css">
<script type="text/javascript" src="../../../include/js/jquery.js"></script>
<script language="Javascript">
$(document).ready(function()
{
$("#myTable").tablesorter(
{
sortList: [[0,0]],
widgets: ["zebra"]
});
});
function checkdata()
{
if(document.getElementById("datum").value=="")
@@ -74,13 +88,10 @@ echo '
</script>
</head>
<body id="inhalt">
<H2><table class="tabcontent">
<tr>
<td>&nbsp;<a class="Item" href="index.php">'.$p->t('lvplan/lehrveranstaltungsplan').'</a> &gt;&gt; '.$p->t('lvplan/raumsuche').'</td>
<td align="right"></td>
</tr>
</table>
</H2>
<H1>
<a class="Item" href="index.php">'.$p->t('lvplan/lehrveranstaltungsplan').'</a>
&gt;&gt; '.$p->t('lvplan/raumsuche').'
</H1>
';
echo '<form action="'.$_SERVER['PHP_SELF'].'" method="POST" onsubmit="return checkdata()">
@@ -155,8 +166,17 @@ if($sent)
}
else
{
echo '<br><table>';
echo '<tr class="liste"><th>'.$p->t('lvplan/raum').'</th><th>'.$p->t('global/bezeichnung').'</th><th>'.$p->t('global/nummer').'</th><th>'.$p->t('global/personen').'</th><th>'.$p->t('global/aktion').'</th></tr>';
echo '<br><table class="tablesorter" id="myTable" style="width: auto">
<thead>
<tr class="liste">
<th>'.$p->t('lvplan/raum').'</th>
<th>'.$p->t('global/bezeichnung').'</th>
<th>'.$p->t('global/nummer').'</th>
<th>'.$p->t('global/personen').'</th>
<th>'.$p->t('global/aktion').'</th>
</tr>
</thead>
<tbody>';
$i=0;
$datum_sec = $datum_obj->mktime_datum($datum)-1;
foreach ($ort->result as $row)
@@ -171,7 +191,7 @@ if($sent)
echo '</tr>';
flush();
}
echo '</table>';
echo '</tbody></table>';
}
}
}
include/ort.class.php
+16 -4
View File
@@ -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