Inserting new cells from already existing week view rows should now work with custom...

[timetracker.git] / week.php

diff --git a/week.php b/week.php
index d6fb6a3b5d82eddd2ef1854237a30ae137dddc92..7cf1c945b16e65cd7de62cec092cf9b49c03b4d1 100644 (file)
--- a/week.php
+++ b/week.php
@@ -272,7 +272,7 @@ $form->addInput(array('type'=>'textarea','name'=>'note','style'=>'width: 600px;
 $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'=>'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'=>'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')));
 
 // If we have custom fields - add controls for them.
 $form->addInput(array('type'=>'submit','name'=>'btn_submit','onclick'=>'browser_today.value=get_date()','value'=>$i18n->getKey('button.submit')));
 
 // If we have custom fields - add controls for them.


@@ -389,18 +389,20 @@ if ($request->isPost()) {
         if ($existingDuration == null) {
           // Insert a new record here.
           $fields = array();
         if ($existingDuration == null) {
           // Insert a new record here.
           $fields = array();

-          $result = ttTimeHelper::insertDurationFromWeekView($fields, $err);
-            //$dataArray[$rowNumber]['row_id'],
-            //$dayHeader,
-            //$postedDuration,
-            //$startDate->toString(DB_DATEFORMAT));
+          $fields['row_id'] = $dataArray[$rowNumber]['row_id'];
+          $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);

         } elseif ($postedDuration == null || 0 == ttTimeHelper::toMinutes($postedDuration)) {
           // Delete an already existing record here.
           $result = ttTimeHelper::delete($dataArray[$rowNumber][$dayHeader]['tt_log_id'], $user->getActiveUser());
         } else {
           $fields = array();
         } elseif ($postedDuration == null || 0 == ttTimeHelper::toMinutes($postedDuration)) {
           // Delete an already existing record here.
           $result = ttTimeHelper::delete($dataArray[$rowNumber][$dayHeader]['tt_log_id'], $user->getActiveUser());
         } else {
           $fields = array();

+          $fields['tt_log_id'] = $dataArray[$rowNumber][$dayHeader]['tt_log_id'];
+          $fields['duration'] = $postedDuration;

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

-          //$result = ttTimeHelper::modifyDurationFromWeekView($dataArray[$rowNumber][$dayHeader]['tt_log_id'], $postedDuration, $user->getActiveUser());

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


@@ -411,7 +413,7 @@ if ($request->isPost()) {
       header('Location: week.php'); // Normal exit.
       exit();
     }
       header('Location: week.php'); // Normal exit.
       exit();
     }

-    $err->add($i18n->getKey('error.db'));
+    // $err->add($i18n->getKey('error.db'));

     /*
     //
     //
     /*
     //
     //