move room label to dedicated column

This commit is contained in:
2016-06-27 11:53:25 +10:00
parent d2dc154518
commit 1aa9f6cfbe

View File

@@ -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),
@@ -521,6 +525,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),
),