X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=week.php;h=9af3564414f5d4e86efaccad1f6416f1b8cad5c3;hb=HEAD;hp=e237bc71032c4949591ccb59a9245d4ff568e39b;hpb=94b8b32ce9a0578c7c3f365b744174000a6f378b;p=timetracker.git

diff --git a/week.php b/week.php
index e237bc71..9af35644 100644
--- a/week.php
+++ b/week.php
@@ -30,17 +30,38 @@ require_once('initialize.php');
 import('form.Form');
 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']);
@@ -52,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)
@@ -68,17 +89,17 @@ $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);
 }
 
-// TODO: how is this plugin supposed to work for week view?
+// Use Monthly Quotas plugin, if applicable.
 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);
@@ -87,7 +108,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')) {
@@ -99,101 +120,115 @@ 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.
+$dayHeaders = ttWeekViewHelper::getDayHeadersForWeek($startDate->toString(DB_DATEFORMAT));
+$lockedDays = ttWeekViewHelper::getLockedDaysForWeek($startDate->toString(DB_DATEFORMAT));
+// Get already existing records.
+$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);
+else
+  $dataArray = ttWeekViewHelper::prePopulateFromPastWeeks($startDate->toString(DB_DATEFORMAT), $dayHeaders);
 
+// 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');
 
 
-
-
-
-
-
-
-
-
-
-// Get column headers.
-$dayHeaders = ttTimeHelper::getDayHeadersForWeek($startDate->toString(DB_DATEFORMAT));
-// Build data array for the table.
-$dataArray = ttTimeHelper::getDataForWeekView($user->getActiveUser(), $startDate->toString(DB_DATEFORMAT), $endDate->toString(DB_DATEFORMAT));
-// Build day totals.
-$dayTotals = ttTimeHelper::getDayTotals($dataArray, $dayHeaders);
-
-// TODO: replace these two sample arrays with real data.
-$durations_with_labels = array(
-  array( // Row 0.
-    'id' => 'something goes here too', // Row identifier.
-    'label' => 'This is a label for row 0',
-    'day_0' => array('id' => '0_0', 'duration' => '00:00'),
-    'day_1' => array('id' => '0_1', 'duration' => '01:00'),
-    'day_2' => array('id' => '0_2', 'duration' => '02:00'),
-    'day_3' => array('id' => '0_3', 'duration' => null),
-    'day_4' => array('id' => '0_4', 'duration' => '04:00')
-  ),
-  array( // Row 1.
-    'label' => 'This is a label for row 1',
-    'day_0' => array('id' => '1_0', 'duration' => '00:30'),
-    'day_1' => array('id' => '1_1', 'duration' => '01:30'),
-    'day_2' => array('id' => '1_2', 'duration' => '02:30'),
-  )
-);
-
-$totals = array(
-    'label' => 'Total:',
-    'day_0' => '00:30',
-    'day_1' => '02:30',
-    'day_2' => '04:30',
-    'day_3' => null,
-    'day_4' => '04:00',
-    'day_5' => null,
-    'day_6' => null
-);
-
 // 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'));
-    $this->setValue(htmlspecialchars($value));
+
+    // 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; 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.
+    $ignoreRow = $showNotes ? 1 : 0;
+    if ($row > $ignoreRow) {
+      $row_id = $table->getValueAtName($row,'row_id');
+      $billable = ttWeekViewHelper::parseFromWeekViewRow($row_id, 'bl');
+      if (!$billable) {
+        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.
     return $this->toString();
   }
 }
 
-// Define rendering class for a single cell for time entry in week view table.
-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) {
-    $field_name = $table->getValueAtName($row,$column)['id']; // Our text field names (and ids) are like x_y (row_column).
+    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.
+    global $lockedDays;
+    if ($lockedDays[$column-1])
+      $field->setEnabled(false);
     $field->setFormName($table->getFormName());
-    $field->setSize(2);
-    $field->setValue($table->getValueAt($row,$column)['duration']);
+    $field->setStyle('width: 60px;'); // TODO: need to style everything properly, eventually.
+    // 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.
+    if (!$field->getValue() && TYPE_START_FINISH == $user->record_type) {
+        $field->setEnabled(false);
+    }
     $this->setValue($field->getHtml());
     return $this->toString();
   }
 }
 
-//$durations = ttTimeHelper::getDurationsForWeek($user->getActiveUser(), $startDate->toString(DB_DATEFORMAT), $endDate->toString(DB_DATEFORMAT));
-
-
-
-//$groupedRecords = ttTimeHelper::getGroupedRecordsForInterval($user->getActiveUser(), $startDate->toString(DB_DATEFORMAT), $endDate->toString(DB_DATEFORMAT));
-//$dayTotals = ttTimeHelper::getGroupedRecordsTotals($groupedRecords);
-
-
-
-
-
-
 // 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,28 +241,21 @@ if ($user->canManageTeam()) {
 }
 
 // Create week_durations table.
-$table = new Table('week_durations');
-// $table->setIAScript('markModified'); // TODO: write a script to mark table or particular cells as modified.
+$table = new Table('week_durations', 'week_view_table');
 $table->setTableOptions(array('width'=>'100%','cellspacing'=>'1','cellpadding'=>'3','border'=>'0'));
-$table->setHeaderOptions(array('align'=>'center')); // TODO: use a class and CSS instead, perhaps a separate class for footer.
-$table->setRowOptions(array('valign'=>'top','class'=>'tableHeader'));
-$table->setData($dataArray); // $durations_with_labels);
+$table->setRowOptions(array('class'=>'tableHeaderCentered'));
+$table->setData($dataArray);
 // Add columns to table.
 $table->addColumn(new TableColumn('label', '', new LabelCellRenderer(), $dayTotals['label']));
-$table->addColumn(new TableColumn($dayHeaders['day_header_0'], $dayHeaders['day_header_0'], new TimeCellRenderer(), $dayTotals[$dayHeaders['day_header_0']]));
-$table->addColumn(new TableColumn($dayHeaders['day_header_1'], $dayHeaders['day_header_1'], new TimeCellRenderer(), $dayTotals[$dayHeaders['day_header_1']]));
-$table->addColumn(new TableColumn($dayHeaders['day_header_2'], $dayHeaders['day_header_2'], new TimeCellRenderer(), $dayTotals[$dayHeaders['day_header_2']]));
-$table->addColumn(new TableColumn($dayHeaders['day_header_3'], $dayHeaders['day_header_3'], new TimeCellRenderer(), $dayTotals[$dayHeaders['day_header_3']]));
-$table->addColumn(new TableColumn($dayHeaders['day_header_4'], $dayHeaders['day_header_4'], new TimeCellRenderer(), $dayTotals[$dayHeaders['day_header_4']]));
-$table->addColumn(new TableColumn($dayHeaders['day_header_5'], $dayHeaders['day_header_5'], new TimeCellRenderer(), $dayTotals[$dayHeaders['day_header_5']]));
-$table->addColumn(new TableColumn($dayHeaders['day_header_6'], $dayHeaders['day_header_6'], new TimeCellRenderer(), $dayTotals[$dayHeaders['day_header_6']]));
+for ($i = 0; $i < 7; $i++) {
+  $table->addColumn(new TableColumn($dayHeaders[$i], $dayHeaders[$i], new WeekViewCellRenderer(), $dayTotals[$dayHeaders[$i]]));
+}
 $table->setInteractive(false);
 $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',
@@ -235,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.
 }
 
@@ -249,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'];
@@ -276,41 +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.
-if ((TYPE_START_FINISH == $user->record_type) || (TYPE_ALL == $user->record_type)) {
-  $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->canManageTeam() && defined('READONLY_START_FINISH') && isTrue(READONLY_START_FINISH)) {
-    // Make the start and finish fields read-only.
-    $form->getElement('start')->setEnabled(false);
-    $form->getElement('finish')->setEnabled(false);
-  }
-}
-if ((TYPE_DURATION == $user->record_type) || (TYPE_ALL == $user->record_type))
-  $form->addInput(array('type'=>'text','name'=>'duration','value'=>$cl_duration,'onchange'=>"formDisable('duration');"));
-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
 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'=>'submit','name'=>'btn_submit','onclick'=>'browser_today.value=get_date()','value'=>$i18n->getKey('button.submit')));
+$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->get('button.submit')));
 
 // If we have custom fields - add controls for them.
 if ($custom_fields && $custom_fields->fields[0]) {
@@ -321,135 +338,160 @@ 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'))));
   }
 }
 
 // Submit.
 if ($request->isPost()) {
   if ($request->getParameter('btn_submit')) {
-
-    // Validate user input.
-    if ($user->isPluginEnabled('cl') && $user->isPluginEnabled('cm') && !$cl_client)
-      $err->add($i18n->getKey('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 (MODE_PROJECTS == $user->tracking_mode || MODE_PROJECTS_AND_TASKS == $user->tracking_mode) {
-      if (!$cl_project) $err->add($i18n->getKey('error.project'));
-    }
-    if (MODE_PROJECTS_AND_TASKS == $user->tracking_mode && $user->task_required) {
-      if (!$cl_task) $err->add($i18n->getKey('error.task'));
-    }
-    if (strlen($cl_duration) == 0) {
-      if ($cl_start || $cl_finish) {
-        if (!ttTimeHelper::isValidTime($cl_start))
-          $err->add($i18n->getKey('error.field'), $i18n->getKey('label.start'));
-        if ($cl_finish) {
-          if (!ttTimeHelper::isValidTime($cl_finish))
-            $err->add($i18n->getKey('error.field'), $i18n->getKey('label.finish'));
-          if (!ttTimeHelper::isValidInterval($cl_start, $cl_finish))
-            $err->add($i18n->getKey('error.interval'), $i18n->getKey('label.finish'), $i18n->getKey('label.start'));
-        }
-      } else {
-        if ((TYPE_START_FINISH == $user->record_type) || (TYPE_ALL == $user->record_type)) {
-          $err->add($i18n->getKey('error.empty'), $i18n->getKey('label.start'));
-          $err->add($i18n->getKey('error.empty'), $i18n->getKey('label.finish'));
-        }
-        if ((TYPE_DURATION == $user->record_type) || (TYPE_ALL == $user->record_type))
-          $err->add($i18n->getKey('error.empty'), $i18n->getKey('label.duration'));
+    // Validate user input for row 0.
+    // Determine if a new entry was posted.
+    $newEntryPosted = false;
+    foreach($dayHeaders as $dayHeader) {
+      $control_id = '0_'.$dayHeader;
+      if ($request->getParameter($control_id)) {
+        $newEntryPosted = true;
+        break;
       }
-    } else {
-      if (!ttTimeHelper::isValidDuration($cl_duration))
-        $err->add($i18n->getKey('error.field'), $i18n->getKey('label.duration'));
-    }
-    if (!ttValidString($cl_note, true)) $err->add($i18n->getKey('error.field'), $i18n->getKey('label.note'));
-    // Finished validating user input.
-
-    // Prohibit creating entries in future.
-    if (defined('FUTURE_ENTRIES') && !isTrue(FUTURE_ENTRIES)) {
-      $browser_today = new DateAndTime(DB_DATEFORMAT, $request->getParameter('browser_today', null));
-      if ($selected_date->after($browser_today))
-        $err->add($i18n->getKey('error.future_date'));
     }
-
-    // Prohibit creating entries in locked range.
-    if ($user->isDateLocked($selected_date))
-      $err->add($i18n->getKey('error.range_locked'));
-
-    // Prohibit creating another uncompleted record.
-    if ($err->no()) {
-      if (($not_completed_rec = ttTimeHelper::getUncompleted($user->getActiveUser())) && (($cl_finish == '') && ($cl_duration == '')))
-        $err->add($i18n->getKey('error.uncompleted_exists')." <a href = 'time_edit.php?id=".$not_completed_rec['id']."'>".$i18n->getKey('error.goto_uncompleted')."</a>");
+    if ($newEntryPosted) {
+      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->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->get('error.project'));
+      }
+      if (MODE_PROJECTS_AND_TASKS == $user->tracking_mode && $user->task_required) {
+        if (!$cl_task) $err->add($i18n->get('error.task'));
+      }
     }
+    // Finished validating user input for row 0.
 
-    // Prohibit creating an overlapping record.
+    // Process the table of values.
     if ($err->no()) {
-      if (ttTimeHelper::overlaps($user->getActiveUser(), $cl_date, $cl_start, $cl_finish))
-        $err->add($i18n->getKey('error.overlap'));
-    }
 
-    // Insert record.
-    if ($err->no()) {
-      $id = ttTimeHelper::insert(array(
-        'date' => $cl_date,
-        'user_id' => $user->getActiveUser(),
-        'client' => $cl_client,
-        'project' => $cl_project,
-        'task' => $cl_task,
-        'start' => $cl_start,
-        'finish' => $cl_finish,
-        'duration' => $cl_duration,
-        'note' => $cl_note,
-        'billable' => $cl_billable));
-
-      // Insert a custom field if we have it.
+      // Obtain values. Iterate through posted parameters one by one,
+      // see if value changed, apply one change at a time until we see an error.
       $result = true;
-      if ($id && $custom_fields && $cl_cf_1) {
-        if ($custom_fields->fields[0]['type'] == CustomFields::TYPE_TEXT)
-          $result = $custom_fields->insert($id, $custom_fields->fields[0]['id'], null, $cl_cf_1);
-        elseif ($custom_fields->fields[0]['type'] == CustomFields::TYPE_DROPDOWN)
-          $result = $custom_fields->insert($id, $custom_fields->fields[0]['id'], $cl_cf_1, null);
+      $rowNumber = 0;
+      // Iterate through existing rows.
+      foreach ($dataArray as $row) {
+        // Iterate through days.
+        foreach ($dayHeaders as $key => $dayHeader) {
+          // Do not process locked days.
+          if ($lockedDays[$key]) continue;
+          // Make control id for the cell.
+          $control_id = $rowNumber.'_'.$dayHeader;
+
+          // Handle durations and comments in separate blocks of code.
+          if (!$showWeekNotes || (0 == $rowNumber % 2)) {
+            // Handle durations row here.
+
+            // Obtain existing and posted durations.
+            $postedDuration = $request->getParameter($control_id);
+            $existingDuration = $dataArray[$rowNumber][$dayHeader]['duration'];
+            // If posted value is not null, check and normalize it.
+            if ($postedDuration) {
+              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.
+            if ($postedDuration == $existingDuration)
+              continue;
+            // Posted value is different.
+            if ($existingDuration == null) {
+              // Skip inserting 0 duration values.
+              if (0 == ttTimeHelper::toMinutes($postedDuration))
+                continue;
+              // Insert a new record.
+              $fields = array();
+              $fields['row_id'] = $dataArray[$rowNumber]['row_id'];
+              if (!$fields['row_id']) {
+                // Special handling for row 0, a new entry. Need to construct new row_id.
+                $record = array();
+                $record['client_id'] = $cl_client;
+                $record['billable'] = $cl_billable ? '1' : '0';
+                $record['project_id'] = $cl_project;
+                $record['task_id'] = $cl_task;
+                $record['cf_1_value'] = $cl_cf_1;
+                $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);
+              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->getUser());
+            } else {
+              $fields = array();
+              $fields['tt_log_id'] = $dataArray[$rowNumber][$dayHeader]['tt_log_id'];
+              $fields['duration'] = $postedDuration;
+              $result = ttWeekViewHelper::modifyDurationFromWeekView($fields, $err);
+            }
+            if (!$result) break; // Break out of the loop in case of first error.
+
+          } else if ($showWeekNotes) {
+            // Handle commments row here.
+
+            // Obtain existing and posted comments.
+            $postedComment = $request->getParameter($control_id);
+            $existingComment = $dataArray[$rowNumber][$dayHeader]['note'];
+            // If posted value is not null, check it.
+            if ($postedComment && !ttValidString($postedComment, true)) {
+              $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.
+            if ($postedComment == $existingComment)
+              continue;
+
+            // Posted value is different.
+            // TODO: handle new entries separately in the durations block above.
+
+            // Here, only update the comment on an already existing record.
+            $fields = array();
+            $fields['tt_log_id'] = $dataArray[$rowNumber][$dayHeader]['tt_log_id'];
+            if ($fields['tt_log_id']) {
+              $fields['comment'] = $postedComment;
+              $result = ttWeekViewHelper::modifyCommentFromWeekView($fields);
+            }
+            if (!$result) break; // Break out of the loop in case of first error.
+          }
+        }
+        if (!$result) break; // Break out of the loop in case of first error.
+        $rowNumber++;
       }
-      if ($id && $result) {
-        header('Location: time.php');
+      if ($result) {
+        header('Location: week.php'); // Normal exit.
         exit();
       }
-      $err->add($i18n->getKey('error.db'));
-    }
-  } elseif ($request->getParameter('btn_stop')) {
-    // Stop button pressed to finish an uncompleted record.
-    $record_id = $request->getParameter('record_id');
-    $record = ttTimeHelper::getRecord($record_id, $user->getActiveUser());
-    $browser_date = $request->getParameter('browser_date');
-    $browser_time = $request->getParameter('browser_time');
-
-    // Can we complete this record?
-    if ($record['date'] == $browser_date                                // closing today's record
-      && ttTimeHelper::isValidInterval($record['start'], $browser_time) // finish time is greater than start time
-      && !ttTimeHelper::overlaps($user->getActiveUser(), $browser_date, $record['start'], $browser_time)) { // no overlap
-      $res = ttTimeHelper::update(array(
-          'id'=>$record['id'],
-          'date'=>$record['date'],
-          'user_id'=>$user->getActiveUser(),
-          'client'=>$record['client_id'],
-          'project'=>$record['project_id'],
-          'task'=>$record['task_id'],
-          'start'=>$record['start'],
-          'finish'=>$browser_time,
-          'note'=>$record['comment'],
-          'billable'=>$record['billable']));
-      if (!$res)
-        $err->add($i18n->getKey('error.db'));
-    } else {
-      // Cannot complete, redirect for manual edit.
-      header('Location: time_edit.php?id='.$record_id);
-      exit();
     }
   }
   elseif ($request->getParameter('onBehalfUser')) {
-    if($user->canManageTeam()) {
+    if($user->can('track_time')) {
       unset($_SESSION['behalf_id']);
       unset($_SESSION['behalf_name']);
 
@@ -463,16 +505,10 @@ 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);
-$smarty->assign('day_total', ttTimeHelper::getTimeForDay($user->getActiveUser(), $cl_date));
-//$groupedRecords = ttTimeHelper::getGroupedRecordsForInterval($user->getActiveUser(), $startDate->toString(DB_DATEFORMAT), $endDate->toString(DB_DATEFORMAT));
-//$smarty->assign('grouped_records', $groupedRecords);
-//$smarty->assign('grouped_records_totals', ttTimeHelper::getGroupedRecordsTotals($groupedRecords));
 
 $smarty->assign('client_list', $client_list);
 $smarty->assign('project_list', $project_list);
@@ -480,29 +516,14 @@ $smarty->assign('task_list', $task_list);
 $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));
-
-// Prepare and assign date headers. Note how startDate moves to the end of the week, so it no longer holds correct start week value.
-$smarty->assign('date_0', $startDate->toString(DB_DATEFORMAT));
-$smarty->assign('day_header_0', $startDate->getDate());
-$startDate->incDay();
-$smarty->assign('date_1', $startDate->toString(DB_DATEFORMAT));
-$smarty->assign('day_header_1', $startDate->getDate());
-$startDate->incDay();
-$smarty->assign('date_2', $startDate->toString(DB_DATEFORMAT));
-$smarty->assign('day_header_2', $startDate->getDate());
-$startDate->incDay();
-$smarty->assign('date_3', $startDate->toString(DB_DATEFORMAT));
-$smarty->assign('day_header_3', $startDate->getDate());
-$startDate->incDay();
-$smarty->assign('date_4', $startDate->toString(DB_DATEFORMAT));
-$smarty->assign('day_header_4', $startDate->getDate());
-$startDate->incDay();
-$smarty->assign('date_5', $startDate->toString(DB_DATEFORMAT));
-$smarty->assign('day_header_5', $startDate->getDate());
-$startDate->incDay();
-$smarty->assign('date_6', $startDate->toString(DB_DATEFORMAT));
-$smarty->assign('day_header_6', $startDate->getDate());
-
-$smarty->assign('title', $i18n->getKey('title.time'));
+$smarty->assign('time_records', $records);
+$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');