From 1aa9f6cfbe9c433cb1e27d087dc9e66be5cdfba4 Mon Sep 17 00:00:00 2001 From: Nathan Coad Date: Mon, 27 Jun 2016 11:53:25 +1000 Subject: [PATCH] move room label to dedicated column --- booking.rooms.inc | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/booking.rooms.inc b/booking.rooms.inc index f85a1ae..c3eb247 100644 --- a/booking.rooms.inc +++ b/booking.rooms.inc @@ -445,6 +445,7 @@ function booking_rooms_view_form($node, &$form_state, $location_id) { //define the header $header = array( 'booking_room_number' => array('data' => t('Room Number')), + 'booking_room_description' => array('data' => t('Room Label')), 'booking_room_singlebed' => array('data' => t('Single Bed')), 'booking_room_doublebed_p1' => array('data' => t('Double Bed Person 1')), 'booking_room_doublebed_p2' => array('data' => t('Double Bed Person 2')), @@ -468,7 +469,8 @@ function booking_rooms_view_form($node, &$form_state, $location_id) { //create a row that contains just the room location and number $rows[] = array( 'data' => array( - $data->booking_room_number . " ‐ " . $data->booking_room_description, + $data->booking_room_number, + $data->booking_room_description, "", "", "", @@ -485,6 +487,7 @@ function booking_rooms_view_form($node, &$form_state, $location_id) { $rows[] = array( 'data' => array( + "", "", _booking_rooms_view_formatperson($attendees, $nid), "", @@ -501,6 +504,7 @@ function booking_rooms_view_form($node, &$form_state, $location_id) { for ($i = 0; $i < $data->booking_room_doublebeds; $i++) { $rows[] = array( 'data' => array( + "", "", "", _booking_rooms_view_formatperson($attendees, (!empty($existing_beds[2][$j])) ? $existing_beds[2][$j++] : 0), @@ -520,6 +524,7 @@ function booking_rooms_view_form($node, &$form_state, $location_id) { "", "", "", + "", "", _booking_rooms_view_formatperson($attendees, (!empty($existing_beds[3][$j])) ? $existing_beds[3][$j++] : 0), _booking_rooms_view_formatperson($attendees, (!empty($existing_beds[3][$j])) ? $existing_beds[3][$j++] : 0),