X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=WEB-INF%2Flib%2FttImportHelper.class.php;h=e732b9890ba47d754834ea2298e1a880b937dc19;hb=0fdda830ba3e780c365c90e1fdfd5cfa7ed77244;hp=6686d40f6e7087174f51f17e191c335a78f473c3;hpb=5d2849f60950348fd2b862f40ae98e9fce837528;p=timetracker.git

diff --git a/WEB-INF/lib/ttImportHelper.class.php b/WEB-INF/lib/ttImportHelper.class.php
index 6686d40f..e732b989 100644
--- a/WEB-INF/lib/ttImportHelper.class.php
+++ b/WEB-INF/lib/ttImportHelper.class.php
@@ -47,6 +47,7 @@ class ttImportHelper {
 
   var $canImport      = true;    // False if we cannot import data due to a login collision.
   var $groupData      = array(); // Array of group data such as group name, etc.
+  var $org_id         = null;    // New organization id we are importing. It is created during the import operation.
   var $group_id       = null;    // New group id we are importing. It is created during the import operation.
   var $roles          = array(); // Array of arrays of role properties.
   var $users          = array(); // Array of arrays of user properties.
@@ -66,7 +67,7 @@ class ttImportHelper {
   var $logMap        = array(); // Time log ids.
 
   // Constructor.
-  function ttImportHelper(&$errors) {
+  function __construct(&$errors) {
     $this->errors = &$errors;
   }
 
@@ -144,13 +145,16 @@ class ttImportHelper {
           'workday_minutes' => $this->groupData['WORKDAY_MINUTES'],
           'config' => $this->groupData['CONFIG']));
         if ($group_id) {
+          $this->org_id = $group_id;
           $this->group_id = $group_id;
 
           // Create roles.
           foreach ($this->roles as $key=>$role_item) {
             $role_id = ttRoleHelper::insert(array(
               'group_id' => $this->group_id,
+              'org_id' => $this->org_id,
               'name' => $role_item['NAME'],
+              'description' => $role_item['DESCRIPTION'],
               'rank' => $role_item['RANK'],
               'rights' => $role_item['RIGHTS'],
               'status' => $role_item['STATUS']));
@@ -161,6 +165,7 @@ class ttImportHelper {
             $role_id = $user_item['ROLE_ID'] === '0' ? $this->top_role_id :  $this->roleMap[$user_item['ROLE_ID']]; // 0 (not null) means top manager role.
             $user_id = ttUserHelper::insert(array(
               'group_id' => $this->group_id,
+              'org_id' => $this->org_id,
               'role_id' => $role_id,
               'client_id' => $user_item['CLIENT_ID'], // Note: NOT mapped value, replaced in CLIENT handler.
               'name' => $user_item['NAME'],
@@ -217,6 +222,7 @@ class ttImportHelper {
       $this->clientMap[$this->currentElement['ID']] =
         ttClientHelper::insert(array(
           'group_id' => $this->group_id,
+          'org_id' => $this->org_id,
           'name' => $this->currentElement['NAME'],
           'address' => $this->currentElement['ADDRESS'],
           'tax' => $this->currentElement['TAX'],