*** theme/theme.inc Mon Jan 30 23:18:21 2012 --- theme/theme.inc.orig Mon Jan 30 23:13:34 2012 *************** *** 501,505 **** $grouped_items[$unit->title] = array(); foreach ($events as $elemkey => $event) { ! foreach(array_keys($event) as $subevent){ // Get initial value as formatted one already blanked $group_key = isset($event->raw->{$grouping_field}) ? $event->raw->{$grouping_field} : t('Items'); --- 501,505 ---- $grouped_items[$unit->title] = array(); foreach ($events as $elemkey => $event) { ! // Get initial value as formatted one already blanked $group_key = isset($event->raw->{$grouping_field}) ? $event->raw->{$grouping_field} : t('Items'); *************** *** 514,535 **** // If EVENTDATE < DAYCALENDARDATESTART: $temp_granularity_end = date_create(date_format($view->date_info->min_date, DATE_FORMAT_DATETIME)); ! if ($event[$subevent]->date_start < $temp_granularity_end) { $event_start = '00:00:00'; } else { ! $event_start = $event[$subevent]->date_start->format('H:i:s'); } $temp_granularity_end = date_create(date_format($view->date_info->max_date, DATE_FORMAT_DATETIME)); ! if ($event[$subevent]->date_end > $temp_granularity_end) { $event_end = '23:59:59'; } else { ! $event_end = $event[$subevent]->date_end->format('H:i:s'); } $i = 0; // Get units of reservation ! $tmpunititems = _agreservations_get_unitn_for_reservation_node($event[$subevent]->nid); if (in_array($unit->nid, $tmpunititems)) { --- 514,535 ---- // If EVENTDATE < DAYCALENDARDATESTART: $temp_granularity_end = date_create(date_format($view->date_info->min_date, DATE_FORMAT_DATETIME)); ! if ($event[0]->date_start < $temp_granularity_end) { $event_start = '00:00:00'; } else { ! $event_start = $event[0]->date_start->format('H:i:s'); } $temp_granularity_end = date_create(date_format($view->date_info->max_date, DATE_FORMAT_DATETIME)); ! if ($event[0]->date_end > $temp_granularity_end) { $event_end = '23:59:59'; } else { ! $event_end = $event[0]->date_end->format('H:i:s'); } $i = 0; // Get units of reservation ! $tmpunititems = _agreservations_get_unitn_for_reservation_node($event[0]->nid); if (in_array($unit->nid, $tmpunititems)) { *************** *** 555,559 **** } ! $grouped_items[$unit->title][$timeslots[$slot]]['values']["$key"] = theme('agres_views_item', array('view' => $view, 'rendered_fields' => $event[$subevent]->rendered_fields, 'item' => $event[$subevent])); // theme($theme, $event, $view); } // First slot of multi slot event --- 555,559 ---- } ! $grouped_items[$unit->title][$timeslots[$slot]]['values']["$key"] = theme('agres_views_item', array('view' => $view, 'rendered_fields' => $event[0]->rendered_fields, 'item' => $event[0])); // theme($theme, $event, $view); } // First slot of multi slot event *************** *** 578,582 **** $span = $timeslots[$slot]; ! $grouped_items[$unit->title][$timeslots[$slot]]['values']["$key"] = theme('agres_views_item', array('view' => $view, 'rendered_fields' => $event[$subevent]->rendered_fields, 'item' => $event[$subevent])); // theme($theme, $event, $view); $grouped_items[$unit->title][$timeslots[$slot]]['span']["$key"] = 1; } --- 578,582 ---- $span = $timeslots[$slot]; ! $grouped_items[$unit->title][$timeslots[$slot]]['values']["$key"] = theme('agres_views_item', array('view' => $view, 'rendered_fields' => $event[0]->rendered_fields, 'item' => $event[0])); // theme($theme, $event, $view); $grouped_items[$unit->title][$timeslots[$slot]]['span']["$key"] = 1; } *************** *** 593,597 **** } } - } // Do the headers last, once we know what the actual values are. --- 593,596 ---- *************** *** 1284,1286 **** } return '
' . t('Empty day') . '
'; ! } --- 1283,1285 ---- } return '
' . t('Empty day') . '
'; ! } \ No newline at end of file