drupal/booking
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity

add ensuite info to room allocations page

Browse Source
This commit is contained in:
Nathan Coad
2016-06-28 13:17:38 +10:00
parent d5d45512c6
commit 69442d30b5
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
booking.module
View File

@@ -440,11 +440,10 @@ function booking_menu() {
}
//configure study groups
if (variable_get('booking_enable_studygroups', 0) == 1)
{
if (variable_get('booking_enable_studygroups', 0) == 1) {
//the config pages for study groups
$items['admin/config/booking/studygroups'] = array(
'title' => 'Booking Module Study Group Configuration',
'title' => 'Booking module Study Group configuration',
'description' => 'Define and configure Study Groups for the Booking module',
'page callback' => 'booking_studygroups_admin',
'access arguments' => array('administer site configuration'),
@@ -583,7 +582,7 @@ function booking_menu() {
//config pages
$items['admin/config/booking/rooms'] = array(
'title' => 'Booking module room definitions',
'description' => 'View and Configure room definitions for the Event Booking module',
'description' => 'View and configure Room Definitions for the Booking module',
'page callback' => 'drupal_get_form',
'page arguments' => array('booking_rooms_view_definitions'),
'access arguments' => array('administer site configuration'),

3
booking.rooms_allocate.inc
View File

@@ -72,6 +72,7 @@ function booking_rooms_allocate_form($node, &$form_state, $location_id) {
'booking_room_location' => array('data' => t('Room Location'), 'field' => 'booking_room_location_id'),
'booking_room_number' => array('data' => t('Room Number')),
'booking_room_description' => array('data' => t('Room Label')),
'booking_room_ensuite' => array('data' => t('Ensuite?')),
'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')),
@@ -99,6 +100,7 @@ function booking_rooms_allocate_form($node, &$form_state, $location_id) {
$default_row['booking_room_location'] = "";
$default_row['booking_room_number'] = "";
$default_row['booking_room_description'] = "";
$default_row['booking_room_ensuite'] = "";
$default_row['booking_room_singlebed'] = "";
$default_row['booking_room_doublebed_p1'] = "";
$default_row['booking_room_doublebed_p2'] = "";
@@ -124,6 +126,7 @@ function booking_rooms_allocate_form($node, &$form_state, $location_id) {
$new_row['booking_room_location'] = $data->booking_roomlocation_descrip;
$new_row['booking_room_number'] = $data->booking_room_number;
$new_row['booking_room_description'] = $data->booking_room_description;
$new_row['booking_room_ensuite'] = $data->booking_room_ensuite == 'Y' ? "Yes" : "No";
$form['rooms']['#rows'][$counter++] = array(
'data' => $new_row,
'id' => array("new-group-row"),