diff --git a/public/userarea/apilogic/api-to-temp.php b/public/userarea/apilogic/api-to-temp.php index 36ed136..c7bb0a4 100644 --- a/public/userarea/apilogic/api-to-temp.php +++ b/public/userarea/apilogic/api-to-temp.php @@ -11,6 +11,9 @@ if ($conn->connect_error) { // Check if POST request was received if ($_SERVER['REQUEST_METHOD'] === 'POST') { + // Array to collect messages about file processing + $file_messages = []; + // Receive JSON from the laboratory via a field in the form (e.g., 'json_data') if (isset($_POST['json_data'])) { $json_data = $_POST['json_data']; @@ -108,6 +111,11 @@ if ($_SERVER['REQUEST_METHOD'] === 'POST') { // Handle file uploads if they exist if (!empty($_FILES)) { include('process_files.php'); // Include file processing logic here + + // Retrieve any messages added in process_files.php for files + if (!empty($GLOBALS['file_messages'])) { + $file_messages = $GLOBALS['file_messages']; + } } // Set a session variable to notify the report import @@ -124,7 +132,8 @@ if ($_SERVER['REQUEST_METHOD'] === 'POST') { "product_refnumber" => $product_refnumber, // Product number "report_number" => $report_number, // Report number "rating" => $rating, // Report rating - "saved_at" => $saved_at // Save date + "saved_at" => $saved_at, // Save date + "file_messages" => $file_messages // Include file messages ]); } else { echo json_encode([ diff --git a/public/userarea/apilogic/process_files.php b/public/userarea/apilogic/process_files.php index 4f90afa..a944089 100644 --- a/public/userarea/apilogic/process_files.php +++ b/public/userarea/apilogic/process_files.php @@ -1,4 +1,7 @@ prepare("INSERT INTO report_files (uuid, original_filename, stored_filename, filepath, file_comment) VALUES (?, ?, ?, ?, ?)"); $stmt->bind_param("sssss", $uuid, $original_filename, $stored_filename, $filepath, $file_comment); - if (!$stmt->execute()) { - echo json_encode([ - "status" => "error", - "message" => "Failed to save file information for $original_filename." - ]); - continue; + if ($stmt->execute()) { + $GLOBALS['file_messages'][] = "File $original_filename uploaded and information saved."; + } else { + $GLOBALS['file_messages'][] = "Failed to save file information for $original_filename."; } - - echo json_encode([ - "status" => "success", - "message" => "File $original_filename uploaded and information saved." - ]); } else { - echo json_encode([ - "status" => "error", - "message" => "Failed to move file $original_filename." - ]); + $GLOBALS['file_messages'][] = "Failed to move file $original_filename."; } } else { - echo json_encode([ - "status" => "error", - "message" => "Error uploading file $original_filename. Error code: " . $file['error'] - ]); + $GLOBALS['file_messages'][] = "Error uploading file $original_filename. Error code: " . $file['error']; } } } diff --git a/public/userarea/apilogic/report_files/672b4126baffd_TEST REPORT.pdf b/public/userarea/apilogic/report_files/672b4126baffd_TEST REPORT.pdf new file mode 100644 index 0000000..6b00f96 Binary files /dev/null and b/public/userarea/apilogic/report_files/672b4126baffd_TEST REPORT.pdf differ diff --git a/public/userarea/apilogic/report_files/672b418927d8e_TEST REPORT.pdf b/public/userarea/apilogic/report_files/672b418927d8e_TEST REPORT.pdf new file mode 100644 index 0000000..6b00f96 Binary files /dev/null and b/public/userarea/apilogic/report_files/672b418927d8e_TEST REPORT.pdf differ diff --git a/public/userarea/apilogic/report_files/672b418927d8e_details1.png b/public/userarea/apilogic/report_files/672b418927d8e_details1.png new file mode 100644 index 0000000..5a03fd0 Binary files /dev/null and b/public/userarea/apilogic/report_files/672b418927d8e_details1.png differ diff --git a/public/userarea/apilogic/report_files/672b418927d8e_details2.png b/public/userarea/apilogic/report_files/672b418927d8e_details2.png new file mode 100644 index 0000000..26d40b6 Binary files /dev/null and b/public/userarea/apilogic/report_files/672b418927d8e_details2.png differ diff --git a/public/userarea/apilogic/report_files/672b418927d8e_productjacket.png b/public/userarea/apilogic/report_files/672b418927d8e_productjacket.png new file mode 100644 index 0000000..7b17c25 Binary files /dev/null and b/public/userarea/apilogic/report_files/672b418927d8e_productjacket.png differ diff --git a/public/userarea/apilogic/report_files/672b418927d8e_reportdata.pdf b/public/userarea/apilogic/report_files/672b418927d8e_reportdata.pdf new file mode 100644 index 0000000..8b5bf2b Binary files /dev/null and b/public/userarea/apilogic/report_files/672b418927d8e_reportdata.pdf differ diff --git a/public/userarea/report_files/672b42a9e4bf5_TEST REPORT.pdf b/public/userarea/report_files/672b42a9e4bf5_TEST REPORT.pdf new file mode 100644 index 0000000..6b00f96 Binary files /dev/null and b/public/userarea/report_files/672b42a9e4bf5_TEST REPORT.pdf differ diff --git a/public/userarea/report_files/672b42a9e4bf5_details1.png b/public/userarea/report_files/672b42a9e4bf5_details1.png new file mode 100644 index 0000000..5a03fd0 Binary files /dev/null and b/public/userarea/report_files/672b42a9e4bf5_details1.png differ diff --git a/public/userarea/report_files/672b42a9e4bf5_details2.png b/public/userarea/report_files/672b42a9e4bf5_details2.png new file mode 100644 index 0000000..26d40b6 Binary files /dev/null and b/public/userarea/report_files/672b42a9e4bf5_details2.png differ diff --git a/public/userarea/report_files/672b42a9e4bf5_productjacket.png b/public/userarea/report_files/672b42a9e4bf5_productjacket.png new file mode 100644 index 0000000..7b17c25 Binary files /dev/null and b/public/userarea/report_files/672b42a9e4bf5_productjacket.png differ diff --git a/public/userarea/report_files/672b42a9e4bf5_reportdata.pdf b/public/userarea/report_files/672b42a9e4bf5_reportdata.pdf new file mode 100644 index 0000000..8b5bf2b Binary files /dev/null and b/public/userarea/report_files/672b42a9e4bf5_reportdata.pdf differ