diff --git a/public/userarea/importify/importify_bg_script.php b/public/userarea/importify/importify_bg_script.php
index 107e0c7..1c83f12 100644
--- a/public/userarea/importify/importify_bg_script.php
+++ b/public/userarea/importify/importify_bg_script.php
@@ -230,6 +230,9 @@ foreach ($arr_total_products as $product) {
$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));
+ if($trim_group_code == "") {
+ $trim_group_code = "N/A";
+ }
$analysis_query = new WA_MySQLi_RS("getquery", $repnew, 0);
$analysis_query->setQuery("SELECT * FROM analysisvocabulary WHERE analysiscode LIKE '$trim_group_code'");
$analysis_query->execute();
@@ -237,13 +240,14 @@ foreach ($arr_total_products as $product) {
$analysis_data = $analysis_query->Results;
$idanalysisvocabulary = 0;
- if (count($analysis_data) > 0 && $trim_group_code != "") {
+ if (count($analysis_data) > 0) {
$idanalysisvocabulary = $analysis_data[0]['idanalysisvocabulary'];
- } else {
- $tmp_val = $result_project[array_search($arr_associate[$group_code_index]->headerfile, $arr_excel_columns)];
+ } else {
+ $analysis_name_index = array_search("result_TestName", array_column($arr_associate, 'column_name'));
+ $tmp_val = $result_project[array_search($arr_associate[$analysis_name_index]->headerfile, $arr_excel_columns)];
$trim_item = str_replace("\n", "", str_replace("'", "\'", $tmp_val));
$analysis_query->setQuery("SELECT * FROM analysisvocabulary WHERE nameanalysisvoc LIKE '$trim_item'");
- $analysis_query->execute();
+ $analysis_query->execute();
$analysis_data = $analysis_query->Results;
if (count($analysis_data) > 0) {
diff --git a/public/userarea/importify/importifydashboard.php b/public/userarea/importify/importifydashboard.php
index ce0af2b..4e8026f 100644
--- a/public/userarea/importify/importifydashboard.php
+++ b/public/userarea/importify/importifydashboard.php
@@ -391,7 +391,7 @@
let str_arr_option = '';
for (let i = 0; i < arr_similary.length; i++) {
- str_arr_option += '';
+ str_arr_option += '';
}
str_arr_option += tmp_str_arr_kind_option;