Revision: 2624
https://sourceforge.net/p/mrbs/code/2624/
Author: cimorrison
Date: 2012-12-29 20:41:08 +0000 (Sat, 29 Dec 2012)
Log Message:
-----------
Made Export from view_entry work with new tables
Modified Paths:
--------------
mrbs/branches/linked_bookings/web/view_entry.php
Modified: mrbs/branches/linked_bookings/web/view_entry.php
===================================================================
--- mrbs/branches/linked_bookings/web/view_entry.php 2012-12-29 20:31:24 UTC
(rev 2623)
+++ mrbs/branches/linked_bookings/web/view_entry.php 2012-12-29 20:41:08 UTC
(rev 2624)
@@ -208,7 +208,7 @@
// If it's a series we want the repeat information
$sql .= ", T.rep_type, T.end_date, T.rep_opt, T.rep_num_weeks";
}
- $sql .= " FROM $tbl_area A, $tbl_room R, $tbl_entry E";
+ $sql .= " FROM $tbl_area A, $tbl_room R, $tbl_entry E, $tbl_room_entry RE";
if ($series)
{
$sql .= ", $tbl_repeat T"
@@ -220,7 +220,8 @@
$sql .= " WHERE E.id=$id";
}
- $sql .= " AND E.room_id=R.id
+ $sql .= " AND E.id=RE.entry_id
+ AND RE.room_id=R.id
AND R.area_id=A.id";
if ($series)
------------------------------------------------------------------------------
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. SALE $99.99 this month only -- learn more at:
http://p.sf.net/sfu/learnmore_122912
_______________________________________________
Mrbs-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/mrbs-commits
