Improved new import with integrating clients.

diff --git a/WEB-INF/lib/ttOrgImportHelper.class.php b/WEB-INF/lib/ttOrgImportHelper.class.php
index f8dbc523b20b1283cbcac058c16b39eed5f6c93d..7c00f25436b4534b3a0e77eccd602aa23f37db58 100644 (file)
--- a/WEB-INF/lib/ttOrgImportHelper.class.php
+++ b/WEB-INF/lib/ttOrgImportHelper.class.php
@@ -30,6 +30,7 @@ import('ttUserHelper');
 import('ttRoleHelper');
 import('ttTaskHelper');
 import('ttProjectHelper');
 import('ttRoleHelper');
 import('ttTaskHelper');
 import('ttProjectHelper');

+import('ttClientHelper');

 
 // 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.


@@ -51,11 +52,7 @@ class ttOrgImportHelper {
   var $currentGroupRoleMap    = array();
   var $currentGroupTaskMap    = array();
   var $currentGroupProjectMap = array();
   var $currentGroupRoleMap    = array();
   var $currentGroupTaskMap    = array();
   var $currentGroupProjectMap = array();

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

 
   // Constructor.
   function __construct(&$errors) {
 
   // Constructor.
   function __construct(&$errors) {


@@ -173,6 +170,35 @@ class ttOrgImportHelper {
           $this->currentGroupProjectMap[$attrs['ID']] = $project_id;
         } else $this->errors->add($i18n->get('error.db'));
       }
           $this->currentGroupProjectMap[$attrs['ID']] = $project_id;
         } else $this->errors->add($i18n->get('error.db'));
       }

+
+      if ($name == 'CLIENTS') {
+        // If we get here, we have to recycle $currentGroupClientMap.
+        unset($this->currentGroupClientMap);
+        $this->currentGroupClientMap = array();
+        // Client map is reconstructed after processing <client> elements in XML. See below.
+      }
+
+      if ($name == 'CLIENT') {
+        // We get here when processing <client> tags for the current group.
+
+        // Prepare a list of project ids.
+        $projects = explode(',', $attrs['PROJECTS']);
+        foreach ($projects as $id)
+          $mapped_projects[] = $this->currentGroupProjectMap[$id];
+
+        $client_id = ttClientHelper::insert(array(
+          'group_id' => $this->current_group_id,
+          'org_id' => $this->org_id,
+          'name' => $attrs['NAME'],
+          'address' => $attrs['ADDRESS'],
+          'tax' => $attrs['TAX'],
+          'projects' => $mapped_projects,
+          'status' => $attrs['STATUS']));
+        if ($client_id) {
+          // Add a mapping.
+          $this->currentGroupClientMap[$attrs['ID']] = $client_id;
+        } else $this->errors->add($i18n->get('error.db'));
+      }

     }
   }
 
     }
   }
 

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 4d6e74dad86f720ec9cad77c26f264b6042e3e32..d4275c187f1ea5319cf75b95e53d594d3a91c9e8 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.4405 | 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.4406 | 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>