cleanup
This commit is contained in:
@@ -487,24 +487,7 @@ function booking_rooms_view_form($node, &$form_state, $location_id) {
|
||||
}
|
||||
}
|
||||
} //end creating existing room mappings for this room
|
||||
|
||||
/*
|
||||
//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_ensuite == 'Y' ? "Yes" : "No",
|
||||
"",
|
||||
"",
|
||||
"",
|
||||
"",
|
||||
"",
|
||||
),
|
||||
'id' => array("new-group-row"),
|
||||
);
|
||||
*/
|
||||
|
||||
|
||||
//create an additional row for each single bed
|
||||
for ($i = 0; $i < $data->booking_room_singlebeds; $i++) {
|
||||
//retrieve the default value if one exists
|
||||
@@ -514,20 +497,6 @@ function booking_rooms_view_form($node, &$form_state, $location_id) {
|
||||
$rows[] = array(
|
||||
'data' => $new_row,
|
||||
);
|
||||
/*
|
||||
$rows[] = array(
|
||||
'data' => array(
|
||||
"",
|
||||
"",
|
||||
"",
|
||||
_booking_rooms_view_formatperson($attendees, $nid),
|
||||
"",
|
||||
"",
|
||||
"",
|
||||
"",
|
||||
),
|
||||
);
|
||||
*/
|
||||
}
|
||||
|
||||
//create an additional row for each double bed
|
||||
@@ -539,21 +508,7 @@ function booking_rooms_view_form($node, &$form_state, $location_id) {
|
||||
$new_row['booking_room_doublebed_p2'] = _booking_rooms_view_formatperson($attendees, (!empty($existing_beds[2][$j])) ? $existing_beds[2][$j++] : 0);
|
||||
$rows[] = array(
|
||||
'data' => $new_row,
|
||||
);
|
||||
/*
|
||||
$rows[] = array(
|
||||
'data' => array(
|
||||
"",
|
||||
"",
|
||||
"",
|
||||
"",
|
||||
_booking_rooms_view_formatperson($attendees, (!empty($existing_beds[2][$j])) ? $existing_beds[2][$j++] : 0),
|
||||
_booking_rooms_view_formatperson($attendees, (!empty($existing_beds[2][$j])) ? $existing_beds[2][$j++] : 0),
|
||||
"",
|
||||
"",
|
||||
),
|
||||
);
|
||||
*/
|
||||
);
|
||||
}
|
||||
|
||||
//create an additional row for each queen bed
|
||||
@@ -565,24 +520,9 @@ function booking_rooms_view_form($node, &$form_state, $location_id) {
|
||||
$new_row['booking_room_queenbed_p2'] = _booking_rooms_view_formatperson($attendees, (!empty($existing_beds[3][$j])) ? $existing_beds[3][$j++] : 0);
|
||||
$rows[] = array(
|
||||
'data' => $new_row,
|
||||
);
|
||||
/*
|
||||
$rows[] = array(
|
||||
'data' => array(
|
||||
"",
|
||||
"",
|
||||
"",
|
||||
"",
|
||||
"",
|
||||
"",
|
||||
_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),
|
||||
),
|
||||
);
|
||||
*/
|
||||
);
|
||||
}
|
||||
|
||||
}
|
||||
} //end room iteration loop
|
||||
|
||||
//watchdog('booking', "<pre>Room assignment report rows:\n@info</pre>", array('@info' => print_r( $rows, true)));
|
||||
|
||||
|
Reference in New Issue
Block a user