Revision: 1760
http://mrbs.svn.sourceforge.net/mrbs/?rev=1760&view=rev
Author: cimorrison
Date: 2011-01-27 09:47:35 +0000 (Thu, 27 Jan 2011)
Log Message:
-----------
Fixed bug whereby start and end times were incorrectly presented in reports
when using mixed periods and times.
Modified Paths:
--------------
mrbs/trunk/web/report.php
Modified: mrbs/trunk/web/report.php
===================================================================
--- mrbs/trunk/web/report.php 2011-01-27 08:34:14 UTC (rev 1759)
+++ mrbs/trunk/web/report.php 2011-01-27 09:47:35 UTC (rev 1760)
@@ -183,7 +183,6 @@
function reporton(&$row, &$last_area_room, &$last_date, $sortby, $display)
{
global $typel;
- global $enable_periods;
global $output_as_csv;
global $csv_row_sep;
global $custom_fields, $field_natures, $field_lengths, $tbl_entry;
@@ -259,14 +258,14 @@
if( $display == "d" )
{
// Start date/time and duration:
- $when = (empty($enable_periods) ?
+ $when = (empty($row['enable_periods']) ?
describe_span($row['start_time'], $row['end_time']) :
describe_period_span($row['start_time'], $row['end_time']));
}
else
{
// Start date/time and End date/time:
- $when = (empty($enable_periods) ?
+ $when = (empty($row['enable_periods']) ?
start_to_end($row['start_time'], $row['end_time']) :
start_to_end_period($row['start_time'], $row['end_time']));
}
@@ -704,7 +703,7 @@
$sql = "SELECT E.*, "
. sql_syntax_timestamp_to_unix("E.timestamp") . " AS last_updated, "
. "A.area_name, R.room_name, "
- . "A.approval_enabled, A.confirmation_enabled";
+ . "A.approval_enabled, A.confirmation_enabled, A.enable_periods";
if ($output_as_ical)
{
// If we're producing an iCalendar then we'll also need the repeat
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Special Offer-- Download ArcSight Logger for FREE (a $49 USD value)!
Finally, a world-class log management solution at an even better price-free!
Download using promo code Free_Logger_4_Dev2Dev. Offer expires
February 28th, so secure your free ArcSight Logger TODAY!
http://p.sf.net/sfu/arcsight-sfd2d
_______________________________________________
Mrbs-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/mrbs-commits
