diff --git a/FrontendV2/src/pages/MyLoansPage.tsx b/FrontendV2/src/pages/MyLoansPage.tsx
index 6272f4b..31148b2 100644
--- a/FrontendV2/src/pages/MyLoansPage.tsx
+++ b/FrontendV2/src/pages/MyLoansPage.tsx
@@ -147,6 +147,8 @@ export const MyLoansPage = () => {
{/* Rückgabedatum */}
+ {/* Notiz */}
+
{/* Aktionen */}
@@ -158,6 +160,7 @@ export const MyLoansPage = () => {
{t("devices")}
{t("take-date")}
{t("return-date")}
+ {t("note")}
{t("actions")}
@@ -178,6 +181,7 @@ export const MyLoansPage = () => {
{formatDate(loan.take_date)}
{formatDate(loan.returned_date)}
+ {loan.note}
diff --git a/backendV2/routes/api/api.database.js b/backendV2/routes/api/api.database.js
index 9e4c948..f1d3581 100644
--- a/backendV2/routes/api/api.database.js
+++ b/backendV2/routes/api/api.database.js
@@ -21,7 +21,7 @@ export const getItemsFromDatabaseV2 = async () => {
export const getLoanByCodeV2 = async (loan_code) => {
const [result] = await pool.query(
- "SELECT username, returned_date, take_date, lockers FROM loans WHERE loan_code = ?;",
+ "SELECT first_name, returned_date, take_date, lockers FROM loans WHERE loan_code = ?;",
[loan_code]
);
if (result.length > 0) {
diff --git a/docker-compose.yml b/docker-compose.yml
index 6d9d0c4..fa6b5f2 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -13,25 +13,25 @@ services:
# - "8003:80"
# restart: unless-stopped
- backend:
- container_name: borrow_system-backend
- build: ./backend
- ports:
- - "8002:8002"
- environment:
- NODE_ENV: production
- DB_HOST: mysql
- DB_USER: root
- DB_PASSWORD: ${DB_PASSWORD}
- DB_NAME: borrow_system
- depends_on:
- - mysql
- restart: unless-stopped
- healthcheck:
- test: ["CMD", "wget", "-qO-", "http://localhost:8002/server-info"]
- interval: 30s
- timeout: 5s
- retries: 3
+ #backend:
+ # container_name: borrow_system-backend
+ # build: ./backend
+ # ports:
+ # - "8002:8002"
+ # environment:
+ # NODE_ENV: production
+ # DB_HOST: mysql
+ # DB_USER: root
+ # DB_PASSWORD: ${DB_PASSWORD}
+ # DB_NAME: borrow_system
+ # depends_on:
+ # - mysql
+ # restart: unless-stopped
+ # healthcheck:
+ # test: ["CMD", "wget", "-qO-", "http://localhost:8002/server-info"]
+ # interval: 30s
+ # timeout: 5s
+ # retries: 3
backend_v2:
container_name: borrow_system-backend_v2