From: Nik Okuntseff Date: Sat, 3 Feb 2018 17:11:27 +0000 (+0000) Subject: Implemented week view as a configurable plugin. X-Git-Tag: timetracker_1.19-1~1244 X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=16cbd33bec16854f1b6a4caf4ac24ededc8326f3;p=timetracker.git Implemented week view as a configurable plugin. --- diff --git a/WEB-INF/lib/ttTeamHelper.class.php b/WEB-INF/lib/ttTeamHelper.class.php index 868e67f3..217c07ad 100644 --- a/WEB-INF/lib/ttTeamHelper.class.php +++ b/WEB-INF/lib/ttTeamHelper.class.php @@ -1026,7 +1026,7 @@ class ttTeamHelper { } // enablePlugin either enables or disables a specific plugin for team. - function enablePlugin($plugin, $enable = true) + static function enablePlugin($plugin, $enable = true) { global $user; if (!$user->canManageTeam()) diff --git a/WEB-INF/lib/ttWeekViewHelper.class.php b/WEB-INF/lib/ttWeekViewHelper.class.php index e74a08f5..130cc3d6 100644 --- a/WEB-INF/lib/ttWeekViewHelper.class.php +++ b/WEB-INF/lib/ttWeekViewHelper.class.php @@ -150,6 +150,7 @@ class ttWeekViewHelper { // ) // ); static function getDataForWeekView($records, $dayHeaders) { + global $user; global $i18n; $dataArray = array(); @@ -161,12 +162,14 @@ class ttWeekViewHelper { $control_id = '0_'. $dayHeaders[$i]; $dataArray[0][$dayHeaders[$i]] = array('control_id' => $control_id, 'tt_log_id' => null,'duration' => null); } - // Construct the second row for daily comments for a brand new entry. - $dataArray[] = array('row_id' => null,'label' => $i18n->getKey('label.notes').':'); // Insert row. - // Insert empty cells with proper control ids. - for ($i = 0; $i < 7; $i++) { - $control_id = '1_'. $dayHeaders[$i]; - $dataArray[1][$dayHeaders[$i]] = array('control_id' => $control_id, 'tt_log_id' => null,'note' => null); + if ($user->isPluginEnabled('wvns')) { + // Construct the second row for daily comments for a brand new entry. + $dataArray[] = array('row_id' => null,'label' => $i18n->getKey('label.notes').':'); // Insert row. + // Insert empty cells with proper control ids. + for ($i = 0; $i < 7; $i++) { + $control_id = '1_'. $dayHeaders[$i]; + $dataArray[1][$dayHeaders[$i]] = array('control_id' => $control_id, 'tt_log_id' => null,'note' => null); + } } // Iterate through records and build $dataArray cell by cell. @@ -193,20 +196,24 @@ class ttWeekViewHelper { $dataArray[$pos][$dayHeaders[$i]] = array('control_id' => $control_id, 'tt_log_id' => null,'duration' => null); } // Insert row for comments. - $dataArray[] = array('row_id' => $row_id.'_notes','label' => $i18n->getKey('label.notes').':'); - $pos++; - // Insert empty cells with proper control ids. - for ($i = 0; $i < 7; $i++) { - $control_id = $pos.'_'. $dayHeaders[$i]; - $dataArray[$pos][$dayHeaders[$i]] = array('control_id' => $control_id, 'tt_log_id' => null,'note' => null); + if ($user->isPluginEnabled('wvns')) { + $dataArray[] = array('row_id' => $row_id.'_notes','label' => $i18n->getKey('label.notes').':'); + $pos++; + // Insert empty cells with proper control ids. + for ($i = 0; $i < 7; $i++) { + $control_id = $pos.'_'. $dayHeaders[$i]; + $dataArray[$pos][$dayHeaders[$i]] = array('control_id' => $control_id, 'tt_log_id' => null,'note' => null); + } + $pos--; } - $pos--; } // Insert actual cell data from $record (one cell only). $dataArray[$pos][$day_header] = array('control_id' => $pos.'_'. $day_header, 'tt_log_id' => $record['id'],'duration' => $record['duration']); - // Insert existing comment from $record into the duration cell. - $pos++; - $dataArray[$pos][$day_header] = array('control_id' => $pos.'_'. $day_header, 'tt_log_id' => $record['id'],'note' => $record['comment']); + // Insert existing comment from $record into the comment cell. + if ($user->isPluginEnabled('wvns')) { + $pos++; + $dataArray[$pos][$day_header] = array('control_id' => $pos.'_'. $day_header, 'tt_log_id' => $record['id'],'note' => $record['comment']); + } } return $dataArray; } diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl index 38bb731b..8799451c 100644 --- a/WEB-INF/templates/footer.tpl +++ b/WEB-INF/templates/footer.tpl @@ -12,7 +12,7 @@
- - {if $smarty.const.WEEK_VIEW_DEBUG == 1} - + - {/if} {/if} diff --git a/WEB-INF/templates/time.tpl b/WEB-INF/templates/time.tpl index 355b9726..f532be42 100644 --- a/WEB-INF/templates/time.tpl +++ b/WEB-INF/templates/time.tpl @@ -8,11 +8,13 @@ {$forms.timeRecordForm.open}
 Anuko Time Tracker 1.17.10.3871 | Copyright © Anuko | +  Anuko Time Tracker 1.17.11.3872 | Copyright © Anuko | {$i18n.footer.credits} | {$i18n.footer.license} | {$i18n.footer.improve} diff --git a/WEB-INF/templates/profile_edit.tpl b/WEB-INF/templates/profile_edit.tpl index 6e3b81eb..4967259e 100644 --- a/WEB-INF/templates/profile_edit.tpl +++ b/WEB-INF/templates/profile_edit.tpl @@ -81,6 +81,14 @@ function handlePluginCheckboxes() { } else { configureLabel.style.visibility = "hidden"; } + + var weekViewCheckbox = document.getElementById("week_view"); + configureLabel = document.getElementById("week_view_config"); + if (weekViewCheckbox.checked){ + configureLabel.style.visibility = "visible"; + } else { + configureLabel.style.visibility = "hidden"; + } } @@ -229,12 +237,10 @@ function handlePluginCheckboxes() { {$forms.profileForm.quotas.control} {$i18n.label.configure}
{$forms.profileForm.week_view.control} {$i18n.label.configure} {$i18n.label.configure}
+{if $user->isPluginEnabled('wv')} +{/if} @@ -73,6 +79,7 @@
{$i18n.label.day_view} / {$i18n.label.week_view}
diff --git a/WEB-INF/templates/week.tpl b/WEB-INF/templates/week.tpl index f5144754..7c59f5b3 100644 --- a/WEB-INF/templates/week.tpl +++ b/WEB-INF/templates/week.tpl @@ -50,6 +50,12 @@ +{/if} +{if $user->isPluginEnabled('wvn')} + + + + {/if}
{$i18n.label.task}: {$forms.weekTimeForm.task.control}
{$i18n.label.week_note}:{$forms.weekTimeForm.note.control}
 
+{if $user->isPluginEnabled('wvl')}
@@ -135,12 +142,16 @@
+{/if} + {if $time_records} + {if $user->isPluginEnabled('wvl')} + {/if} {if $user->isPluginEnabled('mq')} diff --git a/profile_edit.php b/profile_edit.php index 6d82bf78..1d12bae4 100644 --- a/profile_edit.php +++ b/profile_edit.php @@ -207,9 +207,7 @@ if ($user->canManageTeam()) { $form->addInput(array('type'=>'checkbox','name'=>'notifications','value'=>$cl_notifications,'onchange'=>'handlePluginCheckboxes()')); $form->addInput(array('type'=>'checkbox','name'=>'locking','value'=>$cl_locking,'onchange'=>'handlePluginCheckboxes()')); $form->addInput(array('type'=>'checkbox','name'=>'quotas','value'=>$cl_quotas,'onchange'=>'handlePluginCheckboxes()')); - if (defined('WEEK_VIEW_DEBUG') && isTrue(WEEK_VIEW_DEBUG)) { - $form->addInput(array('type'=>'checkbox','name'=>'week_view','value'=>$cl_week_view)); - } + $form->addInput(array('type'=>'checkbox','name'=>'week_view','value'=>$cl_week_view,'onchange'=>'handlePluginCheckboxes()')); } $form->addInput(array('type'=>'submit','name'=>'btn_save','value'=>$i18n->getKey('button.save'))); diff --git a/week.php b/week.php index b70f20b9..44a05bdc 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(); } @@ -107,6 +107,8 @@ $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. @@ -126,19 +128,27 @@ $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. @@ -149,6 +159,8 @@ 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; + $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 +169,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 = $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); } @@ -269,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 @@ -317,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()) { @@ -335,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. @@ -372,15 +397,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. @@ -393,7 +424,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.
{$i18n.label.week_total}: {$week_total}
{$i18n.label.month_total}: {$month_total}