From 7c8e6310a9d0006e93050b15c7c75e86e41bfa5b Mon Sep 17 00:00:00 2001
From: kapsona777 <lasha.kapanadze.1@btu.edu.ge>
Date: Wed, 2 Oct 2024 10:03:47 +0400
Subject: [PATCH] added old hard code by database names if necessary...

---
 .../userarea/importify/check_vocabulary.php   | 20 +++++++++++
 .../userarea/importify/import_auto_script.php | 36 +++++++++++--------
 2 files changed, 41 insertions(+), 15 deletions(-)

diff --git a/public/userarea/importify/check_vocabulary.php b/public/userarea/importify/check_vocabulary.php
index 821465c..587fc38 100644
--- a/public/userarea/importify/check_vocabulary.php
+++ b/public/userarea/importify/check_vocabulary.php
@@ -18,10 +18,30 @@ if(isset($_FILES['f_csv'])) {
         $spreadsheet = IOFactory::load($file, IReader::READ_DATA_ONLY);
         $worksheet = $spreadsheet->getActiveSheet();
         $arr_info = $worksheet->toArray();
+
+        $productsRefNumber_excelName = '';
+        $reportsNumberLab_excelName = '';
+        $partsCode_excelName = '';
+        
         if(count($arr_info) > 1) {  //check excel rows
             $arr_excel_columns = $arr_info[0];
             $arr_need_columns = array(); 
 
+            foreach ($arr_associate as $item){
+                if($item['column_name'] == 'products_refnumber'){
+                    $productsRefNumber_excelName = $item['headerfile'];
+                }
+                if($item['column_name'] == 'reportsNumberLab'){
+                    $reportsNumberLab_excelName = $item['headerfile'];
+                }
+                if($item['column_name'] == 'partsCode'){
+                    $partsCode_excelName = $item['headerfile'];
+                } 
+            }  
+            array_push($arr_need_columns, $productsRefNumber_excelName);
+            array_push($arr_need_columns, $reportsNumberLab_excelName);
+            array_push($arr_need_columns, $partsCode_excelName);
+
             $result_testNameHeaderFile = "";    //for analysisvocabulary
             $result_AnalytsNameHeaderFile = "";    //for compundsvocabulary
 
diff --git a/public/userarea/importify/import_auto_script.php b/public/userarea/importify/import_auto_script.php
index a5cfbd4..a791ecc 100644
--- a/public/userarea/importify/import_auto_script.php
+++ b/public/userarea/importify/import_auto_script.php
@@ -43,6 +43,10 @@ if (isset($_FILES['f_csv'])) {
     $arr_associate_data->setQuery("SELECT * FROM template_associate where template_importify_id=$template_id");
     $arr_associate_data->execute();
     $arr_associate = $arr_associate_data->Results;
+ 
+    $productsRefNumber_excelName = '';
+    $reportsNumberLab_excelName = '';
+    $partsCode_excelName = '';
 
     if (count($arr_associate) > 0) { //check define columns
         $spreadsheet = IOFactory::load($file);
@@ -51,6 +55,20 @@ if (isset($_FILES['f_csv'])) {
         if (count($arr_info) > 1) {  //check excel rows
             $arr_excel_columns = $arr_info[0];
             $arr_need_columns = array(); 
+            foreach ($arr_associate as $item){
+                if($item['column_name'] == 'products_refnumber'){
+                    $productsRefNumber_excelName = $item['headerfile'];
+                }
+                if($item['column_name'] == 'reportsNumberLab'){
+                    $reportsNumberLab_excelName = $item['headerfile'];
+                }
+                if($item['column_name'] == 'partsCode'){
+                    $partsCode_excelName = $item['headerfile'];
+                } 
+            }  
+            array_push($arr_need_columns, $productsRefNumber_excelName);
+            array_push($arr_need_columns, $reportsNumberLab_excelName);
+            array_push($arr_need_columns, $partsCode_excelName);
 
             // remove empty rows
             $arr_info = array_filter($arr_info, function ($row) {
@@ -88,21 +106,6 @@ if (isset($_FILES['f_csv'])) {
                 }
             }
 
-            $productsRefNumber_excelName = '';
-            $reportsNumberLab_excelName = '';
-            $partsCode_excelName = '';
-            foreach ($arr_associate as $item){
-                if($item['column_name'] == 'products_refnumber'){
-                    $productsRefNumber_excelName = $item['headerfile'];
-                }
-                if($item['column_name'] == 'reportsNumberLab'){
-                    $reportsNumberLab_excelName = $item['headerfile'];
-                }
-                if($item['column_name'] == 'partsCode'){
-                    $partsCode_excelName = $item['headerfile'];
-                } 
-            } 
-
             if ($verify_flag) {
                 //separate by products_refnumber - product
                 $idx_sample_code_po = array_search($productsRefNumber_excelName, $arr_excel_columns); 
@@ -128,6 +131,9 @@ if (isset($_FILES['f_csv'])) {
                     array_push($arr_total_products, $tmp_arr_child_products);
                 }
 
+                var_dump($arr_need_columns);
+                die();
+
                 
                 //define importcode (timestamp)
                 $importcode = time();