Cosmetic presentation fixes.

[timetracker.git] / time.php

diff --git a/time.php b/time.php
index 10b38f8..d05f0c5 100644 (file)
--- a/time.php
+++ b/time.php
@@ -27,19 +27,15 @@
 // +----------------------------------------------------------------------+
 
 require_once('initialize.php');
-import('ttDebugTracer');
 import('form.Form');
 import('ttConfigHelper');
 import('ttUserHelper');
 import('ttGroupHelper');
 import('ttClientHelper');
 import('ttTimeHelper');
+import('ttFileHelper');
 import('DateAndTime');
 
-// Initialize ttDebugTracer to print diagnostic messages.
-$debug = new ttDebugTracer(__FILE__);
-$debug->println('page entry after imports');
-
 // Access checks.
 if (!(ttAccessAllowed('track_own_time') || ttAccessAllowed('track_time'))) {
   header('Location: access_denied.php');
@@ -60,7 +56,6 @@ if ($request->isPost()) {
     exit();
   }
 }
-$debug->println('after all access checks');
 // End of access checks.
 
 // Determine user for whom we display this page.
@@ -72,7 +67,6 @@ if ($request->isPost() && $userChanged) {
 }
 
 $group_id = $user->getGroup();
-$debug->println("user_id: $user_id group_id: $group_id");
 
 $showClient = $user->isPluginEnabled('cl');
 $trackingMode = $user->getTrackingMode();
@@ -262,6 +256,8 @@ if ($showStart) {
 }
 if ($showDuration)
   $form->addInput(array('type'=>'text','name'=>'duration','value'=>$cl_duration,'onchange'=>"formDisable('duration');"));
+if ($showFiles)
+  $form->addInput(array('type'=>'upload','name'=>'newfile','value'=>$i18n->get('button.submit')));
 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));
@@ -397,7 +393,17 @@ if ($request->isPost()) {
         elseif ($custom_fields->fields[0]['type'] == CustomFields::TYPE_DROPDOWN)
           $result = $custom_fields->insert($id, $custom_fields->fields[0]['id'], $cl_cf_1, null);
       }
-      if ($id && $result) {
+
+      // Put a new file in storage if we have it.
+      if ($id && $showFiles && $_FILES['newfile']['name']) {
+        $fileHelper = new ttFileHelper($err);
+        $fields = array('entity_type'=>'time',
+          'entity_id' => $id,
+          'file_name' => $_FILES['newfile']['name']);
+        $fileHelper->putFile($fields);
+      }
+
+      if ($id && $result && $err->no()) {
         header('Location: time.php');
         exit();
       }
@@ -436,9 +442,7 @@ if ($request->isPost()) {
 } // isPost
 
 $week_total = ttTimeHelper::getTimeForWeek($selected_date);
-$timeRecords = $showFiles? ttTimeHelper::getRecordsWithFiles($user_id, $cl_date) : ttTimeHelper::getRecords($user_id, $cl_date);
-
-$debug->println('smarty assignments');
+$timeRecords = ttTimeHelper::getRecords($cl_date, $showFiles);
 
 $smarty->assign('selected_date', $selected_date);
 $smarty->assign('week_total', $week_total);