';
$body .= '';
$body .= '| '.$group_by_header.' | ';
- if ($bean->getAttribute('chduration'))
+ if ($options['show_duration'])
$body .= ''.$i18n->get('label.duration').' | ';
- if ($bean->getAttribute('chunits'))
+ if ($options['show_work_units'])
$body .= ''.$i18n->get('label.work_units_short').' | ';
- if ($bean->getAttribute('chcost'))
+ if ($options['show_cost'])
$body .= ''.$i18n->get('label.cost').' | ';
$body .= '
';
foreach($subtotals as $subtotal) {
$body .= '';
$body .= '| '.($subtotal['name'] ? htmlspecialchars($subtotal['name']) : ' ').' | ';
- if ($bean->getAttribute('chduration')) {
+ if ($options['show_duration']) {
$body .= '';
if ($subtotal['time'] <> '0:00') $body .= $subtotal['time'];
$body .= ' | ';
}
- if ($bean->getAttribute('chunits')) {
+ if ($options['show_work_units']) {
$body .= '';
$body .= $subtotal['units'];
$body .= ' | ';
}
- if ($bean->getAttribute('chcost')) {
+ if ($options['show_cost']) {
$body .= '';
$body .= ($canViewReports || $isClient) ? $subtotal['cost'] : $subtotal['expenses'];
$body .= ' | ';
@@ -1328,6 +741,11 @@ class ttReportHelper {
$body .= '
';
}
+// TODO: refactoring ongoing down from here...
+
+
+
+
// Print totals.
$body .= '| |
';
$body .= '';
@@ -1547,7 +965,7 @@ class ttReportHelper {
// checkFavReportCondition - checks whether it is okay to send fav report.
static function checkFavReportCondition($options, $condition)
{
- $items = ttReportHelper::getFavItems($options);
+ $items = ttReportHelper::getItems($options);
$condition = str_replace('count', '', $condition);
$count_required = (int) trim(str_replace('>', '', $condition));
@@ -1559,20 +977,20 @@ class ttReportHelper {
}
// prepareFavReportBody - prepares an email body for a favorite report.
- static function prepareFavReportBody($options)
+ static function prepareFavReportBody($options, $comment = null)
{
global $user;
global $i18n;
// Determine these once as they are used in multiple places in this function.
- $canViewReports = $user->can('view_reports');
+ $canViewReports = $user->can('view_reports') || $user->can('view_all_reports');
$isClient = $user->isClient();
- $items = ttReportHelper::getFavItems($options);
+ $items = ttReportHelper::getItems($options);
$group_by = $options['group_by'];
if ($group_by && 'no_grouping' != $group_by)
- $subtotals = ttReportHelper::getFavSubtotals($options);
- $totals = ttReportHelper::getFavTotals($options);
+ $subtotals = ttReportHelper::getSubtotals($options);
+ $totals = ttReportHelper::getTotals($options);
// Use custom fields plugin if it is enabled.
if ($user->isPluginEnabled('cf'))
@@ -1599,7 +1017,7 @@ class ttReportHelper {
$body .= ''.$i18n->get('form.mail.report_subject').': '.$totals['start_date'].' - '.$totals['end_date'].'
';
// Output comment.
- // if ($comment) $body .= ''.htmlspecialchars($comment).'
'; // No comment for fav. reports.
+ if ($comment) $body .= ''.htmlspecialchars($comment).'
';
if ($options['show_totals_only']) {
// Totals only report. Output subtotals.
@@ -1906,35 +1324,50 @@ class ttReportHelper {
$options['cf_1_option_id'] = $bean->getAttribute('option');
$options['project_id'] = $bean->getAttribute('project');
$options['task_id'] = $bean->getAttribute('task');
-
-/*
- * TODO: remaining fields to fill in...
- `billable` tinyint(4) default NULL, # whether to include billable, not billable, or all records
- `invoice` tinyint(4) default NULL, # whether to include invoiced, not invoiced, or all records
- `paid_status` tinyint(4) default NULL, # whether to include paid, not paid, or all records
- `users` text default NULL, # Comma-separated list of user ids. Nothing here means "all" users.
- `period` tinyint(4) default NULL, # selected period type for report
- `period_start` date default NULL, # period start
- `period_end` date default NULL, # period end
- `show_client` tinyint(4) NOT NULL default 0, # whether to show client column
- `show_invoice` tinyint(4) NOT NULL default 0, # whether to show invoice column
- `show_paid` tinyint(4) NOT NULL default 0, # whether to show paid column
- `show_ip` tinyint(4) NOT NULL default 0, # whether to show ip column
- `show_project` tinyint(4) NOT NULL default 0, # whether to show project column
- `show_start` tinyint(4) NOT NULL default 0, # whether to show start field
- `show_duration` tinyint(4) NOT NULL default 0, # whether to show duration field
- `show_cost` tinyint(4) NOT NULL default 0, # whether to show cost field
- `show_task` tinyint(4) NOT NULL default 0, # whether to show task column
- `show_end` tinyint(4) NOT NULL default 0, # whether to show end field
- `show_note` tinyint(4) NOT NULL default 0, # whether to show note column
- `show_custom_field_1` tinyint(4) NOT NULL default 0, # whether to show custom field 1
- `show_work_units` tinyint(4) NOT NULL default 0, # whether to show work units
- `show_totals_only` tinyint(4) NOT NULL default 0, # whether to show totals only
- `group_by` varchar(20) default NULL, # group by field
- `status` tinyint(4) default 1, # favorite report status
- PRIMARY KEY (`id`)
-);
- */
+ $options['billable'] = $bean->getAttribute('include_records');
+ $options['invoice'] = $bean->getAttribute('invoice');
+ $options['paid_status'] = $bean->getAttribute('paid_status');
+ if (is_array($bean->getAttribute('users'))) $options['users'] = join(',', $bean->getAttribute('users'));
+ $options['period'] = $bean->getAttribute('period');
+ $options['period_start'] = $bean->getAttribute('start_date');
+ $options['period_end'] = $bean->getAttribute('end_date');
+ $options['show_client'] = $bean->getAttribute('chclient');
+ $options['show_invoice'] = $bean->getAttribute('chinvoice');
+ $options['show_paid'] = $bean->getAttribute('chpaid');
+ $options['show_ip'] = $bean->getAttribute('chip');
+ $options['show_project'] = $bean->getAttribute('chproject');
+ $options['show_start'] = $bean->getAttribute('chstart');
+ $options['show_duration'] = $bean->getAttribute('chduration');
+ $options['show_cost'] = $bean->getAttribute('chcost');
+ $options['show_task'] = $bean->getAttribute('chtask');
+ $options['show_end'] = $bean->getAttribute('chfinish');
+ $options['show_note'] = $bean->getAttribute('chnote');
+ $options['show_custom_field_1'] = $bean->getAttribute('chcf_1');
+ $options['show_work_units'] = $bean->getAttribute('chunits');
+ $options['show_totals_only'] = $bean->getAttribute('chtotalsonly');
+ $options['group_by'] = $bean->getAttribute('group_by');
return $options;
}
+
+ // verifyBean is a security function to make sure data in bean makes sense for a group.
+ static function verifyBean($bean) {
+ global $user;
+
+ // Check users.
+ $users_in_bean = $bean->getAttribute('users');
+ if (is_array($users_in_bean)) {
+ $users_in_group = ttTeamHelper::getUsers();
+ foreach ($users_in_group as $user_in_group) {
+ $valid_ids[] = $user_in_group['id'];
+ }
+ foreach ($users_in_bean as $user_in_bean) {
+ if (!in_array($user_in_bean, $valid_ids)) {
+ return false;
+ }
+ }
+ }
+
+ // TODO: add additional checks here. Perhaps do it before saving the bean for consistency.
+ return true;
+ }
}