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

analysis fix and importHistoryFunctionAdd

Browse Source
This commit is contained in:
Lasha Kapanadze 2024-10-26 16:47:28 +04:00
parent fae8d17316
commit 2efe128ea8
1 changed files with 25 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
public/userarea/apilogic/process_import.php
View File

@ -22,8 +22,8 @@ $jsonEntries = $stmt->fetchAll(PDO::FETCH_ASSOC);
foreach ($jsonEntries as $entry) {
$data = json_decode($entry['json_data'], true);
$uuid = $entry['uuid'];
$analysis = array();
$compounds = array();
$analysisArr = array();
$compoundsArr = array();
// check for result_TestName
foreach ($data['product']['reports'] as $report) {
@ -48,14 +48,14 @@ foreach ($jsonEntries as $entry) {
$result = $stmt->fetchColumn();
if(!$result){
// add 0 to analysis array
array_push($analysis, 0);
array_push($analysisArr, 0);
}else{
// add 1 to analysis array
array_push($analysis, 1);
array_push($analysisArr, 1);
}
}else{
// add 1 to analysis array
array_push($analysis, 1);
array_push($analysisArr, 1);
}
}
}
@ -87,14 +87,14 @@ foreach ($jsonEntries as $entry) {
$result = $stmt->fetchColumn();
if(!$result){
// add 0 to compounds array
array_push($compounds, 0);
array_push($compoundsArr, 0);
}else{
// add 1 to compounds array
array_push($compounds, 1);
array_push($compoundsArr, 1);
}
}else{
// add 1 to compounds array
array_push($compounds, 1);
array_push($compoundsArr, 1);
}
}
@ -109,7 +109,7 @@ foreach ($jsonEntries as $entry) {
continue;
}
if(validateJson($data) && !in_array(0, $analysis) && !in_array(0, $compounds)){
if(validateJson($data) && !in_array(0, $analysisArr) && !in_array(0, $compoundsArr)){
// Validate and insert product
$productId = insertProduct($data['product'], $pdo, $uuid);
@ -123,9 +123,9 @@ foreach ($jsonEntries as $entry) {
foreach ($part['analyses'] as $analysis) {
$result_TestName = $analysis['result_TestName'];
$groupcode = $analysis['analysisgroupcode'];
$analysisgroupcode = $analysis['analysisgroupcode'];
$query = "SELECT idanalysisvocabulary FROM analysisvocabulary WHERE analysiscode LIKE '$groupcode'";
$query = "SELECT idanalysisvocabulary FROM analysisvocabulary WHERE analysiscode LIKE '$analysisgroupcode'";
$stmt = $pdo->prepare($query);
$res = $stmt->execute();
$res = $stmt->fetchColumn();
@ -179,11 +179,23 @@ foreach ($jsonEntries as $entry) {
} else {
markForIntervention($entry['id'], $pdo);
}
importHistory($pdo, $uuid);
}
// Function definitions
function importHistory($pdo, $uuid){
$query = "INSERT INTO template_import_his (created_at, importcode, f_status, user_id, importfilename) VALUES (:created_at, :importcode, :f_status, :user_id, :importfilename)";
$stmt = $pdo->prepare($query);
$stmt->execute([
'created_at' => date("Y-m-d H:i:s"),
'importcode' => $uuid,
'f_status' => 1,
'user_id' => 2,
'importfilename' => 'JSON API'
]);
}
function validateJson($json){
$checkData = json_encode($json);
if(json_decode($checkData) !== null){