Improved a comment to clarify a point.

[timetracker.git] / week.php

diff --git a/week.php b/week.php
index 0a69d58e3d3dacdad86c2ca2b027d3740dcc9b64..19476c8bcbf6e945d6c7a12d2494b06bd152629d 100644 (file)
--- a/week.php
+++ b/week.php
@@ -114,9 +114,9 @@ $cl_note = trim($request->getParameter('note'));
 $dayHeaders = ttWeekViewHelper::getDayHeadersForWeek($startDate->toString(DB_DATEFORMAT));
 $lockedDays = ttWeekViewHelper::getLockedDaysForWeek($startDate->toString(DB_DATEFORMAT));
 // Build data array for the table. Format is described in the function..
 $dayHeaders = ttWeekViewHelper::getDayHeadersForWeek($startDate->toString(DB_DATEFORMAT));
 $lockedDays = ttWeekViewHelper::getLockedDaysForWeek($startDate->toString(DB_DATEFORMAT));
 // Build data array for the table. Format is described in the function..

-$dataArray = ttTimeHelper::getDataForWeekView($user->getActiveUser(), $startDate->toString(DB_DATEFORMAT), $endDate->toString(DB_DATEFORMAT), $dayHeaders);
+$dataArray = ttWeekViewHelper::getDataForWeekView($user->getActiveUser(), $startDate->toString(DB_DATEFORMAT), $endDate->toString(DB_DATEFORMAT), $dayHeaders);

 // Build day totals (total durations for each day in week).
 // Build day totals (total durations for each day in week).

-$dayTotals = ttTimeHelper::getDayTotals($dataArray, $dayHeaders);
+$dayTotals = ttWeekViewHelper::getDayTotals($dataArray, $dayHeaders);

 
 // Define rendering class for a label field to the left of durations.
 class LabelCellRenderer extends DefaultCellRenderer {
 
 // Define rendering class for a label field to the left of durations.
 class LabelCellRenderer extends DefaultCellRenderer {


@@ -353,15 +353,17 @@ if ($request->isPost()) {
               $record['project_id'] = $cl_project;
               $record['task_id'] = $cl_task;
               $record['cf_1_value'] = $cl_cf_1;
               $record['project_id'] = $cl_project;
               $record['task_id'] = $cl_task;
               $record['cf_1_value'] = $cl_cf_1;

-              $fields['row_id'] = ttTimeHelper::makeRecordIdentifier($record).'_0'; // TODO: Handle a possible conflict with already existing row...
-                                                                                    // We may have to increment the suffix here.
+              $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.
+

               $fields['note'] = $cl_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);
               $fields['note'] = $cl_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);

-            $result = ttTimeHelper::insertDurationFromWeekView($fields, $custom_fields, $err);
+            $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());
           } elseif ($postedDuration == null || 0 == ttTimeHelper::toMinutes($postedDuration)) {
             // Delete an already existing record here.
             $result = ttTimeHelper::delete($dataArray[$rowNumber][$dayHeader]['tt_log_id'], $user->getActiveUser());


@@ -369,7 +371,7 @@ if ($request->isPost()) {
             $fields = array();
             $fields['tt_log_id'] = $dataArray[$rowNumber][$dayHeader]['tt_log_id'];
             $fields['duration'] = $postedDuration;
             $fields = array();
             $fields['tt_log_id'] = $dataArray[$rowNumber][$dayHeader]['tt_log_id'];
             $fields['duration'] = $postedDuration;

-            $result = ttTimeHelper::modifyDurationFromWeekView($fields, $err);
+            $result = ttWeekViewHelper::modifyDurationFromWeekView($fields, $err);

           }
           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.
         }