Revision: 2199
http://mrbs.svn.sourceforge.net/mrbs/?rev=2199&view=rev
Author: cimorrison
Date: 2011-12-16 16:24:26 +0000 (Fri, 16 Dec 2011)
Log Message:
-----------
Ensured that if a new booking is selected and the default duration takes the
booking past the end of the booking day, then the default end time is the end
of the booking day (rather than the start time + resolution, as at present)
Modified Paths:
--------------
mrbs/trunk/web/edit_entry.php
Modified: mrbs/trunk/web/edit_entry.php
===================================================================
--- mrbs/trunk/web/edit_entry.php 2011-12-08 22:03:04 UTC (rev 2198)
+++ mrbs/trunk/web/edit_entry.php 2011-12-16 16:24:26 UTC (rev 2199)
@@ -861,6 +861,9 @@
}
$duration = ($enable_periods ? 60 : $default_duration);
$end_time = $start_time + $duration;
+ // The end time can't be past the end of the booking day
+ $pm7 = mktime($eveningends, $eveningends_minutes, 0, $month, $day, $year);
+ $end_time = min($end_time, $pm7 + $resolution);
}
}
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Learn Windows Azure Live! Tuesday, Dec 13, 2011
Microsoft is holding a special Learn Windows Azure training event for
developers. It will provide a great way to learn Windows Azure and what it
provides. You can attend the event by watching it streamed LIVE online.
Learn more at http://p.sf.net/sfu/ms-windowsazure
_______________________________________________
Mrbs-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/mrbs-commits
