Changeset:
c398a4904bc9
https://sourceforge.net/p/mrbs/hg-code/ci/c398a4904bc9a13432948d2deb9e4b2e2cb846b8
Author:
Campbell Morrison <cimorri...@hg.code.sf.net>
Date:
Thu Mar 30 20:08:22 2017 +0100
Log message:
Fixed (hopefully properly this time) bug causing a booking occupying a single
slot at the end of the day not to show in the day and week views. See SF
Support Requests 1207.
diffstat:
web/functions_table.inc | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diffs (21 lines):
diff -r 9da195f06ef7 -r c398a4904bc9 web/functions_table.inc
--- a/web/functions_table.inc Thu Mar 30 20:02:20 2017 +0100
+++ b/web/functions_table.inc Thu Mar 30 20:08:22 2017 +0100
@@ -759,7 +759,7 @@
// saves us bothering to do the detailed calculations of which slots are
invalid.
$is_possibly_invalid = !$enable_periods && is_possibly_invalid($am7, $pm7);
- $entries = get_entries_by_area($area_id, $am7, $pm7);
+ $entries = get_entries_by_area($area_id, $am7, $pm7 + $resolution);
// We want to build an array containing all the data we want to show
// and then spit it out.
@@ -1022,7 +1022,7 @@
for ($j = 0; $j<=($num_of_days-1) ; $j++)
{
- $entries = get_entries_by_room($room_id, $am7[$j], $pm7[$j]);
+ $entries = get_entries_by_room($room_id, $am7[$j], $pm7[$j] + $resolution);
foreach ($entries as $entry)
{
map_add_booking($entry, $week_map[$room_id][$j], $am7[$j], $pm7[$j]);
------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot
_______________________________________________
Mrbs-commits mailing list
Mrbs-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/mrbs-commits
