Improved new export a bit by adding tasks to output.

diff --git a/WEB-INF/lib/ttAdmin.class.php b/WEB-INF/lib/ttAdmin.class.php
index 30c78f94b8eb9b22b86d10a95b54045a1f3c5804..23d8480d746e9691d22f10a8d08b2cadd9341646 100644 (file)
--- a/WEB-INF/lib/ttAdmin.class.php
+++ b/WEB-INF/lib/ttAdmin.class.php
@@ -41,7 +41,17 @@ class ttAdmin {
 
   // getSubgroups rerurns an array of subgroups for a group.
   function getSubgroups($group_id) {
 
   // getSubgroups rerurns an array of subgroups for a group.
   function getSubgroups($group_id) {

-    return array(); // TODO: not yet implemented.
+    $mdb2 = getConnection();
+
+    $subgroups = array();
+    $sql =  "select id from tt_groups where parent_id = $group_id";
+    $res = $mdb2->query($sql);
+    if (!is_a($res, 'PEAR_Error')) {
+      while ($val = $res->fetchRow()) {
+        $subgroups[] = $val;
+      }
+    }
+    return $subgroups;

   }
 
   // getUsers obtains user ids in a group.
   }
 
   // getUsers obtains user ids in a group.

diff --git a/WEB-INF/lib/ttGroupExportHelper.class.php b/WEB-INF/lib/ttGroupExportHelper.class.php
index af49e19e67b6ecee8ba0ca289100d92b59cadfea..5338d2d467ad1f82217dba07c539a973bb857fc0 100644 (file)
--- a/WEB-INF/lib/ttGroupExportHelper.class.php
+++ b/WEB-INF/lib/ttGroupExportHelper.class.php
@@ -42,6 +42,7 @@ class ttGroupExportHelper {
   // 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.
   // 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.
 
   // Constructor.
   var $clientMap = array(); // Client ids.
 
   // Constructor.


@@ -114,6 +115,24 @@ class ttGroupExportHelper {
     return false;
   }
 
     return false;
   }
 

+  // getTasks - obtains all tasks defined for group.
+  function getTasks() {
+    global $user;
+    $mdb2 = getConnection();
+
+    $result = array();
+    $sql = "select * from tt_tasks 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() {
 


@@ -138,15 +157,20 @@ class ttGroupExportHelper {
     foreach ($roles as $key=>$role_item)
       $this->roleMap[$role_item['id']] = $key + 1;
 
     foreach ($roles as $key=>$role_item)
       $this->roleMap[$role_item['id']] = $key + 1;
 

+    // Prepare task map.
+    $tasks = $this->getTasks();
+    foreach ($tasks as $key=>$task_item)
+      $this->taskMap[$task_item['id']] = $key + 1;
+

     // Prepare client map.
     $clients = ttTeamHelper::getAllClients($this->group_id, true);
     foreach ($clients as $key=>$client_item)
       $this->clientMap[$client_item['id']] = $key + 1;
 
     // Write roles.
     // Prepare client map.
     $clients = ttTeamHelper::getAllClients($this->group_id, true);
     foreach ($clients as $key=>$client_item)
       $this->clientMap[$client_item['id']] = $key + 1;
 
     // Write roles.

-    fwrite($this->file, $this->indentation."<roles>\n");
+    fwrite($this->file, $this->indentation."  <roles>\n");

     foreach ($roles as $role) {
     foreach ($roles as $role) {

-      $role_part = $this->indentation.'  '."<role id=\"".$this->roleMap[$role['id']]."\"";
+      $role_part = $this->indentation.'    '."<role id=\"".$this->roleMap[$role['id']]."\"";

       $role_part .= " name=\"".htmlentities($role['name'])."\"";
       $role_part .= " description=\"".htmlentities($role['description'])."\"";
       $role_part .= " rank=\"".$role['rank']."\"";
       $role_part .= " name=\"".htmlentities($role['name'])."\"";
       $role_part .= " description=\"".htmlentities($role['description'])."\"";
       $role_part .= " rank=\"".$role['rank']."\"";


@@ -155,13 +179,25 @@ class ttGroupExportHelper {
       $role_part .= "></role>\n";
       fwrite($this->file, $role_part);
     }
       $role_part .= "></role>\n";
       fwrite($this->file, $role_part);
     }

-    fwrite($this->file, $this->indentation."</roles>\n");
+    fwrite($this->file, $this->indentation."  </roles>\n");
+
+    // Write tasks.
+    fwrite($this->file, $this->indentation."  <tasks>\n");
+    foreach ($tasks as $task) {
+      $task_part = $this->indentation.'    '."<task id=\"".$this->taskMap[$task['id']]."\"";
+      $task_part .= " name=\"".htmlentities($task['name'])."\"";
+      $task_part .= " description=\"".htmlentities($task['description'])."\"";
+      $task_part .= " status=\"".$task['status']."\"";
+      $task_part .= "></task>\n";
+      fwrite($this->file, $task_part);
+    }
+    fwrite($this->file, $this->indentation."  </tasks>\n");

 
     // Write users.
 
     // Write users.

-    fwrite($this->file, $this->indentation."<users>\n");
+    fwrite($this->file, $this->indentation."  <users>\n");

     foreach ($users as $user_item) {
       $role_id = $user_item['rank'] == 512 ? 0 : $this->roleMap[$user_item['role_id']]; // Special role_id 0 (not null) for top manager.
     foreach ($users as $user_item) {
       $role_id = $user_item['rank'] == 512 ? 0 : $this->roleMap[$user_item['role_id']]; // Special role_id 0 (not null) for top manager.

-      $user_part = $this->indentation.'  '."<user id=\"".$this->userMap[$user_item['id']]."\"";
+      $user_part = $this->indentation.'    '."<user id=\"".$this->userMap[$user_item['id']]."\"";

       $user_part .= " name=\"".htmlentities($user_item['name'])."\"";
       $user_part .= " login=\"".htmlentities($user_item['login'])."\"";
       $user_part .= " password=\"".$user_item['password']."\"";
       $user_part .= " name=\"".htmlentities($user_item['name'])."\"";
       $user_part .= " login=\"".htmlentities($user_item['login'])."\"";
       $user_part .= " password=\"".$user_item['password']."\"";


@@ -173,7 +209,7 @@ class ttGroupExportHelper {
       $user_part .= "></user>\n";
       fwrite($this->file, $user_part);
     }
       $user_part .= "></user>\n";
       fwrite($this->file, $user_part);
     }

-    fwrite($this->file, $this->indentation."</users>\n");
+    fwrite($this->file, $this->indentation."  </users>\n");

 
     // Call self recursively for all subgroups.
     foreach ($this->subgroups as $subgroup) {
 
     // Call self recursively for all subgroups.
     foreach ($this->subgroups as $subgroup) {

diff --git a/WEB-INF/lib/ttOrgImportHelper.class.php b/WEB-INF/lib/ttOrgImportHelper.class.php
index ba1b120febc1584ff0d5d1432b11976aad42922a..015579c00b349b387b8ad820b0825af13362dc27 100644 (file)
--- a/WEB-INF/lib/ttOrgImportHelper.class.php
+++ b/WEB-INF/lib/ttOrgImportHelper.class.php
@@ -27,6 +27,7 @@
 // +----------------------------------------------------------------------+
 
 import('ttUserHelper');
 // +----------------------------------------------------------------------+
 
 import('ttUserHelper');

+import('ttRoleHelper');

 
 // ttOrgImportHelper - this class is a future replacement for ttImportHelper.
 // Currently, it is work in progress.
 
 // ttOrgImportHelper - this class is a future replacement for ttImportHelper.
 // Currently, it is work in progress.


@@ -37,10 +38,11 @@ class ttOrgImportHelper {
   var $canImport      = true;    // False if we cannot import data due to a conflict such as login collision.
   var $firstPass      = true;    // True during first pass through the file.
   var $org_id         = null;    // Organization id (same as top group_id).
   var $canImport      = true;    // False if we cannot import data due to a conflict such as login collision.
   var $firstPass      = true;    // True during first pass through the file.
   var $org_id         = null;    // Organization id (same as top group_id).

-  var $current_parent_group_id = null; // Current parent group id as we parse the file.
+  var $current_group_id        = null; // Current group id during parsing.
+  var $current_parent_group_id = null; // Current parent group id during parsing.

                                        // Set when we create a new group.
                                        // Set when we create a new group.

-  // Entities for current group.
-  var $currentGroupRoles = array(); // Array of arrays of role properties.
+  // Entities for current group. -- Looks like they are not needed as we insert right away...
+  // var $currentGroupRoles = array(); // Array of arrays of role properties.

   // var $currentGroupUsers = array(); // Array of arrays of user properties.
 
   // Entity maps for current group. They map XML ids with database ids.
   // var $currentGroupUsers = array(); // Array of arrays of user properties.
 
   // Entity maps for current group. They map XML ids with database ids.


@@ -77,7 +79,7 @@ class ttOrgImportHelper {
       // We are in second pass and can import data.
       if ($name == 'GROUP') {
         // Create a new group.
       // We are in second pass and can import data.
       if ($name == 'GROUP') {
         // Create a new group.

-        $group_id = $this->createGroup(array(
+        $this->current_group_id = $this->createGroup(array(

           'parent_id' => $this->current_parent_group_id,
           'org_id' => $this->org_id,
           'name' => $attrs['NAME'],
           'parent_id' => $this->current_parent_group_id,
           'org_id' => $this->org_id,
           'name' => $attrs['NAME'],


@@ -87,13 +89,13 @@ class ttOrgImportHelper {
 
         // Special handling for top group.
         if (!$this->org_id) {
 
         // Special handling for top group.
         if (!$this->org_id) {

-          $this->org_id = $group_id;
-          $sql = "update tt_groups set org_id = $group_id where org_id is NULL and id = $group_id";
+          $this->org_id = $this->current_group_id;
+          $sql = "update tt_groups set org_id = $this->current_group_id where org_id is NULL and id = $this->current_group_id";

           $affected = $mdb2->exec($sql);
           // TODO: design a better error handling approach for the entire import process.
         }
         // Set current parent group.
           $affected = $mdb2->exec($sql);
           // TODO: design a better error handling approach for the entire import process.
         }
         // Set current parent group.

-        $this->current_parent_group_id = $group_id;
+        $this->current_parent_group_id = $this->current_group_id;

       }
 
       if ($name == 'ROLES') {
       }
 
       if ($name == 'ROLES') {


@@ -108,8 +110,16 @@ class ttOrgImportHelper {
 
       if ($name == 'ROLE') {
         // We get here when processing a <role> tag for the current group.
 
       if ($name == 'ROLE') {
         // We get here when processing a <role> tag for the current group.

-        // Add new role to $this->currentGroupRoles and a mapping to $this->currentGroupRoleMap.
-        $this->currentGroupRoles[$attrs['ID']] = $attrs;
+        $role_id = ttRoleHelper::insert(array(
+              'group_id' => $this->current_group_id,
+              'org_id' => $this->org_id,
+              'name' => $attrs['NAME'],
+              'description' => $attrs['DESCRIPTION'],
+              'rank' => $attrs['RANK'],
+              'rights' => $attrs['RIGHTS'],
+              'status' => $attrs['STATUS']));
+        // Add a mapping.
+        $this->currentGroupRoleMap[$attrs['ID']] = $role_id;

       }
     }
   }
       }
     }
   }

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index fd5880c7d1b490a537db14345b11ab1f15a946c4..9e7af7c9513d482808d7aa1e5b706d1ed03ae8aa 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.4398 | 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.4399 | 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>