Changeset:
9877328bdfa2
https://sourceforge.net/p/mrbs/hg-code/ci/9877328bdfa2c69b78280ae3a8b6606bc207eef8
Author:
Campbell Morrison <[email protected]>
Date:
Wed Dec 16 18:41:07 2015 +0000
Log message:
Simplified
diffstat:
web/functions_table.inc | 9 ++-------
1 files changed, 2 insertions(+), 7 deletions(-)
diffs (26 lines):
diff -r ed2bbc9e7433 -r 9877328bdfa2 web/functions_table.inc
--- a/web/functions_table.inc Wed Dec 16 18:24:55 2015 +0000
+++ b/web/functions_table.inc Wed Dec 16 18:41:07 2015 +0000
@@ -767,10 +767,7 @@
// Note: The predicate clause 'start_time <= ...' is an equivalent but
simpler
// form of the original which had 3 BETWEEN parts. It selects all entries
which
// occur on or cross the current day.
- $sql = "SELECT room_id, start_time, end_time, name, repeat_id,
- E.id, type,
- E.description, status,
- create_by
+ $sql = "SELECT E.*
FROM $tbl_entry E, $tbl_room R
WHERE E.room_id = R.id
AND R.area_id = $area_id
@@ -1085,9 +1082,7 @@
for ($j = 0; $j<=($num_of_days-1) ; $j++)
{
- $sql = "SELECT room_id, start_time, end_time, type, name, status,
repeat_id,
- id, description,
- create_by
+ $sql = "SELECT *
FROM $tbl_entry
WHERE room_id = $room
AND start_time <= $pm7[$j] AND end_time > $am7[$j]
------------------------------------------------------------------------------
_______________________________________________
Mrbs-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/mrbs-commits
