fixed some display bugs

This commit is contained in:
2025-11-19 16:31:42 +01:00
parent 6556d2c01d
commit 4ec14416ca
3 changed files with 24 additions and 20 deletions

View File

@@ -147,6 +147,8 @@ export const MyLoansPage = () => {
<Table.Column style={{ width: "14%" }} /> <Table.Column style={{ width: "14%" }} />
{/* Rückgabedatum */} {/* Rückgabedatum */}
<Table.Column style={{ width: "14%" }} /> <Table.Column style={{ width: "14%" }} />
{/* Notiz */}
<Table.Column style={{ width: "14%" }} />
{/* Aktionen */} {/* Aktionen */}
<Table.Column style={{ width: "8%" }} /> <Table.Column style={{ width: "8%" }} />
</Table.ColumnGroup> </Table.ColumnGroup>
@@ -158,6 +160,7 @@ export const MyLoansPage = () => {
<Table.ColumnHeader>{t("devices")}</Table.ColumnHeader> <Table.ColumnHeader>{t("devices")}</Table.ColumnHeader>
<Table.ColumnHeader>{t("take-date")}</Table.ColumnHeader> <Table.ColumnHeader>{t("take-date")}</Table.ColumnHeader>
<Table.ColumnHeader>{t("return-date")}</Table.ColumnHeader> <Table.ColumnHeader>{t("return-date")}</Table.ColumnHeader>
<Table.ColumnHeader>{t("note")}</Table.ColumnHeader>
<Table.ColumnHeader>{t("actions")}</Table.ColumnHeader> <Table.ColumnHeader>{t("actions")}</Table.ColumnHeader>
</Table.Row> </Table.Row>
</Table.Header> </Table.Header>
@@ -178,6 +181,7 @@ export const MyLoansPage = () => {
</Table.Cell> </Table.Cell>
<Table.Cell>{formatDate(loan.take_date)}</Table.Cell> <Table.Cell>{formatDate(loan.take_date)}</Table.Cell>
<Table.Cell>{formatDate(loan.returned_date)}</Table.Cell> <Table.Cell>{formatDate(loan.returned_date)}</Table.Cell>
<Table.Cell>{loan.note}</Table.Cell>
<Table.Cell> <Table.Cell>
<Dialog.Root role="alertdialog"> <Dialog.Root role="alertdialog">
<Dialog.Trigger asChild> <Dialog.Trigger asChild>

View File

@@ -21,7 +21,7 @@ export const getItemsFromDatabaseV2 = async () => {
export const getLoanByCodeV2 = async (loan_code) => { export const getLoanByCodeV2 = async (loan_code) => {
const [result] = await pool.query( 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] [loan_code]
); );
if (result.length > 0) { if (result.length > 0) {

View File

@@ -13,25 +13,25 @@ services:
# - "8003:80" # - "8003:80"
# restart: unless-stopped # restart: unless-stopped
backend: #backend:
container_name: borrow_system-backend # container_name: borrow_system-backend
build: ./backend # build: ./backend
ports: # ports:
- "8002:8002" # - "8002:8002"
environment: # environment:
NODE_ENV: production # NODE_ENV: production
DB_HOST: mysql # DB_HOST: mysql
DB_USER: root # DB_USER: root
DB_PASSWORD: ${DB_PASSWORD} # DB_PASSWORD: ${DB_PASSWORD}
DB_NAME: borrow_system # DB_NAME: borrow_system
depends_on: # depends_on:
- mysql # - mysql
restart: unless-stopped # restart: unless-stopped
healthcheck: # healthcheck:
test: ["CMD", "wget", "-qO-", "http://localhost:8002/server-info"] # test: ["CMD", "wget", "-qO-", "http://localhost:8002/server-info"]
interval: 30s # interval: 30s
timeout: 5s # timeout: 5s
retries: 3 # retries: 3
backend_v2: backend_v2:
container_name: borrow_system-backend_v2 container_name: borrow_system-backend_v2