Improved new export by adding projects in output.

diff --git a/WEB-INF/lib/ttGroupExportHelper.class.php b/WEB-INF/lib/ttGroupExportHelper.class.php
index 5338d2d467ad1f82217dba07c539a973bb857fc0..215414f646bf06890d56ea5fb29750a1ccd6f733 100644 (file)
--- a/WEB-INF/lib/ttGroupExportHelper.class.php
+++ b/WEB-INF/lib/ttGroupExportHelper.class.php
@@ -40,10 +40,11 @@ class ttGroupExportHelper {
 
   // The following arrays are maps between entity ids in the file versus the database.
   // We write to the file sequentially (1,2,3...) while in the database the entities have different ids.
 
   // The following arrays are maps between entity ids in the file versus the database.
   // We write to the file sequentially (1,2,3...) while in the database the entities have different ids.

-  var $userMap   = array(); // User ids.
-  var $roleMap   = array(); // Role ids.
-  var $taskMap   = array(); // Task ids.
-  var $clientMap = array(); // Client ids.
+  var $userMap    = array(); // User ids.
+  var $roleMap    = array(); // Role ids.
+  var $taskMap    = array(); // Task ids.
+  var $projectMap = array(); // Project ids.
+  var $clientMap  = array(); // Client ids.

 
   // Constructor.
   function __construct($group_id, $file, $indentation) {
 
   // Constructor.
   function __construct($group_id, $file, $indentation) {


@@ -133,6 +134,24 @@ class ttGroupExportHelper {
     return false;
   }
 
     return false;
   }
 

+  // getProjects - obtains all projects defined for group.
+  function getProjects() {
+    global $user;
+    $mdb2 = getConnection();
+
+    $result = array();
+    $sql = "select * from tt_projects 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() {
 
   // writeData writes group data into file.
   function writeData() {
 


@@ -162,6 +181,11 @@ class ttGroupExportHelper {
     foreach ($tasks as $key=>$task_item)
       $this->taskMap[$task_item['id']] = $key + 1;
 
     foreach ($tasks as $key=>$task_item)
       $this->taskMap[$task_item['id']] = $key + 1;
 

+    // Prepare project map.
+    $projects = $this->getProjects();
+    foreach ($projects as $key=>$project_item)
+      $this->projectMap[$project_item['id']] = $key + 1;
+

     // Prepare client map.
     $clients = ttTeamHelper::getAllClients($this->group_id, true);
     foreach ($clients as $key=>$client_item)
     // Prepare client map.
     $clients = ttTeamHelper::getAllClients($this->group_id, true);
     foreach ($clients as $key=>$client_item)


@@ -193,6 +217,26 @@ class ttGroupExportHelper {
     }
     fwrite($this->file, $this->indentation."  </tasks>\n");
 
     }
     fwrite($this->file, $this->indentation."  </tasks>\n");
 

+    // Write projects.
+    fwrite($this->file, $this->indentation."  <projects>\n");
+    foreach ($projects as $project_item) {
+      if($project_item['tasks']){
+        $tasks = explode(',', $project_item['tasks']);
+        $tasks_mapped = array();
+        foreach ($tasks as $item)
+          $tasks_mapped[] = $this->taskMap[$item];
+        $tasks_str = implode(',', $tasks_mapped);
+      }
+      $project_part = $this->indentation.'    '."<project id=\"".$this->projectMap[$project_item['id']]."\"";
+      $project_part .= " name=\"".htmlentities($project_item['name'])."\"";
+      $project_part .= " description=\"".htmlentities($project_item['description'])."\"";
+      $project_part .= " tasks=\"".$tasks_str."\"";
+      $project_part .= " status=\"".$project_item['status']."\"";
+      $project_part .= "></project>\n";
+      fwrite($this->file, $project_part);
+    }
+    fwrite($this->file, $this->indentation."  </projects>\n");
+

     // Write users.
     fwrite($this->file, $this->indentation."  <users>\n");
     foreach ($users as $user_item) {
     // 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 92fda1f143f372ecf4d8fe445e671dc09dba916c..98575976c992b879ebde1b7dda2d611a2bce1b2e 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>
       <br>
       <table cellspacing="0" cellpadding="4" width="100%" border="0">
         <tr>

-          <td align="center">&nbsp;Anuko Time Tracker 1.18.12.4402 | 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.4403 | 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>
             <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>