X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/timetracker.git/blobdiff_plain/da106606ea1e1553b080bf4491188d92a436b990..b06601362567c117bdc889277d554c8c58f0efdc:/WEB-INF/lib/ttGroupExportHelper.class.php

diff --git a/WEB-INF/lib/ttGroupExportHelper.class.php b/WEB-INF/lib/ttGroupExportHelper.class.php
index 215414f6..125df0ff 100644
--- a/WEB-INF/lib/ttGroupExportHelper.class.php
+++ b/WEB-INF/lib/ttGroupExportHelper.class.php
@@ -71,7 +71,7 @@ class ttGroupExportHelper {
     global $user;
     $mdb2 = getConnection();
 
-    $sql =  "select name, currency, lang from tt_groups".
+    $sql =  "select * from tt_groups".
             " where status = 1 and id = $this->group_id and org_id = $user->org_id";
     $res = $mdb2->query($sql);
     if (!is_a($res, 'PEAR_Error')) {
@@ -152,6 +152,24 @@ class ttGroupExportHelper {
     return false;
   }
 
+  // getClients - obtains all clients defined for group.
+  function getClients() {
+    global $user;
+    $mdb2 = getConnection();
+
+    $result = array();
+    $sql = "select * from tt_clients where group_id = $this->group_id and org_id = $user->org_id";
+    $res = $mdb2->query($sql);
+    $result = array();
+    if (!is_a($res, 'PEAR_Error')) {
+      while ($val = $res->fetchRow()) {
+        $result[] = $val;
+      }
+      return $result;
+    }
+    return false;
+  }
+
   // writeData writes group data into file.
   function writeData() {
 
@@ -159,8 +177,23 @@ class ttGroupExportHelper {
     $group = $this->getGroupData();
     $group_part = "<group name=\"".htmlentities($group['name'])."\"";
     $group_part .= " currency=\"".htmlentities($group['currency'])."\"";
+    $group_part .= " decimal_mark=\"".$group['decimal_mark']."\"";
     $group_part .= " lang=\"".$group['lang']."\"";
-    // TODO: add other group attributes here.
+    $group_part .= " date_format=\"".$group['date_format']."\"";
+    $group_part .= " time_format=\"".$group['time_format']."\"";
+    $group_part .= " week_start=\"".$group['week_start']."\"";
+    $group_part .= " tracking_mode=\"".$group['tracking_mode']."\"";
+    $group_part .= " project_required=\"".$group['project_required']."\"";
+    $group_part .= " task_required=\"".$group['task_required']."\"";
+    $group_part .= " record_type=\"".$group['record_type']."\"";
+    $group_part .= " bcc_email=\"".$group['bcc_email']."\"";
+    $group_part .= " allow_ip=\"".$group['allow_ip']."\"";
+    $group_part .= " password_complexity=\"".$group['password_complexity']."\"";
+    $group_part .= " plugins=\"".$group['plugins']."\"";
+    $group_part .= " lock_spec=\"".$group['lock_spec']."\"";
+    $group_part .= " workday_minutes=\"".$group['workday_minutes']."\"";
+    $group_part .= " custom_logo=\"".$group['custom_logo']."\"";
+    $group_part .= " config=\"".$group['config']."\"";
     $group_part .= ">\n";
 
     // Write group info.
@@ -187,7 +220,7 @@ class ttGroupExportHelper {
       $this->projectMap[$project_item['id']] = $key + 1;
 
     // Prepare client map.
-    $clients = ttTeamHelper::getAllClients($this->group_id, true);
+    $clients = $this->getClients();
     foreach ($clients as $key=>$client_item)
       $this->clientMap[$client_item['id']] = $key + 1;
 
@@ -237,6 +270,27 @@ class ttGroupExportHelper {
     }
     fwrite($this->file, $this->indentation."  </projects>\n");
 
+    // Write clients.
+    fwrite($this->file, $this->indentation."  <clients>\n");
+    foreach ($clients as $client_item) {
+      if($client_item['projects']){
+        $projects_db = explode(',', $client_item['projects']);
+        $projects_mapped = array();
+        foreach ($projects_db as $item)
+          $projects_mapped[] = $this->projectMap[$item];
+        $projects_str = implode(',', $projects_mapped);
+      }
+      $client_part = $this->indentation.'    '."<client id=\"".$this->clientMap[$client_item['id']]."\"";
+      $client_part .= " name=\"".htmlentities($client_item['name'])."\"";
+      $client_part .= " address=\"".htmlentities($client_item['address'])."\"";
+      $client_part .= " tax=\"".$client_item['tax']."\"";
+      $client_part .= " projects=\"".$projects_str."\"";
+      $client_part .= " status=\"".$client_item['status']."\"";
+      $client_part .= "></client>\n";
+      fwrite($this->file, $client_part);
+    }
+    fwrite($this->file, $this->indentation."  </clients>\n");
+
     // Write users.
     fwrite($this->file, $this->indentation."  <users>\n");
     foreach ($users as $user_item) {
@@ -255,6 +309,21 @@ class ttGroupExportHelper {
     }
     fwrite($this->file, $this->indentation."  </users>\n");
 
+    // Write user to project binds.
+    fwrite($this->file, $this->indentation."  <user_project_binds>\n");
+    $user_binds = ttTeamHelper::getUserToProjectBinds($this->group_id);
+    foreach ($user_binds as $bind) {
+      $user_id = $this->userMap[$bind['user_id']];
+      $project_id = $this->projectMap[$bind['project_id']];
+      $bind_part = $this->indentation.'    '."<user_project_bind user_id=\"".$user_id."\"";
+      $bind_part .= " project_id=\"".$project_id."\"";
+      $bind_part .= " rate=\"".$bind['rate']."\"";
+      $bind_part .= " status=\"".$bind['status']."\"";
+      $bind_part .= "></user_project_bind>\n";
+      fwrite($this->file, $bind_part);
+    }
+    fwrite($this->file, $this->indentation."  </user_project_binds>\n");
+
     // Call self recursively for all subgroups.
     foreach ($this->subgroups as $subgroup) {
       $subgroup_helper = new ttGroupExportHelper($subgroup['id'], $this->file, $this->indentation.'  ');