Compare commits
9 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 7eeea1d319 | |||
| 56486bcbb2 | |||
| 2c3fb779ce | |||
| 299d11c1d0 | |||
| 4d1f95cb1f | |||
| 6b197fd9d1 | |||
| 58064ee249 | |||
| f7573b9a62 | |||
| 85d758fadb |
+1
-1
@@ -1,7 +1,7 @@
|
||||
NUITKA_BUILD=0
|
||||
INVENTAR_HTTP_PORT=10000
|
||||
INVENTAR_HTTP_PORTS=10000
|
||||
INVENTAR_APP_IMAGE=ghcr.io/aiirondev/legendary-octo-garbanzo:v0.7.39
|
||||
INVENTAR_APP_IMAGE=ghcr.io/aiirondev/legendary-octo-garbanzo:v0.7.42
|
||||
INVENTAR_APP_CPUS=1.0
|
||||
INVENTAR_APP_MEM_LIMIT=384m
|
||||
INVENTAR_APP_MEM_SWAP_LIMIT=768m
|
||||
|
||||
@@ -8587,11 +8587,13 @@ def manage_filters():
|
||||
# Get predefined filter values
|
||||
filter1_values = it.get_predefined_filter_values(1)
|
||||
filter2_values = it.get_predefined_filter_values(2)
|
||||
filter3_values = it.get_predefined_filter_values(3)
|
||||
|
||||
return render_template(
|
||||
'manage_filters.html',
|
||||
filter1_values=filter1_values,
|
||||
filter2_values=filter2_values,
|
||||
filter3_values=filter3_values,
|
||||
library_module_enabled=cfg.MODULES.is_enabled('library'),
|
||||
student_cards_module_enabled=cfg.MODULES.is_enabled('student_cards')
|
||||
)
|
||||
|
||||
+12
-3
@@ -570,7 +570,10 @@ def get_primary_filters():
|
||||
items = db['items']
|
||||
filters = [f for f in items.distinct('Filter', _active_record_query(_non_library_query())) if f]
|
||||
client.close()
|
||||
return filters
|
||||
|
||||
# Add predefined values
|
||||
predefined = get_predefined_filter_values(1)
|
||||
return sorted(list(set(filters + predefined)))
|
||||
except Exception as e:
|
||||
print(f"Error retrieving primary filters: {e}")
|
||||
return []
|
||||
@@ -589,7 +592,10 @@ def get_secondary_filters():
|
||||
items = db['items']
|
||||
filters = [f for f in items.distinct('Filter2', _active_record_query(_non_library_query())) if f]
|
||||
client.close()
|
||||
return filters
|
||||
|
||||
# Add predefined values
|
||||
predefined = get_predefined_filter_values(2)
|
||||
return sorted(list(set(filters + predefined)))
|
||||
except Exception as e:
|
||||
print(f"Error retrieving secondary filters: {e}")
|
||||
return []
|
||||
@@ -608,7 +614,10 @@ def get_tertiary_filters():
|
||||
items = db['items']
|
||||
filters = [f for f in items.distinct('Filter3', _active_record_query(_non_library_query())) if f]
|
||||
client.close()
|
||||
return filters
|
||||
|
||||
# Add predefined values
|
||||
predefined = get_predefined_filter_values(3)
|
||||
return sorted(list(set(filters + predefined)))
|
||||
except Exception as e:
|
||||
print(f"Error retrieving tertiary filters: {e}")
|
||||
return []
|
||||
|
||||
@@ -10,13 +10,13 @@
|
||||
.planned-appointments-panel {
|
||||
margin: 15px 0;
|
||||
padding: 15px;
|
||||
background-color: #e1f5fe;
|
||||
background-color: var(--ui-surface-soft, #e1f5fe);
|
||||
border-left: 4px solid #03a9f4;
|
||||
border-radius: 4px;
|
||||
}
|
||||
|
||||
.planned-appointments-panel h4 {
|
||||
color: #0277bd;
|
||||
color: var(--ui-title, #0277bd);
|
||||
margin-top: 0;
|
||||
margin-bottom: 10px;
|
||||
font-size: 1.1em;
|
||||
@@ -30,9 +30,9 @@
|
||||
|
||||
.appointment-item {
|
||||
padding: 10px;
|
||||
background-color: #f9fdff;
|
||||
background-color: var(--ui-surface, #f9fdff);
|
||||
border-radius: 4px;
|
||||
border: 1px solid #b3e5fc;
|
||||
border: 1px solid var(--ui-border, #b3e5fc);
|
||||
}
|
||||
|
||||
.appointment-header {
|
||||
@@ -44,7 +44,7 @@
|
||||
|
||||
.appointment-date {
|
||||
font-weight: bold;
|
||||
color: #0288d1;
|
||||
color: var(--ui-title, #0288d1);
|
||||
}
|
||||
|
||||
.appointment-period {
|
||||
@@ -86,14 +86,14 @@
|
||||
.appointment-user {
|
||||
margin-left: auto;
|
||||
font-style: italic;
|
||||
color: #546e7a;
|
||||
color: var(--ui-text-muted, #546e7a);
|
||||
}
|
||||
|
||||
.appointment-notes {
|
||||
font-size: 0.9em;
|
||||
color: #455a64;
|
||||
color: var(--ui-text, #455a64);
|
||||
margin-top: 5px;
|
||||
padding-top: 5px;
|
||||
border-top: 1px solid #e1f5fe;
|
||||
border-top: 1px solid var(--ui-border, #e1f5fe);
|
||||
font-style: italic;
|
||||
}
|
||||
|
||||
+95
-10
@@ -22,16 +22,21 @@
|
||||
}
|
||||
|
||||
:root[data-theme="dark"] {
|
||||
--ui-bg: #0f172a;
|
||||
--ui-bg-accent: #1e293b;
|
||||
/* Tiefes Blau-Theme (Dark Blue) */
|
||||
--ui-bg: #0b1120;
|
||||
--ui-bg-accent: #111827;
|
||||
--ui-surface: #1e293b;
|
||||
--ui-surface-soft: #25314a;
|
||||
--ui-border: #334155;
|
||||
--ui-text: #f1f5f9;
|
||||
--ui-surface-soft: #334155;
|
||||
--ui-border: #475569;
|
||||
--ui-text: #f8fafc;
|
||||
--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);
|
||||
--ui-shadow-sm: 0 4px 12px rgba(0, 0, 0, 0.4), inset 0 0 0 1px rgba(255, 255, 255, 0.05);
|
||||
--ui-shadow-md: 0 10px 30px rgba(0, 0, 0, 0.6), inset 0 0 0 1px rgba(255, 255, 255, 0.05);
|
||||
|
||||
/* Abgerundetes Format im gesamten Dark Mode */
|
||||
--ui-radius: 20px;
|
||||
--ui-btn-radius: 99px; /* Pillenform für Buttons */
|
||||
}
|
||||
|
||||
/* Safe Area Support for iPad notches, Dynamic Island, and rounded corners */
|
||||
@@ -57,9 +62,17 @@ body {
|
||||
:root[data-theme="dark"] input,
|
||||
:root[data-theme="dark"] select,
|
||||
:root[data-theme="dark"] textarea {
|
||||
background-color: var(--ui-surface-soft) !important;
|
||||
background-color: var(--ui-bg) !important;
|
||||
color: var(--ui-text) !important;
|
||||
border-color: var(--ui-border) !important;
|
||||
border: 1px solid var(--ui-border) !important;
|
||||
border-radius: 12px !important;
|
||||
box-shadow: inset 0 1px 2px rgba(0,0,0,0.3) !important;
|
||||
}
|
||||
:root[data-theme="dark"] input:focus,
|
||||
:root[data-theme="dark"] select:focus,
|
||||
:root[data-theme="dark"] textarea:focus {
|
||||
border-color: #52a8ff !important;
|
||||
box-shadow: 0 0 0 2px rgba(82, 168, 255, 0.2), inset 0 1px 2px rgba(0,0,0,0.3) !important;
|
||||
}
|
||||
|
||||
body {
|
||||
@@ -295,7 +308,7 @@ select:focus {
|
||||
|
||||
/* Modal dialog styling */
|
||||
.modal-dialog-white {
|
||||
background: white;
|
||||
background: var(--ui-surface);
|
||||
padding: 20px;
|
||||
border-radius: 5px;
|
||||
text-align: center;
|
||||
@@ -896,3 +909,75 @@ html, body {
|
||||
padding-bottom: env(safe-area-inset-bottom);
|
||||
}
|
||||
}
|
||||
|
||||
/* ========================================================= */
|
||||
/* UNIVERSAL DARK MODE OVERRIDES FOR HARDCODED HTML STYLES */
|
||||
/* ========================================================= */
|
||||
:root[data-theme="dark"] .bg-white,
|
||||
:root[data-theme="dark"] .bg-light,
|
||||
:root[data-theme="dark"] [style*="background-color: #fff"],
|
||||
:root[data-theme="dark"] [style*="background-color: #ffffff"],
|
||||
:root[data-theme="dark"] [style*="background-color: #f8f9fa"],
|
||||
:root[data-theme="dark"] [style*="background-color: #f5f5f5"],
|
||||
:root[data-theme="dark"] [style*="background: #fff"],
|
||||
:root[data-theme="dark"] [style*="background: #ffffff"],
|
||||
:root[data-theme="dark"] [style*="background: #f8f9fa"],
|
||||
:root[data-theme="dark"] [style*="background: #f5f5f5"],
|
||||
:root[data-theme="dark"] [style*="background: white"],
|
||||
:root[data-theme="dark"] [style*="background-color: white"],
|
||||
:root[data-theme="dark"] .modal-content,
|
||||
:root[data-theme="dark"] .card,
|
||||
:root[data-theme="dark"] .dropdown-menu {
|
||||
background-color: var(--ui-surface) !important;
|
||||
background: var(--ui-surface) !important;
|
||||
color: var(--ui-text) !important;
|
||||
}
|
||||
|
||||
:root[data-theme="dark"] .text-dark,
|
||||
:root[data-theme="dark"] .text-black,
|
||||
:root[data-theme="dark"] [style*="color: #000"],
|
||||
:root[data-theme="dark"] [style*="color: rgb(0, 0, 0)"],
|
||||
:root[data-theme="dark"] [style*="color: black"],
|
||||
:root[data-theme="dark"] [style*="color: #333"] {
|
||||
color: var(--ui-text) !important;
|
||||
}
|
||||
|
||||
:root[data-theme="dark"] .text-muted {
|
||||
color: var(--ui-text-muted) !important;
|
||||
}
|
||||
|
||||
/* Fix table backgrounds that might have hardcoded light colors */
|
||||
:root[data-theme="dark"] .table-light,
|
||||
:root[data-theme="dark"] table.table,
|
||||
:root[data-theme="dark"] table [style*="background: #fff"] {
|
||||
background-color: var(--ui-bg) !important;
|
||||
color: var(--ui-text) !important;
|
||||
}
|
||||
|
||||
/* Fix list items */
|
||||
:root[data-theme="dark"] .list-group-item {
|
||||
background-color: var(--ui-surface) !important;
|
||||
color: var(--ui-text) !important;
|
||||
border-color: var(--ui-border) !important;
|
||||
}
|
||||
|
||||
/* Additional inline style coverage */
|
||||
:root[data-theme="dark"] [style*="background: #eef4ff"],
|
||||
:root[data-theme="dark"] [style*="background-color: #eef4ff"],
|
||||
:root[data-theme="dark"] [style*="background: #e9ecef"],
|
||||
:root[data-theme="dark"] [style*="background-color: #e9ecef"],
|
||||
:root[data-theme="dark"] [style*="background: #e2e8f0"],
|
||||
:root[data-theme="dark"] [style*="background-color: #e2e8f0"],
|
||||
:root[data-theme="dark"] [style*="background-color: #fefefe"],
|
||||
:root[data-theme="dark"] [style*="background: #fffdfd"] {
|
||||
background-color: var(--ui-surface) !important;
|
||||
background: var(--ui-surface) !important;
|
||||
color: var(--ui-text) !important;
|
||||
}
|
||||
|
||||
:root[data-theme="dark"] .badge-light,
|
||||
:root[data-theme="dark"] .bg-light {
|
||||
background-color: var(--ui-surface-soft) !important;
|
||||
color: var(--ui-text) !important;
|
||||
border: 1px solid var(--ui-border);
|
||||
}
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
|
||||
{% block content %}
|
||||
<div class="container my-4">
|
||||
<div class="impressum-content bg-white p-4 shadow rounded">
|
||||
<div class="impressum-content p-4 shadow rounded" style="background: var(--ui-surface); color: var(--ui-text);">
|
||||
<h1 class="mb-4 text-center">Impressum</h1>
|
||||
<p class="text-center mb-5">(Angaben gemäß § 5 DDG)</p>
|
||||
|
||||
@@ -20,7 +20,7 @@
|
||||
<h3 class="mb-3">Kontaktinformationen</h3>
|
||||
<address class="mb-0">
|
||||
<p><strong>Name:</strong> Invario UG</p>
|
||||
<p><strong>Adresse:</strong> Musterstraße 123<br>12345 Musterstadt<br>Deutschland</p>
|
||||
<p><strong>Adresse:</strong> Am Sportplatz 10<br>83052 Bruckmühl<br>Deutschland</p>
|
||||
</address>
|
||||
<p><strong>E-Mail:</strong> <a href="mailto:info@invario.eu">info@invario.eu</a></p>
|
||||
</div>
|
||||
@@ -29,8 +29,8 @@
|
||||
<h3 class="mb-3">Verantwortlich für den Inhalt</h3>
|
||||
<p>(nach § 18 Abs. 2 MStV)</p>
|
||||
<p>Invario UG<br>
|
||||
Musterstraße 123<br>
|
||||
12345 Musterstadt<br>
|
||||
Am Sportplatz 10<br>
|
||||
83052 Bruckmühl<br>
|
||||
Deutschland</p>
|
||||
</div>
|
||||
|
||||
|
||||
+58
-6
@@ -751,6 +751,7 @@
|
||||
let mainItemsSentinel = null;
|
||||
let mainItemsLoadingIndicator = null;
|
||||
let mainItemsScrollPrefetchBound = false;
|
||||
let cardVirtualizationObserver = null;
|
||||
|
||||
function ensureMainItemsLoadingIndicator() {
|
||||
const itemsContainer = document.querySelector('#items-container');
|
||||
@@ -1189,6 +1190,55 @@
|
||||
mainItemsScrollPrefetchBound = true;
|
||||
}
|
||||
|
||||
// Setup DOM virtualization for items
|
||||
if (!cardVirtualizationObserver) {
|
||||
cardVirtualizationObserver = new IntersectionObserver((entries) => {
|
||||
entries.forEach(entry => {
|
||||
const card = entry.target;
|
||||
if (entry.isIntersecting) {
|
||||
if (card.dataset.deloaded === 'true') {
|
||||
card.innerHTML = card.dataset.savedHtml;
|
||||
card.dataset.deloaded = 'false';
|
||||
card.classList.remove('is-deloaded');
|
||||
const favBtn = card.querySelector('.bookmark-btn');
|
||||
if (favBtn) {
|
||||
favBtn.addEventListener('click', (ev) => {
|
||||
ev.stopPropagation();
|
||||
toggleFavorite(card.dataset.itemId, favBtn, card);
|
||||
});
|
||||
}
|
||||
const cardContent = card.querySelector('.card-content');
|
||||
if (cardContent) {
|
||||
cardContent.addEventListener('click', function(e) {
|
||||
if (e.target.tagName === 'BUTTON' || e.target.tagName === 'A' || e.target.tagName === 'INPUT' ||
|
||||
e.target.closest('button') || e.target.closest('a') || e.target.closest('.image-container')) return;
|
||||
e.stopPropagation();
|
||||
openItemQuick(card.dataset.itemId);
|
||||
});
|
||||
}
|
||||
}
|
||||
} else {
|
||||
if (card.dataset.deloaded !== 'true') {
|
||||
const rect = card.getBoundingClientRect();
|
||||
if (rect.height > 50) {
|
||||
card.style.minHeight = rect.height + 'px';
|
||||
card.dataset.itemId = card.querySelector('.card-content')?.dataset.itemId || '';
|
||||
card.dataset.savedHtml = card.innerHTML;
|
||||
card.innerHTML = '';
|
||||
card.dataset.deloaded = 'true';
|
||||
card.classList.add('is-deloaded');
|
||||
}
|
||||
}
|
||||
}
|
||||
});
|
||||
}, {
|
||||
rootMargin: isMobileLayout ? '1500px 0px 1500px 0px' : '0px 2500px 0px 2500px'
|
||||
});
|
||||
}
|
||||
|
||||
// Observe all valid cards
|
||||
document.querySelectorAll('.item-card').forEach(card => cardVirtualizationObserver.observe(card));
|
||||
|
||||
if (!mainItemsHasMore) return;
|
||||
|
||||
mainItemsObserver = new IntersectionObserver(entries => {
|
||||
@@ -2419,29 +2469,29 @@
|
||||
// Add these functions right after the loadFilterState() function
|
||||
|
||||
function rebuildFilter3Options() {
|
||||
if (!allItems || allItems.length === 0) return;
|
||||
if (!allItems) return;
|
||||
|
||||
// Get current filter 1 and filter 2 selections
|
||||
const filter1Selections = activeFilters.filter1;
|
||||
const filter2Selections = activeFilters.filter2;
|
||||
|
||||
// If both filters are empty, show all filter3 values
|
||||
// If both filters are empty, show all filter3 values from server
|
||||
if (filter1Selections.length === 0 && filter2Selections.length === 0) {
|
||||
// Get all unique filter3 values
|
||||
const allFilter3Values = new Set();
|
||||
// Include dynamically added ones from loaded items too, just in case
|
||||
const combinedFilter3Values = new Set(typeof allFilter3Values !== 'undefined' ? [...allFilter3Values] : []);
|
||||
allItems.forEach(item => {
|
||||
const filter3Array = Array.isArray(item.Filter3) ? item.Filter3 :
|
||||
(item.Filter3 ? [item.Filter3] : []);
|
||||
|
||||
filter3Array.forEach(value => {
|
||||
if (value && typeof value === 'string' && value.trim() !== '') {
|
||||
allFilter3Values.add(value);
|
||||
combinedFilter3Values.add(value);
|
||||
}
|
||||
});
|
||||
});
|
||||
|
||||
// Populate filter 3 dropdown with all values
|
||||
populateFilterOptions('filter3-options', [...allFilter3Values].sort(), 3);
|
||||
populateFilterOptions('filter3-options', [...combinedFilter3Values].sort(), 3);
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -3114,6 +3164,8 @@
|
||||
cursor: pointer;
|
||||
transition: transform 0.2s, box-shadow 0.2s;
|
||||
position: relative;
|
||||
content-visibility: auto;
|
||||
contain-intrinsic-size: 300px 450px;
|
||||
}
|
||||
.item-card:hover {
|
||||
transform: translateY(-5px);
|
||||
|
||||
@@ -403,6 +403,8 @@
|
||||
cursor: pointer;
|
||||
transition: transform 0.2s, box-shadow 0.2s;
|
||||
position: relative;
|
||||
content-visibility: auto;
|
||||
contain-intrinsic-size: 300px 450px;
|
||||
}
|
||||
|
||||
.item-card.bulk-selected {
|
||||
@@ -2738,6 +2740,9 @@ document.addEventListener('DOMContentLoaded', ()=>{
|
||||
let descSearchIds = null; // Set of matching IDs or null when disabled
|
||||
let currentUsername = '';
|
||||
let allItems = []; // Cache for all items
|
||||
let allFilter1Values = new Set();
|
||||
let allFilter2Values = new Set();
|
||||
let allFilter3Values = new Set();
|
||||
let bulkDeleteSelection = new Set();
|
||||
let bulkDeleteDrawerOpen = false;
|
||||
const studentCardsModuleEnabled = {{ 'true' if student_cards_module_enabled else 'false' }};
|
||||
@@ -2876,30 +2881,29 @@ document.addEventListener('DOMContentLoaded', ()=>{
|
||||
}
|
||||
|
||||
function rebuildFilter3Options() {
|
||||
if (!allItems || allItems.length === 0) return;
|
||||
if (!allItems) return;
|
||||
|
||||
// Get current filter 1 and filter 2 selections
|
||||
const filter1Selections = activeFilters.filter1;
|
||||
const filter2Selections = activeFilters.filter2;
|
||||
|
||||
// If both filters are empty, show all filter3 values
|
||||
// If both filters are empty, show all filter3 values from server
|
||||
if (filter1Selections.length === 0 && filter2Selections.length === 0) {
|
||||
// Get all unique filter3 values
|
||||
const allFilter3Values = new Set();
|
||||
// Include dynamically added ones from loaded items too, just in case
|
||||
const combinedFilter3Values = new Set(typeof allFilter3Values !== 'undefined' ? [...allFilter3Values] : []);
|
||||
allItems.forEach(item => {
|
||||
const filter3Array = Array.isArray(item.Filter3) ? item.Filter3 :
|
||||
(item.Filter3 ? [item.Filter3] : []);
|
||||
(item.Filter3 ? [item.Filter3] : []);
|
||||
|
||||
filter3Array.forEach(value => {
|
||||
if (value && typeof value === 'string' && value.trim() !== '') {
|
||||
allFilter3Values.add(value);
|
||||
combinedFilter3Values.add(value);
|
||||
}
|
||||
});
|
||||
});
|
||||
|
||||
// Populate filter 3 dropdown with all values
|
||||
populateFilterOptions('filter3-options', [...allFilter3Values].sort(), 3);
|
||||
return;
|
||||
populateFilterOptions('filter3-options', [...combinedFilter3Values].sort(), 3);
|
||||
}
|
||||
|
||||
// Filter items based on filter1 and filter2 selections
|
||||
@@ -3258,6 +3262,7 @@ document.addEventListener('DOMContentLoaded', ()=>{
|
||||
// Load predefined filter values for dropdowns
|
||||
loadPredefinedFilterValues(1);
|
||||
loadPredefinedFilterValues(2);
|
||||
loadPredefinedFilterValues(3);
|
||||
|
||||
// Set up edit form submission
|
||||
setupEditFormSubmission();
|
||||
@@ -3282,11 +3287,24 @@ document.addEventListener('DOMContentLoaded', ()=>{
|
||||
});
|
||||
});
|
||||
|
||||
// Fetch user status to get current username
|
||||
fetch('/user_status')
|
||||
.then(response => response.json())
|
||||
.then(data => {
|
||||
currentUsername = data.username;
|
||||
// Fetch user status and global filters
|
||||
Promise.all([
|
||||
fetch('/user_status').then(response => response.json()),
|
||||
fetch('/get_filter').then(response => response.json())
|
||||
])
|
||||
.then(([userData, filterData]) => {
|
||||
currentUsername = userData.username;
|
||||
|
||||
if (filterData.filter1) {
|
||||
allFilter1Values = new Set(filterData.filter1.filter(value => value && typeof value === 'string' && value.trim() !== ''));
|
||||
}
|
||||
if (filterData.filter2) {
|
||||
allFilter2Values = new Set(filterData.filter2.filter(value => value && typeof value === 'string' && value.trim() !== ''));
|
||||
}
|
||||
if (filterData.filter3) {
|
||||
allFilter3Values = new Set(filterData.filter3.filter(value => value && typeof value === 'string' && value.trim() !== ''));
|
||||
}
|
||||
|
||||
// Now load items with username information
|
||||
loadItems();
|
||||
// Setup card images display after a short delay to ensure items are loaded
|
||||
@@ -3295,7 +3313,7 @@ document.addEventListener('DOMContentLoaded', ()=>{
|
||||
}, 300);
|
||||
})
|
||||
.catch(error => {
|
||||
console.error('Error fetching user status:', error);
|
||||
console.error('Error fetching user status or filters:', error);
|
||||
loadItems(); // Load items anyway in case of error
|
||||
});
|
||||
|
||||
@@ -3356,6 +3374,7 @@ document.addEventListener('DOMContentLoaded', ()=>{
|
||||
let mainAdminItemsLoadingIndicator = null;
|
||||
let mainAdminItemsScrollPrefetchBound = false;
|
||||
let totalItemsInSystem = 0;
|
||||
let cardVirtualizationObserver = null;
|
||||
|
||||
function ensureMainAdminItemsLoadingIndicator() {
|
||||
const itemsContainer = document.querySelector('#items-container');
|
||||
@@ -3695,10 +3714,10 @@ document.addEventListener('DOMContentLoaded', ()=>{
|
||||
}
|
||||
});
|
||||
|
||||
// Populate filter options
|
||||
populateFilterOptions('filter1-options', [...filter1Values].sort(), 1);
|
||||
populateFilterOptions('filter2-options', [...filter2Values].sort(), 2);
|
||||
populateFilterOptions('filter3-options', [...filter3Values].sort(), 3);
|
||||
// Populate filter options using server-provided full filter lists when available.
|
||||
populateFilterOptions('filter1-options', allFilter1Values.size ? [...allFilter1Values].sort() : [...filter1Values].sort(), 1);
|
||||
populateFilterOptions('filter2-options', allFilter2Values.size ? [...allFilter2Values].sort() : [...filter2Values].sort(), 2);
|
||||
populateFilterOptions('filter3-options', allFilter3Values.size ? [...allFilter3Values].sort() : [...filter3Values].sort(), 3);
|
||||
|
||||
if (!append) {
|
||||
itemsContainer.scrollLeft = 0;
|
||||
@@ -3783,6 +3802,56 @@ document.addEventListener('DOMContentLoaded', ()=>{
|
||||
mainAdminItemsScrollPrefetchBound = true;
|
||||
}
|
||||
|
||||
// Setup DOM virtualization for items
|
||||
if (!cardVirtualizationObserver) {
|
||||
cardVirtualizationObserver = new IntersectionObserver((entries) => {
|
||||
entries.forEach(entry => {
|
||||
const card = entry.target;
|
||||
if (entry.isIntersecting) {
|
||||
if (card.dataset.deloaded === 'true') {
|
||||
card.innerHTML = card.dataset.savedHtml;
|
||||
card.dataset.deloaded = 'false';
|
||||
card.classList.remove('is-deloaded');
|
||||
const favBtn = card.querySelector('.bookmark-btn');
|
||||
if (favBtn) {
|
||||
favBtn.addEventListener('click', (ev) => {
|
||||
ev.stopPropagation();
|
||||
toggleFavorite(card.dataset.itemId, favBtn, card);
|
||||
});
|
||||
}
|
||||
const cardContent = card.querySelector('.card-content');
|
||||
if (cardContent) {
|
||||
cardContent.addEventListener('click', function(e) {
|
||||
if (e.target.tagName === 'BUTTON' || e.target.tagName === 'A' || e.target.tagName === 'INPUT' ||
|
||||
e.target.closest('button') || e.target.closest('a') || e.target.closest('.image-container') ||
|
||||
e.target.closest('.bulk-delete-toggle') || e.target.closest('label')) return;
|
||||
e.stopPropagation();
|
||||
openItemQuick(card.dataset.itemId);
|
||||
});
|
||||
}
|
||||
}
|
||||
} else {
|
||||
if (card.dataset.deloaded !== 'true') {
|
||||
const rect = card.getBoundingClientRect();
|
||||
if (rect.height > 50) {
|
||||
card.style.minHeight = rect.height + 'px';
|
||||
card.dataset.itemId = card.querySelector('.card-content')?.dataset.itemId || '';
|
||||
card.dataset.savedHtml = card.innerHTML;
|
||||
card.innerHTML = '';
|
||||
card.dataset.deloaded = 'true';
|
||||
card.classList.add('is-deloaded');
|
||||
}
|
||||
}
|
||||
}
|
||||
});
|
||||
}, {
|
||||
rootMargin: isMobileLayout ? '1500px 0px 1500px 0px' : '0px 2500px 0px 2500px'
|
||||
});
|
||||
}
|
||||
|
||||
// Observe all valid cards
|
||||
document.querySelectorAll('.item-card').forEach(card => cardVirtualizationObserver.observe(card));
|
||||
|
||||
if (!mainAdminItemsHasMore) return;
|
||||
|
||||
mainAdminItemsObserver = new IntersectionObserver(entries => {
|
||||
|
||||
@@ -15,16 +15,16 @@
|
||||
<h1 class="mb-4">Filterwerte verwalten</h1>
|
||||
|
||||
<div class="row">
|
||||
<!-- Filter 1: Unterrichtsfach -->
|
||||
<div class="col-md-6">
|
||||
<!-- Filter 1 -->
|
||||
<div class="col-md-4">
|
||||
<div class="card mb-4">
|
||||
<div class="card-header">
|
||||
<h2 class="card-title h5 mb-0">Unterrichtsfach (Filter 1)</h2>
|
||||
<h2 class="card-title h5 mb-0">Fach/Kategorie (Filter 1)</h2>
|
||||
</div>
|
||||
<div class="card-body">
|
||||
<form method="POST" action="{{ url_for('add_filter_value', filter_num=1) }}" class="mb-4">
|
||||
<div class="input-group">
|
||||
<input type="text" name="value" class="form-control" placeholder="Neues Unterrichtsfach..." required>
|
||||
<input type="text" name="value" class="form-control" placeholder="Neuer Wert..." required>
|
||||
<button type="submit" class="btn btn-primary">Hinzufügen</button>
|
||||
</div>
|
||||
</form>
|
||||
@@ -51,16 +51,16 @@
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- Filter 2: Jahrgangsstufe -->
|
||||
<div class="col-md-6">
|
||||
<!-- Filter 2 -->
|
||||
<div class="col-md-4">
|
||||
<div class="card mb-4">
|
||||
<div class="card-header">
|
||||
<h2 class="card-title h5 mb-0">Jahrgangsstufe (Filter 2)</h2>
|
||||
<h2 class="card-title h5 mb-0">System/Bereich (Filter 2)</h2>
|
||||
</div>
|
||||
<div class="card-body">
|
||||
<form method="POST" action="{{ url_for('add_filter_value', filter_num=2) }}" class="mb-4">
|
||||
<div class="input-group">
|
||||
<input type="text" name="value" class="form-control" placeholder="Neue Jahrgangsstufe..." required>
|
||||
<input type="text" name="value" class="form-control" placeholder="Neuer Wert..." required>
|
||||
<button type="submit" class="btn btn-primary">Hinzufügen</button>
|
||||
</div>
|
||||
</form>
|
||||
@@ -86,6 +86,42 @@
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- Filter 3 -->
|
||||
<div class="col-md-4">
|
||||
<div class="card mb-4">
|
||||
<div class="card-header">
|
||||
<h2 class="card-title h5 mb-0">Typ/Art (Filter 3)</h2>
|
||||
</div>
|
||||
<div class="card-body">
|
||||
<form method="POST" action="{{ url_for('add_filter_value', filter_num=3) }}" class="mb-4">
|
||||
<div class="input-group">
|
||||
<input type="text" name="value" class="form-control" placeholder="Neuer Wert..." required>
|
||||
<button type="submit" class="btn btn-primary">Hinzufügen</button>
|
||||
</div>
|
||||
</form>
|
||||
|
||||
<h5 class="mb-3">Vorhandene Werte</h5>
|
||||
{% if filter3_values %}
|
||||
<div class="list-group">
|
||||
{% for value in filter3_values %}
|
||||
<div class="list-group-item d-flex justify-content-between align-items-center">
|
||||
{{ value }}
|
||||
<form method="POST" action="{{ url_for('remove_filter_value', filter_num=3, value=value) }}" class="d-inline">
|
||||
<button type="submit" class="btn btn-sm btn-danger"
|
||||
onclick="return confirm('Sind Sie sicher, dass Sie den Wert \"' + '{{ value }}'.replace(/'/g, '\\\'') + '\" löschen möchten?');">
|
||||
Entfernen
|
||||
</button>
|
||||
</form>
|
||||
</div>
|
||||
{% endfor %}
|
||||
</div>
|
||||
{% else %}
|
||||
<div class="alert alert-info">Keine Werte definiert.</div>
|
||||
{% endif %}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="alert alert-warning">
|
||||
|
||||
@@ -709,7 +709,6 @@
|
||||
</style>
|
||||
|
||||
<div class="upload-container">
|
||||
<a href="{{ url_for(back_target|default('home_admin')) }}" class="nav-back-button">← Zurück zur Artikelübersicht</a>
|
||||
|
||||
{% if show_library_features %}
|
||||
<div style="border:1px solid #dbe4ee; border-radius:8px; padding:14px; margin-bottom:16px; background:#f8fbff;">
|
||||
|
||||
+1
-7
@@ -498,8 +498,6 @@ def check_nm_pwd(username, password):
|
||||
finally:
|
||||
client.close()
|
||||
|
||||
return None
|
||||
|
||||
|
||||
def add_user(
|
||||
username,
|
||||
@@ -536,16 +534,12 @@ def add_user(
|
||||
for key, value in page_permissions.items():
|
||||
permission_defaults['pages'][str(key)] = bool(value)
|
||||
|
||||
alias_first = name if str(name or '').strip() else username
|
||||
alias_last = last_name if str(last_name or '').strip() else ''
|
||||
name_alias = build_name_synonym(alias_first, alias_last)
|
||||
|
||||
user_doc = {
|
||||
'Username': username,
|
||||
'Password': hashing(password),
|
||||
'Admin': False,
|
||||
'active_ausleihung': None,
|
||||
'name': name_alias,
|
||||
'name': name.strip() if name else '',
|
||||
'last_name': last_name.strip() if last_name else '',
|
||||
'IsStudent': bool(is_student),
|
||||
'PermissionPreset': permission_defaults['preset'],
|
||||
|
||||
Reference in New Issue
Block a user