Revision: 2611
https://sourceforge.net/p/mrbs/code/2611/
Author: cimorrison
Date: 2012-12-27 08:46:35 +0000 (Thu, 27 Dec 2012)
Log Message:
-----------
Made the week view work with the new tables
Modified Paths:
--------------
mrbs/branches/linked_bookings/web/functions_table.inc
Modified: mrbs/branches/linked_bookings/web/functions_table.inc
===================================================================
--- mrbs/branches/linked_bookings/web/functions_table.inc 2012-12-27
08:39:33 UTC (rev 2610)
+++ mrbs/branches/linked_bookings/web/functions_table.inc 2012-12-27
08:46:35 UTC (rev 2611)
@@ -994,7 +994,7 @@
function week_table_innerhtml($day, $month, $year, $room, $area,
$timetohighlight=NULL)
{
- global $tbl_entry, $tbl_room, $tbl_area;
+ global $tbl_entry, $tbl_room, $tbl_area, $tbl_room_entry;
global $enable_periods, $periods;
global $times_along_top, $row_labels_both_sides, $column_labels_both_ends;
global $resolution, $morningstarts, $morningstarts_minutes, $eveningends,
$eveningends_minutes;
@@ -1071,11 +1071,12 @@
for ($j = 0; $j<=($num_of_days-1) ; $j++)
{
- $sql = "SELECT room_id, start_time, end_time, type, name, status,
repeat_id,
- id AS entry_id, description AS entry_description,
+ $sql = "SELECT RE.room_id AS room_id, start_time, end_time, type, name,
status, repeat_id,
+ E.id AS entry_id, description AS entry_description,
create_by AS entry_create_by
- FROM $tbl_entry
- WHERE room_id = $room
+ FROM $tbl_entry E, $tbl_room_entry RE
+ WHERE E.id = RE.entry_id
+ AND RE.room_id = $room
AND start_time <= $pm7[$j] AND end_time > $am7[$j]
ORDER BY start_time"; // necessary so that multiple bookings
appear in the right order
------------------------------------------------------------------------------
Master Visual Studio, SharePoint, SQL, ASP.NET, C# 2012, HTML5, CSS,
MVC, Windows 8 Apps, JavaScript and much more. Keep your skills current
with LearnDevNow - 3,200 step-by-step video tutorials by Microsoft
MVPs and experts. ON SALE this month only -- learn more at:
http://p.sf.net/sfu/learnmore_122712
_______________________________________________
Mrbs-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/mrbs-commits
