Compare commits
11 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
 Aiirondev_dev
|
bfbc8b6796 | ||
|
Aiirondev_dev
|
2f6ab9c3fb | ||
|
Aiirondev_dev
|
7a4c3b82c0 | ||
|
Aiirondev_dev
|
1d6c722cd3 | ||
|
Aiirondev_dev
|
3e48aa23cc | ||
|
Aiirondev_dev
|
e2f8da213a | ||
|
Aiirondev_dev
|
91fc5cae21 | ||
|
Aiirondev_dev
|
b47fcdf804 | ||
|
Aiirondev_dev
|
92bea9a87e | ||
|
Aiirondev_dev
|
84ac9e812a | ||
|
Aiirondev_dev
|
d2f882ed61 |
+4
-20
@@ -7060,9 +7060,7 @@ def register():
|
||||
|
||||
permission_preset = (request.form.get('permission_preset') or 'standard_user').strip()
|
||||
use_custom_permissions = request.form.get('use_custom_permissions') == 'on'
|
||||
is_student = bool(request.form.get('is_student')) if cfg.STUDENT_CARDS_MODULE_ENABLED else False
|
||||
student_card_id = us.normalize_student_card_id(request.form.get('student_card_id')) if cfg.STUDENT_CARDS_MODULE_ENABLED else ''
|
||||
max_borrow_days_raw = request.form.get('max_borrow_days') if cfg.STUDENT_CARDS_MODULE_ENABLED else None
|
||||
|
||||
if not username or not password or not name or not last_name:
|
||||
flash('Bitte füllen Sie alle Felder aus', 'error')
|
||||
return redirect(url_for('register'))
|
||||
@@ -7081,28 +7079,14 @@ def register():
|
||||
for endpoint_name, _ in PERMISSION_PAGE_OPTIONS:
|
||||
page_permissions[endpoint_name] = request.form.get(f'page_{endpoint_name}') == 'on'
|
||||
|
||||
max_borrow_days = None
|
||||
if is_student:
|
||||
if not student_card_id:
|
||||
flash('Für Schüler muss eine Ausweis-ID angegeben werden.', 'error')
|
||||
return redirect(url_for('register'))
|
||||
if us.student_card_exists(student_card_id):
|
||||
flash('Die Ausweis-ID ist bereits vergeben.', 'error')
|
||||
return redirect(url_for('register'))
|
||||
try:
|
||||
max_borrow_days = int(max_borrow_days_raw) if max_borrow_days_raw else cfg.STUDENT_DEFAULT_BORROW_DAYS
|
||||
except (TypeError, ValueError):
|
||||
max_borrow_days = cfg.STUDENT_DEFAULT_BORROW_DAYS
|
||||
max_borrow_days = max(1, min(max_borrow_days, cfg.STUDENT_MAX_BORROW_DAYS))
|
||||
|
||||
us.add_user(
|
||||
username,
|
||||
password,
|
||||
name,
|
||||
last_name,
|
||||
is_student=is_student,
|
||||
student_card_id=student_card_id if is_student else None,
|
||||
max_borrow_days=max_borrow_days,
|
||||
is_student=False,
|
||||
student_card_id=None,
|
||||
max_borrow_days=None,
|
||||
permission_preset=permission_preset,
|
||||
action_permissions=action_permissions,
|
||||
page_permissions=page_permissions,
|
||||
|
||||
+4
-4
@@ -71,6 +71,10 @@ def get_current_status(ausleihung, log_changes=False, user=None):
|
||||
# Bei stornierten Ausleihungen bleibt der Status immer storniert
|
||||
if original_status == 'cancelled':
|
||||
return 'cancelled'
|
||||
|
||||
# Wenn die Ausleihung bereits abgeschlossen ist, bleibt sie es
|
||||
if original_status == 'completed':
|
||||
return 'completed'
|
||||
|
||||
current_time = datetime.datetime.now()
|
||||
start_time = ausleihung.get('Start')
|
||||
@@ -79,10 +83,6 @@ def get_current_status(ausleihung, log_changes=False, user=None):
|
||||
# Wenn kein Startdatum vorhanden ist, Status auf 'planned' setzen
|
||||
if not start_time:
|
||||
new_status = 'planned'
|
||||
# Wenn die Ausleihung als 'completed' markiert wurde und ein Enddatum hat,
|
||||
# bleibt sie bei 'completed'
|
||||
elif original_status == 'completed' and end_time:
|
||||
new_status = 'completed'
|
||||
# Wenn die aktuelle Zeit vor dem Startdatum liegt, ist die Ausleihung geplant
|
||||
elif current_time < start_time:
|
||||
# DEBUG: Log info wenn Booking noch lange in der Zukunft ist
|
||||
|
||||
@@ -0,0 +1 @@
|
||||
[2026-04-19 20:20:39,502] ERROR in app: Error during scheduler shutdown: name '__file__' is not defined
|
||||
@@ -324,7 +324,8 @@ def _send_web_push_notification(subscription, payload):
|
||||
data=json.dumps(payload),
|
||||
vapid_private_key=VAPID_PRIVATE_KEY,
|
||||
vapid_claims={'sub': VAPID_SUBJECT},
|
||||
timeout=10
|
||||
timeout=10,
|
||||
ttl=3600 # Notification expires after 1 hour if device is offline
|
||||
)
|
||||
|
||||
return True
|
||||
|
||||
+64
-33
@@ -21,6 +21,28 @@
|
||||
--ui-radius: 12px;
|
||||
}
|
||||
|
||||
@media (prefers-color-scheme: dark) {
|
||||
:root {
|
||||
--ui-bg: #0f172a;
|
||||
--ui-bg-accent: #1e293b;
|
||||
--ui-surface: #1e293b;
|
||||
--ui-surface-soft: #25314a;
|
||||
--ui-border: #334155;
|
||||
--ui-text: #f1f5f9;
|
||||
--ui-text-muted: #94a3b8;
|
||||
--ui-title: #ffffff;
|
||||
--ui-shadow-sm: 0 2px 8px rgba(0, 0, 0, 0.4);
|
||||
--ui-shadow-md: 0 10px 24px rgba(0, 0, 0, 0.5);
|
||||
}
|
||||
|
||||
/* Make inputs visible in dark mode */
|
||||
input, select, textarea {
|
||||
background-color: var(--ui-surface-soft) !important;
|
||||
color: var(--ui-text) !important;
|
||||
border-color: var(--ui-border) !important;
|
||||
}
|
||||
}
|
||||
|
||||
body {
|
||||
font-family: "Manrope", "Segoe UI", "Noto Sans", sans-serif;
|
||||
color: var(--ui-text);
|
||||
@@ -92,7 +114,7 @@ span {
|
||||
.card-header,
|
||||
.modal-header,
|
||||
thead th {
|
||||
background: linear-gradient(180deg, #f7fafd, #edf3f8) !important;
|
||||
background: var(--ui-surface-soft) !important;
|
||||
border-bottom: 1px solid var(--ui-border) !important;
|
||||
color: var(--ui-title) !important;
|
||||
}
|
||||
@@ -107,10 +129,10 @@ input[type="email"],
|
||||
input[type="date"],
|
||||
select {
|
||||
border-radius: 10px !important;
|
||||
border: 1px solid #cad5e0 !important;
|
||||
border: 1px solid var(--ui-border) !important;
|
||||
min-height: 40px;
|
||||
color: var(--ui-text) !important;
|
||||
background-color: #fff !important;
|
||||
background-color: var(--ui-surface) !important;
|
||||
transition: border-color 0.15s ease, box-shadow 0.15s ease;
|
||||
}
|
||||
|
||||
@@ -131,11 +153,13 @@ select:focus {
|
||||
.table th,
|
||||
.table td {
|
||||
vertical-align: middle;
|
||||
border-color: #dee6ee !important;
|
||||
border-color: var(--ui-border) !important;
|
||||
background-color: var(--ui-surface) !important;
|
||||
color: var(--ui-text) !important;
|
||||
}
|
||||
|
||||
.table-striped > tbody > tr:nth-of-type(odd) {
|
||||
background-color: #f8fbff;
|
||||
background-color: var(--ui-surface-soft) !important;
|
||||
}
|
||||
|
||||
.alert {
|
||||
@@ -144,8 +168,10 @@ select:focus {
|
||||
}
|
||||
|
||||
.navbar {
|
||||
border-bottom: 1px solid #273341;
|
||||
border-bottom: 1px solid var(--ui-border);
|
||||
box-shadow: none;
|
||||
-webkit-backdrop-filter: blur(10px);
|
||||
backdrop-filter: blur(10px);
|
||||
}
|
||||
|
||||
.navbar-brand {
|
||||
@@ -164,21 +190,13 @@ select:focus {
|
||||
}
|
||||
}
|
||||
|
||||
/* Edit and generate buttons with black text for better visibility */
|
||||
.edit-button {
|
||||
color: black !important; /* Override any existing color */
|
||||
}
|
||||
|
||||
.duplicate-button {
|
||||
color: black !important; /* Override any existing color */
|
||||
}
|
||||
|
||||
.generate-qr-button {
|
||||
color: black !important; /* Override any existing color */
|
||||
/* Edit and generate buttons with theme-aware text for better visibility */
|
||||
.edit-button, .duplicate-button, .generate-qr-button {
|
||||
color: var(--ui-text) !important; /* Override any existing color */
|
||||
}
|
||||
|
||||
.ausleihen {
|
||||
color: black !important; /* Override any existing color */
|
||||
/* Color handled securely below */
|
||||
}
|
||||
|
||||
/* Modal image display fix */
|
||||
@@ -245,12 +263,12 @@ select:focus {
|
||||
.view-toggle-btn {
|
||||
width: 38px;
|
||||
height: 38px;
|
||||
border: 1px solid #c7ced6;
|
||||
border: 1px solid var(--ui-border);
|
||||
border-radius: 50%;
|
||||
background: #ffffff;
|
||||
background: var(--ui-surface);
|
||||
font-size: 1.15rem;
|
||||
cursor: pointer;
|
||||
color: #2f3e4e;
|
||||
color: var(--ui-text);
|
||||
display: inline-flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
@@ -259,8 +277,8 @@ select:focus {
|
||||
|
||||
.view-toggle-btn:hover {
|
||||
transform: translateY(-1px);
|
||||
border-color: #8fa2b7;
|
||||
background: #f8fbff;
|
||||
border-color: var(--ui-border);
|
||||
background: var(--ui-surface-soft);
|
||||
box-shadow: 0 3px 8px rgba(33, 37, 41, 0.12);
|
||||
}
|
||||
|
||||
@@ -269,9 +287,9 @@ select:focus {
|
||||
}
|
||||
|
||||
.view-toggle-btn[aria-pressed='true'] {
|
||||
background: #e9f2ff;
|
||||
border-color: #7ea1c8;
|
||||
color: #1f4f7a;
|
||||
background: var(--module-primary-color);
|
||||
border-color: var(--module-primary-color);
|
||||
color: white;
|
||||
}
|
||||
|
||||
.table-view-header {
|
||||
@@ -288,7 +306,7 @@ body.table-view .table-view-header {
|
||||
border: 0;
|
||||
border-radius: 10px;
|
||||
background: transparent;
|
||||
color: #3f4e5d;
|
||||
color: var(--ui-text-muted);
|
||||
font-size: 0.82rem;
|
||||
font-weight: 700;
|
||||
text-transform: uppercase;
|
||||
@@ -307,9 +325,9 @@ body.table-view .item-card {
|
||||
max-width: none;
|
||||
margin: 0 0 10px 0;
|
||||
padding: 12px 14px;
|
||||
border: 1px solid #e1e6ed;
|
||||
border: 1px solid var(--ui-border);
|
||||
border-radius: 10px;
|
||||
background: #ffffff;
|
||||
background: var(--ui-surface);
|
||||
box-shadow: none;
|
||||
scroll-snap-align: none;
|
||||
}
|
||||
@@ -335,7 +353,7 @@ body.table-view .item-card .card-content .item-name-cell,
|
||||
body.table-view .item-card .card-content .item-col-name {
|
||||
font-size: 0.98rem;
|
||||
font-weight: 700;
|
||||
color: #1f2d3d;
|
||||
color: var(--ui-title);
|
||||
white-space: nowrap;
|
||||
overflow: hidden;
|
||||
text-overflow: ellipsis;
|
||||
@@ -352,7 +370,7 @@ body.table-view .item-card .card-content .item-col-filter3,
|
||||
body.table-view .item-card .card-content .item-code-cell,
|
||||
body.table-view .item-card .card-content .item-col-code,
|
||||
body.table-view .item-card .card-content .item-col-count {
|
||||
color: #445465;
|
||||
color: var(--ui-text-muted);
|
||||
font-size: 0.9rem;
|
||||
white-space: nowrap;
|
||||
overflow: hidden;
|
||||
@@ -369,7 +387,7 @@ body.table-view .item-card .damage-badge {
|
||||
body.table-view .item-card .actions {
|
||||
margin-top: 10px;
|
||||
padding-top: 10px;
|
||||
border-top: 1px dashed #d9e0e8;
|
||||
border-top: 1px dashed var(--ui-border);
|
||||
}
|
||||
|
||||
@media (max-width: 900px) {
|
||||
@@ -805,4 +823,17 @@ body.table-view .item-card .actions {
|
||||
padding: 7px 12px !important;
|
||||
font-size: 0.84rem !important;
|
||||
}
|
||||
}
|
||||
}
|
||||
/* iOS and Mobile optimization fixes */
|
||||
html, body {
|
||||
-webkit-text-size-adjust: 100%;
|
||||
-webkit-tap-highlight-color: transparent;
|
||||
}
|
||||
.scrollable-container, .items-container {
|
||||
-webkit-overflow-scrolling: touch;
|
||||
}
|
||||
@supports (padding-bottom: env(safe-area-inset-bottom)) {
|
||||
.fixed-bottom, .modal-footer {
|
||||
padding-bottom: env(safe-area-inset-bottom);
|
||||
}
|
||||
}
|
||||
|
||||
Binary file not shown.
|
After Width: | Height: | Size: 545 B |
Binary file not shown.
|
After Width: | Height: | Size: 1.8 KiB |
+9
-120
@@ -1,134 +1,23 @@
|
||||
{
|
||||
"name": "Inventarsystem",
|
||||
"short_name": "Inventar",
|
||||
"description": "Verwaltungssystem für Schulinventare mit Ausleihmanagement",
|
||||
"name": "Ausleihsystem",
|
||||
"short_name": "Ausleihe",
|
||||
"description": "System zur Verwaltung von Ausleihen",
|
||||
"start_url": "/",
|
||||
"scope": "/",
|
||||
"display": "standalone",
|
||||
"orientation": "portrait-primary",
|
||||
"background_color": "#ffffff",
|
||||
"theme_color": "#007bff",
|
||||
"dir": "ltr",
|
||||
"lang": "de-DE",
|
||||
"prefer_related_applications": false,
|
||||
"related_applications": [],
|
||||
"theme_color": "#1f2937",
|
||||
"icons": [
|
||||
{
|
||||
"src": "/static/img/logo-72x72.png",
|
||||
"sizes": "72x72",
|
||||
"src": "/static/img/icon-192.png",
|
||||
"type": "image/png",
|
||||
"purpose": "any"
|
||||
},
|
||||
{
|
||||
"src": "/static/img/logo-96x96.png",
|
||||
"sizes": "96x96",
|
||||
"type": "image/png",
|
||||
"purpose": "any"
|
||||
},
|
||||
{
|
||||
"src": "/static/img/logo-128x128.png",
|
||||
"sizes": "128x128",
|
||||
"type": "image/png",
|
||||
"purpose": "any"
|
||||
},
|
||||
{
|
||||
"src": "/static/img/logo-144x144.png",
|
||||
"sizes": "144x144",
|
||||
"type": "image/png",
|
||||
"purpose": "any"
|
||||
},
|
||||
{
|
||||
"src": "/static/img/logo-152x152.png",
|
||||
"sizes": "152x152",
|
||||
"type": "image/png",
|
||||
"purpose": "any"
|
||||
},
|
||||
{
|
||||
"src": "/static/img/logo-192x192.png",
|
||||
"sizes": "192x192",
|
||||
"type": "image/png",
|
||||
"purpose": "any"
|
||||
"purpose": "any maskable"
|
||||
},
|
||||
{
|
||||
"src": "/static/img/logo-384x384.png",
|
||||
"sizes": "384x384",
|
||||
"src": "/static/img/icon-512.png",
|
||||
"type": "image/png",
|
||||
"purpose": "any"
|
||||
},
|
||||
{
|
||||
"src": "/static/img/logo-512x512.png",
|
||||
"sizes": "512x512",
|
||||
"type": "image/png",
|
||||
"purpose": "any"
|
||||
},
|
||||
{
|
||||
"src": "/static/img/logo-192x192-maskable.png",
|
||||
"sizes": "192x192",
|
||||
"type": "image/png",
|
||||
"purpose": "maskable"
|
||||
},
|
||||
{
|
||||
"src": "/static/img/logo-512x512-maskable.png",
|
||||
"sizes": "512x512",
|
||||
"type": "image/png",
|
||||
"purpose": "maskable"
|
||||
"purpose": "any maskable"
|
||||
}
|
||||
],
|
||||
"screenshots": [
|
||||
{
|
||||
"src": "/static/img/screenshot-540x720.png",
|
||||
"sizes": "540x720",
|
||||
"type": "image/png",
|
||||
"form_factor": "narrow"
|
||||
},
|
||||
{
|
||||
"src": "/static/img/screenshot-1280x720.png",
|
||||
"sizes": "1280x720",
|
||||
"type": "image/png",
|
||||
"form_factor": "wide"
|
||||
}
|
||||
],
|
||||
"categories": ["education", "productivity"],
|
||||
"shortcuts": [
|
||||
{
|
||||
"name": "Meine Ausleihungen",
|
||||
"short_name": "Ausleihungen",
|
||||
"description": "Zeige meine aktuellen Ausleihungen",
|
||||
"url": "/my_borrowed_items",
|
||||
"icons": [
|
||||
{
|
||||
"src": "/static/img/shortcut-96x96.png",
|
||||
"sizes": "96x96"
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"name": "Kalender",
|
||||
"short_name": "Kalender",
|
||||
"description": "Kalender für Ausleihplanungen",
|
||||
"url": "/terminplan",
|
||||
"icons": [
|
||||
{
|
||||
"src": "/static/img/shortcut-96x96.png",
|
||||
"sizes": "96x96"
|
||||
}
|
||||
]
|
||||
}
|
||||
],
|
||||
"share_target": {
|
||||
"action": "/share",
|
||||
"method": "POST",
|
||||
"enctype": "multipart/form-data",
|
||||
"params": {
|
||||
"title": "title",
|
||||
"text": "text",
|
||||
"url": "url",
|
||||
"files": [
|
||||
{
|
||||
"name": "media",
|
||||
"accept": ["image/*", "video/*"]
|
||||
}
|
||||
]
|
||||
}
|
||||
}
|
||||
]
|
||||
}
|
||||
|
||||
@@ -0,0 +1,18 @@
|
||||
const CACHE_NAME = 'ausleihe-cache-v1';
|
||||
|
||||
self.addEventListener('install', (event) => {
|
||||
self.skipWaiting();
|
||||
});
|
||||
|
||||
self.addEventListener('activate', (event) => {
|
||||
event.waitUntil(clients.claim());
|
||||
});
|
||||
|
||||
self.addEventListener('fetch', (event) => {
|
||||
// Einfacher Fallback aufs Netzwerk (Offline-Seite könnte hier ergänzt werden)
|
||||
event.respondWith(
|
||||
fetch(event.request).catch(() => {
|
||||
return caches.match(event.request);
|
||||
})
|
||||
);
|
||||
});
|
||||
+93
-24
@@ -10,10 +10,12 @@
|
||||
<html lang="de" data-module="{{ CURRENT_MODULE }}">
|
||||
<head>
|
||||
<meta charset="UTF-8">
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=5.0, user-scalable=yes">
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=5.0, user-scalable=yes, viewport-fit=cover">
|
||||
<meta name="mobile-web-app-capable" content="yes">
|
||||
<meta name="apple-mobile-web-app-capable" content="yes">
|
||||
<meta name="apple-mobile-web-app-status-bar-style" content="black-translucent">
|
||||
<meta name="theme-color" content="#2c3e50" media="(prefers-color-scheme: light)">
|
||||
<meta name="theme-color" content="#1a252f" media="(prefers-color-scheme: dark)">
|
||||
<meta name="csrf-token" content="{{ csrf_token }}">
|
||||
<title>{% block title %}Inventarsystem{% endblock %}</title>
|
||||
{% block head %}
|
||||
@@ -102,6 +104,9 @@
|
||||
--module-accent-color: #3498db;
|
||||
--module-accent-light: rgba(52, 152, 219, 0.1);
|
||||
--module-brand-icon: "📦";
|
||||
--page-bg-gradient: linear-gradient(180deg, #f2f5f8, #e7edf4);
|
||||
--page-bg-overlay1: rgba(86, 145, 200, 0.08);
|
||||
--page-bg-overlay2: rgba(52, 98, 150, 0.09);
|
||||
}
|
||||
|
||||
html[data-module="library"] {
|
||||
@@ -112,17 +117,35 @@
|
||||
--module-brand-icon: "📚";
|
||||
}
|
||||
|
||||
@media (prefers-color-scheme: dark) {
|
||||
:root {
|
||||
--module-primary-color: #1a252f;
|
||||
--module-primary-light: #2c3e50;
|
||||
--module-accent-color: #2980b9;
|
||||
--module-brand-icon: "📦";
|
||||
--page-bg-gradient: linear-gradient(180deg, #0f172a, #1e293b);
|
||||
--page-bg-overlay1: rgba(56, 189, 248, 0.05);
|
||||
--page-bg-overlay2: rgba(59, 130, 246, 0.06);
|
||||
}
|
||||
html[data-module="library"] {
|
||||
--module-primary-color: #4a354d;
|
||||
--module-primary-light: #614666;
|
||||
--module-accent-color: #8e44ad;
|
||||
}
|
||||
}
|
||||
|
||||
/* Global styles */
|
||||
body {
|
||||
font-family: "Manrope", "Segoe UI", "Noto Sans", sans-serif;
|
||||
background:
|
||||
radial-gradient(1200px 500px at 10% -10%, rgba(86, 145, 200, 0.08), transparent 55%),
|
||||
radial-gradient(900px 420px at 95% 0%, rgba(52, 98, 150, 0.09), transparent 52%),
|
||||
linear-gradient(180deg, #f2f5f8, #e7edf4);
|
||||
radial-gradient(1200px 500px at 10% -10%, var(--page-bg-overlay1), transparent 55%),
|
||||
radial-gradient(900px 420px at 95% 0%, var(--page-bg-overlay2), transparent 52%),
|
||||
var(--page-bg-gradient);
|
||||
margin: 0;
|
||||
padding: 0;
|
||||
padding-bottom: 30px;
|
||||
color: #1f2d3d;
|
||||
padding-bottom: auto; /* Fallback for dynamic calculation */
|
||||
padding-bottom: env(safe-area-inset-bottom, 30px);
|
||||
color: var(--ui-text, #1f2d3d);
|
||||
}
|
||||
|
||||
.container {
|
||||
@@ -135,11 +158,13 @@
|
||||
background-color: var(--module-primary-color) !important;
|
||||
position: sticky;
|
||||
top: 0;
|
||||
padding-top: env(safe-area-inset-top, 0); /* iOS Safe Area */
|
||||
z-index: 1900;
|
||||
}
|
||||
|
||||
.navbar .container-fluid {
|
||||
gap: 10px;
|
||||
padding-bottom: env(safe-area-inset-bottom, 0); /* Fallback */
|
||||
}
|
||||
|
||||
.navbar-brand {
|
||||
@@ -351,18 +376,19 @@
|
||||
|
||||
/* Dropdown menus - consistent with system design */
|
||||
.dropdown-menu {
|
||||
box-shadow: 0 4px 6px rgba(0,0,0,0.1);
|
||||
border: 1px solid #dee2e6;
|
||||
box-shadow: var(--ui-shadow-md);
|
||||
border: 1px solid var(--ui-border);
|
||||
border-radius: 8px;
|
||||
padding: 8px 0;
|
||||
min-width: 200px;
|
||||
margin-top: 5px;
|
||||
background-color: var(--ui-surface);
|
||||
}
|
||||
|
||||
.dropdown-item {
|
||||
padding: 10px 16px;
|
||||
font-size: 0.9rem;
|
||||
color: #495057;
|
||||
color: var(--ui-text);
|
||||
transition: all 0.2s ease;
|
||||
border: none;
|
||||
background: none;
|
||||
@@ -370,8 +396,8 @@
|
||||
|
||||
.dropdown-item:hover,
|
||||
.dropdown-item:focus {
|
||||
background-color: #f8f9fa;
|
||||
color: #007bff;
|
||||
background-color: var(--ui-surface-soft);
|
||||
color: var(--module-accent-color);
|
||||
transform: translateX(2px);
|
||||
}
|
||||
|
||||
@@ -434,12 +460,16 @@
|
||||
}
|
||||
|
||||
.nav-item.dropdown .dropdown-toggle {
|
||||
padding: 8px 12px;
|
||||
padding: 12px 12px;
|
||||
min-height: 48px;
|
||||
}
|
||||
|
||||
.navbar-toggler {
|
||||
padding: 0.5rem 0.65rem;
|
||||
padding: 0.6rem 0.8rem;
|
||||
border-width: 2px;
|
||||
min-height: 48px;
|
||||
min-width: 48px;
|
||||
margin-top: 4px;
|
||||
}
|
||||
|
||||
.function-search-wrap {
|
||||
@@ -573,17 +603,38 @@
|
||||
margin-left: auto;
|
||||
flex: 0 0 auto;
|
||||
align-self: flex-start;
|
||||
min-width: 48px;
|
||||
min-height: 48px;
|
||||
border: none;
|
||||
background: rgba(255, 255, 255, 0.1);
|
||||
border-radius: 10px;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
transition: background 0.2s ease;
|
||||
}
|
||||
|
||||
.navbar-toggler:active,
|
||||
.navbar-toggler:focus {
|
||||
background: rgba(255, 255, 255, 0.2);
|
||||
box-shadow: 0 0 0 2px rgba(255, 255, 255, 0.1);
|
||||
}
|
||||
|
||||
.navbar-collapse {
|
||||
order: 4;
|
||||
width: 100%;
|
||||
margin-top: 8px;
|
||||
padding: 10px 10px 6px;
|
||||
border-radius: 14px;
|
||||
background: rgba(15, 23, 42, 0.18);
|
||||
backdrop-filter: blur(10px);
|
||||
-webkit-backdrop-filter: blur(10px);
|
||||
margin-top: 12px;
|
||||
padding: 12px;
|
||||
border-radius: 16px;
|
||||
background: rgba(15, 23, 42, 0.85);
|
||||
box-shadow: 0 10px 30px rgba(0, 0, 0, 0.3);
|
||||
border: 1px solid rgba(255, 255, 255, 0.1);
|
||||
backdrop-filter: blur(16px);
|
||||
-webkit-backdrop-filter: blur(16px);
|
||||
max-height: calc(100vh - 90px); /* fallback */
|
||||
max-height: calc(100dvh - 90px);
|
||||
overflow-y: auto;
|
||||
-webkit-overflow-scrolling: touch;
|
||||
}
|
||||
|
||||
.navbar-collapse.show,
|
||||
@@ -595,7 +646,7 @@
|
||||
width: 100%;
|
||||
align-items: stretch;
|
||||
gap: 8px;
|
||||
padding-top: 2px;
|
||||
padding-top: 4px;
|
||||
}
|
||||
|
||||
.navbar-nav .nav-item {
|
||||
@@ -605,11 +656,12 @@
|
||||
.navbar-nav .nav-link {
|
||||
width: 100%;
|
||||
justify-content: flex-start;
|
||||
min-height: 46px;
|
||||
padding: 0.8rem 0.95rem;
|
||||
min-height: 48px;
|
||||
padding: 0.9rem 1.1rem;
|
||||
margin-bottom: 2px;
|
||||
border-radius: 12px;
|
||||
background: rgba(255, 255, 255, 0.08);
|
||||
box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.08);
|
||||
background: rgba(255, 255, 255, 0.06);
|
||||
box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.05);
|
||||
}
|
||||
|
||||
.navbar-nav .nav-link.nav-active,
|
||||
@@ -632,6 +684,23 @@
|
||||
margin-left: 0;
|
||||
margin-top: 6px;
|
||||
border-radius: 12px;
|
||||
background: rgba(255, 255, 255, 0.08); /* Match nav-link slightly */
|
||||
border: 1px solid rgba(255, 255, 255, 0.08);
|
||||
box-shadow: none;
|
||||
}
|
||||
|
||||
.navbar-nav .dropdown-item {
|
||||
color: rgba(255, 255, 255, 0.9);
|
||||
padding: 12px 16px;
|
||||
border-radius: 8px;
|
||||
margin: 2px 8px;
|
||||
width: calc(100% - 16px);
|
||||
}
|
||||
|
||||
.navbar-nav .dropdown-item:hover,
|
||||
.navbar-nav .dropdown-item:focus {
|
||||
background: rgba(255, 255, 255, 0.15);
|
||||
color: #fff;
|
||||
}
|
||||
|
||||
.module-selector-bar {
|
||||
|
||||
+74
-65
@@ -6,7 +6,7 @@
|
||||
|
||||
/* Calendar styles for detailed view */
|
||||
.calendar-wrapper {
|
||||
background: #fff;
|
||||
background: var(--ui-surface);
|
||||
border: 1px solid #dbe3ee;
|
||||
border-radius: 12px;
|
||||
overflow: hidden;
|
||||
@@ -19,7 +19,7 @@
|
||||
align-items: center;
|
||||
gap: 12px;
|
||||
padding: 12px;
|
||||
border-bottom: 1px solid #e7edf5;
|
||||
border-bottom: 1px solid var(--ui-border);
|
||||
background: #f8fafc;
|
||||
}
|
||||
|
||||
@@ -28,8 +28,8 @@
|
||||
height: 34px;
|
||||
border: 1px solid #dbe3ee;
|
||||
border-radius: 8px;
|
||||
background: #fff;
|
||||
color: #334155;
|
||||
background: var(--ui-surface);
|
||||
color: var(--ui-text);
|
||||
font-weight: 700;
|
||||
line-height: 1;
|
||||
cursor: pointer;
|
||||
@@ -60,7 +60,7 @@
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
border-radius: 8px;
|
||||
color: #334155;
|
||||
color: var(--ui-text);
|
||||
font-size: 0.95rem;
|
||||
font-weight: 600;
|
||||
line-height: 1;
|
||||
@@ -109,7 +109,7 @@
|
||||
}
|
||||
|
||||
.cal-cell.selected.has-booking::after {
|
||||
background: #fff;
|
||||
background: var(--ui-surface);
|
||||
}
|
||||
|
||||
.calendar-day-details {
|
||||
@@ -138,7 +138,7 @@
|
||||
}
|
||||
|
||||
.cal-booking-item {
|
||||
background: #fff;
|
||||
background: var(--ui-surface);
|
||||
border: 1px solid #dbe3ee;
|
||||
border-left: 3px solid #2563eb;
|
||||
border-radius: 10px;
|
||||
@@ -173,7 +173,7 @@
|
||||
|
||||
.cal-booking-period {
|
||||
margin-left: 8px;
|
||||
color: #475569;
|
||||
color: var(--ui-text);
|
||||
font-size: 0.85rem;
|
||||
font-weight: 600;
|
||||
}
|
||||
@@ -225,14 +225,14 @@
|
||||
|
||||
.filter-option-group {
|
||||
margin-bottom: 12px;
|
||||
border-bottom: 1px solid #eee;
|
||||
border-bottom: 1px solid var(--ui-border);
|
||||
padding-bottom: 8px;
|
||||
}
|
||||
|
||||
.filter-group-header {
|
||||
font-weight: bold;
|
||||
margin-bottom: 5px;
|
||||
color: #495057;
|
||||
color: var(--ui-text-muted);
|
||||
font-size: 0.9rem;
|
||||
}
|
||||
|
||||
@@ -253,7 +253,7 @@
|
||||
}
|
||||
|
||||
.filter-tag-group {
|
||||
color: #6c757d;
|
||||
color: var(--ui-text-muted);
|
||||
font-size: 0.8em;
|
||||
font-style: italic;
|
||||
margin-right: 2px;
|
||||
@@ -262,7 +262,7 @@
|
||||
.filter-tag-remove {
|
||||
background: none;
|
||||
border: none;
|
||||
color: #6c757d;
|
||||
color: var(--ui-text-muted);
|
||||
margin-left: 5px;
|
||||
cursor: pointer;
|
||||
font-size: 1rem;
|
||||
@@ -296,7 +296,7 @@
|
||||
#code-search {
|
||||
flex: 1;
|
||||
padding: 8px;
|
||||
border: 1px solid #ddd;
|
||||
border: 1px solid var(--ui-border);
|
||||
border-radius: 4px;
|
||||
}
|
||||
|
||||
@@ -724,7 +724,9 @@
|
||||
// Add this line to define allItems globally
|
||||
let allItems = [];
|
||||
|
||||
const MAIN_ITEMS_PAGE_SIZE = 120;
|
||||
// Dynamic page size: scan viewport/screen size to only load the exact amount needed.
|
||||
const isMobileDevice = window.matchMedia('(max-width: 768px)').matches;
|
||||
const MAIN_ITEMS_PAGE_SIZE = isMobileDevice ? 20 : 120;
|
||||
let mainItemsNextOffset = 0;
|
||||
let mainItemsHasMore = false;
|
||||
let mainItemsLoadingMore = false;
|
||||
@@ -781,10 +783,10 @@
|
||||
styles.flexDirection === 'column';
|
||||
|
||||
const distanceToEnd = isMobileLayout
|
||||
? itemsContainer.scrollHeight - (itemsContainer.scrollTop + itemsContainer.clientHeight)
|
||||
? Math.max(document.body.scrollHeight, document.documentElement.scrollHeight) - (window.scrollY + window.innerHeight)
|
||||
: itemsContainer.scrollWidth - (itemsContainer.scrollLeft + itemsContainer.clientWidth);
|
||||
const prefetchThreshold = isMobileLayout
|
||||
? Math.max(220, itemsContainer.clientHeight * 0.9)
|
||||
? window.innerHeight * 1.5
|
||||
: Math.max(260, itemsContainer.clientWidth * 1.4);
|
||||
if (distanceToEnd > prefetchThreshold) {
|
||||
return;
|
||||
@@ -1167,6 +1169,7 @@
|
||||
|
||||
if (!mainItemsScrollPrefetchBound) {
|
||||
itemsContainer.addEventListener('scroll', maybePrefetchMainItems, { passive: true });
|
||||
window.addEventListener('scroll', maybePrefetchMainItems, { passive: true });
|
||||
mainItemsScrollPrefetchBound = true;
|
||||
}
|
||||
|
||||
@@ -1188,7 +1191,7 @@
|
||||
updateMainItemsLoadingIndicator();
|
||||
});
|
||||
}, {
|
||||
root: itemsContainer,
|
||||
root: isMobileLayout ? null : itemsContainer,
|
||||
threshold: 0.15,
|
||||
rootMargin: isMobileLayout ? '0px 0px 900px 0px' : '0px 900px 0px 0px'
|
||||
});
|
||||
@@ -1466,7 +1469,7 @@
|
||||
const badgeText = entry.type === 'repair' ? 'Repariert' : 'Schaden';
|
||||
const metaLine = entry.meta ? `<div style="font-size:0.84rem;color:#4b5563;">${escapeHtml(entry.meta)}</div>` : '';
|
||||
return `
|
||||
<div style="border:1px solid #dbe3ee;border-radius:8px;padding:10px;background:#fff;display:grid;gap:6px;">
|
||||
<div style="border:1px solid var(--ui-border);border-radius:8px;padding:10px;background:var(--ui-surface);display:grid;gap:6px;">
|
||||
<div style="display:flex;flex-wrap:wrap;gap:8px;align-items:center;">
|
||||
<span style="display:inline-block;padding:2px 8px;border-radius:999px;font-size:0.75rem;font-weight:700;${badgeStyle}">${badgeText}</span>
|
||||
<span style="font-size:0.84rem;color:#475569;">${entry.dateLabel}</span>
|
||||
@@ -2805,7 +2808,7 @@
|
||||
}
|
||||
|
||||
.container {
|
||||
background-color: #fff;
|
||||
background-color: var(--ui-surface);
|
||||
padding: 20px;
|
||||
border-radius: 5px;
|
||||
box-shadow: 0 0 10px rgba(0, 0, 0, 0.1);
|
||||
@@ -2830,8 +2833,8 @@
|
||||
.filter-group {
|
||||
position: relative;
|
||||
min-width: 200px;
|
||||
background-color: #fff;
|
||||
border: 1px solid #ddd;
|
||||
background-color: var(--ui-surface);
|
||||
border: 1px solid var(--ui-border);
|
||||
border-radius: 5px;
|
||||
padding: 10px;
|
||||
}
|
||||
@@ -2853,7 +2856,7 @@
|
||||
|
||||
.clear-filter {
|
||||
font-size: 0.8rem;
|
||||
color: #6c757d;
|
||||
color: var(--ui-text-muted);
|
||||
}
|
||||
|
||||
.filter-dropdown {
|
||||
@@ -2865,7 +2868,7 @@
|
||||
max-height: 300px;
|
||||
overflow-y: auto;
|
||||
background-color: white;
|
||||
border: 1px solid #ddd;
|
||||
border: 1px solid var(--ui-border);
|
||||
border-radius: 5px;
|
||||
box-shadow: 0 4px 8px rgba(0,0,0,0.2);
|
||||
z-index: 100;
|
||||
@@ -2900,14 +2903,14 @@
|
||||
|
||||
.filter-option-group {
|
||||
margin-bottom: 12px;
|
||||
border-bottom: 1px solid #eee;
|
||||
border-bottom: 1px solid var(--ui-border);
|
||||
padding-bottom: 8px;
|
||||
}
|
||||
|
||||
.filter-group-header {
|
||||
font-weight: bold;
|
||||
margin-bottom: 5px;
|
||||
color: #495057;
|
||||
color: var(--ui-text-muted);
|
||||
font-size: 0.9rem;
|
||||
}
|
||||
|
||||
@@ -2928,7 +2931,7 @@
|
||||
}
|
||||
|
||||
.filter-tag-group {
|
||||
color: #6c757d;
|
||||
color: var(--ui-text-muted);
|
||||
font-size: 0.8em;
|
||||
font-style: italic;
|
||||
margin-right: 2px;
|
||||
@@ -2937,7 +2940,7 @@
|
||||
.filter-tag-remove {
|
||||
background: none;
|
||||
border: none;
|
||||
color: #6c757d;
|
||||
color: var(--ui-text-muted);
|
||||
margin-left: 5px;
|
||||
cursor: pointer;
|
||||
font-size: 1rem;
|
||||
@@ -2954,7 +2957,7 @@
|
||||
#code-search {
|
||||
flex: 1;
|
||||
padding: 8px;
|
||||
border: 1px solid #ddd;
|
||||
border: 1px solid var(--ui-border);
|
||||
border-radius: 4px;
|
||||
}
|
||||
|
||||
@@ -3026,7 +3029,7 @@
|
||||
border: 1px solid #dbe3ee;
|
||||
border-radius: 10px;
|
||||
background: #f8fafc;
|
||||
color: #334155;
|
||||
color: var(--ui-text);
|
||||
justify-content: center;
|
||||
align-items: center;
|
||||
flex-direction: column;
|
||||
@@ -3083,19 +3086,17 @@
|
||||
}
|
||||
|
||||
.item-card {
|
||||
background-color: #fff;
|
||||
border: 1px solid #ddd;
|
||||
border-radius: 5px;
|
||||
box-shadow: 0 0 10px rgba(0, 0, 0, 0.1);
|
||||
background-color: var(--ui-surface);
|
||||
border: 1px solid var(--ui-border);
|
||||
border-radius: var(--ui-radius);
|
||||
box-shadow: var(--ui-shadow-sm);
|
||||
padding: 20px;
|
||||
max-width: 300px;
|
||||
flex-shrink: 0;
|
||||
width: 100%;
|
||||
max-width: 340px;
|
||||
flex: 1 1 300px;
|
||||
scroll-snap-align: center;
|
||||
cursor: pointer;
|
||||
transition: transform 0.2s;
|
||||
position: relative;
|
||||
}
|
||||
|
||||
transition: transform 0.2s, box-shadow 0.2s;
|
||||
.item-card:hover {
|
||||
transform: translateY(-5px);
|
||||
box-shadow: 0 5px 15px rgba(0, 0, 0, 0.2);
|
||||
@@ -3191,7 +3192,7 @@
|
||||
.form-group textarea {
|
||||
width: 100%;
|
||||
padding: 8px;
|
||||
border: 1px solid #ddd;
|
||||
border: 1px solid var(--ui-border);
|
||||
border-radius: 4px;
|
||||
box-sizing: border-box;
|
||||
}
|
||||
@@ -3235,7 +3236,7 @@
|
||||
}
|
||||
|
||||
.cancel-button {
|
||||
background-color: #6c757d;
|
||||
background-color: var(--ui-text-muted);
|
||||
color: white;
|
||||
}
|
||||
|
||||
@@ -3561,6 +3562,9 @@
|
||||
margin: 0 !important;
|
||||
padding: 15px !important;
|
||||
scroll-snap-align: none !important;
|
||||
/* Only render when user looks at it (content-visibility virtualizes the DOM) */
|
||||
content-visibility: auto;
|
||||
contain-intrinsic-size: auto 300px;
|
||||
}
|
||||
|
||||
.item-card:hover {
|
||||
@@ -3634,7 +3638,7 @@
|
||||
display: block !important;
|
||||
margin-bottom: 8px !important;
|
||||
font-weight: 600 !important;
|
||||
color: #333 !important;
|
||||
color: var(--ui-title) !important;
|
||||
}
|
||||
|
||||
.form-group input, .form-group select, .form-group textarea {
|
||||
@@ -3705,8 +3709,8 @@
|
||||
}
|
||||
|
||||
/* Element text colors for better visibility */
|
||||
.edit-button, .duplicate-button, .generate-qr-button, .ausleihen {
|
||||
color: black !important;
|
||||
.edit-button, .duplicate-button, .generate-qr-button {
|
||||
color: var(--ui-title) !important;
|
||||
}
|
||||
|
||||
/* Standardized button styles across the application */
|
||||
@@ -3867,7 +3871,7 @@
|
||||
.modal-details { margin: 20px 0; }
|
||||
.detail-group { display: flex; margin-bottom: 10px; align-items: flex-start; }
|
||||
.detail-group.full-width { flex-direction: column; margin-bottom: 15px; }
|
||||
.detail-label { font-weight: bold; color: #495057; min-width: 150px; margin-right: 10px; }
|
||||
.detail-label { font-weight: bold; color: var(--ui-text-muted); min-width: 150px; margin-right: 10px; }
|
||||
.detail-value { color: #212529; flex: 1; word-wrap: break-word; }
|
||||
.detail-group.full-width .detail-label { margin-bottom: 5px; }
|
||||
.detail-group.full-width .detail-value {
|
||||
@@ -3935,7 +3939,7 @@
|
||||
|
||||
/* Calendar Styles - Optimized & Mobile Friendly */
|
||||
.calendar-wrapper {
|
||||
background: #fff;
|
||||
background: var(--ui-surface);
|
||||
border-radius: 12px;
|
||||
overflow: hidden;
|
||||
border: 1px solid #e5e7eb;
|
||||
@@ -3948,8 +3952,8 @@
|
||||
justify-content: space-between;
|
||||
align-items: center;
|
||||
padding: 15px;
|
||||
background-color: #fff;
|
||||
border-bottom: 1px solid #f3f4f6;
|
||||
background-color: var(--ui-surface);
|
||||
border-bottom: 1px solid var(--ui-border);
|
||||
}
|
||||
|
||||
.calendar-header button {
|
||||
@@ -3973,7 +3977,7 @@
|
||||
.calendar-grid {
|
||||
display: grid;
|
||||
grid-template-columns: repeat(7, 1fr);
|
||||
background-color: #fff;
|
||||
background-color: var(--ui-surface);
|
||||
padding: 10px;
|
||||
gap: 5px;
|
||||
}
|
||||
@@ -4035,7 +4039,7 @@
|
||||
}
|
||||
|
||||
.cal-cell.selected.has-booking::after {
|
||||
background-color: #fff;
|
||||
background-color: var(--ui-surface);
|
||||
}
|
||||
|
||||
.calendar-day-details {
|
||||
@@ -4063,7 +4067,7 @@
|
||||
|
||||
.cal-booking-item {
|
||||
padding: 10px;
|
||||
background: #fff;
|
||||
background: var(--ui-surface);
|
||||
border: 1px solid #e5e7eb;
|
||||
border-radius: 8px;
|
||||
margin-bottom: 8px;
|
||||
@@ -4115,7 +4119,7 @@
|
||||
font-size: 0.95rem !important;
|
||||
font-weight: 600 !important;
|
||||
line-height: 1.35 !important;
|
||||
color: #212529 !important;
|
||||
color: var(--ui-title) !important;
|
||||
word-break: break-word !important;
|
||||
overflow-wrap: anywhere !important;
|
||||
}
|
||||
@@ -4193,7 +4197,7 @@
|
||||
display: block !important;
|
||||
margin-right: 0 !important;
|
||||
margin-bottom: 2px !important;
|
||||
color: #6c757d !important;
|
||||
color: var(--ui-text-muted) !important;
|
||||
font-size: 0.8rem !important;
|
||||
}
|
||||
|
||||
@@ -4213,8 +4217,12 @@
|
||||
}
|
||||
|
||||
.items-container {
|
||||
padding: 6px 0 !important;
|
||||
gap: 10px !important;
|
||||
display: grid !important;
|
||||
grid-template-columns: 1fr !important;
|
||||
gap: 15px !important;
|
||||
padding: 10px 0 !important;
|
||||
overflow-x: visible !important;
|
||||
scroll-snap-type: none !important;
|
||||
}
|
||||
|
||||
body.table-view .table-view-header {
|
||||
@@ -4231,16 +4239,17 @@
|
||||
}
|
||||
|
||||
.item-card {
|
||||
border: none !important;
|
||||
border-radius: 0 !important;
|
||||
box-shadow: none !important;
|
||||
border-bottom: 1px solid #e5e7eb !important;
|
||||
padding: 12px 0 !important;
|
||||
max-width: 100% !important;
|
||||
margin: 0 !important;
|
||||
padding: 15px !important;
|
||||
scroll-snap-align: none !important;
|
||||
content-visibility: auto;
|
||||
contain-intrinsic-size: auto 300px;
|
||||
}
|
||||
|
||||
.item-card:hover {
|
||||
transform: none !important;
|
||||
box-shadow: none !important;
|
||||
transform: translateY(-2px) !important;
|
||||
box-shadow: var(--ui-shadow-md) !important;
|
||||
}
|
||||
|
||||
.item-card .image-container {
|
||||
@@ -4430,7 +4439,7 @@ function openItemQuick(id){
|
||||
}
|
||||
|
||||
.filter-group {
|
||||
background: #ffffff;
|
||||
background: var(--ui-surface);
|
||||
border: 1px solid #cfd8e3;
|
||||
border-radius: 12px;
|
||||
padding: 12px;
|
||||
@@ -4478,7 +4487,7 @@ function openItemQuick(id){
|
||||
}
|
||||
|
||||
.clear-filter {
|
||||
background: #fff;
|
||||
background: var(--ui-surface);
|
||||
color: #495868;
|
||||
}
|
||||
|
||||
@@ -4487,7 +4496,7 @@ function openItemQuick(id){
|
||||
border: 1px solid #cfd8e3;
|
||||
border-radius: 12px;
|
||||
box-shadow: 0 8px 20px rgba(20, 35, 60, 0.12);
|
||||
background: #ffffff;
|
||||
background: var(--ui-surface);
|
||||
padding: 10px;
|
||||
}
|
||||
|
||||
|
||||
@@ -21,7 +21,7 @@
|
||||
.items-indicator {
|
||||
text-align: center;
|
||||
font-size: 0.9rem;
|
||||
color: #495057;
|
||||
color: var(--ui-text-muted);
|
||||
margin: 6px 0 16px;
|
||||
font-weight: 600;
|
||||
}
|
||||
@@ -55,7 +55,7 @@
|
||||
max-width: 980px;
|
||||
margin: 0 auto 18px;
|
||||
border: 1px solid #dbe3ee;
|
||||
background: #ffffff;
|
||||
background: var(--ui-surface);
|
||||
border-radius: 10px;
|
||||
padding: 14px;
|
||||
box-shadow: 0 8px 18px rgba(15, 23, 42, 0.08);
|
||||
@@ -78,7 +78,7 @@
|
||||
}
|
||||
|
||||
.bulk-delete-summary {
|
||||
color: #334155;
|
||||
color: var(--ui-text);
|
||||
font-size: 0.92rem;
|
||||
margin-top: 4px;
|
||||
}
|
||||
@@ -105,7 +105,7 @@
|
||||
padding: 9px 12px;
|
||||
cursor: pointer;
|
||||
background: #f8fafc;
|
||||
color: #1e293b;
|
||||
color: var(--ui-title);
|
||||
font-weight: 600;
|
||||
text-align: center;
|
||||
}
|
||||
@@ -138,8 +138,8 @@
|
||||
.filter-group {
|
||||
position: relative;
|
||||
min-width: 200px;
|
||||
background-color: #fff;
|
||||
border: 1px solid #ddd;
|
||||
background-color: var(--ui-surface);
|
||||
border: 1px solid var(--ui-border);
|
||||
border-radius: 5px;
|
||||
padding: 10px;
|
||||
}
|
||||
@@ -161,7 +161,7 @@
|
||||
|
||||
.clear-filter {
|
||||
font-size: 0.8rem;
|
||||
color: #6c757d;
|
||||
color: var(--ui-text-muted);
|
||||
}
|
||||
|
||||
.filter-dropdown {
|
||||
@@ -173,7 +173,7 @@
|
||||
max-height: 300px;
|
||||
overflow-y: auto;
|
||||
background-color: white;
|
||||
border: 1px solid #ddd;
|
||||
border: 1px solid var(--ui-border);
|
||||
border-radius: 5px;
|
||||
box-shadow: 0 4px 8px rgba(0,0,0,0.2);
|
||||
z-index: 100;
|
||||
@@ -208,14 +208,14 @@
|
||||
|
||||
.filter-option-group {
|
||||
margin-bottom: 12px;
|
||||
border-bottom: 1px solid #eee;
|
||||
border-bottom: 1px solid var(--ui-border);
|
||||
padding-bottom: 8px;
|
||||
}
|
||||
|
||||
.filter-group-header {
|
||||
font-weight: bold;
|
||||
margin-bottom: 5px;
|
||||
color: #495057;
|
||||
color: var(--ui-text-muted);
|
||||
font-size: 0.9rem;
|
||||
}
|
||||
|
||||
@@ -236,7 +236,7 @@
|
||||
}
|
||||
|
||||
.filter-tag-group {
|
||||
color: #6c757d;
|
||||
color: var(--ui-text-muted);
|
||||
font-size: 0.8em;
|
||||
font-style: italic;
|
||||
margin-right: 2px;
|
||||
@@ -245,7 +245,7 @@
|
||||
.filter-tag-remove {
|
||||
background: none;
|
||||
border: none;
|
||||
color: #6c757d;
|
||||
color: var(--ui-text-muted);
|
||||
margin-left: 5px;
|
||||
cursor: pointer;
|
||||
font-size: 1rem;
|
||||
@@ -262,7 +262,7 @@
|
||||
#code-search {
|
||||
flex: 1;
|
||||
padding: 8px;
|
||||
border: 1px solid #ddd;
|
||||
border: 1px solid var(--ui-border);
|
||||
border-radius: 4px;
|
||||
}
|
||||
|
||||
@@ -334,7 +334,7 @@
|
||||
border: 1px solid #dbe3ee;
|
||||
border-radius: 10px;
|
||||
background: #f8fafc;
|
||||
color: #334155;
|
||||
color: var(--ui-text);
|
||||
justify-content: center;
|
||||
align-items: center;
|
||||
flex-direction: column;
|
||||
@@ -391,16 +391,17 @@
|
||||
}
|
||||
|
||||
.item-card {
|
||||
background-color: #fff;
|
||||
border: 1px solid #ddd;
|
||||
border-radius: 5px;
|
||||
box-shadow: 0 0 10px rgba(0, 0, 0, 0.1);
|
||||
background-color: var(--ui-surface);
|
||||
border: 1px solid var(--ui-border);
|
||||
border-radius: var(--ui-radius);
|
||||
box-shadow: var(--ui-shadow-sm);
|
||||
padding: 20px;
|
||||
max-width: 300px;
|
||||
flex-shrink: 0;
|
||||
width: 100%;
|
||||
max-width: 340px;
|
||||
flex: 1 1 300px;
|
||||
scroll-snap-align: center;
|
||||
cursor: pointer;
|
||||
transition: transform 0.2s;
|
||||
transition: transform 0.2s, box-shadow 0.2s;
|
||||
position: relative;
|
||||
}
|
||||
|
||||
@@ -447,7 +448,7 @@
|
||||
align-items: center;
|
||||
gap: 6px;
|
||||
font-size: 0.9rem;
|
||||
color: #475569;
|
||||
color: var(--ui-text);
|
||||
cursor: pointer;
|
||||
user-select: none;
|
||||
}
|
||||
@@ -632,7 +633,7 @@
|
||||
.form-group textarea {
|
||||
width: 100%;
|
||||
padding: 8px;
|
||||
border: 1px solid #ddd;
|
||||
border: 1px solid var(--ui-border);
|
||||
border-radius: 4px;
|
||||
box-sizing: border-box;
|
||||
}
|
||||
@@ -676,7 +677,7 @@
|
||||
}
|
||||
|
||||
.cancel-button {
|
||||
background-color: #6c757d;
|
||||
background-color: var(--ui-text-muted);
|
||||
color: white;
|
||||
}
|
||||
|
||||
@@ -703,7 +704,7 @@
|
||||
.filter-inputs {
|
||||
margin: 20px 0;
|
||||
padding: 15px;
|
||||
border: 1px solid #ddd;
|
||||
border: 1px solid var(--ui-border);
|
||||
border-radius: 5px;
|
||||
background-color: #f8f9fa;
|
||||
}
|
||||
@@ -711,7 +712,7 @@
|
||||
.filter-inputs h3 {
|
||||
margin-top: 0;
|
||||
margin-bottom: 15px;
|
||||
color: #495057;
|
||||
color: var(--ui-text-muted);
|
||||
}
|
||||
|
||||
.multi-filter {
|
||||
@@ -723,7 +724,7 @@
|
||||
.filter-dropdown-select {
|
||||
width: 100%;
|
||||
padding: 8px;
|
||||
border: 1px solid #ddd;
|
||||
border: 1px solid var(--ui-border);
|
||||
border-radius: 4px;
|
||||
background-color: white;
|
||||
}
|
||||
@@ -1000,16 +1001,16 @@
|
||||
|
||||
/* Disabled Button */
|
||||
.disabled-button {
|
||||
background-color: #6c757d !important;
|
||||
border-color: #6c757d !important;
|
||||
background-color: var(--ui-text-muted) !important;
|
||||
border-color: var(--ui-text-muted) !important;
|
||||
color: #fff !important;
|
||||
cursor: not-allowed !important;
|
||||
opacity: 0.6;
|
||||
}
|
||||
|
||||
.disabled-button:hover {
|
||||
background-color: #6c757d !important;
|
||||
border-color: #6c757d !important;
|
||||
background-color: var(--ui-text-muted) !important;
|
||||
border-color: var(--ui-text-muted) !important;
|
||||
transform: none !important;
|
||||
box-shadow: none !important;
|
||||
}
|
||||
@@ -1032,7 +1033,7 @@
|
||||
|
||||
.detail-label {
|
||||
font-weight: bold;
|
||||
color: #495057;
|
||||
color: var(--ui-text-muted);
|
||||
min-width: 150px;
|
||||
margin-right: 10px;
|
||||
}
|
||||
@@ -1351,7 +1352,7 @@
|
||||
display: block !important;
|
||||
margin-bottom: 8px !important;
|
||||
font-weight: 600 !important;
|
||||
color: #333 !important;
|
||||
color: var(--ui-title) !important;
|
||||
}
|
||||
|
||||
.form-group input, .form-group select, .form-group textarea {
|
||||
@@ -1389,7 +1390,7 @@
|
||||
/* Tab navigation improvements */
|
||||
.nav-tabs {
|
||||
flex-wrap: wrap !important;
|
||||
border-bottom: 1px solid #dee2e6 !important;
|
||||
border-bottom: 1px solid var(--ui-border) !important;
|
||||
}
|
||||
|
||||
.nav-tabs .nav-link {
|
||||
@@ -1605,6 +1606,7 @@
|
||||
gap: 15px !important;
|
||||
padding: 10px 0 !important;
|
||||
overflow-x: visible !important;
|
||||
scroll-snap-type: none !important;
|
||||
}
|
||||
|
||||
.item-card {
|
||||
@@ -1612,6 +1614,9 @@
|
||||
margin: 0 !important;
|
||||
padding: 15px !important;
|
||||
scroll-snap-align: none !important;
|
||||
/* Only render when user looks at it (content-visibility virtualizes the DOM) */
|
||||
content-visibility: auto;
|
||||
contain-intrinsic-size: auto 300px;
|
||||
}
|
||||
|
||||
.item-card:hover {
|
||||
@@ -1685,7 +1690,7 @@
|
||||
display: block !important;
|
||||
margin-bottom: 8px !important;
|
||||
font-weight: 600 !important;
|
||||
color: #333 !important;
|
||||
color: var(--ui-title) !important;
|
||||
}
|
||||
|
||||
.form-group input, .form-group select, .form-group textarea {
|
||||
@@ -1959,8 +1964,8 @@
|
||||
}
|
||||
|
||||
/* Element text colors for better visibility */
|
||||
.edit-button, .duplicate-button, .generate-qr-button, .ausleihen {
|
||||
color: black !important;
|
||||
.edit-button, .duplicate-button, .generate-qr-button {
|
||||
color: var(--ui-title) !important;
|
||||
}
|
||||
|
||||
/* Standardized button styles across the application */
|
||||
@@ -2003,7 +2008,7 @@
|
||||
}
|
||||
/* Calendar styles for detailed view */
|
||||
.calendar-wrapper {
|
||||
background: #fff;
|
||||
background: var(--ui-surface);
|
||||
border: 1px solid #dbe3ee;
|
||||
border-radius: 12px;
|
||||
overflow: hidden;
|
||||
@@ -2016,7 +2021,7 @@
|
||||
align-items: center;
|
||||
gap: 12px;
|
||||
padding: 12px;
|
||||
border-bottom: 1px solid #e7edf5;
|
||||
border-bottom: 1px solid var(--ui-border);
|
||||
background: #f8fafc;
|
||||
}
|
||||
|
||||
@@ -2025,8 +2030,8 @@
|
||||
height: 34px;
|
||||
border: 1px solid #dbe3ee;
|
||||
border-radius: 8px;
|
||||
background: #fff;
|
||||
color: #334155;
|
||||
background: var(--ui-surface);
|
||||
color: var(--ui-text);
|
||||
font-weight: 700;
|
||||
line-height: 1;
|
||||
cursor: pointer;
|
||||
@@ -2057,7 +2062,7 @@
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
border-radius: 8px;
|
||||
color: #334155;
|
||||
color: var(--ui-text);
|
||||
font-size: 0.95rem;
|
||||
font-weight: 600;
|
||||
line-height: 1;
|
||||
@@ -2106,7 +2111,7 @@
|
||||
}
|
||||
|
||||
.cal-cell.selected.has-booking::after {
|
||||
background: #fff;
|
||||
background: var(--ui-surface);
|
||||
}
|
||||
|
||||
.calendar-day-details {
|
||||
@@ -2135,7 +2140,7 @@
|
||||
}
|
||||
|
||||
.cal-booking-item {
|
||||
background: #fff;
|
||||
background: var(--ui-surface);
|
||||
border: 1px solid #dbe3ee;
|
||||
border-left: 3px solid #2563eb;
|
||||
border-radius: 10px;
|
||||
@@ -2170,7 +2175,7 @@
|
||||
|
||||
.cal-booking-period {
|
||||
margin-left: 8px;
|
||||
color: #475569;
|
||||
color: var(--ui-text);
|
||||
font-size: 0.85rem;
|
||||
font-weight: 600;
|
||||
}
|
||||
@@ -3339,7 +3344,9 @@ document.addEventListener('DOMContentLoaded', ()=>{
|
||||
});
|
||||
|
||||
// Function to load items from server
|
||||
const MAIN_ADMIN_ITEMS_PAGE_SIZE = 120;
|
||||
// Dynamic page size: scan viewport/screen size to only load the exact amount needed.
|
||||
const isMobileDevice = window.matchMedia('(max-width: 768px)').matches;
|
||||
const MAIN_ADMIN_ITEMS_PAGE_SIZE = isMobileDevice ? 20 : 120;
|
||||
let mainAdminItemsNextOffset = 0;
|
||||
let mainAdminItemsHasMore = false;
|
||||
let mainAdminItemsLoadingMore = false;
|
||||
@@ -3397,10 +3404,10 @@ document.addEventListener('DOMContentLoaded', ()=>{
|
||||
styles.flexDirection === 'column';
|
||||
|
||||
const distanceToEnd = isMobileLayout
|
||||
? itemsContainer.scrollHeight - (itemsContainer.scrollTop + itemsContainer.clientHeight)
|
||||
? Math.max(document.body.scrollHeight, document.documentElement.scrollHeight) - (window.scrollY + window.innerHeight)
|
||||
: itemsContainer.scrollWidth - (itemsContainer.scrollLeft + itemsContainer.clientWidth);
|
||||
const prefetchThreshold = isMobileLayout
|
||||
? Math.max(220, itemsContainer.clientHeight * 0.9)
|
||||
? window.innerHeight * 1.5
|
||||
: Math.max(260, itemsContainer.clientWidth * 1.4);
|
||||
if (distanceToEnd > prefetchThreshold) {
|
||||
return;
|
||||
@@ -3772,6 +3779,7 @@ document.addEventListener('DOMContentLoaded', ()=>{
|
||||
|
||||
if (!mainAdminItemsScrollPrefetchBound) {
|
||||
itemsContainer.addEventListener('scroll', maybePrefetchMainAdminItems, { passive: true });
|
||||
window.addEventListener('scroll', maybePrefetchMainAdminItems, { passive: true });
|
||||
mainAdminItemsScrollPrefetchBound = true;
|
||||
}
|
||||
|
||||
@@ -3793,7 +3801,7 @@ document.addEventListener('DOMContentLoaded', ()=>{
|
||||
updateMainAdminItemsLoadingIndicator();
|
||||
});
|
||||
}, {
|
||||
root: itemsContainer,
|
||||
root: isMobileLayout ? null : itemsContainer,
|
||||
threshold: 0.15,
|
||||
rootMargin: isMobileLayout ? '0px 0px 900px 0px' : '0px 900px 0px 0px'
|
||||
});
|
||||
@@ -4355,7 +4363,7 @@ document.addEventListener('DOMContentLoaded', ()=>{
|
||||
const badgeText = entry.type === 'repair' ? 'Repariert' : 'Schaden';
|
||||
const metaLine = entry.meta ? `<div style="font-size:0.84rem;color:#4b5563;">${escapeHtml(entry.meta)}</div>` : '';
|
||||
return `
|
||||
<div style="border:1px solid #dbe3ee;border-radius:8px;padding:10px;background:#fff;display:grid;gap:6px;">
|
||||
<div style="border:1px solid var(--ui-border);border-radius:8px;padding:10px;background:var(--ui-surface);display:grid;gap:6px;">
|
||||
<div style="display:flex;flex-wrap:wrap;gap:8px;align-items:center;">
|
||||
<span style="display:inline-block;padding:2px 8px;border-radius:999px;font-size:0.75rem;font-weight:700;${badgeStyle}">${badgeText}</span>
|
||||
<span style="font-size:0.84rem;color:#475569;">${entry.dateLabel}</span>
|
||||
@@ -5494,7 +5502,7 @@ document.addEventListener('DOMContentLoaded', ()=>{
|
||||
}
|
||||
|
||||
.filter-group {
|
||||
background: #ffffff;
|
||||
background: var(--ui-surface);
|
||||
border: 1px solid #cfd8e3;
|
||||
border-radius: 12px;
|
||||
padding: 12px;
|
||||
@@ -5542,7 +5550,7 @@ document.addEventListener('DOMContentLoaded', ()=>{
|
||||
}
|
||||
|
||||
.clear-filter {
|
||||
background: #fff;
|
||||
background: var(--ui-surface);
|
||||
color: #495868;
|
||||
}
|
||||
|
||||
@@ -5551,7 +5559,7 @@ document.addEventListener('DOMContentLoaded', ()=>{
|
||||
border: 1px solid #cfd8e3;
|
||||
border-radius: 12px;
|
||||
box-shadow: 0 8px 20px rgba(20, 35, 60, 0.12);
|
||||
background: #ffffff;
|
||||
background: var(--ui-surface);
|
||||
padding: 10px;
|
||||
}
|
||||
|
||||
@@ -5661,7 +5669,7 @@ document.addEventListener('DOMContentLoaded', ()=>{
|
||||
display: block !important;
|
||||
margin-right: 0 !important;
|
||||
margin-bottom: 2px !important;
|
||||
color: #6c757d !important;
|
||||
color: var(--ui-text-muted) !important;
|
||||
font-size: 0.8rem !important;
|
||||
}
|
||||
|
||||
|
||||
@@ -70,27 +70,6 @@
|
||||
</div>
|
||||
</div>
|
||||
|
||||
{% if student_cards_module_enabled %}
|
||||
<div class="form-group">
|
||||
<label style="display:flex; align-items:center; gap:8px; color:#1f2937;">
|
||||
<input type="checkbox" id="is-student" name="is_student" style="width:auto;">
|
||||
Schülerkonto mit Ausweis
|
||||
</label>
|
||||
<div id="student-fields" style="display:none; margin-top:10px;">
|
||||
<label for="student-card-id">Ausweis-ID</label>
|
||||
<div class="input-container">
|
||||
<span class="input-icon">🪪</span>
|
||||
<input type="text" id="student-card-id" name="student_card_id" placeholder="z.B. S-2026-001">
|
||||
</div>
|
||||
<label for="max-borrow-days" style="margin-top:10px;">Standard-Ausleihdauer (Tage)</label>
|
||||
<div class="input-container">
|
||||
<span class="input-icon">📅</span>
|
||||
<input type="number" id="max-borrow-days" name="max_borrow_days" min="1" max="{{ student_max_borrow_days }}" value="{{ student_default_borrow_days }}">
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
{% endif %}
|
||||
|
||||
<div class="form-group">
|
||||
<label for="permission-preset">Berechtigungs-Preset</label>
|
||||
<select id="permission-preset" name="permission_preset" class="form-select">
|
||||
@@ -561,25 +540,6 @@ document.addEventListener('DOMContentLoaded', function () {
|
||||
passwordInput.addEventListener('blur', updatePasswordRules);
|
||||
updatePasswordRules();
|
||||
}
|
||||
|
||||
{% if student_cards_module_enabled %}
|
||||
const studentCheckbox = document.getElementById('is-student');
|
||||
const studentFields = document.getElementById('student-fields');
|
||||
const studentCardInput = document.getElementById('student-card-id');
|
||||
|
||||
if (!studentCheckbox || !studentFields || !studentCardInput) {
|
||||
return;
|
||||
}
|
||||
|
||||
function toggleStudentFields() {
|
||||
const isChecked = studentCheckbox.checked;
|
||||
studentFields.style.display = isChecked ? 'block' : 'none';
|
||||
studentCardInput.required = isChecked;
|
||||
}
|
||||
|
||||
studentCheckbox.addEventListener('change', toggleStudentFields);
|
||||
toggleStudentFields();
|
||||
{% endif %}
|
||||
});
|
||||
</script>
|
||||
{% endblock %}
|
||||
@@ -51,6 +51,8 @@
|
||||
<label for="booking-type">Reservierungstyp:</label>
|
||||
<select id="booking-type" name="booking_type">
|
||||
<option value="single">Einzeltermin</option>
|
||||
<option value="range">Zeitraum</option>
|
||||
<option value="recurring">Wiederkehrend</option>
|
||||
</select>
|
||||
</div>
|
||||
|
||||
@@ -624,6 +626,7 @@ document.addEventListener('DOMContentLoaded', function() {
|
||||
}
|
||||
|
||||
const userId = document.getElementById('user-id').value || 'Admin'; // Get user ID or use fallback
|
||||
const bookingType = document.getElementById('booking-type').value;
|
||||
|
||||
// Convert JSON data to FormData
|
||||
const formData = new FormData();
|
||||
@@ -631,16 +634,43 @@ document.addEventListener('DOMContentLoaded', function() {
|
||||
// Add all required fields with correct names the server expects
|
||||
formData.append('item_id', itemId);
|
||||
formData.append('booking_date', startDate);
|
||||
formData.append('booking_end_date', startDate); // For single bookings, end = start
|
||||
formData.append('period_start', periodStart);
|
||||
formData.append('period_end', periodEnd);
|
||||
formData.append('notes', document.getElementById('booking-notes').value || '');
|
||||
formData.append('booking_type', document.getElementById('booking-type').value);
|
||||
formData.append('user_id', userId);
|
||||
|
||||
if (bookingType === 'range') {
|
||||
const endDate = document.getElementById('booking-end-date').value;
|
||||
if (!endDate) {
|
||||
alert('Bitte wählen Sie ein Enddatum für den Zeitraum.');
|
||||
return;
|
||||
}
|
||||
formData.append('booking_end_date', endDate);
|
||||
formData.append('booking_type', 'range');
|
||||
} else if (bookingType === 'recurring') {
|
||||
formData.append('booking_type', 'single'); // Server expects 'single' structure for these individually sent requests
|
||||
const dates = calculateDates();
|
||||
if (dates.length === 0) {
|
||||
alert('Es konnten keine Termine berechnet werden. Bitte überprüfen Sie Ihre Eingaben.');
|
||||
return;
|
||||
}
|
||||
if (confirm(`Möchten Sie wirklich ${dates.length} Termine planen?`)) {
|
||||
processMultipleDates(formData, dates, periodStart, periodEnd);
|
||||
}
|
||||
return; // Use processMultipleDates instead
|
||||
} else {
|
||||
formData.append('booking_end_date', startDate); // For single bookings, end = start
|
||||
formData.append('booking_type', 'single');
|
||||
}
|
||||
|
||||
const csrfToken = document.querySelector('meta[name="csrf-token"]') ? document.querySelector('meta[name="csrf-token"]').content : '';
|
||||
|
||||
// Submit with FormData instead of JSON
|
||||
fetch('/plan_booking', {
|
||||
method: 'POST',
|
||||
headers: {
|
||||
'X-CSRFToken': csrfToken
|
||||
},
|
||||
body: formData // Remove the Content-Type header and JSON.stringify
|
||||
})
|
||||
.then(response => {
|
||||
@@ -681,8 +711,12 @@ document.addEventListener('DOMContentLoaded', function() {
|
||||
// Cancel booking
|
||||
document.getElementById('cancel-booking').addEventListener('click', function() {
|
||||
if (confirm('Möchten Sie diese Ausleihe wirklich stornieren?')) {
|
||||
const csrfToken = document.querySelector('meta[name="csrf-token"]') ? document.querySelector('meta[name="csrf-token"]').content : '';
|
||||
fetch('/cancel_booking/' + currentEventId, {
|
||||
method: 'POST'
|
||||
method: 'POST',
|
||||
headers: {
|
||||
'X-CSRFToken': csrfToken
|
||||
}
|
||||
})
|
||||
.then(response => response.json())
|
||||
.then(data => {
|
||||
@@ -1131,8 +1165,12 @@ document.addEventListener('DOMContentLoaded', function() {
|
||||
newFormData.get('end_date'));
|
||||
|
||||
// Submit this booking
|
||||
const csrfToken = document.querySelector('meta[name="csrf-token"]') ? document.querySelector('meta[name="csrf-token"]').content : '';
|
||||
fetch('/plan_booking', {
|
||||
method: 'POST',
|
||||
headers: {
|
||||
'X-CSRFToken': csrfToken
|
||||
},
|
||||
body: newFormData
|
||||
})
|
||||
.then(response => response.json())
|
||||
|
||||
@@ -0,0 +1,7 @@
|
||||
from app import app
|
||||
with app.test_client() as client:
|
||||
with client.session_transaction() as sess:
|
||||
sess['username'] = 'admin'
|
||||
sess['admin'] = True
|
||||
resp = client.get('/terminplan')
|
||||
print("Status:", resp.status_code)
|
||||
@@ -0,0 +1,5 @@
|
||||
from Web.app import app
|
||||
with app.test_client() as client:
|
||||
resp = client.get('/terminplan')
|
||||
print(resp.status_code)
|
||||
# print(resp.data.decode('utf-8')[:200])
|
||||
Reference in New Issue
Block a user