Revision: 2613
https://sourceforge.net/p/mrbs/code/2613/
Author: cimorrison
Date: 2012-12-27 09:19:15 +0000 (Thu, 27 Dec 2012)
Log Message:
-----------
Made the month view work with the new tables
Modified Paths:
--------------
mrbs/branches/linked_bookings/web/month.php
Modified: mrbs/branches/linked_bookings/web/month.php
===================================================================
--- mrbs/branches/linked_bookings/web/month.php 2012-12-27 08:48:01 UTC (rev
2612)
+++ mrbs/branches/linked_bookings/web/month.php 2012-12-27 09:19:15 UTC (rev
2613)
@@ -181,10 +181,11 @@
// This data will be retrieved day-by-day fo the whole month
for ($day_num = 1; $day_num<=$days_in_month; $day_num++)
{
- $sql = "SELECT start_time, end_time, id, name, type,
+ $sql = "SELECT start_time, end_time, E.id, name, type,
repeat_id, status, 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[$day_num] AND end_time > $am7[$day_num]
ORDER BY start_time";
------------------------------------------------------------------------------
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
