Added groupcode and cas ids priority checks
This commit is contained in:
parent
dfefc36169
commit
6778c02a4e
@ -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));
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user