Populated group_id and org_id in tt_fav_reports table.

[timetracker.git] / WEB-INF / lib / ttOrgImportHelper.class.php

diff --git a/WEB-INF/lib/ttOrgImportHelper.class.php b/WEB-INF/lib/ttOrgImportHelper.class.php
index d95aabb46613ae1162c1aab87246d225ea561345..c57cc640577aeafb29dbc119349d8f5e5960e32e 100644 (file)
--- a/WEB-INF/lib/ttOrgImportHelper.class.php
+++ b/WEB-INF/lib/ttOrgImportHelper.class.php
@@ -29,7 +29,6 @@
 import('ttUserHelper');
 import('ttRoleHelper');
 import('ttTaskHelper');
-import('ttProjectHelper');
 import('ttClientHelper');
 import('ttInvoiceHelper');
 import('ttTimeHelper');
@@ -200,12 +199,14 @@ class ttOrgImportHelper {
         // We get here when processing <project> tags for the current group.
 
         // Prepare a list of task ids.
-        $tasks = explode(',', $attrs['TASKS']);
-        foreach ($tasks as $id)
-          $mapped_tasks[] = $this->currentGroupTaskMap[$id];
+        if ($attrs['TASKS']) {
+          $tasks = explode(',', $attrs['TASKS']);
+          foreach ($tasks as $id)
+            $mapped_tasks[] = $this->currentGroupTaskMap[$id];
+        }
 
-        $project_id = ttProjectHelper::insert(array( // TODO: continue refactoring, write a separate, simple function to import projects
-          'group_id' => $this->current_group_id,     // because ttProjectHelper::insert is complicated.
+        $project_id = $this->insertProject(array(
+          'group_id' => $this->current_group_id,
           'org_id' => $this->org_id,
           'name' => $attrs['NAME'],
           'description' => $attrs['DESCRIPTION'],
@@ -461,9 +462,11 @@ class ttOrgImportHelper {
           foreach ($arr as $v)
             $user_list .= (strlen($user_list) == 0 ? '' : ',').$this->currentGroupUserMap[$v];
         }
-        $fav_report_id = ttFavReportHelper::insertReport(array(
+        if (!$this->insertFavReport(array(
           'name' => $attrs['NAME'],
           'user_id' => $this->currentGroupUserMap[$attrs['USER_ID']],
+          'group_id' => $this->current_group_id,
+          'org_id' => $this->org_id,
           'client' => $this->currentGroupClientMap[$attrs['CLIENT_ID']],
           'option' => $this->currentGroupCustomFieldOptionMap[$attrs['CF_1_OPTION_ID']],
           'project' => $this->currentGroupProjectMap[$attrs['PROJECT_ID']],
@@ -489,8 +492,9 @@ class ttOrgImportHelper {
           'group_by1' => $attrs['GROUP_BY1'],
           'group_by2' => $attrs['GROUP_BY2'],
           'group_by3' => $attrs['GROUP_BY3'],
-          'chtotalsonly' => (int) $attrs['SHOW_TOTALS_ONLY']));
-         if (!$fav_report_id) $this->errors->add($i18n->get('error.db'));
+          'chtotalsonly' => (int) $attrs['SHOW_TOTALS_ONLY']))) {
+           $this->errors->add($i18n->get('error.db'));
+         }
          return;
       }
     }
@@ -705,4 +709,75 @@ class ttOrgImportHelper {
     $affected = $mdb2->exec($sql);
     return (!is_a($affected, 'PEAR_Error'));
   }
+
+  // insertProject - a helper function to insert a project as well as project to task binds.
+  private function insertProject($fields)
+  {
+    $mdb2 = getConnection();
+
+    $group_id = (int) $fields['group_id'];
+    $org_id = (int) $fields['org_id'];
+
+    $name = $fields['name'];
+    $description = $fields['description'];
+    $tasks = $fields['tasks'];
+    $comma_separated = implode(',', $tasks); // This is a comma-separated list of associated task ids.
+    $status = $fields['status'];
+
+    $sql = "insert into tt_projects (group_id, org_id, name, description, tasks, status)
+      values ($group_id, $org_id, ".$mdb2->quote($name).", ".$mdb2->quote($description).", ".$mdb2->quote($comma_separated).", ".$mdb2->quote($status).")";
+    $affected = $mdb2->exec($sql);
+    if (is_a($affected, 'PEAR_Error'))
+      return false;
+
+    $last_id = 0;
+    $sql = "select last_insert_id() as last_insert_id";
+    $res = $mdb2->query($sql);
+    $val = $res->fetchRow();
+    $last_id = $val['last_insert_id'];
+
+    // Insert binds into tt_project_task_binds table.
+    if (is_array($tasks)) {
+      foreach ($tasks as $task_id) {
+        $sql = "insert into tt_project_task_binds (project_id, task_id, group_id, org_id)".
+          " values($last_id, $task_id, $group_id, $org_id)";
+        $affected = $mdb2->exec($sql);
+        if (is_a($affected, 'PEAR_Error'))
+          return false;
+      }
+    }
+
+    return $last_id;
+  }
+
+  // insertFavReport - inserts a favorite report in database.
+  private function insertFavReport($fields) {
+    $mdb2 = getConnection();
+
+    $group_id = (int) $fields['group_id'];
+    $org_id = (int) $fields['org_id'];
+
+    $sql = "insert into tt_fav_reports".
+      " (name, user_id, group_id, org_id, client_id, cf_1_option_id, project_id, task_id,".
+      " billable, invoice, paid_status, users, period, period_start, period_end,".
+      " show_client, show_invoice, show_paid, show_ip,".
+      " show_project, show_start, show_duration, show_cost,".
+      " show_task, show_end, show_note, show_custom_field_1, show_work_units,".
+      " group_by1, group_by2, group_by3, show_totals_only)".
+      " values(".
+      $mdb2->quote($fields['name']).", ".$fields['user_id'].", $group_id, $org_id, ".
+      $mdb2->quote($fields['client']).", ".$mdb2->quote($fields['option']).", ".
+      $mdb2->quote($fields['project']).", ".$mdb2->quote($fields['task']).", ".
+      $mdb2->quote($fields['billable']).", ".$mdb2->quote($fields['invoice']).", ".
+      $mdb2->quote($fields['paid_status']).", ".
+      $mdb2->quote($fields['users']).", ".$mdb2->quote($fields['period']).", ".
+      $mdb2->quote($fields['from']).", ".$mdb2->quote($fields['to']).", ".
+      $fields['chclient'].", ".$fields['chinvoice'].", ".$fields['chpaid'].", ".$fields['chip'].", ".
+      $fields['chproject'].", ".$fields['chstart'].", ".$fields['chduration'].", ".$fields['chcost'].", ".
+      $fields['chtask'].", ".$fields['chfinish'].", ".$fields['chnote'].", ".$fields['chcf_1'].", ".$fields['chunits'].", ".
+      $mdb2->quote($fields['group_by1']).", ".$mdb2->quote($fields['group_by2']).", ".
+      $mdb2->quote($fields['group_by3']).", ".$fields['chtotalsonly'].")";
+    $affected = $mdb2->exec($sql);
+    return (!is_a($affected, 'PEAR_Error'));
+  }
 }