From 9fc2b95e492018d340dcd83aa4cfcf90b1cf3db7 Mon Sep 17 00:00:00 2001
From: kapsona777 <lasha.kapanadze.1@btu.edu.ge>
Date: Tue, 1 Oct 2024 16:16:16 +0400
Subject: [PATCH] first task done

---
 .../userarea/importify/check_vocabulary.php   |  5 +--
 .../userarea/importify/import_auto_script.php | 32 +++++++++++++------
 .../importify/importify_bg_script.php         | 11 +++++--
 3 files changed, 32 insertions(+), 16 deletions(-)

diff --git a/public/userarea/importify/check_vocabulary.php b/public/userarea/importify/check_vocabulary.php
index 90d3233..821465c 100644
--- a/public/userarea/importify/check_vocabulary.php
+++ b/public/userarea/importify/check_vocabulary.php
@@ -20,10 +20,7 @@ if(isset($_FILES['f_csv'])) {
         $arr_info = $worksheet->toArray();
         if(count($arr_info) > 1) {  //check excel rows
             $arr_excel_columns = $arr_info[0];
-            $arr_need_columns = array();
-            array_push($arr_need_columns, "Sample Code (PO#)");
-            array_push($arr_need_columns, "Report no.");
-            array_push($arr_need_columns, "Part No.");
+            $arr_need_columns = array(); 
 
             $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 01a2a6b..a5cfbd4 100644
--- a/public/userarea/importify/import_auto_script.php
+++ b/public/userarea/importify/import_auto_script.php
@@ -50,10 +50,7 @@ if (isset($_FILES['f_csv'])) {
         $arr_info = $worksheet->toArray();
         if (count($arr_info) > 1) {  //check excel rows
             $arr_excel_columns = $arr_info[0];
-            $arr_need_columns = array();
-            array_push($arr_need_columns, "Sample Code (PO#)");
-            array_push($arr_need_columns, "Report no.");
-            array_push($arr_need_columns, "Part No.");
+            $arr_need_columns = array(); 
 
             // remove empty rows
             $arr_info = array_filter($arr_info, function ($row) {
@@ -91,10 +88,24 @@ if (isset($_FILES['f_csv'])) {
                 }
             }
 
-            if ($verify_flag) {
-                //separate by Sample Code (PO#) - product
-                $idx_sample_code_po = array_search("Sample Code (PO#)", $arr_excel_columns);
+            $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); 
 
                 $arr_total_products = array();
                 $tmp_arr_child_products = array();
@@ -117,7 +128,7 @@ if (isset($_FILES['f_csv'])) {
                     array_push($arr_total_products, $tmp_arr_child_products);
                 }
 
-
+                
                 //define importcode (timestamp)
                 $importcode = time();
 
@@ -141,7 +152,10 @@ if (isset($_FILES['f_csv'])) {
                     'arr_project' => json_encode($arr_total_products),
                     'arr_excel_columns' => json_encode($arr_excel_columns),
                     'arr_associate' => json_encode($arr_associate),
-                    'importcode' => $importcode
+                    'importcode' => $importcode,
+                    'productsRefNumber_excelName' => $productsRefNumber_excelName,
+                    'reportsNumberLab_excelName' => $reportsNumberLab_excelName,
+                    'partsCode_excelName' => $partsCode_excelName
                 ]);
 
                 //insert to products table
diff --git a/public/userarea/importify/importify_bg_script.php b/public/userarea/importify/importify_bg_script.php
index 8b3368e..acce83e 100644
--- a/public/userarea/importify/importify_bg_script.php
+++ b/public/userarea/importify/importify_bg_script.php
@@ -11,8 +11,13 @@ $arr_total_products = json_decode($_POST['arr_project']);
 $arr_excel_columns = json_decode($_POST['arr_excel_columns']);
 $arr_associate = json_decode($_POST['arr_associate']);
 $importcode = $_POST['importcode'];
+$productsRefNumber_excelName = $_POST['productsRefNumber_excelName'];
+$reportsNumberLab_excelName = $_POST['reportsNumberLab_excelName'];
+$partsCode_excelName = $_POST['partsCode_excelName'];
 
-$idx_sample_code_po = array_search("Sample Code (PO#)", $arr_excel_columns);
+$sample_code_po_column_name = array_search("products_refnumber", $arr_associate);
+
+$idx_sample_code_po = array_search($productsRefNumber_excelName, $arr_excel_columns);
 
 //insert to products table
 $idx = 0;
@@ -65,7 +70,7 @@ foreach ($arr_total_products as $product) {
 
     //-----------  report table ------------------
     //separate reports table data
-    $idx_report_no_po = array_search("Report no.", $arr_excel_columns);
+    $idx_report_no_po = array_search($reportsNumberLab_excelName, $arr_excel_columns);
 
     $arr_total_reports = array();
     $tmp_arr_child_reports = array();
@@ -136,7 +141,7 @@ foreach ($arr_total_products as $product) {
 
         //-----------  parts table ------------------
         //separate parts table data
-        $idx_part_no_po = array_search("Part No.", $arr_excel_columns);
+        $idx_part_no_po = array_search($partsCode_excelName, $arr_excel_columns);
 
         $arr_total_parts = array();
         $tmp_arr_child_parts = array();