[Fmsystem-commits] [16042]

[nelson . guerra]

Revision: 16042
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=16042
Author:   nelson224
Date:     2016-12-03 00:50:13 +0000 (Sat, 03 Dec 2016)
Log Message:
-----------


Modified Paths:
--------------
    
branches/dev-syncromind-2/property/inc/import/class.import_component_files.inc.php

Modified: 
branches/dev-syncromind-2/property/inc/import/class.import_component_files.inc.php
===================================================================
--- 
branches/dev-syncromind-2/property/inc/import/class.import_component_files.inc.php
  2016-12-03 00:50:00 UTC (rev 16041)
+++ 
branches/dev-syncromind-2/property/inc/import/class.import_component_files.inc.php
  2016-12-03 00:50:13 UTC (rev 16042)
@@ -101,14 +101,9 @@
                public function add_files_location($id, $location_code)
                {               
                        $message = array();
-
-                       $uploaded_files = $this->_get_uploaded_files();
-
-                       if ($this->receipt['error'])
-                       {
-                               return $this->receipt;
-                       }
                        
+                       $uploaded_files = 
phpgwapi_cache::session_get('property', 'import_data');
+                       
                        $count_new_relations = 0;
                        $count_relations_existing = 0;
                        $count_new_files = 0;
@@ -406,14 +401,11 @@
                
                        return $results;
                }
-
-               public function add_files_components_location($id, 
$location_code, $attrib_name_componentID)
-               {               
+               
+               public function get_relations ()
+               {
                        $exceldata = 
$this->_getexceldata($_FILES['file']['tmp_name'], false);
                        $component_files = array();
-                       $message = array();
-       
-                       $uploaded_files = $this->_get_uploaded_files();
 
                        if ($this->receipt['error'])
                        {
@@ -444,10 +436,36 @@
                                        'row' => ($k + 1)
                                );
                        }
+                       
+                       return $component_files;
+               }
+               
+               public function preview ()
+               {
+                       $with_components = 
phpgw::get_var('with_components_check');
+                       
+                       $uploaded_files = $this->_get_uploaded_files();
+                       
+                       if ($with_components)
+                       {
+                               $relations = $this->get_relations();
+                               $this->_compare_names($relations, 
$uploaded_files);
+                       } else {
+                               $relations = $uploaded_files;
+                       }
+                       
+                       phpgwapi_cache::session_set('property', 'import_data', 
$relations);
+                       
+                       return $relations;
+               }
 
-                       $this->_compare_names($component_files, 
$uploaded_files);
+               public function add_files_components_location($id, 
$location_code, $attrib_name_componentID)
+               {               
+                       $message = array();
 
-                       $count_new_relations = 0;
+                       $component_files = 
phpgwapi_cache::session_get('property', 'import_data');
+                       
+                       $count_new_relations = 0; 
                        $count_relations_existing = 0;
                        $count_new_files = 0;
                        //$count_files_not_existing = 0;