From e767736834e8f38fa28e009f9090a328f8b40c64 Mon Sep 17 00:00:00 2001
From: 65160024 <65160024@go.buu.ac.th>
Date: Tue, 25 Mar 2025 04:27:39 +0000
Subject: [PATCH] update loans
---
index.js | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/index.js b/index.js
index 05f3e32..2e47f40 100644
--- a/index.js
+++ b/index.js
@@ -294,15 +294,17 @@ app.post("/delete-equipment", isAuthenticated, (req, res) => {
app.get("/loans", (req, res) => {
if (req.user && req.user.role === "user") {
db.query(
- `SELECT loans.id, loans.quantity, loans.status, equipment.name AS equipment_name
+ `SELECT loans.id, loans.quantity, loans.status, equipment.name AS equipment_name, users.name AS borrower_name
FROM loans
JOIN equipment ON loans.equipment_id = equipment.id
+ JOIN users ON loans.user_id = users.id
WHERE loans.user_id = ?`,
- [req.user.id], // req.user.id will be substituted into the ?
+ [req.user.id], // Ensure that user_id is being passed correctly
(err, loans) => {
if (err) {
return res.status(500).send("Error retrieving loans");
}
+ // ส่งข้อมูลทั้ง loans และ borrower_name ไปยัง EJS
res.render("loans", { loans: loans, user: req.user });
}
);
@@ -313,6 +315,7 @@ app.get("/loans", (req, res) => {
+
// หน้าแสดงรายการการยืมสำหรับ Admin
app.get("/admin-loans", (req, res) => {
if (req.isAuthenticated() && req.user.role === "admin") {
--
GitLab