Added associating items with a timesheet upon its creation.

diff --git a/WEB-INF/lib/ttTimesheetHelper.class.php b/WEB-INF/lib/ttTimesheetHelper.class.php
index 3e44c8c..056fc68 100644 (file)
--- a/WEB-INF/lib/ttTimesheetHelper.class.php
+++ b/WEB-INF/lib/ttTimesheetHelper.class.php
@@ -28,6 +28,8 @@
 
 import('ttUserHelper');
 import('ttGroupHelper');
+import('form.ActionForm');
+import('ttReportHelper');
 
 // Class ttTimesheetHelper is used to help with project related tasks.
 class ttTimesheetHelper {
@@ -55,6 +57,49 @@ class ttTimesheetHelper {
   // insert function inserts a new timesheet into database.
   static function insert($fields)
   {
+    // First, we obtain report items.
+
+    // Obtain session bean with report attributes.
+    $bean = new ActionForm('reportBean', new Form('reportForm'));
+    $options = ttReportHelper::getReportOptions($bean);
+    $report_items = ttReportHelper::getItems($options);
+
+    // Prepare ids for time and expense items, at the same time checking
+    // if we can proceed with creating a timesheet.
+    $canCreateTimesheet = true;
+    $first_user_id = null;
+
+    foreach ($report_items as $report_item) {
+      // Check user id.
+      if (!$first_user_id)
+        $first_user_id = $report_item['user_id'];
+      else {
+        if ($report_item['user_id'] != $first_user_id) {
+          // We have items for multiple users.
+          $canCreateTimesheet = false;
+          break;
+        }
+      }
+      // Check timesheet id.
+      if ($report_item['timesheet_id']) {
+        // We have an item already assigned to a timesheet.
+        $canCreateTimesheet = false;
+        break;
+      }
+      if ($report_item['type'] == 1)
+        $time_ids[] = $report_item['id'];
+      elseif ($report_item['type'] == 2)
+        $expense_ids[] = $report_item['id'];
+    }
+    if (!$canCreateTimesheet) return false;
+
+    // Make comma-seperated lists of ids for sql.
+    if ($time_ids)
+      $comma_separated_time_ids = implode(',', $time_ids);
+    if ($expense_ids)
+      $comma_separated_expense_ids = implode(',', $expense_ids);
+
+    // Create a new timesheet entry.
     global $user;
     $mdb2 = getConnection();
 
@@ -74,7 +119,23 @@ class ttTimesheetHelper {
 
     $last_id = $mdb2->lastInsertID('tt_timesheets', 'id');
 
-    // TODO: Associate report items with new timesheet.
+    // Associate time items with timesheet.
+    if ($comma_separated_time_ids) {
+      $sql = "update tt_log set timesheet_id = $last_id".
+        " where id in ($comma_separated_time_ids) and group_id = $group_id and org_id = $org_id";
+      $affected = $mdb2->exec($sql);
+      if (is_a($affected, 'PEAR_Error'))
+        return false;
+    }
+
+    // Associate expense items with timesheet.
+    if ($comma_separated_expense_ids) {
+      $sql = "update tt_expense_items set timesheet_id = $last_id".
+        " where id in ($comma_separated_expense_ids) and group_id = $group_id and org_id = $org_id";
+      $affected = $mdb2->exec($sql);
+      if (is_a($affected, 'PEAR_Error'))
+        return false;
+    }
 
     return $last_id;
   }

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 5fb91bf..7d43e77 100644 (file)
--- a/WEB-INF/templates/footer.tpl
+++ b/WEB-INF/templates/footer.tpl
@@ -12,7 +12,7 @@
       <br>
       <table cellspacing="0" cellpadding="4" width="100%" border="0">
         <tr>
-          <td align="center">&nbsp;Anuko Time Tracker 1.18.37.4747 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">&nbsp;Anuko Time Tracker 1.18.37.4748 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
             <a href="https://www.anuko.com/lp/tt_4.htm" target="_blank">{$i18n.footer.credits}</a> |
             <a href="https://www.anuko.com/lp/tt_5.htm" target="_blank">{$i18n.footer.license}</a> |
             <a href="https://www.anuko.com/lp/tt_7.htm" target="_blank">{$i18n.footer.improve}</a>

diff --git a/timesheet_add.php b/timesheet_add.php
index fa8ec4f..9e6b9ac 100644 (file)
--- a/timesheet_add.php
+++ b/timesheet_add.php
@@ -31,7 +31,7 @@ import('form.Form');
 import('ttTimesheetHelper');
 
 // Access checks.
-if (!(ttAccessAllowed('manage_own_timesheets') || ttAccessAllowed('manage_timesheets'))) {
+if (!(ttAccessAllowed('manage_own_timesheets') || ttAccessAllowed('manage_timesheets') || ttAccessAllowed('manage_all_timesheets'))) {
   header('Location: access_denied.php');
   exit();
 }