X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=week.php;h=9af3564414f5d4e86efaccad1f6416f1b8cad5c3;hb=HEAD;hp=16fd79ba7b842e15390e4321ff0eae3dd9d57a2b;hpb=704d09fab8234dda51765058b15393f6c68191f3;p=timetracker.git diff --git a/week.php b/week.php index 16fd79ba..9af35644 100644 --- a/week.php +++ b/week.php @@ -32,17 +32,36 @@ import('form.DefaultCellRenderer'); import('form.Table'); import('form.TextField'); import('ttUserHelper'); -import('ttTeamHelper'); +import('ttGroupHelper'); import('ttWeekViewHelper'); import('ttClientHelper'); import('ttTimeHelper'); import('DateAndTime'); -// Access check. -if (!ttAccessCheck(right_data_entry)) { +// Access checks. +if (!(ttAccessAllowed('track_own_time') || ttAccessAllowed('track_time'))) { header('Location: access_denied.php'); exit(); } +if (!$user->isPluginEnabled('wv')) { + header('Location: feature_disabled.php'); + exit(); +} +if ($user->behalf_id && (!$user->can('track_time') || !$user->checkBehalfId())) { + header('Location: access_denied.php'); // Trying on behalf, but no right or wrong user. + exit(); +} +if (!$user->behalf_id && !$user->can('track_own_time') && !$user->adjustBehalfId()) { + header('Location: access_denied.php'); // Trying as self, but no right for self, and noone to work on behalf. + exit(); +} +// End of access checks. + +$showClient = $user->isPluginEnabled('cl'); +$trackingMode = $user->getTrackingMode(); +$showProject = MODE_PROJECTS == $trackingMode || MODE_PROJECTS_AND_TASKS == $trackingMode; +$showTask = MODE_PROJECTS_AND_TASKS == $trackingMode; +$showFiles = $user->isPluginEnabled('at'); // Initialize and store date in session. $cl_date = $request->getParameter('date', @$_SESSION['date']); @@ -54,7 +73,7 @@ if(!$cl_date) $_SESSION['date'] = $cl_date; // Determine selected week start and end dates. -$weekStartDay = $user->week_start; +$weekStartDay = $user->getWeekStart(); $t_arr = localtime($selected_date->getTimestamp()); $t_arr[5] = $t_arr[5] + 1900; if ($t_arr[6] < $weekStartDay) @@ -70,7 +89,7 @@ $endDate->setTimestamp(mktime(0,0,0,$t_arr[4]+1,$t_arr[3]-$t_arr[6]+6+$startWeek // Use custom fields plugin if it is enabled. if ($user->isPluginEnabled('cf')) { require_once('plugins/CustomFields.class.php'); - $custom_fields = new CustomFields($user->team_id); + $custom_fields = new CustomFields(); $smarty->assign('custom_fields', $custom_fields); } @@ -78,9 +97,9 @@ if ($user->isPluginEnabled('cf')) { if ($user->isPluginEnabled('mq')){ require_once('plugins/MonthlyQuota.class.php'); $quota = new MonthlyQuota(); - $month_quota = $quota->get($selected_date->mYear, $selected_date->mMonth); - $month_total = ttTimeHelper::getTimeForMonth($user->getActiveUser(), $selected_date); - $minutes_left = ttTimeHelper::toMinutes($month_quota) - ttTimeHelper::toMinutes($month_total); + $month_quota_minutes = $quota->getUserQuota($selected_date->mYear, $selected_date->mMonth); + $month_total = ttTimeHelper::getTimeForMonth($selected_date); + $minutes_left = $month_quota_minutes - ttTimeHelper::toMinutes($month_total); $smarty->assign('month_total', $month_total); $smarty->assign('over_quota', $minutes_left < 0); @@ -107,13 +126,15 @@ $cl_project = $request->getParameter('project', ($request->isPost() ? null : @$_ $_SESSION['project'] = $cl_project; $cl_task = $request->getParameter('task', ($request->isPost() ? null : @$_SESSION['task'])); $_SESSION['task'] = $cl_task; +$cl_note = $request->getParameter('note', ($request->isPost() ? null : @$_SESSION['note'])); +$_SESSION['note'] = $cl_note; // Get the data we need to display week view. // Get column headers, which are day numbers in month. $dayHeaders = ttWeekViewHelper::getDayHeadersForWeek($startDate->toString(DB_DATEFORMAT)); $lockedDays = ttWeekViewHelper::getLockedDaysForWeek($startDate->toString(DB_DATEFORMAT)); // Get already existing records. -$records = ttWeekViewHelper::getRecordsForInterval($user->getActiveUser(), $startDate->toString(DB_DATEFORMAT), $endDate->toString(DB_DATEFORMAT)); +$records = ttWeekViewHelper::getRecordsForInterval($startDate->toString(DB_DATEFORMAT), $endDate->toString(DB_DATEFORMAT), $showFiles); // Build data array for the table. Format is described in ttWeekViewHelper::getDataForWeekView function. if ($records) $dataArray = ttWeekViewHelper::getDataForWeekView($records, $dayHeaders); @@ -122,23 +143,35 @@ else // Build day totals (total durations for each day in week). $dayTotals = ttWeekViewHelper::getDayTotals($dataArray, $dayHeaders); +$showWeekNote = $user->isOptionEnabled('week_note'); +$showWeekNotes = $user->isOptionEnabled('week_notes'); + // Define rendering class for a label field to the left of durations. class LabelCellRenderer extends DefaultCellRenderer { function render(&$table, $value, $row, $column, $selected = false) { + global $user; + $showNotes = $user->isOptionEnabled('week_notes'); + $this->setOptions(array('width'=>200,'valign'=>'middle')); - // Special handling for row 0, which represents a new week entry. + + // Special handling for a new week entry (row 0, or 0 and 1 if we show notes). if (0 == $row) { - $this->setOptions(array('style'=>'text-align: center; font-weight: bold;')); - } else if (0 != $row % 2) { + $this->setOptions(array('style'=>'text-align: center; font-weight: bold; vertical-align: top;')); + } else if ($showNotes && (1 == $row)) { + $this->setOptions(array('style'=>'text-align: right; vertical-align: top;')); + } else if ($showNotes && (0 != $row % 2)) { $this->setOptions(array('style'=>'text-align: right;')); } // Special handling for not billable entries. - if ($row > 1 && 0 == $row % 2) { + $ignoreRow = $showNotes ? 1 : 0; + if ($row > $ignoreRow) { $row_id = $table->getValueAtName($row,'row_id'); $billable = ttWeekViewHelper::parseFromWeekViewRow($row_id, 'bl'); if (!$billable) { - $this->setOptions(array('style'=>'color: red;')); // TODO: style it properly in CSS. + if (($showNotes && (0 == $row % 2)) || !$showNotes) { + $this->setOptions(array('style'=>'color: red;')); // TODO: style it properly in CSS. + } } } $this->setValue(htmlspecialchars($value)); // This escapes HTML for output. @@ -149,6 +182,9 @@ class LabelCellRenderer extends DefaultCellRenderer { // Define rendering class for a single cell for a time or a comment entry in week view table. class WeekViewCellRenderer extends DefaultCellRenderer { function render(&$table, $value, $row, $column, $selected = false) { + global $user; + $showNotes = $user->isOptionEnabled('week_notes'); + $field_name = $table->getValueAt($row,$column)['control_id']; // Our text field names (and ids) are like x_y (row_column). $field = new TextField($field_name); // Disable control if the date is locked. @@ -157,15 +193,24 @@ class WeekViewCellRenderer extends DefaultCellRenderer { $field->setEnabled(false); $field->setFormName($table->getFormName()); $field->setStyle('width: 60px;'); // TODO: need to style everything properly, eventually. - if (0 == $row % 2) - $field->setValue($table->getValueAt($row,$column)['duration']); // Duration for even rows. - else { - $field->setValue($table->getValueAt($row,$column)['note']); // Comment for odd rows. - $field->setTitle($table->getValueAt($row,$column)['note']); // Tooltip to help view the entire comment. + // Provide visual separation for new entry row. + $rowToSeparate = $showNotes ? 1 : 0; + if ($rowToSeparate == $row) { + $field->setStyle('width: 60px; margin-bottom: 40px'); + } + if ($showNotes) { + if (0 == $row % 2) { + $field->setValue($table->getValueAt($row,$column)['duration']); // Duration for even rows. + } else { + $field->setValue($table->getValueAt($row,$column)['note']); // Comment for odd rows. + $field->setTitle($table->getValueAt($row,$column)['note']); // Tooltip to help view the entire comment. + } + } else { + $field->setValue($table->getValueAt($row,$column)['duration']); + // $field->setTitle($table->getValueAt($row,$column)['note']); // Tooltip to see comment. TODO - value not available. } // Disable control when time entry mode is TYPE_START_FINISH and there is no value in control // because we can't supply start and finish times in week view - there are no fields for them. - global $user; if (!$field->getValue() && TYPE_START_FINISH == $user->record_type) { $field->setEnabled(false); } @@ -177,9 +222,13 @@ class WeekViewCellRenderer extends DefaultCellRenderer { // Elements of weekTimeForm. $form = new Form('weekTimeForm'); -if ($user->canManageTeam()) { - $user_list = ttTeamHelper::getActiveUsers(array('putSelfFirst'=>true)); - if (count($user_list) > 1) { +if ($user->can('track_time')) { + if ($user->can('track_own_time')) + $options = array('status'=>ACTIVE,'max_rank'=>$user->rank-1,'include_self'=>true,'self_first'=>true); + else + $options = array('status'=>ACTIVE,'max_rank'=>$user->rank-1); + $user_list = $user->getUsers($options); + if (count($user_list) >= 1) { $form->addInput(array('type'=>'combobox', 'onchange'=>'this.form.submit();', 'name'=>'onBehalfUser', @@ -206,7 +255,7 @@ $form->addInputElement($table); // Dropdown for clients in MODE_TIME. Use all active clients. if (MODE_TIME == $user->tracking_mode && $user->isPluginEnabled('cl')) { - $active_clients = ttTeamHelper::getActiveClients($user->team_id, true); + $active_clients = ttGroupHelper::getActiveClients(true); $form->addInput(array('type'=>'combobox', 'onchange'=>'fillProjectDropdown(this.value);', 'name'=>'client', @@ -214,7 +263,7 @@ if (MODE_TIME == $user->tracking_mode && $user->isPluginEnabled('cl')) { 'value'=>$cl_client, 'data'=>$active_clients, 'datakeys'=>array('id', 'name'), - 'empty'=>array(''=>$i18n->getKey('dropdown.select')))); + 'empty'=>array(''=>$i18n->get('dropdown.select')))); // Note: in other modes the client list is filtered to relevant clients only. See below. } @@ -228,11 +277,11 @@ if (MODE_PROJECTS == $user->tracking_mode || MODE_PROJECTS_AND_TASKS == $user->t 'value'=>$cl_project, 'data'=>$project_list, 'datakeys'=>array('id','name'), - 'empty'=>array(''=>$i18n->getKey('dropdown.select')))); + 'empty'=>array(''=>$i18n->get('dropdown.select')))); // Dropdown for clients if the clients plugin is enabled. if ($user->isPluginEnabled('cl')) { - $active_clients = ttTeamHelper::getActiveClients($user->team_id, true); + $active_clients = ttGroupHelper::getActiveClients(true); // We need an array of assigned project ids to do some trimming. foreach($project_list as $project) $projects_assigned_to_user[] = $project['id']; @@ -255,27 +304,30 @@ if (MODE_PROJECTS == $user->tracking_mode || MODE_PROJECTS_AND_TASKS == $user->t 'value'=>$cl_client, 'data'=>$client_list, 'datakeys'=>array('id', 'name'), - 'empty'=>array(''=>$i18n->getKey('dropdown.select')))); + 'empty'=>array(''=>$i18n->get('dropdown.select')))); } } if (MODE_PROJECTS_AND_TASKS == $user->tracking_mode) { - $task_list = ttTeamHelper::getActiveTasks($user->team_id); + $task_list = ttGroupHelper::getActiveTasks(); $form->addInput(array('type'=>'combobox', 'name'=>'task', 'style'=>'width: 250px;', 'value'=>$cl_task, 'data'=>$task_list, 'datakeys'=>array('id','name'), - 'empty'=>array(''=>$i18n->getKey('dropdown.select')))); + 'empty'=>array(''=>$i18n->get('dropdown.select')))); } +if (!defined('NOTE_INPUT_HEIGHT')) + define('NOTE_INPUT_HEIGHT', 40); +$form->addInput(array('type'=>'textarea','name'=>'note','style'=>'width: 250px; height:'.NOTE_INPUT_HEIGHT.'px;','value'=>$cl_note)); // Add other controls. $form->addInput(array('type'=>'calendar','name'=>'date','value'=>$cl_date)); // calendar if ($user->isPluginEnabled('iv')) $form->addInput(array('type'=>'checkbox','name'=>'billable','value'=>$cl_billable)); $form->addInput(array('type'=>'hidden','name'=>'browser_today','value'=>'get_date()')); // User current date, which gets filled in on btn_submit click. -$form->addInput(array('type'=>'submit','name'=>'btn_submit','onclick'=>'browser_today.value=get_date()','value'=>$i18n->getKey('button.submit'))); +$form->addInput(array('type'=>'submit','name'=>'btn_submit','onclick'=>'browser_today.value=get_date()','value'=>$i18n->get('button.submit'))); // If we have custom fields - add controls for them. if ($custom_fields && $custom_fields->fields[0]) { @@ -286,8 +338,8 @@ if ($custom_fields && $custom_fields->fields[0]) { $form->addInput(array('type'=>'combobox','name'=>'cf_1', 'style'=>'width: 250px;', 'value'=>$cl_cf_1, - 'data'=>$custom_fields->options, - 'empty'=>array(''=>$i18n->getKey('dropdown.select')))); + 'data'=>CustomFields::getOptions($custom_fields->fields[0]['id']), + 'empty'=>array(''=>$i18n->get('dropdown.select')))); } } @@ -305,18 +357,19 @@ if ($request->isPost()) { } } if ($newEntryPosted) { - if ($user->isPluginEnabled('cl') && $user->isPluginEnabled('cm') && !$cl_client) - $err->add($i18n->getKey('error.client')); + if ($user->isPluginEnabled('cl') && $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->getKey('error.field'), $custom_fields->fields[0]['label']); + if (!ttValidString($cl_cf_1, !$custom_fields->fields[0]['required'])) $err->add($i18n->get('error.field'), $custom_fields->fields[0]['label']); } if (MODE_PROJECTS == $user->tracking_mode || MODE_PROJECTS_AND_TASKS == $user->tracking_mode) { - if (!$cl_project) $err->add($i18n->getKey('error.project')); + if (!$cl_project) $err->add($i18n->get('error.project')); } if (MODE_PROJECTS_AND_TASKS == $user->tracking_mode && $user->task_required) { - if (!$cl_task) $err->add($i18n->getKey('error.task')); + if (!$cl_task) $err->add($i18n->get('error.task')); } } + // Finished validating user input for row 0. // Process the table of values. if ($err->no()) { @@ -335,7 +388,7 @@ if ($request->isPost()) { $control_id = $rowNumber.'_'.$dayHeader; // Handle durations and comments in separate blocks of code. - if (0 == $rowNumber % 2) { + if (!$showWeekNotes || (0 == $rowNumber % 2)) { // Handle durations row here. // Obtain existing and posted durations. @@ -343,11 +396,12 @@ if ($request->isPost()) { $existingDuration = $dataArray[$rowNumber][$dayHeader]['duration']; // If posted value is not null, check and normalize it. if ($postedDuration) { - if (ttTimeHelper::isValidDuration($postedDuration)) { - $postedDuration = ttTimeHelper::normalizeDuration($postedDuration, false); // No leading zero. - } else { - $err->add($i18n->getKey('error.field'), $i18n->getKey('label.duration')); + if (false === ttTimeHelper::postedDurationToMinutes($postedDuration)) { + $err->add($i18n->get('error.field'), $i18n->get('label.duration')); $result = false; break; // Break out. Stop any further processing. + } else { + $minutes = ttTimeHelper::postedDurationToMinutes($postedDuration); + $postedDuration = ttTimeHelper::minutesToDuration($minutes); } } // Do not process if value has not changed. @@ -372,19 +426,25 @@ if ($request->isPost()) { $fields['row_id'] = ttWeekViewHelper::makeRowIdentifier($record).'_0'; // Note: no need to check for a possible conflict with an already existing row // because we are doing an insert that does not affect already existing data. + + if ($showWeekNote) { + $fields['note'] = $request->getParameter('note'); + } } $fields['day_header'] = $dayHeader; $fields['start_date'] = $startDate->toString(DB_DATEFORMAT); // To be able to determine date for the entry using $dayHeader. $fields['duration'] = $postedDuration; $fields['browser_today'] = $request->getParameter('browser_today', null); - // Take note value from the control below duration. - $noteRowNumber = $rowNumber + 1; - $note_control_id = $noteRowNumber.'_'.$dayHeader; - $fields['note'] = $request->getParameter($note_control_id); + if ($showWeekNotes) { + // Take note value from the control below duration. + $noteRowNumber = $rowNumber + 1; + $note_control_id = $noteRowNumber.'_'.$dayHeader; + $fields['note'] = $request->getParameter($note_control_id); + } $result = ttWeekViewHelper::insertDurationFromWeekView($fields, $custom_fields, $err); } elseif ($postedDuration == null || 0 == ttTimeHelper::toMinutes($postedDuration)) { // Delete an already existing record here. - $result = ttTimeHelper::delete($dataArray[$rowNumber][$dayHeader]['tt_log_id'], $user->getActiveUser()); + $result = ttTimeHelper::delete($dataArray[$rowNumber][$dayHeader]['tt_log_id'], $user->getUser()); } else { $fields = array(); $fields['tt_log_id'] = $dataArray[$rowNumber][$dayHeader]['tt_log_id']; @@ -393,7 +453,7 @@ if ($request->isPost()) { } if (!$result) break; // Break out of the loop in case of first error. - } else { + } else if ($showWeekNotes) { // Handle commments row here. // Obtain existing and posted comments. @@ -401,7 +461,7 @@ if ($request->isPost()) { $existingComment = $dataArray[$rowNumber][$dayHeader]['note']; // If posted value is not null, check it. if ($postedComment && !ttValidString($postedComment, true)) { - $err->add($i18n->getKey('error.field'), $i18n->getKey('label.note')); + $err->add($i18n->get('error.field'), $i18n->get('label.note')); $result = false; break; // Break out. Stop any further processing. } // Do not process if value has not changed. @@ -431,7 +491,7 @@ if ($request->isPost()) { } } elseif ($request->getParameter('onBehalfUser')) { - if($user->canManageTeam()) { + if($user->can('track_time')) { unset($_SESSION['behalf_id']); unset($_SESSION['behalf_name']); @@ -445,7 +505,7 @@ if ($request->isPost()) { } } // isPost -$week_total = ttTimeHelper::getTimeForWeek($user->getActiveUser(), $selected_date); +$week_total = ttTimeHelper::getTimeForWeek($selected_date); $smarty->assign('selected_date', $selected_date); $smarty->assign('week_total', $week_total); @@ -457,7 +517,13 @@ $smarty->assign('forms', array($form->getName()=>$form->toArray())); $smarty->assign('onload', 'onLoad="fillDropdowns()"'); $smarty->assign('timestring', $startDate->toString($user->date_format).' - '.$endDate->toString($user->date_format)); $smarty->assign('time_records', $records); - -$smarty->assign('title', $i18n->getKey('title.time')); +$smarty->assign('show_navigation', !$user->isOptionEnabled('week_menu')); +$smarty->assign('show_client', $showClient); +$smarty->assign('show_project', $showProject); +$smarty->assign('show_task', $showTask); +$smarty->assign('show_week_note', $showWeekNote); +$smarty->assign('show_week_list', $user->isOptionEnabled('week_list')); +$smarty->assign('show_files', $showFiles); +$smarty->assign('title', $i18n->get('menu.week')); $smarty->assign('content_page_name', 'week.tpl'); $smarty->display('index.tpl');