Improved new export-import by adding invoices.

diff --git a/WEB-INF/lib/ttGroupExportHelper.class.php b/WEB-INF/lib/ttGroupExportHelper.class.php
index 125df0ff0da22ec1bae54716ecc52652f8b593d6..91a36ce97e5eb71ece9805ddb5ab736350d597b3 100644 (file)
--- a/WEB-INF/lib/ttGroupExportHelper.class.php
+++ b/WEB-INF/lib/ttGroupExportHelper.class.php
@@ -45,6 +45,7 @@ class ttGroupExportHelper {
   var $taskMap    = array(); // Task ids.
   var $projectMap = array(); // Project ids.
   var $clientMap  = array(); // Client ids.
   var $taskMap    = array(); // Task ids.
   var $projectMap = array(); // Project ids.
   var $clientMap  = array(); // Client ids.

+  var $invoiceMap = array(); // Invoice ids.

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


@@ -224,6 +225,11 @@ class ttGroupExportHelper {
     foreach ($clients as $key=>$client_item)
       $this->clientMap[$client_item['id']] = $key + 1;
 
     foreach ($clients as $key=>$client_item)
       $this->clientMap[$client_item['id']] = $key + 1;
 

+    // Prepare invoice map.
+    $invoices = ttTeamHelper::getAllInvoices();
+    foreach ($invoices as $key=>$invoice_item)
+      $this->invoiceMap[$invoice_item['id']] = $key + 1;
+

     // Write roles.
     fwrite($this->file, $this->indentation."  <roles>\n");
     foreach ($roles as $role) {
     // Write roles.
     fwrite($this->file, $this->indentation."  <roles>\n");
     foreach ($roles as $role) {


@@ -324,6 +330,19 @@ class ttGroupExportHelper {
     }
     fwrite($this->file, $this->indentation."  </user_project_binds>\n");
 
     }
     fwrite($this->file, $this->indentation."  </user_project_binds>\n");
 

+    // Write invoices.
+    fwrite($this->file, $this->indentation."  <invoices>\n");
+    foreach ($invoices as $invoice_item) {
+      $invoice_part = $this->indentation.'    '."<invoice id=\"".$this->invoiceMap[$invoice_item['id']]."\"";
+      $invoice_part .= " name=\"".htmlentities($invoice_item['name'])."\"";
+      $invoice_part .= " date=\"".$invoice_item['date']."\"";
+      $invoice_part .= " client_id=\"".$this->clientMap[$invoice_item['client_id']]."\"";
+      $invoice_part .= " status=\"".$invoice_item['status']."\"";
+      $invoice_part .= "></invoice>\n";
+      fwrite($this->file, $invoice_part);
+    }
+    fwrite($this->file, $this->indentation."  </invoices>\n");
+

     // Call self recursively for all subgroups.
     foreach ($this->subgroups as $subgroup) {
       $subgroup_helper = new ttGroupExportHelper($subgroup['id'], $this->file, $this->indentation.'  ');
     // Call self recursively for all subgroups.
     foreach ($this->subgroups as $subgroup) {
       $subgroup_helper = new ttGroupExportHelper($subgroup['id'], $this->file, $this->indentation.'  ');

diff --git a/WEB-INF/lib/ttImportHelper.class.php b/WEB-INF/lib/ttImportHelper.class.php
index ea899821a3c002285f9d4178d831f8efa7a7c2c3..7fa1e28309b549b6fe7b531fb97ae627079d0de5 100644 (file)
--- a/WEB-INF/lib/ttImportHelper.class.php
+++ b/WEB-INF/lib/ttImportHelper.class.php
@@ -247,7 +247,6 @@ class ttImportHelper {
           'name' => $this->currentElement['NAME'],
           'date' => $this->currentElement['DATE'],
           'client_id' => $this->clientMap[$this->currentElement['CLIENT_ID']],
           'name' => $this->currentElement['NAME'],
           'date' => $this->currentElement['DATE'],
           'client_id' => $this->clientMap[$this->currentElement['CLIENT_ID']],

-          'discount' => $this->currentElement['DISCOUNT'],

           'status' => $this->currentElement['STATUS']));
     }
 
           'status' => $this->currentElement['STATUS']));
     }
 

diff --git a/WEB-INF/lib/ttOrgImportHelper.class.php b/WEB-INF/lib/ttOrgImportHelper.class.php
index ccdc05b20f8c4665094894c5b90a6e557ec326b7..015668807ba8130598b15c362bd31719f856f1fe 100644 (file)
--- a/WEB-INF/lib/ttOrgImportHelper.class.php
+++ b/WEB-INF/lib/ttOrgImportHelper.class.php
@@ -31,6 +31,7 @@ import('ttRoleHelper');
 import('ttTaskHelper');
 import('ttProjectHelper');
 import('ttClientHelper');
 import('ttTaskHelper');
 import('ttProjectHelper');
 import('ttClientHelper');

+import('ttInvoiceHelper');

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


@@ -52,6 +53,7 @@ class ttOrgImportHelper {
   var $currentGroupProjectMap = array();
   var $currentGroupClientMap  = array();
   var $currentGroupUserMap    = array();
   var $currentGroupProjectMap = array();
   var $currentGroupClientMap  = array();
   var $currentGroupUserMap    = array();

+  var $currentGroupInvoiceMap = array();

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


@@ -255,6 +257,28 @@ class ttOrgImportHelper {
           $this->errors->add($i18n->get('error.db'));
         }
       }
           $this->errors->add($i18n->get('error.db'));
         }
       }

+
+      if ($name == 'INVOICES') {
+        // If we get here, we have to recycle $currentGroupInvoiceMap.
+        unset($this->currentGroupInvoiceMap);
+        $this->currentGroupInvoiceMap = array();
+        // Invoice map is reconstructed after processing <invoice> elements in XML. See below.
+      }
+
+      if ($name == 'INVOICE') {
+        // We get here when processing <invoice> tags for the current group.
+        $invoice_id = ttInvoiceHelper::insert(array(
+          'group_id' => $this->current_group_id,
+          'org_id' => $this->org_id,
+          'name' => $attrs['NAME'],
+          'date' => $attrs['DATE'],
+          'client_id' => $this->currentGroupClientMap[$attrs['CLIENT_ID']],
+          'status' => $attrs['STATUS']));
+        if ($invoice_id) {
+          // Add a mapping.
+          $this->currentGroupInvoiceMap[$attrs['ID']] = $invoice_id;
+        } else $this->errors->add($i18n->get('error.db'));
+      }

     }
   }
 
     }
   }
 

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index cff882273d7065a36b52e811d6f323cce902f9e9..8995b12b2936012f42bbb356f9595b3b6dd6510e 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.4409 | 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.4410 | 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>