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

Merge branch 'master' of gitlab.coadcorp.com:drupal/booking

Browse Source
This commit is contained in:
Nathan Coad
2016-07-21 07:41:34 +10:00
parent e30f2f7d6f e404501cda
commit bc881f3abb
15 changed files with 441 additions and 277 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
booking.studygroups.inc
View File

@@ -23,6 +23,7 @@ function booking_available_leadhelp_select_form($node, &$form_state, $group_id)
1 => "leader-row",
2 => "helper-row",
3 => "reserveleader-row",
4 => "reservehelper-row",
);
//verify that $group_id is a number
@@ -126,8 +127,7 @@ function booking_available_leadhelp_select_form($node, &$form_state, $group_id)
$assigned_role = $role;
$session_id = $group->booking_session_id;
//list any role for this current group
if ($role > 0)
{
if ($role > 0) {
$text = _booking_studygroup_role_lookup($role);
$role_listing .= "<b>" . $text . "</b> group " . $group->booking_studygroup_id . " #" . $group->booking_session_id . "; ";
$class = $class_array[$role];
@@ -400,8 +400,7 @@ function booking_studygroups_edit_form($node, &$form_state, $nid) {
//retrieve the number of study group sessions, assume they all have the same number of sessions
$num_sessions = reset($studygroups)->booking_num_group_sessions;
//create the array for our html select fields
for ($i = 1; $i <= $num_sessions; $i++)
{
for ($i = 1; $i <= $num_sessions; $i++) {
$session_options[$i] = $i;
$readinggroup_options[$i] = _booking_readinggroup_colour_lookup($i);
}
@@ -500,9 +499,10 @@ function booking_studygroups_edit_form($node, &$form_state, $nid) {
function booking_studygroups_edit_form_submit($form, &$form_state) {
global $event;
$counter = 0;
$checkboxes = $form_state['values']['table'];
//$checkboxes = $form_state['values']['table'];
$studygroup_ids = $form_state['values']['booking_assign_sessionid'];
$values = $form_state['input'];
$update_messages = array();
//check that $values['personid'] is a number
if (! preg_match('/^[0-9]+$/', $values['personid'])) {
@@ -536,7 +536,7 @@ function booking_studygroups_edit_form_submit($form, &$form_state) {
}
//check to see if we need to remove a study group mapping
if (! empty($person_groups[$key]) && $value == 'Remove') {
watchdog('booking', "Removing an existing Study Group session id: @id from group @group.\n<pre>@info</pre>",
$update_messages[] = t("Removing an existing Study Group session id: @id from group @group.\n<pre>@info</pre>",
array('@id' => $value, '@group' => $key, '@info' => print_r( $person_groups[$key], true)));
$num_deleted = db_delete('booking_studygroup_mapping')
@@ -545,7 +545,7 @@ function booking_studygroups_edit_form_submit($form, &$form_state) {
}
//check for an existing study group mapping to change
elseif ((!empty($person_groups[$key])) && $person_groups[$key]->booking_session_id != $value) {
watchdog('booking', "Updating Study Group session from: @key to @value for id @id",
$update_messages[] = t( "Updating Study Group session from: @key to @value for id @id",
array('@key' => $person_groups[$key]->booking_session_id, '@value' => $value, '@id' => $nid));
db_update('booking_studygroup_mapping')
@@ -567,12 +567,12 @@ function booking_studygroups_edit_form_submit($form, &$form_state) {
}
//found this entry already, so no change needed
elseif ((!empty($person_groups[$key])) && $person_groups[$key]->booking_session_id == $value) {
watchdog('booking', "Study Group @group session already set to @session.",
$update_messages[] = t("Study Group @group session already set to @session.",
array('@group' => $key, '@session' => $value));
}
//no previously defined value, so add a new entry to the mapping table
else {
watchdog('booking', "Adding Study Group session id: @id for group @group.", array('@id' => $value, '@group' => $key));
$update_messages[] = t("Adding Study Group session id: @id for group @group.", array('@id' => $value, '@group' => $key));
db_insert('booking_studygroup_mapping')
->fields(array(
@@ -593,8 +593,12 @@ function booking_studygroups_edit_form_submit($form, &$form_state) {
}
} //end new value check
} //end valid data check
} //end checkbox loop
}
} //end select dropdown loop
//output messages to watchdog
$final_message = t('Finished processing study groups for person id !id.', array('!id' => $nid));
drupal_set_message($final_message);
watchdog('booking', "<pre>" . $final_message . "\n" . implode("\n", $update_messages) . "</pre>");
} //end function
/**
* Function for calculating who belongs to which study group
@@ -1267,6 +1271,7 @@ function booking_studygroups_view_form($node, &$form_state, $group_id) {
1 => "leader-row",
2 => "helper-row",
3 => "reserveleader-row",
4 => "reservehelper-row",
);
//attach the custom css
@@ -1336,11 +1341,9 @@ function booking_studygroups_view_form($node, &$form_state, $group_id) {
$class = $class_array[$data->booking_studygroup_role];
//only add the lines separating groups if we're sorting by the session id
if ($sort['sql'] == "m.booking_session_id")
{
if ($sort['sql'] == "m.booking_session_id") {
//Add a different id for first entry of new session, with a border-top to distinguish it
if ($last_session <> $data->booking_session_id)
{
if ($last_session <> $data->booking_session_id) {
switch ($data->booking_studygroup_role) {
case 1:
$class = "leader-new-group-row";
@@ -1351,6 +1354,9 @@ function booking_studygroups_view_form($node, &$form_state, $group_id) {
case 3:
$class = "reserveleader-new-group-row";
break;
case 4:
$class = "reservehelper-new-group-row";
break;
default:
$class = "new-group-row";
@@ -1360,7 +1366,7 @@ function booking_studygroups_view_form($node, &$form_state, $group_id) {
$session = $group->booking_is_readinggroup == 'Y' ? _booking_readinggroup_colour_lookup($data->booking_session_id) : $data->booking_session_id;
$rows[] = array (
$rows[] = array(
'data' => array(
$session,
l(t('!first !last', array('!first' => $data->booking_firstname, '!last' => $data->booking_lastname)),
@@ -1382,14 +1388,6 @@ function booking_studygroups_view_form($node, &$form_state, $group_id) {
}
$prefix = t("<h2>Study Group !descrip</h2>", array('!descrip' => $group->booking_studygroup_descrip));
/*
$form['table'] = array (
'#type' => 'tableselect',
'#header' => $header,
'#options' => $options,
//'#attributes' => array('id' => 'sort-table'),
);
*/
return array (
'#attached' => array (
'css' => array(drupal_get_path('module', 'booking') . '/booking.css')
@@ -1404,8 +1402,7 @@ function booking_studygroups_view_form($node, &$form_state, $group_id) {
'#rows' => $rows,
'#attributes' => array('id' => 'sort-table'),
//'#sticky' => FALSE,
)
//'form' => $form,
)
);
}