From 9fc2b95e492018d340dcd83aa4cfcf90b1cf3db7 Mon Sep 17 00:00:00 2001 From: kapsona777 Date: Tue, 1 Oct 2024 16:16:16 +0400 Subject: [PATCH 01/15] 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(); From 7c8e6310a9d0006e93050b15c7c75e86e41bfa5b Mon Sep 17 00:00:00 2001 From: kapsona777 Date: Wed, 2 Oct 2024 10:03:47 +0400 Subject: [PATCH 02/15] 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(); From c2464eedcf13a1ed609ed418ccb983796e219b4d Mon Sep 17 00:00:00 2001 From: kapsona777 Date: Wed, 2 Oct 2024 12:55:48 +0400 Subject: [PATCH 03/15] fx --- public/userarea/importify/import_auto_script.php | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/public/userarea/importify/import_auto_script.php b/public/userarea/importify/import_auto_script.php index a791ecc..a81d03e 100644 --- a/public/userarea/importify/import_auto_script.php +++ b/public/userarea/importify/import_auto_script.php @@ -129,10 +129,7 @@ if (isset($_FILES['f_csv'])) { } if (count($tmp_arr_child_products) > 0) { array_push($arr_total_products, $tmp_arr_child_products); - } - - var_dump($arr_need_columns); - die(); + } //define importcode (timestamp) From 171aa4e8160bcb0706f5f84afa44fc7f1844fdab Mon Sep 17 00:00:00 2001 From: kapsona777 Date: Wed, 2 Oct 2024 21:40:15 +0400 Subject: [PATCH 04/15] added functionality which is checking cas code and analysiscode before checking names. --- .../userarea/importify/check_vocabulary.php | 166 ++++++++++++------ 1 file changed, 115 insertions(+), 51 deletions(-) diff --git a/public/userarea/importify/check_vocabulary.php b/public/userarea/importify/check_vocabulary.php index 587fc38..bf7d11c 100644 --- a/public/userarea/importify/check_vocabulary.php +++ b/public/userarea/importify/check_vocabulary.php @@ -50,6 +50,14 @@ if(isset($_FILES['f_csv'])) { if($item['column_name'] == 'result_TestName') { $result_testNameHeaderFile = $item['headerfile']; + } + + if($item['column_name'] == 'analysisgroupcode') { + $result_AnalytsGroupCodeHeaderFile = $item['headerfile']; + } + + if($item['column_name'] == 'cas') { + $result_CASHeaderFile = $item['headerfile']; } if($item['column_name'] == 'result_AnalytsName') { @@ -66,79 +74,135 @@ if(isset($_FILES['f_csv'])) { } } + $arr_analysis_code = array(); + $arr_anaysisvoc_words = array(); if($verify_flag) { - //check result_TestName field - $arr_anaysisvoc_words = array(); - if($result_testNameHeaderFile != "") { - $arr_diff_anaysisvoc_words = array(); - $idx_resultTestName_po = array_search($result_testNameHeaderFile, $arr_excel_columns); - + // check analysis code + if($result_AnalytsGroupCodeHeaderFile != ""){ + $arr_diff_analysis_code = array(); + $idx_resultAnalytsGroupCode_po = array_search($result_AnalytsGroupCodeHeaderFile, $arr_excel_columns); for($i=1; $isetQuery("SELECT * FROM analysisvocabulary where nameanalysisvoc like '$trim_item'"); + $arr_analysis_refdata->setQuery("SELECT * FROM analysisvocabulary where analysiscode like '%$trim_item%'"); $arr_analysis_refdata->execute(); $arr_analysis_ref = $arr_analysis_refdata->Results; if(count($arr_analysis_ref) == 0) { - //check kind - $arr_analysiskind_refdata = new WA_MySQLi_RS("rsl", $repnew, 0); - $arr_analysiskind_refdata->setQuery("SELECT * FROM analysisvocabulary where preferred like 'Y'"); - $arr_analysiskind_refdata->execute(); - $arr_analysiskind_ref = $arr_analysiskind_refdata->Results; - array_push($arr_anaysisvoc_words, array( - 'word' => $item, - 'arr_similary' => $arr_analysiskind_ref - )); + array_push($arr_analysis_code, $item); + } + } + } + + // if array $arr_analysis_code is empty + if(count($arr_analysis_code) == 0 && $result_testNameHeaderFile != "") { + //check result_TestName field + if($result_testNameHeaderFile != "") { + $arr_diff_anaysisvoc_words = array(); + $idx_resultTestName_po = array_search($result_testNameHeaderFile, $arr_excel_columns); + + for($i=1; $isetQuery("SELECT * FROM analysisvocabulary where nameanalysisvoc like '%$trim_item%'"); + $arr_analysis_refdata->execute(); + $arr_analysis_ref = $arr_analysis_refdata->Results; + if(count($arr_analysis_ref) == 0) { + //check kind + $arr_analysiskind_refdata = new WA_MySQLi_RS("rsl", $repnew, 0); + $arr_analysiskind_refdata->setQuery("SELECT * FROM analysisvocabulary where preferred like '%Y%'"); + $arr_analysiskind_refdata->execute(); + $arr_analysiskind_ref = $arr_analysiskind_refdata->Results; + array_push($arr_anaysisvoc_words, array( + 'word' => $item, + 'arr_similary' => $arr_analysiskind_ref + )); + } } } } - //check result_AnalytsName field - $arr_compundsvoc_words = array(); - if($result_AnalytsNameHeaderFile != "") { - $arr_diff_compundsvoc_words = array(); - $arr_tmp_diff_compundsvoc_words = array(); - $idx_resultAnalytsName_po = array_search($result_AnalytsNameHeaderFile, $arr_excel_columns); - $idx_resultTestName_po = $result_testNameHeaderFile != "" ? array_search($result_testNameHeaderFile, $arr_excel_columns) : 0; - + + + // check cas code + $arr_cas_code = array(); + if($result_CASHeaderFile != ""){ + $arr_diff_cas_code = array(); + $idx_resultCAS_po = array_search($result_CASHeaderFile, $arr_excel_columns); for($i=1; $i $arr_info[$i][$idx_resultAnalytsName_po], - 'analysis_word' => $result_testNameHeaderFile != "" ? $arr_info[$i][$idx_resultTestName_po] : "" - )); + if(!in_array($arr_info[$i][$idx_resultCAS_po], $arr_diff_cas_code)) { + array_push($arr_diff_cas_code, $arr_info[$i][$idx_resultCAS_po]); } } - foreach($arr_diff_compundsvoc_words as $item) { - $arr_compunds_refdata = new WA_MySQLi_RS("rsl", $repnew, 0); - $compund_word = $item['word']; - $trim_item = str_replace("\n", "", str_replace("'", "\'", $compund_word)); - $arr_compunds_refdata->setQuery("SELECT * FROM compundsvocabulary where namecompoundsvocabulary like '$trim_item' or cascompoundvocabulary like '$trim_item'"); - $arr_compunds_refdata->execute(); - $arr_compunds_ref = $arr_compunds_refdata->Results; - if(count($arr_compunds_ref) == 0) { - //check kind - $arr_compundskind_refdata = new WA_MySQLi_RS("rsl", $repnew, 0); - $arr_compundskind_refdata->setQuery("SELECT * FROM compundsvocabulary where preferred like 'Y'"); - $arr_compundskind_refdata->execute(); - $arr_compundskind_ref = $arr_compundskind_refdata->Results; - array_push($arr_compundsvoc_words, array( - 'word' => $compund_word, - 'anaysis_word' => $item['analysis_word'], - 'arr_similary' => $arr_compundskind_ref - )); + foreach($arr_diff_cas_code as $item) { + $arr_cas_refdata = new WA_MySQLi_RS("rsl", $repnew, 0); + $trim_item = str_replace("\n", "", str_replace("'", "\'", $item)); + $arr_cas_refdata->setQuery("SELECT * FROM compundsvocabulary where cascompoundvocabulary like '%$trim_item%'"); + $arr_cas_refdata->execute(); + $arr_cas_ref = $arr_cas_refdata->Results; + if(count($arr_cas_ref) == 0) { + array_push($arr_cas_code, $item); + } + } + } + + // if array $arr_cas_code is empty + if(count($arr_cas_code) == 0 && $result_AnalytsNameHeaderFile != "") { + //check result_AnalytsName field + $arr_compundsvoc_words = array(); + if($result_AnalytsNameHeaderFile != "") { + $arr_diff_compundsvoc_words = array(); + $arr_tmp_diff_compundsvoc_words = array(); + $idx_resultAnalytsName_po = array_search($result_AnalytsNameHeaderFile, $arr_excel_columns); + $idx_resultTestName_po = $result_testNameHeaderFile != "" ? array_search($result_testNameHeaderFile, $arr_excel_columns) : 0; + + for($i=1; $i $arr_info[$i][$idx_resultAnalytsName_po], + 'analysis_word' => $result_testNameHeaderFile != "" ? $arr_info[$i][$idx_resultTestName_po] : "" + )); + } + } + + foreach($arr_diff_compundsvoc_words as $item) { + $arr_compunds_refdata = new WA_MySQLi_RS("rsl", $repnew, 0); + $compund_word = $item['word']; + $trim_item = str_replace("\n", "", str_replace("'", "\'", $compund_word)); + $arr_compunds_refdata->setQuery("SELECT * FROM compundsvocabulary where namecompoundsvocabulary like '%$trim_item%' or cascompoundvocabulary like '%$trim_item%'"); + $arr_compunds_refdata->execute(); + $arr_compunds_ref = $arr_compunds_refdata->Results; + if(count($arr_compunds_ref) == 0) { + //check kind + $arr_compundskind_refdata = new WA_MySQLi_RS("rsl", $repnew, 0); + $arr_compundskind_refdata->setQuery("SELECT * FROM compundsvocabulary where preferred like '%Y%'"); + $arr_compundskind_refdata->execute(); + $arr_compundskind_ref = $arr_compundskind_refdata->Results; + array_push($arr_compundsvoc_words, array( + 'word' => $compund_word, + 'anaysis_word' => $item['analysis_word'], + 'arr_similary' => $arr_compundskind_ref + )); + } } } } + + die(json_encode(array( 'code' => "success", 'arr_analysis_data' => $arr_anaysisvoc_words, From f62198ef96bb009e8c7e895fe642c8f9f3385bad Mon Sep 17 00:00:00 2001 From: kapsona777 Date: Wed, 2 Oct 2024 21:55:55 +0400 Subject: [PATCH 05/15] changed YogiWhere into Reportify on login page and also added missing icons on pages --- public/userarea/photoschool.php | 2 +- public/userarea/products/products.php | 1 + public/userarea/reports/reports.php | 1 + storage/settings.json | 2 +- 4 files changed, 4 insertions(+), 2 deletions(-) diff --git a/public/userarea/photoschool.php b/public/userarea/photoschool.php index a0d0e6f..ee9cbd3 100644 --- a/public/userarea/photoschool.php +++ b/public/userarea/photoschool.php @@ -50,7 +50,7 @@ ini_set('display_errors', 1);
    -
  1. YogiWhere
    2. +
  2. Reportify
  3. Dashboard
diff --git a/public/userarea/products/products.php b/public/userarea/products/products.php index 69b70e8..0b52702 100644 --- a/public/userarea/products/products.php +++ b/public/userarea/products/products.php @@ -34,6 +34,7 @@ $result = $conn->query($query); Products + diff --git a/public/userarea/reports/reports.php b/public/userarea/reports/reports.php index f1c8869..4161c08 100644 --- a/public/userarea/reports/reports.php +++ b/public/userarea/reports/reports.php @@ -33,6 +33,7 @@ $result = $conn->query($query); + diff --git a/storage/settings.json b/storage/settings.json index ee26a59..864514e 100644 --- a/storage/settings.json +++ b/storage/settings.json @@ -1 +1 @@ -{"remember_me":"1","notifications_signup_email":"0","forgot_password":"1","login_reset_token_lifetime":"30","throttle_enabled":"1","throttle_attempts":"3","throttle_lockout_time":"2","reg_enabled":"1","reg_email_confirmation":"1","2fa":{"enabled":false},"app_name":"YogiWhere","registration":{"captcha":{"enabled":false}},"tos":"1","captcha":{"enabled":false}} \ No newline at end of file +{"remember_me":"1","notifications_signup_email":"0","forgot_password":"1","login_reset_token_lifetime":"30","throttle_enabled":"1","throttle_attempts":"3","throttle_lockout_time":"2","reg_enabled":"1","reg_email_confirmation":"1","2fa":{"enabled":false},"app_name":"Reportify","registration":{"captcha":{"enabled":false}},"tos":"1","captcha":{"enabled":false}} \ No newline at end of file From dfefc36169c1933498dc8c62221c66ace86a1094 Mon Sep 17 00:00:00 2001 From: kapsona777 Date: Wed, 2 Oct 2024 22:15:13 +0400 Subject: [PATCH 06/15] revert --- .../userarea/importify/check_vocabulary.php | 172 ++++++------------ 1 file changed, 52 insertions(+), 120 deletions(-) diff --git a/public/userarea/importify/check_vocabulary.php b/public/userarea/importify/check_vocabulary.php index bf7d11c..99c4faf 100644 --- a/public/userarea/importify/check_vocabulary.php +++ b/public/userarea/importify/check_vocabulary.php @@ -50,14 +50,6 @@ if(isset($_FILES['f_csv'])) { if($item['column_name'] == 'result_TestName') { $result_testNameHeaderFile = $item['headerfile']; - } - - if($item['column_name'] == 'analysisgroupcode') { - $result_AnalytsGroupCodeHeaderFile = $item['headerfile']; - } - - if($item['column_name'] == 'cas') { - $result_CASHeaderFile = $item['headerfile']; } if($item['column_name'] == 'result_AnalytsName') { @@ -74,135 +66,79 @@ if(isset($_FILES['f_csv'])) { } } - $arr_analysis_code = array(); - $arr_anaysisvoc_words = array(); if($verify_flag) { - // check analysis code - if($result_AnalytsGroupCodeHeaderFile != ""){ - $arr_diff_analysis_code = array(); - $idx_resultAnalytsGroupCode_po = array_search($result_AnalytsGroupCodeHeaderFile, $arr_excel_columns); + //check result_TestName field + $arr_anaysisvoc_words = array(); + if($result_testNameHeaderFile != "") { + $arr_diff_anaysisvoc_words = array(); + $idx_resultTestName_po = array_search($result_testNameHeaderFile, $arr_excel_columns); + for($i=1; $isetQuery("SELECT * FROM analysisvocabulary where analysiscode like '%$trim_item%'"); + $arr_analysis_refdata->setQuery("SELECT * FROM analysisvocabulary where nameanalysisvoc like '%$trim_item%'"); $arr_analysis_refdata->execute(); $arr_analysis_ref = $arr_analysis_refdata->Results; if(count($arr_analysis_ref) == 0) { - array_push($arr_analysis_code, $item); - } - } - } - - // if array $arr_analysis_code is empty - if(count($arr_analysis_code) == 0 && $result_testNameHeaderFile != "") { - //check result_TestName field - if($result_testNameHeaderFile != "") { - $arr_diff_anaysisvoc_words = array(); - $idx_resultTestName_po = array_search($result_testNameHeaderFile, $arr_excel_columns); - - for($i=1; $isetQuery("SELECT * FROM analysisvocabulary where nameanalysisvoc like '%$trim_item%'"); - $arr_analysis_refdata->execute(); - $arr_analysis_ref = $arr_analysis_refdata->Results; - if(count($arr_analysis_ref) == 0) { - //check kind - $arr_analysiskind_refdata = new WA_MySQLi_RS("rsl", $repnew, 0); - $arr_analysiskind_refdata->setQuery("SELECT * FROM analysisvocabulary where preferred like '%Y%'"); - $arr_analysiskind_refdata->execute(); - $arr_analysiskind_ref = $arr_analysiskind_refdata->Results; - array_push($arr_anaysisvoc_words, array( - 'word' => $item, - 'arr_similary' => $arr_analysiskind_ref - )); - } + //check kind + $arr_analysiskind_refdata = new WA_MySQLi_RS("rsl", $repnew, 0); + $arr_analysiskind_refdata->setQuery("SELECT * FROM analysisvocabulary where preferred like '%Y%'"); + $arr_analysiskind_refdata->execute(); + $arr_analysiskind_ref = $arr_analysiskind_refdata->Results; + array_push($arr_anaysisvoc_words, array( + 'word' => $item, + 'arr_similary' => $arr_analysiskind_ref + )); } } } - - - // check cas code - $arr_cas_code = array(); - if($result_CASHeaderFile != ""){ - $arr_diff_cas_code = array(); - $idx_resultCAS_po = array_search($result_CASHeaderFile, $arr_excel_columns); + //check result_AnalytsName field + $arr_compundsvoc_words = array(); + if($result_AnalytsNameHeaderFile != "") { + $arr_diff_compundsvoc_words = array(); + $arr_tmp_diff_compundsvoc_words = array(); + $idx_resultAnalytsName_po = array_search($result_AnalytsNameHeaderFile, $arr_excel_columns); + $idx_resultTestName_po = $result_testNameHeaderFile != "" ? array_search($result_testNameHeaderFile, $arr_excel_columns) : 0; + for($i=1; $i $arr_info[$i][$idx_resultAnalytsName_po], + 'analysis_word' => $result_testNameHeaderFile != "" ? $arr_info[$i][$idx_resultTestName_po] : "" + )); } } - foreach($arr_diff_cas_code as $item) { - $arr_cas_refdata = new WA_MySQLi_RS("rsl", $repnew, 0); - $trim_item = str_replace("\n", "", str_replace("'", "\'", $item)); - $arr_cas_refdata->setQuery("SELECT * FROM compundsvocabulary where cascompoundvocabulary like '%$trim_item%'"); - $arr_cas_refdata->execute(); - $arr_cas_ref = $arr_cas_refdata->Results; - if(count($arr_cas_ref) == 0) { - array_push($arr_cas_code, $item); - } - } - } - - // if array $arr_cas_code is empty - if(count($arr_cas_code) == 0 && $result_AnalytsNameHeaderFile != "") { - //check result_AnalytsName field - $arr_compundsvoc_words = array(); - if($result_AnalytsNameHeaderFile != "") { - $arr_diff_compundsvoc_words = array(); - $arr_tmp_diff_compundsvoc_words = array(); - $idx_resultAnalytsName_po = array_search($result_AnalytsNameHeaderFile, $arr_excel_columns); - $idx_resultTestName_po = $result_testNameHeaderFile != "" ? array_search($result_testNameHeaderFile, $arr_excel_columns) : 0; - - for($i=1; $i $arr_info[$i][$idx_resultAnalytsName_po], - 'analysis_word' => $result_testNameHeaderFile != "" ? $arr_info[$i][$idx_resultTestName_po] : "" - )); - } - } - - foreach($arr_diff_compundsvoc_words as $item) { - $arr_compunds_refdata = new WA_MySQLi_RS("rsl", $repnew, 0); - $compund_word = $item['word']; - $trim_item = str_replace("\n", "", str_replace("'", "\'", $compund_word)); - $arr_compunds_refdata->setQuery("SELECT * FROM compundsvocabulary where namecompoundsvocabulary like '%$trim_item%' or cascompoundvocabulary like '%$trim_item%'"); - $arr_compunds_refdata->execute(); - $arr_compunds_ref = $arr_compunds_refdata->Results; - if(count($arr_compunds_ref) == 0) { - //check kind - $arr_compundskind_refdata = new WA_MySQLi_RS("rsl", $repnew, 0); - $arr_compundskind_refdata->setQuery("SELECT * FROM compundsvocabulary where preferred like '%Y%'"); - $arr_compundskind_refdata->execute(); - $arr_compundskind_ref = $arr_compundskind_refdata->Results; - array_push($arr_compundsvoc_words, array( - 'word' => $compund_word, - 'anaysis_word' => $item['analysis_word'], - 'arr_similary' => $arr_compundskind_ref - )); - } + foreach($arr_diff_compundsvoc_words as $item) { + $arr_compunds_refdata = new WA_MySQLi_RS("rsl", $repnew, 0); + $compund_word = $item['word']; + $trim_item = str_replace("\n", "", str_replace("'", "\'", $compund_word)); + $arr_compunds_refdata->setQuery("SELECT * FROM compundsvocabulary where namecompoundsvocabulary like '%$trim_item%' or cascompoundvocabulary like '%$trim_item%'"); + $arr_compunds_refdata->execute(); + $arr_compunds_ref = $arr_compunds_refdata->Results; + if(count($arr_compunds_ref) == 0) { + //check kind + $arr_compundskind_refdata = new WA_MySQLi_RS("rsl", $repnew, 0); + $arr_compundskind_refdata->setQuery("SELECT * FROM compundsvocabulary where preferred like '%Y%'"); + $arr_compundskind_refdata->execute(); + $arr_compundskind_ref = $arr_compundskind_refdata->Results; + array_push($arr_compundsvoc_words, array( + 'word' => $compund_word, + 'anaysis_word' => $item['analysis_word'], + 'arr_similary' => $arr_compundskind_ref + )); } } } - - die(json_encode(array( 'code' => "success", 'arr_analysis_data' => $arr_anaysisvoc_words, @@ -219,8 +155,4 @@ if(isset($_FILES['f_csv'])) { } } else { die("file_empty_error"); -} - - - - +} \ No newline at end of file From 6778c02a4ef0b4a2f73cb250438532a3e50e5e70 Mon Sep 17 00:00:00 2001 From: kapsona777 Date: Thu, 3 Oct 2024 03:49:01 +0400 Subject: [PATCH 07/15] Added groupcode and cas ids priority checks --- .../importify/importify_bg_script.php | 42 +++++++++++++++---- 1 file changed, 35 insertions(+), 7 deletions(-) diff --git a/public/userarea/importify/importify_bg_script.php b/public/userarea/importify/importify_bg_script.php index acce83e..b3d6964 100644 --- a/public/userarea/importify/importify_bg_script.php +++ b/public/userarea/importify/importify_bg_script.php @@ -218,33 +218,61 @@ foreach ($arr_total_products as $product) { // $sql_result_project_query = "SELECT * FROM result_project WHERE idPart='$idparts' and idreports='$idreports' and idproducts='$idproducts'"; // $arr_result_project_need_idx = array(); + for ($i = 0; $i < count($arr_associate); $i++) { if ($arr_associate[$i]->table_name == "result_project") { if ($arr_associate[$i]->column_name == "result_TestName") { - $tmp_val = $result_project[array_search($arr_associate[$i]->headerfile, $arr_excel_columns)]; - $trim_item = str_replace("\n", "", str_replace("'", "\'", $tmp_val)); + $group_code_index = array_search("analysisgroupcode", array_column($arr_associate, 'column_name')); + $group_code_val = $result_project[array_search($arr_associate[$group_code_index]->headerfile, $arr_excel_columns)]; + + $trim_group_code = str_replace("\n", "", str_replace("'", "\'", $group_code_val)); $analysis_query = new WA_MySQLi_RS("getquery", $repnew, 0); - $analysis_query->setQuery("SELECT * FROM analysisvocabulary WHERE nameanalysisvoc like '$trim_item'"); + $analysis_query->setQuery("SELECT * FROM analysisvocabulary WHERE analysiscode like '$trim_group_code'"); $analysis_query->execute(); $analysis_data = $analysis_query->Results; $ref_id = 0; if (count($analysis_data) > 0) { $ref_id = $analysis_data[0]['idanalysisvocabulary']; - } + } else { + $tmp_val = $result_project[array_search($arr_associate[$i]->headerfile, $arr_excel_columns)]; + $trim_item = str_replace("\n", "", str_replace("'", "\'", $tmp_val)); + $analysis_query = new WA_MySQLi_RS("getquery", $repnew, 0); + $analysis_query->setQuery("SELECT * FROM analysisvocabulary WHERE nameanalysisvoc like '$trim_item'"); + $analysis_query->execute(); + $analysis_data = $analysis_query->Results; + $ref_id = 0; + if (count($analysis_data) > 0) { + $ref_id = $analysis_data[0]['idanalysisvocabulary']; + } + } array_push($arr_result_project_need_idx, array($arr_associate[$i]->column_name, $ref_id, 1)); } else if ($arr_associate[$i]->column_name == "result_AnalytsName") { - $tmp_val = $result_project[array_search($arr_associate[$i]->headerfile, $arr_excel_columns)]; - $trim_item = str_replace("\n", "", str_replace("'", "\'", $tmp_val)); + $cas_index = array_search("cas", array_column($arr_associate, 'column_name')); + $cas_val = $result_project[array_search($arr_associate[$cas_index]->headerfile, $arr_excel_columns)]; + + $trim_cas_val = str_replace("\n", "", str_replace("'", "\'", $cas_val)); $analysis_query = new WA_MySQLi_RS("getquery", $repnew, 0); - $analysis_query->setQuery("SELECT * FROM compundsvocabulary WHERE namecompoundsvocabulary like '$tmp_val' or cascompoundvocabulary like '$tmp_val'"); + $analysis_query->setQuery("SELECT * FROM compundsvocabulary WHERE cascompoundvocabulary like '%$trim_cas_val%'"); $analysis_query->execute(); $analysis_data = $analysis_query->Results; $ref_id = 0; if (count($analysis_data) > 0) { $ref_id = $analysis_data[0]['idcompoundsvocabulary']; + } else { + $tmp_val = $result_project[array_search($arr_associate[$i]->headerfile, $arr_excel_columns)]; + $trim_item = str_replace("\n", "", str_replace("'", "\'", $tmp_val)); + $analysis_query = new WA_MySQLi_RS("getquery", $repnew, 0); + $analysis_query->setQuery("SELECT * FROM compundsvocabulary WHERE namecompoundsvocabulary like '$tmp_val'"); + $analysis_query->execute(); + + $analysis_data = $analysis_query->Results; + $ref_id = 0; + if (count($analysis_data) > 0) { + $ref_id = $analysis_data[0]['idcompoundsvocabulary']; + } } array_push($arr_result_project_need_idx, array($arr_associate[$i]->column_name, $ref_id, 1)); From db6fd425338e2e9009fdc339e515eedbbb51f7a9 Mon Sep 17 00:00:00 2001 From: kapsona777 Date: Thu, 3 Oct 2024 13:52:30 +0400 Subject: [PATCH 08/15] fixed some navigation errors --- public/userarea/easyspec/index.php | 6 ++++++ public/userarea/importify/index.php | 6 ++++++ public/userarea/include/navigationbar.php | 15 +-------------- public/userarea/products/index.php | 6 ++++++ public/userarea/reports/index.php | 6 ++++++ public/userarea/statkpi/index.php | 6 ++++++ 6 files changed, 31 insertions(+), 14 deletions(-) create mode 100644 public/userarea/easyspec/index.php create mode 100644 public/userarea/importify/index.php create mode 100644 public/userarea/products/index.php create mode 100644 public/userarea/reports/index.php create mode 100644 public/userarea/statkpi/index.php diff --git a/public/userarea/easyspec/index.php b/public/userarea/easyspec/index.php new file mode 100644 index 0000000..e5b7117 --- /dev/null +++ b/public/userarea/easyspec/index.php @@ -0,0 +1,6 @@ + \ No newline at end of file diff --git a/public/userarea/importify/index.php b/public/userarea/importify/index.php new file mode 100644 index 0000000..e5b7117 --- /dev/null +++ b/public/userarea/importify/index.php @@ -0,0 +1,6 @@ + \ No newline at end of file diff --git a/public/userarea/include/navigationbar.php b/public/userarea/include/navigationbar.php index 4a3d292..1d5631b 100644 --- a/public/userarea/include/navigationbar.php +++ b/public/userarea/include/navigationbar.php @@ -7,7 +7,7 @@
@@ -130,19 +130,6 @@ - - - - - - - - - - - - -
    • diff --git a/public/userarea/products/index.php b/public/userarea/products/index.php new file mode 100644 index 0000000..a17af94 --- /dev/null +++ b/public/userarea/products/index.php @@ -0,0 +1,6 @@ + \ No newline at end of file diff --git a/public/userarea/reports/index.php b/public/userarea/reports/index.php new file mode 100644 index 0000000..a17af94 --- /dev/null +++ b/public/userarea/reports/index.php @@ -0,0 +1,6 @@ + \ No newline at end of file diff --git a/public/userarea/statkpi/index.php b/public/userarea/statkpi/index.php new file mode 100644 index 0000000..3cc9ca8 --- /dev/null +++ b/public/userarea/statkpi/index.php @@ -0,0 +1,6 @@ + \ No newline at end of file From e7bff64b88ab78bc7e8c260951882a292bcb0da7 Mon Sep 17 00:00:00 2001 From: kapsona777 Date: Thu, 3 Oct 2024 21:51:24 +0400 Subject: [PATCH 09/15] fix --- public/userarea/importify/importify_bg_script.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/public/userarea/importify/importify_bg_script.php b/public/userarea/importify/importify_bg_script.php index b3d6964..dc6cc7d 100644 --- a/public/userarea/importify/importify_bg_script.php +++ b/public/userarea/importify/importify_bg_script.php @@ -227,7 +227,7 @@ foreach ($arr_total_products as $product) { $trim_group_code = str_replace("\n", "", str_replace("'", "\'", $group_code_val)); $analysis_query = new WA_MySQLi_RS("getquery", $repnew, 0); - $analysis_query->setQuery("SELECT * FROM analysisvocabulary WHERE analysiscode like '$trim_group_code'"); + $analysis_query->setQuery("SELECT * FROM analysisvocabulary WHERE analysiscode like '%$trim_group_code%'"); $analysis_query->execute(); $analysis_data = $analysis_query->Results; @@ -238,7 +238,7 @@ foreach ($arr_total_products as $product) { $tmp_val = $result_project[array_search($arr_associate[$i]->headerfile, $arr_excel_columns)]; $trim_item = str_replace("\n", "", str_replace("'", "\'", $tmp_val)); $analysis_query = new WA_MySQLi_RS("getquery", $repnew, 0); - $analysis_query->setQuery("SELECT * FROM analysisvocabulary WHERE nameanalysisvoc like '$trim_item'"); + $analysis_query->setQuery("SELECT * FROM analysisvocabulary WHERE nameanalysisvoc like '%$trim_item%'"); $analysis_query->execute(); $analysis_data = $analysis_query->Results; @@ -265,7 +265,7 @@ foreach ($arr_total_products as $product) { $tmp_val = $result_project[array_search($arr_associate[$i]->headerfile, $arr_excel_columns)]; $trim_item = str_replace("\n", "", str_replace("'", "\'", $tmp_val)); $analysis_query = new WA_MySQLi_RS("getquery", $repnew, 0); - $analysis_query->setQuery("SELECT * FROM compundsvocabulary WHERE namecompoundsvocabulary like '$tmp_val'"); + $analysis_query->setQuery("SELECT * FROM compundsvocabulary WHERE namecompoundsvocabulary like '%$tmp_val%'"); $analysis_query->execute(); $analysis_data = $analysis_query->Results; From e2090d4138ae223812ed283ddd55b15fd823d9fe Mon Sep 17 00:00:00 2001 From: kapsona777 Date: Fri, 4 Oct 2024 11:38:38 +0400 Subject: [PATCH 10/15] another fix --- public/userarea/importify/importify_bg_script.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/public/userarea/importify/importify_bg_script.php b/public/userarea/importify/importify_bg_script.php index dc6cc7d..9f78445 100644 --- a/public/userarea/importify/importify_bg_script.php +++ b/public/userarea/importify/importify_bg_script.php @@ -232,7 +232,7 @@ foreach ($arr_total_products as $product) { $analysis_data = $analysis_query->Results; $ref_id = 0; - if (count($analysis_data) > 0) { + if (count($analysis_data) > 0 && $trim_group_code != "") { $ref_id = $analysis_data[0]['idanalysisvocabulary']; } else { $tmp_val = $result_project[array_search($arr_associate[$i]->headerfile, $arr_excel_columns)]; @@ -259,7 +259,7 @@ foreach ($arr_total_products as $product) { $analysis_data = $analysis_query->Results; $ref_id = 0; - if (count($analysis_data) > 0) { + if (count($analysis_data) > 0 && $trim_cas_val != "") { $ref_id = $analysis_data[0]['idcompoundsvocabulary']; } else { $tmp_val = $result_project[array_search($arr_associate[$i]->headerfile, $arr_excel_columns)]; From e789bc6d2c162a3bcb307cf198cfbec0d403adff Mon Sep 17 00:00:00 2001 From: kapsona777 Date: Fri, 4 Oct 2024 14:34:45 +0400 Subject: [PATCH 11/15] final fix I think --- public/userarea/importify/check_vocabulary.php | 8 ++++---- public/userarea/importify/columnlink.php | 6 +++--- public/userarea/importify/importify_bg_script.php | 8 ++++---- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/public/userarea/importify/check_vocabulary.php b/public/userarea/importify/check_vocabulary.php index 99c4faf..9a82092 100644 --- a/public/userarea/importify/check_vocabulary.php +++ b/public/userarea/importify/check_vocabulary.php @@ -82,13 +82,13 @@ if(isset($_FILES['f_csv'])) { foreach($arr_diff_anaysisvoc_words as $item) { $arr_analysis_refdata = new WA_MySQLi_RS("rsl", $repnew, 0); $trim_item = str_replace("\n", "", str_replace("'", "\'", $item)); - $arr_analysis_refdata->setQuery("SELECT * FROM analysisvocabulary where nameanalysisvoc like '%$trim_item%'"); + $arr_analysis_refdata->setQuery("SELECT * FROM analysisvocabulary where nameanalysisvoc like '$trim_item'"); $arr_analysis_refdata->execute(); $arr_analysis_ref = $arr_analysis_refdata->Results; if(count($arr_analysis_ref) == 0) { //check kind $arr_analysiskind_refdata = new WA_MySQLi_RS("rsl", $repnew, 0); - $arr_analysiskind_refdata->setQuery("SELECT * FROM analysisvocabulary where preferred like '%Y%'"); + $arr_analysiskind_refdata->setQuery("SELECT * FROM analysisvocabulary where preferred like 'Y'"); $arr_analysiskind_refdata->execute(); $arr_analysiskind_ref = $arr_analysiskind_refdata->Results; array_push($arr_anaysisvoc_words, array( @@ -121,13 +121,13 @@ if(isset($_FILES['f_csv'])) { $arr_compunds_refdata = new WA_MySQLi_RS("rsl", $repnew, 0); $compund_word = $item['word']; $trim_item = str_replace("\n", "", str_replace("'", "\'", $compund_word)); - $arr_compunds_refdata->setQuery("SELECT * FROM compundsvocabulary where namecompoundsvocabulary like '%$trim_item%' or cascompoundvocabulary like '%$trim_item%'"); + $arr_compunds_refdata->setQuery("SELECT * FROM compundsvocabulary where namecompoundsvocabulary like '$trim_item' or cascompoundvocabulary like '$trim_item'"); $arr_compunds_refdata->execute(); $arr_compunds_ref = $arr_compunds_refdata->Results; if(count($arr_compunds_ref) == 0) { //check kind $arr_compundskind_refdata = new WA_MySQLi_RS("rsl", $repnew, 0); - $arr_compundskind_refdata->setQuery("SELECT * FROM compundsvocabulary where preferred like '%Y%'"); + $arr_compundskind_refdata->setQuery("SELECT * FROM compundsvocabulary where preferred like 'Y'"); $arr_compundskind_refdata->execute(); $arr_compundskind_ref = $arr_compundskind_refdata->Results; array_push($arr_compundsvoc_words, array( diff --git a/public/userarea/importify/columnlink.php b/public/userarea/importify/columnlink.php index 16bd610..0ecb85b 100644 --- a/public/userarea/importify/columnlink.php +++ b/public/userarea/importify/columnlink.php @@ -25,12 +25,12 @@ $arr_old_column_name = array(); $arr_old_headerfile = array(); $arr_old_db_headerfile = array(); - foreach($arr_exist_info->Results as $item) { + foreach($arr_exist_info->Results as $item) { array_push($arr_old_table_name, $item['table_name']); array_push($arr_old_column_name, $item['column_name']); array_push($arr_old_headerfile, $item['headerfile']); array_push($arr_old_db_headerfile, $item['db_headerfile']); - } + } ?> @@ -258,7 +258,7 @@ - + setQuery("SELECT * FROM analysisvocabulary WHERE analysiscode like '%$trim_group_code%'"); + $analysis_query->setQuery("SELECT * FROM analysisvocabulary WHERE analysiscode = '%$trim_group_code%'"); $analysis_query->execute(); $analysis_data = $analysis_query->Results; @@ -238,7 +238,7 @@ foreach ($arr_total_products as $product) { $tmp_val = $result_project[array_search($arr_associate[$i]->headerfile, $arr_excel_columns)]; $trim_item = str_replace("\n", "", str_replace("'", "\'", $tmp_val)); $analysis_query = new WA_MySQLi_RS("getquery", $repnew, 0); - $analysis_query->setQuery("SELECT * FROM analysisvocabulary WHERE nameanalysisvoc like '%$trim_item%'"); + $analysis_query->setQuery("SELECT * FROM analysisvocabulary WHERE nameanalysisvoc = '$trim_item'"); $analysis_query->execute(); $analysis_data = $analysis_query->Results; @@ -254,7 +254,7 @@ foreach ($arr_total_products as $product) { $trim_cas_val = str_replace("\n", "", str_replace("'", "\'", $cas_val)); $analysis_query = new WA_MySQLi_RS("getquery", $repnew, 0); - $analysis_query->setQuery("SELECT * FROM compundsvocabulary WHERE cascompoundvocabulary like '%$trim_cas_val%'"); + $analysis_query->setQuery("SELECT * FROM compundsvocabulary WHERE cascompoundvocabulary = '$trim_cas_val'"); $analysis_query->execute(); $analysis_data = $analysis_query->Results; @@ -265,7 +265,7 @@ foreach ($arr_total_products as $product) { $tmp_val = $result_project[array_search($arr_associate[$i]->headerfile, $arr_excel_columns)]; $trim_item = str_replace("\n", "", str_replace("'", "\'", $tmp_val)); $analysis_query = new WA_MySQLi_RS("getquery", $repnew, 0); - $analysis_query->setQuery("SELECT * FROM compundsvocabulary WHERE namecompoundsvocabulary like '%$tmp_val%'"); + $analysis_query->setQuery("SELECT * FROM compundsvocabulary WHERE namecompoundsvocabulary = '$tmp_val'"); $analysis_query->execute(); $analysis_data = $analysis_query->Results; From efcc66d290a5e12d214d4cbc90ca49f1c2f2cac2 Mon Sep 17 00:00:00 2001 From: kapsona777 Date: Fri, 4 Oct 2024 14:40:48 +0400 Subject: [PATCH 12/15] fx --- public/userarea/importify/importify_bg_script.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/userarea/importify/importify_bg_script.php b/public/userarea/importify/importify_bg_script.php index aaf0786..eaec4d9 100644 --- a/public/userarea/importify/importify_bg_script.php +++ b/public/userarea/importify/importify_bg_script.php @@ -254,7 +254,7 @@ foreach ($arr_total_products as $product) { $trim_cas_val = str_replace("\n", "", str_replace("'", "\'", $cas_val)); $analysis_query = new WA_MySQLi_RS("getquery", $repnew, 0); - $analysis_query->setQuery("SELECT * FROM compundsvocabulary WHERE cascompoundvocabulary = '$trim_cas_val'"); + $analysis_query->setQuery("SELECT * FROM compundsvocabulary WHERE cascompoundvocabulary = '%$trim_cas_val%'"); $analysis_query->execute(); $analysis_data = $analysis_query->Results; From ee8756e82622da13e3303b177c9d0c94c17a5ff4 Mon Sep 17 00:00:00 2001 From: kapsona777 Date: Fri, 4 Oct 2024 19:18:39 +0400 Subject: [PATCH 13/15] final fixxxxxxxxxxxx --- .../userarea/importify/check_vocabulary.php | 45 ++++++++++++++++--- .../importify/importify_bg_script.php | 2 +- 2 files changed, 39 insertions(+), 8 deletions(-) diff --git a/public/userarea/importify/check_vocabulary.php b/public/userarea/importify/check_vocabulary.php index 9a82092..4b039ca 100644 --- a/public/userarea/importify/check_vocabulary.php +++ b/public/userarea/importify/check_vocabulary.php @@ -42,16 +42,28 @@ if(isset($_FILES['f_csv'])) { array_push($arr_need_columns, $reportsNumberLab_excelName); array_push($arr_need_columns, $partsCode_excelName); + $result_groupNameHeaderFile = ""; //for analysisgroupcode $result_testNameHeaderFile = ""; //for analysisvocabulary + $result_CasNameHeaderFile = ""; //for compundsvocabulary $result_AnalytsNameHeaderFile = ""; //for compundsvocabulary + foreach($arr_associate as $item) { array_push($arr_need_columns, $item['headerfile']); + if($item['column_name'] == 'analysisgroupcode'){ + $result_groupNameHeaderFile = $item['headerfile']; + } + if($item['column_name'] == 'result_TestName') { $result_testNameHeaderFile = $item['headerfile']; } + + if($item['column_name'] == 'cas'){ + $result_CasNameHeaderFile = $item['headerfile']; + } + if($item['column_name'] == 'result_AnalytsName') { $result_AnalytsNameHeaderFile = $item['headerfile']; } @@ -72,19 +84,30 @@ if(isset($_FILES['f_csv'])) { if($result_testNameHeaderFile != "") { $arr_diff_anaysisvoc_words = array(); $idx_resultTestName_po = array_search($result_testNameHeaderFile, $arr_excel_columns); + $idx_groupCodeHeaderFile = array_search($result_groupNameHeaderFile, $arr_excel_columns); for($i=1; $i$arr_info[$i][$idx_resultTestName_po], + "groupcode"=> $arr_info[$i][$idx_groupCodeHeaderFile], + )); } } foreach($arr_diff_anaysisvoc_words as $item) { $arr_analysis_refdata = new WA_MySQLi_RS("rsl", $repnew, 0); - $trim_item = str_replace("\n", "", str_replace("'", "\'", $item)); - $arr_analysis_refdata->setQuery("SELECT * FROM analysisvocabulary where nameanalysisvoc like '$trim_item'"); + $trim_item = str_replace("\n", "", str_replace("'", "\'", $item['word'])); + $groupcodeTrimmed = str_replace("\n", "", str_replace("'", "\'", $item['groupcode'])); + $arr_analysis_refdata->setQuery("SELECT * FROM analysisvocabulary where analysiscode like '$groupcodeTrimmed'"); $arr_analysis_refdata->execute(); $arr_analysis_ref = $arr_analysis_refdata->Results; + if($arr_analysis_ref > 0){ + $arr_analysis_refdata->setQuery("SELECT * FROM analysisvocabulary where nameanalysisvoc like '$trim_item'"); + $arr_analysis_refdata->execute(); + $arr_analysis_ref = $arr_analysis_refdata->Results; + } if(count($arr_analysis_ref) == 0) { //check kind $arr_analysiskind_refdata = new WA_MySQLi_RS("rsl", $repnew, 0); @@ -92,7 +115,7 @@ if(isset($_FILES['f_csv'])) { $arr_analysiskind_refdata->execute(); $arr_analysiskind_ref = $arr_analysiskind_refdata->Results; array_push($arr_anaysisvoc_words, array( - 'word' => $item, + 'word' => $item['word'], 'arr_similary' => $arr_analysiskind_ref )); } @@ -105,6 +128,7 @@ if(isset($_FILES['f_csv'])) { $arr_diff_compundsvoc_words = array(); $arr_tmp_diff_compundsvoc_words = array(); $idx_resultAnalytsName_po = array_search($result_AnalytsNameHeaderFile, $arr_excel_columns); + $idx_resultAnalytsName_cas = array_search($result_CasNameHeaderFile, $arr_excel_columns); $idx_resultTestName_po = $result_testNameHeaderFile != "" ? array_search($result_testNameHeaderFile, $arr_excel_columns) : 0; for($i=1; $i $arr_info[$i][$idx_resultAnalytsName_po], + 'cas' => $arr_info[$i][$idx_resultAnalytsName_cas], 'analysis_word' => $result_testNameHeaderFile != "" ? $arr_info[$i][$idx_resultTestName_po] : "" )); } } - foreach($arr_diff_compundsvoc_words as $item) { + foreach($arr_diff_compundsvoc_words as $item) { $arr_compunds_refdata = new WA_MySQLi_RS("rsl", $repnew, 0); $compund_word = $item['word']; + $compund_cas = $item['cas']; $trim_item = str_replace("\n", "", str_replace("'", "\'", $compund_word)); - $arr_compunds_refdata->setQuery("SELECT * FROM compundsvocabulary where namecompoundsvocabulary like '$trim_item' or cascompoundvocabulary like '$trim_item'"); + $arr_compunds_refdata->setQuery("SELECT * FROM compundsvocabulary where cascompoundvocabulary like '%$compund_cas%'"); $arr_compunds_refdata->execute(); $arr_compunds_ref = $arr_compunds_refdata->Results; + if($arr_compunds_ref > 0 ){ + $arr_compunds_refdata->setQuery("SELECT * FROM compundsvocabulary where namecompoundsvocabulary like '$trim_item' or cascompoundvocabulary like '$trim_item'"); + $arr_compunds_refdata->execute(); + $arr_compunds_ref = $arr_compunds_refdata->Results; + } if(count($arr_compunds_ref) == 0) { //check kind $arr_compundskind_refdata = new WA_MySQLi_RS("rsl", $repnew, 0); @@ -136,7 +167,7 @@ if(isset($_FILES['f_csv'])) { 'arr_similary' => $arr_compundskind_ref )); } - } + } } die(json_encode(array( diff --git a/public/userarea/importify/importify_bg_script.php b/public/userarea/importify/importify_bg_script.php index eaec4d9..350d994 100644 --- a/public/userarea/importify/importify_bg_script.php +++ b/public/userarea/importify/importify_bg_script.php @@ -227,7 +227,7 @@ foreach ($arr_total_products as $product) { $trim_group_code = str_replace("\n", "", str_replace("'", "\'", $group_code_val)); $analysis_query = new WA_MySQLi_RS("getquery", $repnew, 0); - $analysis_query->setQuery("SELECT * FROM analysisvocabulary WHERE analysiscode = '%$trim_group_code%'"); + $analysis_query->setQuery("SELECT * FROM analysisvocabulary WHERE analysiscode = '$trim_group_code'"); $analysis_query->execute(); $analysis_data = $analysis_query->Results; From c916d9d1e62cfd2ef024a44c3d4cc9cd58be0289 Mon Sep 17 00:00:00 2001 From: kapsona777 Date: Fri, 4 Oct 2024 19:47:20 +0400 Subject: [PATCH 14/15] . --- public/userarea/importify/importify_bg_script.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/public/userarea/importify/importify_bg_script.php b/public/userarea/importify/importify_bg_script.php index 350d994..e863d6b 100644 --- a/public/userarea/importify/importify_bg_script.php +++ b/public/userarea/importify/importify_bg_script.php @@ -227,7 +227,7 @@ foreach ($arr_total_products as $product) { $trim_group_code = str_replace("\n", "", str_replace("'", "\'", $group_code_val)); $analysis_query = new WA_MySQLi_RS("getquery", $repnew, 0); - $analysis_query->setQuery("SELECT * FROM analysisvocabulary WHERE analysiscode = '$trim_group_code'"); + $analysis_query->setQuery("SELECT * FROM analysisvocabulary WHERE analysiscode like '$trim_group_code'"); $analysis_query->execute(); $analysis_data = $analysis_query->Results; @@ -238,7 +238,7 @@ foreach ($arr_total_products as $product) { $tmp_val = $result_project[array_search($arr_associate[$i]->headerfile, $arr_excel_columns)]; $trim_item = str_replace("\n", "", str_replace("'", "\'", $tmp_val)); $analysis_query = new WA_MySQLi_RS("getquery", $repnew, 0); - $analysis_query->setQuery("SELECT * FROM analysisvocabulary WHERE nameanalysisvoc = '$trim_item'"); + $analysis_query->setQuery("SELECT * FROM analysisvocabulary WHERE nameanalysisvoc like '$trim_item'"); $analysis_query->execute(); $analysis_data = $analysis_query->Results; @@ -254,7 +254,7 @@ foreach ($arr_total_products as $product) { $trim_cas_val = str_replace("\n", "", str_replace("'", "\'", $cas_val)); $analysis_query = new WA_MySQLi_RS("getquery", $repnew, 0); - $analysis_query->setQuery("SELECT * FROM compundsvocabulary WHERE cascompoundvocabulary = '%$trim_cas_val%'"); + $analysis_query->setQuery("SELECT * FROM compundsvocabulary WHERE cascompoundvocabulary like '%$trim_cas_val%'"); $analysis_query->execute(); $analysis_data = $analysis_query->Results; @@ -265,7 +265,7 @@ foreach ($arr_total_products as $product) { $tmp_val = $result_project[array_search($arr_associate[$i]->headerfile, $arr_excel_columns)]; $trim_item = str_replace("\n", "", str_replace("'", "\'", $tmp_val)); $analysis_query = new WA_MySQLi_RS("getquery", $repnew, 0); - $analysis_query->setQuery("SELECT * FROM compundsvocabulary WHERE namecompoundsvocabulary = '$tmp_val'"); + $analysis_query->setQuery("SELECT * FROM compundsvocabulary WHERE namecompoundsvocabulary like '$tmp_val'"); $analysis_query->execute(); $analysis_data = $analysis_query->Results; From eb0d65db19d6abc82500193102db279c109682c5 Mon Sep 17 00:00:00 2001 From: kapsona777 Date: Fri, 4 Oct 2024 20:13:54 +0400 Subject: [PATCH 15/15] done --- public/userarea/importify/importify_bg_script.php | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/public/userarea/importify/importify_bg_script.php b/public/userarea/importify/importify_bg_script.php index e863d6b..9dec0ab 100644 --- a/public/userarea/importify/importify_bg_script.php +++ b/public/userarea/importify/importify_bg_script.php @@ -244,7 +244,11 @@ foreach ($arr_total_products as $product) { $analysis_data = $analysis_query->Results; $ref_id = 0; if (count($analysis_data) > 0) { - $ref_id = $analysis_data[0]['idanalysisvocabulary']; + if($analysis_data[0]['refid'] == 0){ + $ref_id = $analysis_data[0]['idanalysisvocabulary']; + }else{ + $ref_id = $analysis_data[0]['refid']; + } } } array_push($arr_result_project_need_idx, array($arr_associate[$i]->column_name, $ref_id, 1)); @@ -271,7 +275,11 @@ foreach ($arr_total_products as $product) { $analysis_data = $analysis_query->Results; $ref_id = 0; if (count($analysis_data) > 0) { - $ref_id = $analysis_data[0]['idcompoundsvocabulary']; + if($analysis_data[0]['refid'] == 0){ + $ref_id = $analysis_data[0]['idcompoundsvocabulary']; + }else{ + $ref_id = $analysis_data[0]['refid']; + } } }