study group update calculations

This commit is contained in:
2014-06-14 12:18:58 +10:00
parent 7751058348
commit c9ead35f16
8 changed files with 445 additions and 56 deletions

View File

@@ -40,6 +40,7 @@ function booking_report_summary() {
array('data' => t('Booking Status'), 'field' => 'booking_status'),
array('data' => t('Studygroups')),
array('data' => t('Room')),
array('data' => t('Travel')),
array('data' => t('Email'), 'field' => 'booking_email'),
array('data' => t('Payment To Date'), 'field' => 'booking_amount_paid'),
array('data' => t('Total Payment Required')),
@@ -107,15 +108,26 @@ function booking_report_summary() {
//$amount_owing = _booking_amount_owing($person->nid, 0, FALSE);
$amount_owing = _booking_amount_owing($person, 0, FALSE);
//calculate the travel link
if ($person->tid > 0)
{
$travel_link = l(t('Travel'), t('node/!id/edit', array('!id' => $person->tid)));
}
else
{
$travel_link = t('N/A');
}
//define the row for this person
$rows[] = array(
l(t('!id', array('!id' => $person->nid)), t('node/!id', array('!id' => $person->nid))),
//l(t('!id', array('!id' => $person->nid)), t('node/!id/edit', array('!id' => $person->nid))),
l(t('View !id', array('!id' => $person->nid)), t('node/!id', array('!id' => $person->nid))),
l(t('!first !last', array('!first' => ucwords($person->booking_firstname), '!last' => ucwords($person->booking_lastname))),
t('node/!id/edit', array('!id' => $person->nid))
),
_booking_status_generate($person->booking_status),
l(t('Groups'), t('admin/booking/!id/edit-studygroup', array('!id' => $person->nid))),
l(t('Room'), t('admin/booking/!id/edit-room', array('!id' => $person->nid))),
$travel_link,
t('!email', array('!email' => $person->booking_email)),
t('!payment', array('!payment' => $person->booking_amount_paid)),
t('!payment', array('!payment' => $amount_owing == 0 ? $person->booking_total_pay_reqd : _booking_total_due($person))),