require_once('initialize.php');
import('form.Form');
+import('ttConfigHelper');
import('ttUserHelper');
import('ttGroupHelper');
import('ttClientHelper');
import('ttTimeHelper');
+import('ttFileHelper');
import('DateAndTime');
// Access checks.
$group_id = $user->getGroup();
+$showClient = $user->isPluginEnabled('cl');
+$trackingMode = $user->getTrackingMode();
+$showProject = MODE_PROJECTS == $trackingMode || MODE_PROJECTS_AND_TASKS == $trackingMode;
+$showTask = MODE_PROJECTS_AND_TASKS == $trackingMode;
+$recordType = $user->getRecordType();
+$showStart = TYPE_START_FINISH == $recordType || TYPE_ALL == $recordType;
+$showFinish = $showStart;
+$showDuration = TYPE_DURATION == $recordType || TYPE_ALL == $recordType;
+$showFiles = $user->isPluginEnabled('at');
+
// Initialize and store date in session.
$cl_date = $request->getParameter('date', @$_SESSION['date']);
$selected_date = new DateAndTime(DB_DATEFORMAT, $cl_date);
$smarty->assign('custom_fields', $custom_fields);
}
+$config = new ttConfigHelper($user->getConfig());
+$showNoteColumn = !$config->getDefinedValue('time_note_on_separate_row');
+$showNoteRow = $config->getDefinedValue('time_note_on_separate_row');
+if ($showNoteRow) {
+ // Determine column span for note field.
+ $colspan = 0;
+ if ($showClient) $colspan++;
+ if ($user->isPluginEnabled('cf')) $colspan++;
+ if ($showProject) $colspan++;
+ if ($showTask) $colspan++;
+ if ($showStart) $colspan++;
+ if ($showFinish) $colspan++;
+ $colspan++; // There is always a duration.
+ if ($showFiles) $colspan++;
+ $colspan++; // There is always an edit column.
+ // $colspan++; // There is always a delete column.
+ // $colspan--; // Remove one column for label.
+ $smarty->assign('colspan', $colspan);
+}
+
if ($user->isPluginEnabled('mq')){
require_once('plugins/MonthlyQuota.class.php');
$quota = new MonthlyQuota();
if (isset($_SESSION['billable']))
$cl_billable = $_SESSION['billable'];
}
-//$on_behalf_id = $request->getParameter('onBehalfUser', (isset($_SESSION['behalf_id'])? $_SESSION['behalf_id'] : $user->id));
-//$on_behalf_group_id = $request->getParameter('onBehalfGroup', (isset($_SESSION['behalf_group_id'])? $_SESSION['behalf_group_id'] : $user->group_id));
$cl_client = $request->getParameter('client', ($request->isPost() ? null : @$_SESSION['client']));
$_SESSION['client'] = $cl_client;
$cl_project = $request->getParameter('project', ($request->isPost() ? null : @$_SESSION['project']));
}
// Dropdown for clients in MODE_TIME. Use all active clients.
-if (MODE_TIME == $user->getTrackingMode() && $user->isPluginEnabled('cl')) {
+if (MODE_TIME == $trackingMode && $showClient) {
$active_clients = ttGroupHelper::getActiveClients(true);
$form->addInput(array('type'=>'combobox',
'onchange'=>'fillProjectDropdown(this.value);',
// Note: in other modes the client list is filtered to relevant clients only. See below.
}
-if (MODE_PROJECTS == $user->getTrackingMode() || MODE_PROJECTS_AND_TASKS == $user->getTrackingMode()) {
+if ($showProject) {
// Dropdown for projects assigned to user.
$project_list = $user->getAssignedProjects();
$form->addInput(array('type'=>'combobox',
'empty'=>array(''=>$i18n->get('dropdown.select'))));
// Dropdown for clients if the clients plugin is enabled.
- if ($user->isPluginEnabled('cl')) {
+ if ($showClient) {
$active_clients = ttGroupHelper::getActiveClients(true);
// We need an array of assigned project ids to do some trimming.
foreach($project_list as $project)
}
}
-if (MODE_PROJECTS_AND_TASKS == $user->getTrackingMode()) {
+if ($showTask) {
$task_list = ttGroupHelper::getActiveTasks();
$form->addInput(array('type'=>'combobox',
'name'=>'task',
}
// Add other controls.
-if ((TYPE_START_FINISH == $user->getRecordType()) || (TYPE_ALL == $user->getRecordType())) {
+if ($showStart) {
$form->addInput(array('type'=>'text','name'=>'start','value'=>$cl_start,'onchange'=>"formDisable('start');"));
$form->addInput(array('type'=>'text','name'=>'finish','value'=>$cl_finish,'onchange'=>"formDisable('finish');"));
if ($user->punch_mode && !$user->canOverridePunchMode()) {
$form->getElement('finish')->setEnabled(false);
}
}
-if ((TYPE_DURATION == $user->getRecordType()) || (TYPE_ALL == $user->getRecordType()))
+if ($showDuration)
$form->addInput(array('type'=>'text','name'=>'duration','value'=>$cl_duration,'onchange'=>"formDisable('duration');"));
+if ($showFiles)
+ $form->addInput(array('type'=>'upload','name'=>'newfile','value'=>$i18n->get('button.submit')));
if (!defined('NOTE_INPUT_HEIGHT'))
define('NOTE_INPUT_HEIGHT', 40);
$form->addInput(array('type'=>'textarea','name'=>'note','style'=>'width: 600px; height:'.NOTE_INPUT_HEIGHT.'px;','value'=>$cl_note));
$form->addInput(array('type'=>'calendar','name'=>'date','value'=>$cl_date)); // calendar
+
+
+
+// TODO: refactoring ongoing down from here. Use $showBillable, perhaps?
if ($user->isPluginEnabled('iv'))
$form->addInput(array('type'=>'checkbox','name'=>'billable','value'=>$cl_billable));
$form->addInput(array('type'=>'hidden','name'=>'browser_today','value'=>'')); // User current date, which gets filled in on btn_submit click.
$form->addInput(array('type'=>'combobox','name'=>'cf_1',
'style'=>'width: 250px;',
'value'=>$cl_cf_1,
- 'data'=>$custom_fields->options,
+ 'data'=>CustomFields::getOptions($custom_fields->fields[0]['id']),
'empty'=>array(''=>$i18n->get('dropdown.select'))));
}
}
if ($request->getParameter('btn_submit')) {
// Validate user input.
- if ($user->isPluginEnabled('cl') && $user->isPluginEnabled('cm') && !$cl_client)
+ if ($showClient && $user->isOptionEnabled('client_required') && !$cl_client)
$err->add($i18n->get('error.client'));
if ($custom_fields) {
if (!ttValidString($cl_cf_1, !$custom_fields->fields[0]['required'])) $err->add($i18n->get('error.field'), $custom_fields->fields[0]['label']);
elseif ($custom_fields->fields[0]['type'] == CustomFields::TYPE_DROPDOWN)
$result = $custom_fields->insert($id, $custom_fields->fields[0]['id'], $cl_cf_1, null);
}
- if ($id && $result) {
+
+ // Put a new file in storage if we have it.
+ if ($id && $showFiles && $_FILES['newfile']['name']) {
+ $fileHelper = new ttFileHelper($err);
+ $fields = array('entity_type'=>'time',
+ 'entity_id' => $id,
+ 'file_name' => $_FILES['newfile']['name']);
+ $fileHelper->putFile($fields);
+ }
+
+ if ($id && $result && $err->no()) {
header('Location: time.php');
exit();
}
} // isPost
$week_total = ttTimeHelper::getTimeForWeek($selected_date);
+$timeRecords = ttTimeHelper::getRecords($cl_date, $showFiles);
$smarty->assign('selected_date', $selected_date);
$smarty->assign('week_total', $week_total);
$smarty->assign('day_total', ttTimeHelper::getTimeForDay($cl_date));
-$smarty->assign('time_records', ttTimeHelper::getRecords($user_id, $cl_date));
-$smarty->assign('show_files', $user->isPluginEnabled('at'));
+$smarty->assign('time_records', $timeRecords);
+$smarty->assign('show_navigation', $user->isPluginEnabled('wv') && !$user->isOptionEnabled('week_menu'));
+$smarty->assign('show_client', $showClient);
+$smarty->assign('show_cf_1', $user->isPluginEnabled('cf'));
+$smarty->assign('show_project', $showProject);
+$smarty->assign('show_task', $showTask);
+$smarty->assign('show_start', $showStart);
+$smarty->assign('show_finish', $showFinish);
+$smarty->assign('show_duration', $showDuration);
+$smarty->assign('show_note_column', $showNoteColumn);
+$smarty->assign('show_note_row', $showNoteRow);
+$smarty->assign('show_files', $showFiles);
$smarty->assign('client_list', $client_list);
$smarty->assign('project_list', $project_list);
$smarty->assign('task_list', $task_list);
projects / timetracker.git / blobdiff