|
|
|
@@ -374,7 +374,7 @@
|
|
|
|
|
<div class="filter-bar">
|
|
|
|
|
<input id="library-search" type="text" placeholder="Nach Element, Benutzer, Klasse, Ausweis oder Rechnung suchen...">
|
|
|
|
|
|
|
|
|
|
<!-- NEU: Klassen-Filter -->
|
|
|
|
|
<!-- Klassen-Filter -->
|
|
|
|
|
<select id="class-filter">
|
|
|
|
|
<option value="all">Alle Klassen</option>
|
|
|
|
|
{% set classes = [] %}
|
|
|
|
@@ -407,7 +407,6 @@
|
|
|
|
|
<table class="library-table" id="loans-table">
|
|
|
|
|
<thead>
|
|
|
|
|
<tr>
|
|
|
|
|
<!-- NEU: onClick Handler zum Sortieren hinzugefügt -->
|
|
|
|
|
<th style="cursor: pointer;" onclick="sortTable('loans-table', 0)">Status ↕</th>
|
|
|
|
|
<th style="cursor: pointer;" onclick="sortTable('loans-table', 1)">Element ↕</th>
|
|
|
|
|
<th style="cursor: pointer;" onclick="sortTable('loans-table', 2)">Benutzer ↕</th>
|
|
|
|
@@ -419,7 +418,6 @@
|
|
|
|
|
</tr>
|
|
|
|
|
</thead>
|
|
|
|
|
<tbody>
|
|
|
|
|
<!-- NEU: data-klasse hinzugefügt -->
|
|
|
|
|
{% for e in loan_entries %}
|
|
|
|
|
<tr class="loan-row"
|
|
|
|
|
data-borrow-id="{{ e.id }}"
|
|
|
|
@@ -452,7 +450,6 @@
|
|
|
|
|
<td>
|
|
|
|
|
<div><strong>{{ e.user }}</strong></div>
|
|
|
|
|
</td>
|
|
|
|
|
<!-- NEU: Klasse Spalte -->
|
|
|
|
|
<td>
|
|
|
|
|
{% if e.klasse %}
|
|
|
|
|
<span class="badge-pill badge-class">{{ e.klasse }}</span>
|
|
|
|
@@ -469,9 +466,6 @@
|
|
|
|
|
{% if e.invoice_number %}
|
|
|
|
|
<div class="mono">{{ e.invoice_number }}</div>
|
|
|
|
|
<div class="muted">{{ e.invoice_amount }}</div>
|
|
|
|
|
<!--{% if e.invoice_corrections_count %}
|
|
|
|
|
<div class="muted" style="color:#7c2d12;">{{ e.invoice_corrections_count }} Korrektur(en)</div>
|
|
|
|
|
{% endif %} -->
|
|
|
|
|
<div style="margin-top:6px;">
|
|
|
|
|
<a class="btn btn-outline-primary btn-sm" href="{{ url_for('admin_view_invoice_pdf', borrow_id=e.id) }}" target="_blank" rel="noopener">PDF öffnen</a>
|
|
|
|
|
</div>
|
|
|
|
@@ -506,18 +500,9 @@
|
|
|
|
|
{% endif %}
|
|
|
|
|
|
|
|
|
|
{% if e.has_damage %}
|
|
|
|
|
<!-- Aufruf des Reparatur-Auswahl-Modals -->
|
|
|
|
|
<button type="button" class="btn btn-warning btn-sm" onclick="openRepairModal('{{ e.item_id }}', '{{ e.item_code }}')">Reparieren / Ersetzen</button>
|
|
|
|
|
{% endif %}
|
|
|
|
|
|
|
|
|
|
<!--{% if e.invoice_number %}
|
|
|
|
|
<form method="post" action="{{ url_for('admin_add_invoice_correction', borrow_id=e.id) }}" onsubmit="return confirm('Korrekturbuchung hinzufügen?');" style="display: flex; gap: 6px; align-items: center; flex-wrap: wrap;">
|
|
|
|
|
<input type="text" name="correction_reason" value="Korrektur zu {{ e.invoice_number }}" placeholder="Korrekturgrund" required style="padding:6px; border:1px solid #ddd; border-radius:6px; min-width:160px; max-width:180px;">
|
|
|
|
|
<input type="text" name="amount_delta" placeholder="z.B. -{{ e.invoice_amount }}" style="padding:6px; border:1px solid #ddd; border-radius:6px; width:120px;">
|
|
|
|
|
<button type="submit" class="btn btn-outline-danger btn-sm">Korrektur</button>
|
|
|
|
|
</form>
|
|
|
|
|
{% endif %}-->
|
|
|
|
|
|
|
|
|
|
{% if e.status in ['active', 'planned'] %}
|
|
|
|
|
<form method="post" action="{{ url_for('admin_reset_borrowing', borrow_id=e.id) }}" onsubmit="return confirm('Ausleihe zurücksetzen?');">
|
|
|
|
|
<button type="submit" class="btn btn-secondary btn-sm">Zurücksetzen</button>
|
|
|
|
@@ -541,7 +526,6 @@
|
|
|
|
|
<table class="library-table" id="damaged-table">
|
|
|
|
|
<thead>
|
|
|
|
|
<tr>
|
|
|
|
|
<!-- NEU: onClick Handler zum Sortieren hinzugefügt -->
|
|
|
|
|
<th style="cursor: pointer;" onclick="sortTable('damaged-table', 0)">Element ↕</th>
|
|
|
|
|
<th style="cursor: pointer;" onclick="sortTable('damaged-table', 1)">Code ↕</th>
|
|
|
|
|
<th style="cursor: pointer;" onclick="sortTable('damaged-table', 2)">Schaden ↕</th>
|
|
|
|
@@ -574,7 +558,6 @@
|
|
|
|
|
<div class="row-actions" style="margin-bottom:8px;">
|
|
|
|
|
<a class="btn btn-outline-secondary btn-sm" href="{{ url_for('library_item_invoices', item_id=item.id) }}">Rechnungen</a>
|
|
|
|
|
</div>
|
|
|
|
|
<!-- Aufruf des Reparatur-Auswahl-Modals -->
|
|
|
|
|
<button type="button" class="btn btn-warning btn-sm" onclick="openRepairModal('{{ item.id }}', '{{ item.code }}')">Reparieren / Ersetzen</button>
|
|
|
|
|
</td>
|
|
|
|
|
</tr>
|
|
|
|
@@ -627,6 +610,13 @@
|
|
|
|
|
<textarea id="damage-invoice-reason" name="damage_reason" rows="5" required style="width:100%; padding:10px; border:1px solid #ddd; border-radius:6px; resize:vertical;" placeholder="Beschreiben Sie kurz den Schaden oder die Zerstörung."></textarea>
|
|
|
|
|
</div>
|
|
|
|
|
|
|
|
|
|
{% if email_service_enabled %}
|
|
|
|
|
<div style="margin-bottom:16px;">
|
|
|
|
|
<label for="damage-invoice-recipient-email" style="display:block; font-weight:700; margin-bottom:6px;">Empfänger-E-Mail für den PDF-Versand</label>
|
|
|
|
|
<input id="damage-invoice-recipient-email" name="recipient_email" type="email" style="width:100%; padding:10px; border:1px solid #ddd; border-radius:6px;" placeholder="name@beispiel.de">
|
|
|
|
|
</div>
|
|
|
|
|
{% endif %}
|
|
|
|
|
|
|
|
|
|
<div style="display:flex; flex-wrap:wrap; gap:16px; align-items:center; margin-bottom:18px;">
|
|
|
|
|
<label style="display:flex; align-items:center; gap:8px;">
|
|
|
|
|
<input id="damage-invoice-destroyed" type="checkbox" name="mark_destroyed" checked>
|
|
|
|
@@ -640,13 +630,16 @@
|
|
|
|
|
|
|
|
|
|
<div style="display:flex; justify-content:flex-end; gap:10px;">
|
|
|
|
|
<button type="button" class="btn btn-secondary" onclick="closeDamageInvoiceModal()">Abbrechen</button>
|
|
|
|
|
<button type="submit" class="btn btn-danger">PDF-Rechnung erstellen</button>
|
|
|
|
|
<button type="submit" class="btn btn-outline-danger" name="delivery" value="pdf">Nur PDF herunterladen</button>
|
|
|
|
|
{% if email_service_enabled %}
|
|
|
|
|
<button type="submit" class="btn btn-danger" name="delivery" value="email">PDF per E-Mail senden</button>
|
|
|
|
|
{% endif %}
|
|
|
|
|
</div>
|
|
|
|
|
</form>
|
|
|
|
|
</div>
|
|
|
|
|
</div>
|
|
|
|
|
|
|
|
|
|
<!-- Neues Modal: Reparatur-Optionen (Reparieren, Ersetzen mit neuem Code_4, Löschen) -->
|
|
|
|
|
<!-- Modal: Reparatur-Optionen -->
|
|
|
|
|
<div id="repair-action-modal" role="dialog" aria-modal="true" aria-labelledby="repair-modal-title" style="display:none; position:fixed; inset:0; background:rgba(15,23,42,0.72); z-index:9999; padding:20px; overflow:auto;">
|
|
|
|
|
<div style="max-width:540px; margin:60px auto; background: var(--ui-surface); border-radius:12px; padding:24px; box-shadow:0 20px 60px rgba(0,0,0,0.3);">
|
|
|
|
|
<div style="display:flex; justify-content:space-between; align-items:center; gap:12px; margin-bottom:16px;">
|
|
|
|
@@ -676,7 +669,7 @@
|
|
|
|
|
<script>
|
|
|
|
|
(function() {
|
|
|
|
|
const searchInput = document.getElementById('library-search');
|
|
|
|
|
const classFilter = document.getElementById('class-filter'); // NEU: Klassenfilter hinzugefügt
|
|
|
|
|
const classFilter = document.getElementById('class-filter');
|
|
|
|
|
const statusFilter = document.getElementById('loan-status-filter');
|
|
|
|
|
const damageFilter = document.getElementById('damage-filter');
|
|
|
|
|
const loanRows = Array.from(document.querySelectorAll('.loan-row'));
|
|
|
|
@@ -693,10 +686,8 @@
|
|
|
|
|
const damageInvoiceReason = document.getElementById('damage-invoice-reason');
|
|
|
|
|
const damageInvoiceReplaceBtn = document.getElementById('damage-invoice-replace-btn');
|
|
|
|
|
|
|
|
|
|
// NEU: Globale Sortier-Richtungsobjekte
|
|
|
|
|
let sortDirections = {};
|
|
|
|
|
|
|
|
|
|
// NEU: Sortier-Funktion
|
|
|
|
|
window.sortTable = function(tableId, columnIndex) {
|
|
|
|
|
const table = document.getElementById(tableId);
|
|
|
|
|
const tbody = table.tBodies[0];
|
|
|
|
@@ -714,7 +705,6 @@
|
|
|
|
|
const isAscending = sortDirections[sortKey];
|
|
|
|
|
const multiplier = isAscending ? 1 : -1;
|
|
|
|
|
|
|
|
|
|
// Pfeil im Header aktualisieren
|
|
|
|
|
const headers = table.querySelectorAll("th");
|
|
|
|
|
headers.forEach(th => {
|
|
|
|
|
if(th.innerHTML.includes('↕') || th.innerHTML.includes('▲') || th.innerHTML.includes('▼')) {
|
|
|
|
@@ -726,19 +716,15 @@
|
|
|
|
|
currentTh.innerHTML = currentTh.innerHTML.replace('↕', isAscending ? '▲' : '▼');
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// Zeilen sortieren
|
|
|
|
|
rows.sort((a, b) => {
|
|
|
|
|
const cellA = a.cells[columnIndex].textContent.trim();
|
|
|
|
|
const cellB = b.cells[columnIndex].textContent.trim();
|
|
|
|
|
return cellA.localeCompare(cellB, 'de', { numeric: true, sensitivity: 'base' }) * multiplier;
|
|
|
|
|
});
|
|
|
|
|
|
|
|
|
|
// Neu einfügen
|
|
|
|
|
rows.forEach(row => tbody.appendChild(row));
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// Funktionen für das Reparatur-Modal
|
|
|
|
|
window.openRepairModal = function(itemId, currentCode) {
|
|
|
|
|
const modal = document.getElementById('repair-action-modal');
|
|
|
|
|
const form = document.getElementById('repair-action-form');
|
|
|
|
@@ -871,26 +857,25 @@
|
|
|
|
|
});
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// NEU: Kombinierte Filter-Funktion (Suche + Status + Schaden + Klasse)
|
|
|
|
|
function applyFilters() {
|
|
|
|
|
const search = (searchInput.value || '').trim().toLowerCase();
|
|
|
|
|
const status = statusFilter.value;
|
|
|
|
|
const damage = damageFilter.value;
|
|
|
|
|
const klasse = classFilter.value; // NEU
|
|
|
|
|
const klasse = classFilter.value;
|
|
|
|
|
|
|
|
|
|
let visibleLoans = 0;
|
|
|
|
|
loanRows.forEach(row => {
|
|
|
|
|
const haystack = row.dataset.search || '';
|
|
|
|
|
const rowStatus = row.dataset.status || '';
|
|
|
|
|
const rowKlasse = row.dataset.klasse || ''; // NEU
|
|
|
|
|
const rowKlasse = row.dataset.klasse || '';
|
|
|
|
|
const hasDamage = row.dataset.hasDamage === '1';
|
|
|
|
|
|
|
|
|
|
const searchMatch = !search || haystack.includes(search);
|
|
|
|
|
const statusMatch = !status || rowStatus === status;
|
|
|
|
|
const classMatch = klasse === 'all' || rowKlasse === klasse; // NEU
|
|
|
|
|
const classMatch = klasse === 'all' || rowKlasse === klasse;
|
|
|
|
|
const damageMatch = damage === 'all' || (damage === 'damage' && hasDamage) || (damage === 'clean' && !hasDamage);
|
|
|
|
|
|
|
|
|
|
const show = searchMatch && statusMatch && classMatch && damageMatch; // NEU
|
|
|
|
|
const show = searchMatch && statusMatch && classMatch && damageMatch;
|
|
|
|
|
row.style.display = show ? '' : 'none';
|
|
|
|
|
if (show) visibleLoans++;
|
|
|
|
|
});
|
|
|
|
@@ -905,10 +890,6 @@
|
|
|
|
|
const searchMatch = !search || haystack.includes(search);
|
|
|
|
|
const statusMatch = !status || rowStatus === status || status === '';
|
|
|
|
|
const damageMatch = damage === 'all' || (damage === 'damage' && hasDamage) || (damage === 'clean' && !hasDamage);
|
|
|
|
|
|
|
|
|
|
// Defekte-Medien-Tabelle hat keine verknüpfte "Klasse", deshalb blenden wir sie nur bei Klassen-Filter "all" ein,
|
|
|
|
|
// oder wenn gar nicht nach Klasse gefiltert wird, damit sie nicht verschwindet.
|
|
|
|
|
// Falls sie bei aktiver Klassensuche komplett verschwinden soll, passe die Bedingung an:
|
|
|
|
|
const classMatch = klasse === 'all';
|
|
|
|
|
|
|
|
|
|
const show = searchMatch && statusMatch && damageMatch && classMatch;
|
|
|
|
@@ -919,7 +900,7 @@
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
searchInput.addEventListener('input', applyFilters);
|
|
|
|
|
classFilter.addEventListener('change', applyFilters); // NEU
|
|
|
|
|
classFilter.addEventListener('change', applyFilters);
|
|
|
|
|
statusFilter.addEventListener('change', applyFilters);
|
|
|
|
|
damageFilter.addEventListener('change', applyFilters);
|
|
|
|
|
applyFilters();
|
|
|
|
|
Aiirondev_dev