Improved new export by adding clients in output.

diff --git a/WEB-INF/lib/ttGroupExportHelper.class.php b/WEB-INF/lib/ttGroupExportHelper.class.php
index 215414f..054c435 100644 (file)
--- a/WEB-INF/lib/ttGroupExportHelper.class.php
+++ b/WEB-INF/lib/ttGroupExportHelper.class.php
@@ -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() {
 
@@ -187,7 +205,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 +255,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) {

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index b09112d..4d6e74d 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.12.4404 | 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.12.4405 | 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>