From 994884d3c96929f797a03bf881c6dbd6be8e58c2 Mon Sep 17 00:00:00 2001
From: kapsona777 <lasha.kapanadze.1@btu.edu.ge>
Date: Sun, 27 Oct 2024 13:24:35 +0400
Subject: [PATCH] fixed bugs

---
 public/userarea/apilogic/process_import.php   | 27 ++++++++++++-------
 .../userarea/importify/interventionlist.php   | 14 +++++++---
 2 files changed, 28 insertions(+), 13 deletions(-)

diff --git a/public/userarea/apilogic/process_import.php b/public/userarea/apilogic/process_import.php
index 5096e46..4269799 100644
--- a/public/userarea/apilogic/process_import.php
+++ b/public/userarea/apilogic/process_import.php
@@ -13,19 +13,22 @@ try {
 } catch (PDOException $e) {
     die("Connection failed: " . $e->getMessage());
 }
-
-$method = $_POST['method'];
-if ($method == 'intervention') {
-    $query = "SELECT * FROM temp_json_queue WHERE processed = 2";
-    $stmt = $pdo->prepare($query);
-    $stmt->execute();
-    $jsonEntries = $stmt->fetchAll(PDO::FETCH_ASSOC);
-} else {
+// method validation
+if (!isset($_POST['method'])) {
     $query = "SELECT * FROM temp_json_queue WHERE processed = 0";
     $stmt = $pdo->prepare($query);
     $stmt->execute();
     $jsonEntries = $stmt->fetchAll(PDO::FETCH_ASSOC);
 }
+else {
+    $method = $_POST['method'];
+    if($method == 'intervention'){
+        $query = "SELECT * FROM temp_json_queue WHERE processed = 2";
+        $stmt = $pdo->prepare($query);
+        $stmt->execute();
+        $jsonEntries = $stmt->fetchAll(PDO::FETCH_ASSOC);
+    }
+}
 
 foreach ($jsonEntries as $entry) {
     $data = json_decode($entry['json_data'], true);
@@ -180,17 +183,21 @@ foreach ($jsonEntries as $entry) {
             }
 
             markAsProcessed($entry['id'], $pdo);
+            importHistory($pdo, $uuid);
+            die(json_encode(['code' => 'success']));
         } else {
             markForIntervention($entry['id'], $pdo);
+            importHistory($pdo, $uuid);
+            die(json_encode(['code' => 'success', 'message' => 'Intervention']));
         }
     } else {
         markForIntervention($entry['id'], $pdo);
+        importHistory($pdo, $uuid);
+        die(json_encode(['code' => 'success', 'message' => 'Intervention']));
     }
-    importHistory($pdo, $uuid);
 }
 
 
-die(json_encode(['code' => 'success']));
 
 // Function definitions
 
diff --git a/public/userarea/importify/interventionlist.php b/public/userarea/importify/interventionlist.php
index f2ba4d2..775b8fe 100644
--- a/public/userarea/importify/interventionlist.php
+++ b/public/userarea/importify/interventionlist.php
@@ -131,6 +131,14 @@
     </div>
 
     <script>
+        function refresh_table(){ 
+            // location reload in 2 seconds
+            setTimeout(function(){
+                location.reload();
+            }, 2000);
+
+        }
+
         function handleImport(id) {
             formdata = new FormData();
             formdata.append('id', id);
@@ -171,7 +179,7 @@
                         showWarningPopup("Excel data format is not valid!")
                     } else {
                         $('#f_csv').val("");
-                        showWarningAlert("Server eeee.")
+                        showWarningAlert("Server Error.")
                     }
                 }
             })
@@ -197,7 +205,7 @@
                     $('#ajax_preloader').fadeOut();
                     if (data.code == "success") {
                         showSuccessAlert("Successfully imported!");
-                        window.location.reload();
+                        refresh_table();
                     } else {
                         showWarningAlert("Server Error.")
                     }
@@ -326,7 +334,7 @@
 
             let str_arr_option = '';
             for (let i = 0; i < arr_similary.length; i++) {
-                str_arr_option += '<option value="' + arr_similary[i]['refid'] + '">' + arr_similary[i]['namecompoundsvocabulary'] + '</option>';
+                str_arr_option += '<option value="' + arr_similary[i]['idcompoundsvocabulary'] + '">' + arr_similary[i]['namecompoundsvocabulary'] + '</option>';
             }
             str_arr_option += tmp_str_arr_compunds_kind_option;