<tr>
<td valign="top" colspan="2" align="center">
<table border="0" cellpadding="3">
-{if (($user->isPluginEnabled('cl') && !($user->isClient() && $user->client_id)) || ($custom_fields && $custom_fields->fields[0] && $custom_fields->fields[0]['type'] == CustomFields::TYPE_DROPDOWN))}
<tr>
- {if $user->isPluginEnabled('cl') && !($user->isClient() && $user->client_id)}<td><b>{$i18n.label.client}</b></td>{else}<td> </td>{/if}
- <td> </td>
- {if ($custom_fields && $custom_fields->fields[0] && $custom_fields->fields[0]['type'] == CustomFields::TYPE_DROPDOWN)}<td><b>{$i18n.label.option}</b></td>{else}<td> </td>{/if}
- </tr>
- <tr>
- <td>{$forms.reportForm.client.control}</td>
- <td> </td>
- <td>{$forms.reportForm.option.control}</td>
- </tr>
+ <td valign="top">
+ <table border="0" cellpadding="3">
+{if $show_client}
+ <tr><td><b>{$i18n.label.client}</b></td></tr>
+ <tr><td>{$forms.reportForm.client.control}</td></tr>
{/if}
-{if ($smarty.const.MODE_PROJECTS == $user->tracking_mode || $smarty.const.MODE_PROJECTS_AND_TASKS == $user->tracking_mode)}
- <tr>
- <td><b>{$i18n.label.project}</b></td>
- <td> </td>
- {if ($smarty.const.MODE_PROJECTS_AND_TASKS == $user->tracking_mode)}
- <td><b>{$i18n.label.task}</b></td>
- {/if}
- </tr>
+{if $show_project}
+ <tr><td><b>{$i18n.label.project}</b></td></tr>
+ <tr><td>{$forms.reportForm.project.control}</td></tr>
{/if}
-{if ($smarty.const.MODE_PROJECTS == $user->tracking_mode || $smarty.const.MODE_PROJECTS_AND_TASKS == $user->tracking_mode)}
- <tr>
- <td>{$forms.reportForm.project.control}</td>
- <td> </td>
- {if ($smarty.const.MODE_PROJECTS_AND_TASKS == $user->tracking_mode)}
- <td>{$forms.reportForm.task.control}</td>
- {/if}
- </tr>
+{if $show_billable}
+ <tr><td><b>{$i18n.form.time.billable}</b></td></tr>
+ <tr><td>{$forms.reportForm.include_records.control}</td></tr>
{/if}
-{if $user->isPluginEnabled('iv')}
- <tr>
- <td><b>{$i18n.form.time.billable}</b></td>
- <td> </td>
- {if $user->can('manage_invoices')}
- <td><b>{$i18n.label.invoice}</b></td>
- {/if}
- </tr>
- <tr valign="top">
- <td>{$forms.reportForm.include_records.control}</td>
- <td> </td>
- {if $user->can('manage_invoices')}
- <td>{$forms.reportForm.invoice.control}</td>
- </tr>
- {/if}
+{if $show_paid_status}
+ <tr><td><b>{$i18n.label.paid_status}</b></td></tr>
+ <tr><td>{$forms.reportForm.paid_status.control}</td></tr>
{/if}
-{if ($user->can('manage_invoices') && $user->isPluginEnabled('ps'))}
- <tr>
- <td><b>{$i18n.label.paid_status}</b></td>
- <td> </td>
- {if $user->isPluginEnabled('ts')}
- <td><b>{$i18n.label.timesheet}</b></td>
- {/if}
- </tr>
- <tr>
- <td>{$forms.reportForm.paid_status.control}</td>
- <td> </td>
- {if $user->isPluginEnabled('ts')}
- <td>{$forms.reportForm.timesheet.control}</td>
- {/if}
- </tr>
+ </table>
+ </td>
+ <td></td>
+ <td valign="top">
+ <table border="0" cellpadding="3">
+{if $show_cf_1_dropdown}
+ <tr><td><b>{$i18n.label.option}</b></td></tr>
+ <tr><td>{$forms.reportForm.option.control}</td></tr>
+{/if}
+{if $show_task}
+ <tr><td><b>{$i18n.label.task}</b></td></tr>
+ <tr><td>{$forms.reportForm.task.control}</td></tr>
+{/if}
+{if $show_invoice_dropdown}
+ <tr><td><b>{$i18n.label.invoice}</b></td></tr>
+ <tr><td>{$forms.reportForm.invoice.control}</td></tr>
+{/if}
+{if $show_timesheet}
+ <tr><td><b>{$i18n.label.timesheet}</b></td></tr>
+ <tr><td>{$forms.reportForm.timesheet.control}</td></tr>
{/if}
-{if $user->can('view_reports') || $user->can('view_all_reports') || $user->isClient()}
+ </table>
+ </td>
+ </tr>
+{if $show_users}
<tr>
<td colspan="3"><b>{$i18n.label.users}</b></td>
</tr>
<tr>
<td colspan="3">
<table border="0" width="100%">
-{if $user->can('view_reports') || $user->can('view_all_reports') || $user->isPluginEnabled('cl') || $user->isPluginEnabled('iv') || $user->isPluginEnabled('ps')}
<tr>
- {if $user->isPluginEnabled('cl')}
- <td width="25%"><label>{$forms.reportForm.chclient.control} {$i18n.label.client}</label></td>
- {/if}
- {if ($user->can('manage_invoices') || $user->isClient()) && $user->isPluginEnabled('iv')}
- <td width="25%"><label>{$forms.reportForm.chinvoice.control} {$i18n.label.invoice}</label></td>
- {/if}
- {if ($user->can('manage_invoices') && $user->isPluginEnabled('ps'))}
- <td width="25%"><label>{$forms.reportForm.chpaid.control} {$i18n.label.paid}</label></td>
- {/if}
- {if $user->can('view_reports') || $user->can('view_all_reports')}
- <td width="25%"><label>{$forms.reportForm.chip.control} {$i18n.label.ip}</label></td>
- {/if}
- </tr>
+ <td width="25%" valign="top">
+ <table border="0" cellpadding="3">
+{if $show_client}
+ <tr><td><label>{$forms.reportForm.chclient.control} {$i18n.label.client}</label></td></tr>
{/if}
- <tr>
- <td width="25%">{if ($smarty.const.MODE_PROJECTS == $user->tracking_mode || $smarty.const.MODE_PROJECTS_AND_TASKS == $user->tracking_mode)}<label>{$forms.reportForm.chproject.control} {$i18n.label.project}</label>{/if}</td>
- <td width="25%">{if (($smarty.const.TYPE_START_FINISH == $user->record_type) || ($smarty.const.TYPE_ALL == $user->record_type))}<label>{$forms.reportForm.chstart.control} {$i18n.label.start}</label>{/if}</td>
- <td width="25%"><label>{$forms.reportForm.chduration.control} {$i18n.label.duration}</label></td>
-{if ($user->can('manage_invoices') || $user->isClient()) || $user->isPluginEnabled('ex')}
- <td width="25%"><label>{$forms.reportForm.chcost.control} {$i18n.label.cost}</label></td>
-{else}
- <td></td>
+{if $show_project}
+ <tr><td><label>{$forms.reportForm.chproject.control} {$i18n.label.project}</label></td></tr>
{/if}
- </tr>
- <tr>
- <td>{if ($smarty.const.MODE_PROJECTS_AND_TASKS == $user->tracking_mode)}<label>{$forms.reportForm.chtask.control} {$i18n.label.task}</label>{/if}</td>
- <td>{if (($smarty.const.TYPE_START_FINISH == $user->record_type) || ($smarty.const.TYPE_ALL == $user->record_type))}<label>{$forms.reportForm.chfinish.control} {$i18n.label.finish}</label>{/if}</td>
- <td><label>{$forms.reportForm.chnote.control} {$i18n.label.note}</label></td>
-{if ($custom_fields && $custom_fields->fields[0])}
- <td><label>{$forms.reportForm.chcf_1.control} {$custom_fields->fields[0]['label']|escape}</label></td>
-{else}
- <td></td>
+{if $show_timesheet}
+ <tr><td><label>{$forms.reportForm.chtimesheet.control} {$i18n.label.timesheet}</label></td></tr>
{/if}
- </tr>
-{if $user->isPluginEnabled('wu')}
- <tr>
- <td></td>
- <td></td>
- <td width="25%"><label>{$forms.reportForm.chunits.control} {$i18n.label.work_units}</label></td>
- <td></td>
- </tr>
+{if $show_cf_1_checkbox}
+ <tr><td><label>{$forms.reportForm.chcf_1.control} {$custom_fields->fields[0]['label']|escape}</label></td></tr>
+{/if}
+ </table>
+ </td>
+ <td width="25%" valign="top">
+ <table border="0" cellpadding="3">
+{if $show_start}
+ <tr><td><label>{$forms.reportForm.chstart.control} {$i18n.label.start}</label></td></tr>
+{/if}
+{if $show_task}
+ <tr><td><label>{$forms.reportForm.chtask.control} {$i18n.label.task}</label></td></tr>
+{/if}
+{if $show_ip}
+ <tr><td><label>{$forms.reportForm.chip.control} {$i18n.label.ip}</label></td></tr>
+{/if}
+{if $show_work_units}
+ <tr><td><label>{$forms.reportForm.chunits.control} {$i18n.label.work_units}</label></td></tr>
+{/if}
+ </table>
+ </td>
+ <td width="25%" valign="top">
+ <table border="0" cellpadding="3">
+{if $show_finish}
+ <tr><td><label>{$forms.reportForm.chfinish.control} {$i18n.label.finish}</label></td></tr>
{/if}
+ <tr><td><label>{$forms.reportForm.chnote.control} {$i18n.label.note}</label></td></tr>
+{if $show_invoice_checkbox}
+ <tr><td><label>{$forms.reportForm.chinvoice.control} {$i18n.label.invoice}</label></td></tr>
+{/if}
+ </table>
+ </td>
+ <td width="25%" valign="top">
+ <table border="0" cellpadding="3">
+ <tr><td><label>{$forms.reportForm.chduration.control} {$i18n.label.duration}</label></td></tr>
+ <tr><td><label>{$forms.reportForm.chcost.control} {$i18n.label.cost}</label></td></tr>
+{if $show_paid_status}
+ <tr><td><label>{$forms.reportForm.chpaid.control} {$i18n.label.paid}</label></td></tr>
+{/if}
+ </table>
+ </td>
+ </tr>
</table>
</td>
</tr>
- <tr>
- <td><b>{$i18n.form.reports.group_by}</b></td>
- </tr>
+
+ <tr><td><b>{$i18n.form.reports.group_by}</b></td></tr>
<tr valign="top">
<td>{$forms.reportForm.group_by1.control}</td>
<td>{$forms.reportForm.group_by2.control}</td>
// End of access checks.
$trackingMode = $user->getTrackingMode();
-$showClient = $user->isPluginEnabled('cl') && !$user->isClient();
// Use custom fields plugin if it is enabled.
if ($user->isPluginEnabled('cf')) {
$smarty->assign('custom_fields', $custom_fields);
$showCustomFieldCheckbox = $custom_fields->fields[0];
$showCustomFieldDropdown = $custom_fields->fields[0] && $custom_fields->fields[0]['type'] == CustomFields::TYPE_DROPDOWN;
+ if ($showCustomFieldDropdown)
+ $showCustomFieldDropdown &= count($custom_fields->options) > 0;
}
$form = new Form('reportForm');
$form->addInput(array('type'=>'submit','name'=>'btn_delete','value'=>$i18n->get('label.delete'),'onclick'=>"return confirm('".$i18n->get('form.reports.confirm_delete')."')"));
// Dropdown for clients if the clients plugin is enabled.
+$showClient = $user->isPluginEnabled('cl') && !$user->isClient();
if ($showClient) {
if ($user->can('view_reports') || $user->can('view_all_reports')) {
$client_list = ttClientHelper::getClients(); // TODO: improve getClients for "view_reports"
// by filtering out not relevant clients.
} else
$client_list = ttClientHelper::getClientsForUser();
+ if (count($client_list) == 0) $showClient = false;
+}
+if ($showClient) {
$form->addInput(array('type'=>'combobox',
'name'=>'client',
'style'=>'width: 250px;',
'empty'=>array(''=>$i18n->get('dropdown.all'))));
}
-// Add controls for projects and tasks.
-if ($user->can('view_reports') || $user->can('view_all_reports')) {
- $project_list = ttProjectHelper::getProjects(); // All active and inactive projects.
-} elseif ($user->isClient()) {
- $project_list = ttProjectHelper::getProjectsForClient();
-} else {
- $project_list = ttProjectHelper::getAssignedProjects($user->getUser());
+// Add project dropdown.
+$showProject = MODE_PROJECTS == $trackingMode || MODE_PROJECTS_AND_TASKS == $trackingMode;
+if ($showProject) {
+ if ($user->can('view_reports') || $user->can('view_all_reports')) {
+ $project_list = ttProjectHelper::getProjects(); // All active and inactive projects.
+ } elseif ($user->isClient()) {
+ $project_list = ttProjectHelper::getProjectsForClient();
+ } else {
+ $project_list = ttProjectHelper::getAssignedProjects($user->getUser());
+ }
+ if (count($project_list) == 0) $showProject = false;
}
-$form->addInput(array('type'=>'combobox',
- 'onchange'=>'fillTaskDropdown(this.value);selectAssignedUsers(this.value);',
- 'name'=>'project',
- 'style'=>'width: 250px;',
- 'data'=>$project_list,
- 'datakeys'=>array('id','name'),
- 'empty'=>array(''=>$i18n->get('dropdown.all'))));
-if (MODE_PROJECTS_AND_TASKS == $trackingMode) {
+if ($showProject) {
+ $form->addInput(array('type'=>'combobox',
+ 'onchange'=>'fillTaskDropdown(this.value);selectAssignedUsers(this.value);',
+ 'name'=>'project',
+ 'style'=>'width: 250px;',
+ 'data'=>$project_list,
+ 'datakeys'=>array('id','name'),
+ 'empty'=>array(''=>$i18n->get('dropdown.all'))));
+}
+
+// Add task dropdown.
+$showTask = MODE_PROJECTS_AND_TASKS == $trackingMode;
+if ($showTask) {
$task_list = ttGroupHelper::getActiveTasks();
+ if (count($task_list) == 0) $showTask = false;
+}
+if ($showTask) {
$form->addInput(array('type'=>'combobox',
'name'=>'task',
'style'=>'width: 250px;',
'empty'=>array(''=>$i18n->get('dropdown.all'))));
}
-// Add include records control.
-$include_options = array('1'=>$i18n->get('form.reports.include_billable'),
- '2'=>$i18n->get('form.reports.include_not_billable'));
-$form->addInput(array('type'=>'combobox',
- 'name'=>'include_records',
- 'style'=>'width: 250px;',
- 'data'=>$include_options,
- 'empty'=>array(''=>$i18n->get('dropdown.all'))));
+// Add billable dropdown.
+$showBillable = $user->isPluginEnabled('iv');
+if ($showBillable) {
+ $include_options = array('1'=>$i18n->get('form.reports.include_billable'),
+ '2'=>$i18n->get('form.reports.include_not_billable'));
+ $form->addInput(array('type'=>'combobox',
+ 'name'=>'include_records', // TODO: how about a better name here?
+ 'style'=>'width: 250px;',
+ 'data'=>$include_options,
+ 'empty'=>array(''=>$i18n->get('dropdown.all'))));
+}
// Add invoiced / not invoiced selector.
-if ($user->can('manage_invoices')) {
+$showInvoiceDropdown = $user->isPluginEnabled('iv') && $user->can('manage_invoices');
+if ($showInvoiceDropdown) {
$invoice_options = array('1'=>$i18n->get('form.reports.include_invoiced'),
'2'=>$i18n->get('form.reports.include_not_invoiced'));
$form->addInput(array('type'=>'combobox',
'data'=>$invoice_options,
'empty'=>array(''=>$i18n->get('dropdown.all'))));
}
+$showInvoiceCheckbox = $user->isPluginEnabled('iv') && ($user->can('manage_invoices') || $user->isClient());
-if ($user->can('manage_invoices') && $user->isPluginEnabled('ps')) {
+// Add paid status selector.
+$showPaidStatus = $user->isPluginEnabled('ps') && $user->can('manage_invoices');
+if ($showPaidStatus) {
$form->addInput(array('type'=>'combobox',
'name'=>'paid_status',
'style'=>'width: 250px;',
));
}
-// TODO: check rights.
-if ($user->isPluginEnabled('ts')) {
+// Add timesheet assignment selector.
+$showTimesheet = $user->isPluginEnabled('ts') &&
+ ($user->can('view_own_timesheets') || $user->can('manage_own_timesheets') ||
+ $user->can('view_timesheets') || $user->can('manage_timesheets') || $user->can('approve_timesheets'));
+if ($showTimesheet) {
$form->addInput(array('type'=>'combobox',
'name'=>'timesheet',
'style'=>'width: 250px;',
'data'=>array('1'=>$i18n->get('form.reports.include_assigned'),'2'=>$i18n->get('form.reports.include_not_assigned')),
'empty'=>array(''=>$i18n->get('dropdown.all'))
- ));
+ ));
}
+// Add user table.
+$showUsers = $user->can('view_reports') || $user->can('view_all_reports') || $user->isClient();
$user_list = array();
-if ($user->can('view_reports') || $user->can('view_all_reports') || $user->isClient()) {
+if ($showUsers) {
// Prepare user and assigned projects arrays.
if ($user->can('view_reports') || $user->can('view_all_reports')) {
$rank = $user->getMaxRankForGroup($user->getGroup());
$form->addInput(array('type'=>'datefield','maxlength'=>'20','name'=>'start_date'));
$form->addInput(array('type'=>'datefield','maxlength'=>'20','name'=>'end_date'));
-// Add checkboxes for fields.
+// Add checkboxes for "Show fields" block.
if ($showClient)
$form->addInput(array('type'=>'checkbox','name'=>'chclient'));
-if (($user->can('manage_invoices') || $user->isClient()) && $user->isPluginEnabled('iv'))
+if ($showProject)
+ $form->addInput(array('type'=>'checkbox','name'=>'chproject'));
+if ($showTask)
+ $form->addInput(array('type'=>'checkbox','name'=>'chtask'));
+if ($showCustomFieldCheckbox)
+ $form->addInput(array('type'=>'checkbox','name'=>'chcf_1'));
+if ($showInvoiceCheckbox)
$form->addInput(array('type'=>'checkbox','name'=>'chinvoice'));
-if ($user->can('manage_invoices') && $user->isPluginEnabled('ps'))
+if ($showPaidStatus)
$form->addInput(array('type'=>'checkbox','name'=>'chpaid'));
-if ($user->can('view_reports') || $user->can('view_all_reports'))
+$showIP = $user->can('view_reports') || $user->can('view_all_reports');
+if ($showIP)
$form->addInput(array('type'=>'checkbox','name'=>'chip'));
-if (MODE_PROJECTS == $trackingMode || MODE_PROJECTS_AND_TASKS == $trackingMode)
- $form->addInput(array('type'=>'checkbox','name'=>'chproject'));
-if (MODE_PROJECTS_AND_TASKS == $trackingMode)
- $form->addInput(array('type'=>'checkbox','name'=>'chtask'));
-if ((TYPE_START_FINISH == $user->getRecordType()) || (TYPE_ALL == $user->getRecordType())) {
+$recordType = $user->getRecordType();
+$showStart = TYPE_START_FINISH == $recordType || TYPE_ALL == $recordType;
+$showFinish = $showStart;
+if ($showStart)
$form->addInput(array('type'=>'checkbox','name'=>'chstart'));
+if ($showFinish)
$form->addInput(array('type'=>'checkbox','name'=>'chfinish'));
-}
$form->addInput(array('type'=>'checkbox','name'=>'chduration'));
$form->addInput(array('type'=>'checkbox','name'=>'chnote'));
$form->addInput(array('type'=>'checkbox','name'=>'chcost'));
-// If we have a custom field - add a checkbox for it.
-if ($custom_fields && $custom_fields->fields[0])
- $form->addInput(array('type'=>'checkbox','name'=>'chcf_1'));
-if ($user->isPluginEnabled('wu'))
+$showWorkUnits = $user->isPluginEnabled('wu');
+if ($showWorkUnits)
$form->addInput(array('type'=>'checkbox','name'=>'chunits'));
+if ($showTimesheet)
+ $form->addInput(array('type'=>'checkbox','name'=>'chtimesheet'));
// Add group by control.
$group_by_options['no_grouping'] = $i18n->get('form.reports.group_by_no');
$form->setValueByElement('chnote', '1');
$form->setValueByElement('chcf_1', '0');
$form->setValueByElement('chunits', '0');
+ $form->setValueByElement('chtimesheet', '0');
$form->setValueByElement('chtotalsonly', '0');
}
} // isPost
$smarty->assign('show_client', $showClient);
+$smarty->assign('show_cf_1_dropdown', $showCustomFieldDropdown);
+$smarty->assign('show_cf_1_checkbox', $showCustomFieldCheckbox);
+$smarty->assign('show_project', $showProject);
+$smarty->assign('show_task', $showTask);
+$smarty->assign('show_billable', $showBillable);
+$smarty->assign('show_invoice_dropdown', $showInvoiceDropdown);
+$smarty->assign('show_invoice_checkbox', $showInvoiceCheckbox);
+$smarty->assign('show_paid_status', $showPaidStatus);
+$smarty->assign('show_timesheet', $showTimesheet);
+$smarty->assign('show_users', $showUsers);
+$smarty->assign('show_start', $showStart);
+$smarty->assign('show_finish', $showFinish);
+$smarty->assign('show_work_units', $showWorkUnits);
+$smarty->assign('show_ip', $showIP);
$smarty->assign('project_list', $project_list);
$smarty->assign('task_list', $task_list);
$smarty->assign('assigned_projects', $assigned_projects);