X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=week.php;h=194532470323f5a2a4480f9d891a7e0fee622c46;hb=a46ca9f2c279305fc8a6c7456e23f4ef46fd6fe4;hp=1fb904ebc02b22889a85de4663fbabefcd366989;hpb=19e183c61f684ff92f5b7c95f09a0a6ca7d7bffe;p=timetracker.git diff --git a/week.php b/week.php index 1fb904eb..19453247 100644 --- a/week.php +++ b/week.php @@ -39,7 +39,7 @@ import('ttTimeHelper'); import('DateAndTime'); // Access check. -if (!ttAccessCheck(right_data_entry)) { +if (!ttAccessCheck(right_data_entry) || !$user->isPluginEnabled('wv')) { header('Location: access_denied.php'); exit(); } @@ -80,7 +80,7 @@ if ($user->isPluginEnabled('mq')){ $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); + $minutes_left = round(60*$month_quota) - ttTimeHelper::toMinutes($month_total); $smarty->assign('month_total', $month_total); $smarty->assign('over_quota', $minutes_left < 0); @@ -89,7 +89,7 @@ if ($user->isPluginEnabled('mq')){ // Initialize variables. // Custom field. -$cl_cf_1 = trim($request->getParameter('cf_1', ($request->getMethod()=='POST'? null : @$_SESSION['cf_1']))); +$cl_cf_1 = trim($request->getParameter('cf_1', ($request->isPost() ? null : @$_SESSION['cf_1']))); $_SESSION['cf_1'] = $cl_cf_1; $cl_billable = 1; if ($user->isPluginEnabled('iv')) { @@ -101,12 +101,14 @@ if ($user->isPluginEnabled('iv')) { $cl_billable = $_SESSION['billable']; } $on_behalf_id = $request->getParameter('onBehalfUser', (isset($_SESSION['behalf_id'])? $_SESSION['behalf_id'] : $user->id)); -$cl_client = $request->getParameter('client', ($request->getMethod()=='POST'? null : @$_SESSION['client'])); +$cl_client = $request->getParameter('client', ($request->isPost() ? null : @$_SESSION['client'])); $_SESSION['client'] = $cl_client; -$cl_project = $request->getParameter('project', ($request->getMethod()=='POST'? null : @$_SESSION['project'])); +$cl_project = $request->getParameter('project', ($request->isPost() ? null : @$_SESSION['project'])); $_SESSION['project'] = $cl_project; -$cl_task = $request->getParameter('task', ($request->getMethod()=='POST'? null : @$_SESSION['task'])); +$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. @@ -114,27 +116,39 @@ $dayHeaders = ttWeekViewHelper::getDayHeadersForWeek($startDate->toString(DB_DAT $lockedDays = ttWeekViewHelper::getLockedDaysForWeek($startDate->toString(DB_DATEFORMAT)); // Get already existing records. $records = ttWeekViewHelper::getRecordsForInterval($user->getActiveUser(), $startDate->toString(DB_DATEFORMAT), $endDate->toString(DB_DATEFORMAT)); -// Build data array for the table. Format is described in the function. -$dataArray = ttWeekViewHelper::getDataForWeekView($records, $dayHeaders); +// Build data array for the table. Format is described in ttWeekViewHelper::getDataForWeekView function. +if ($records) + $dataArray = ttWeekViewHelper::getDataForWeekView($records, $dayHeaders); +else + $dataArray = ttWeekViewHelper::prePopulateFromPastWeeks($startDate->toString(DB_DATEFORMAT), $dayHeaders); + // Build day totals (total durations for each day in week). $dayTotals = ttWeekViewHelper::getDayTotals($dataArray, $dayHeaders); // 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; + $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 ($user->isPluginEnabled('wvns') && (1 == $row)) { + $this->setOptions(array('style'=>'text-align: right; vertical-align: top;')); + } else if ($user->isPluginEnabled('wvns') && (0 != $row % 2)) { $this->setOptions(array('style'=>'text-align: right;')); } // Special handling for not billable entries. - if ($row > 1 && 0 == $row % 2) { + $ignoreRow = $user->isPluginEnabled('wvns') ? 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 (($user->isPluginEnabled('wvns') && (0 == $row % 2)) || !$user->isPluginEnabled('wvns')) { + $this->setOptions(array('style'=>'color: red;')); // TODO: style it properly in CSS. + } } } $this->setValue(htmlspecialchars($value)); // This escapes HTML for output. @@ -142,10 +156,11 @@ class LabelCellRenderer extends DefaultCellRenderer { } } -// Define rendering class for a single cell for time entry in week view table. -// TODO: Refactor the class name, as we now handle both durations and comments in these cells. -class TimeCellRenderer 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; + $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. @@ -154,13 +169,24 @@ class TimeCellRenderer 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. + // Provide visual separation for new entry row. + $rowToSeparate = $user->isPluginEnabled('wvns') ? 1 : 0; + if ($rowToSeparate == $row) { + $field->setStyle('width: 60px; margin-bottom: 40px'); + } + if ($user->isPluginEnabled('wvns')) { + 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); } @@ -194,7 +220,7 @@ $table->setData($dataArray); // Add columns to table. $table->addColumn(new TableColumn('label', '', new LabelCellRenderer(), $dayTotals['label'])); for ($i = 0; $i < 7; $i++) { - $table->addColumn(new TableColumn($dayHeaders[$i], $dayHeaders[$i], new TimeCellRenderer(), $dayTotals[$dayHeaders[$i]])); + $table->addColumn(new TableColumn($dayHeaders[$i], $dayHeaders[$i], new WeekViewCellRenderer(), $dayTotals[$dayHeaders[$i]])); } $table->setInteractive(false); $form->addInputElement($table); @@ -264,6 +290,9 @@ if (MODE_PROJECTS_AND_TASKS == $user->tracking_mode) { 'datakeys'=>array('id','name'), 'empty'=>array(''=>$i18n->getKey('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 @@ -312,6 +341,7 @@ if ($request->isPost()) { if (!$cl_task) $err->add($i18n->getKey('error.task')); } } + // Finished validating user input for row 0. // Process the table of values. if ($err->no()) { @@ -330,7 +360,7 @@ if ($request->isPost()) { $control_id = $rowNumber.'_'.$dayHeader; // Handle durations and comments in separate blocks of code. - if (0 == $rowNumber % 2) { + if (!$user->isPluginEnabled('wvns') || (0 == $rowNumber % 2)) { // Handle durations row here. // Obtain existing and posted durations. @@ -338,11 +368,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 { + if (false === ttTimeHelper::postedDurationToMinutes($postedDuration)) { $err->add($i18n->getKey('error.field'), $i18n->getKey('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. @@ -367,15 +398,21 @@ 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 ($user->isPluginEnabled('wvn')) { + $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 ($user->isPluginEnabled('wvns')) { + // 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. @@ -388,7 +425,7 @@ if ($request->isPost()) { } if (!$result) break; // Break out of the loop in case of first error. - } else { + } else if ($user->isPluginEnabled('wvns')) { // Handle commments row here. // Obtain existing and posted comments.