solocla/reportify_mncl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix analysis +

Browse Source
This commit is contained in:
Lasha Kapanadze 2024-10-18 20:49:27 +04:00
parent 58736b44f5
commit 2b46b082dd
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
public/userarea/importify/importify_bg_script.php
View File

@ -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)]; $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)); $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 = 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_query->execute();
@ -237,10 +240,11 @@ foreach ($arr_total_products as $product) {
$analysis_data = $analysis_query->Results; $analysis_data = $analysis_query->Results;
$idanalysisvocabulary = 0; $idanalysisvocabulary = 0;
if (count($analysis_data) > 0 && $trim_group_code != "") { if (count($analysis_data) > 0) {
$idanalysisvocabulary = $analysis_data[0]['idanalysisvocabulary']; $idanalysisvocabulary = $analysis_data[0]['idanalysisvocabulary'];
} else { } else {
$tmp_val = $result_project[array_search($arr_associate[$group_code_index]->headerfile, $arr_excel_columns)]; $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)); $trim_item = str_replace("\n", "", str_replace("'", "\'", $tmp_val));
$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_query->execute();

2
public/userarea/importify/importifydashboard.php
View File

@ -391,7 +391,7 @@
let str_arr_option = ''; let str_arr_option = '';
for (let i = 0; i < arr_similary.length; i++) { for (let i = 0; i < arr_similary.length; i++) {
str_arr_option += '<option value="' + arr_similary[i]['refid'] + '">' + arr_similary[i]['nameanalysisvoc'] + '</option>'; str_arr_option += '<option value="' + arr_similary[i]['idanalysisvocabulary'] + '">' + arr_similary[i]['nameanalysisvoc'] + '</option>';
} }
str_arr_option += tmp_str_arr_kind_option; str_arr_option += tmp_str_arr_kind_option;