This commit is contained in:
@@ -1027,47 +1027,21 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
async function processQuickToggleScan(scannedCode) {
|
async function processQuickToggleScan(scannedCode) {
|
||||||
if (!activeStudentCardId) {
|
// 1. Prüfen, ob "Nur Rückgabe"-Modus aktiv ist
|
||||||
// If return-only mode is active, always attempt to return by code
|
|
||||||
const returnOnly = (document.getElementById('returnOnlyToggle') || {}).checked;
|
const returnOnly = (document.getElementById('returnOnlyToggle') || {}).checked;
|
||||||
if (returnOnly) {
|
if (returnOnly) {
|
||||||
await returnByCode(scannedCode);
|
await returnByCode(scannedCode);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// 2. Wenn kein Ausweis gesetzt ist, wird der Code als Ausweis interpretiert
|
||||||
if (!activeStudentCardId) {
|
if (!activeStudentCardId) {
|
||||||
setActiveStudentCard(scannedCode);
|
setActiveStudentCard(scannedCode);
|
||||||
setScanStatus(`Ausweis gesetzt: ${activeStudentCardId}`, 'ok');
|
setScanStatus(`Ausweis gesetzt: ${activeStudentCardId}`, 'ok');
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// 3. Ausleihe/Rückgabe verarbeiten (wenn Ausweis vorhanden)
|
||||||
async function returnByCode(code) {
|
|
||||||
if (!code) return;
|
|
||||||
setScanStatus('Verarbeite Rückgabe...', 'warn');
|
|
||||||
try {
|
|
||||||
const resp = await fetch('/api/library_return_by_code', {
|
|
||||||
method: 'POST',
|
|
||||||
headers: {'Content-Type': 'application/json'},
|
|
||||||
body: JSON.stringify({ item_code: code })
|
|
||||||
});
|
|
||||||
const result = await resp.json();
|
|
||||||
if (!resp.ok || !result.ok) {
|
|
||||||
setScanStatus(result.message || 'Rückgabe fehlgeschlagen.', 'error');
|
|
||||||
showSmallConfirm(result.message || 'Rückgabe fehlgeschlagen.', 'error');
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
setScanStatus(result.message || `Zurückgegeben: ${result.item_name || ''}`, 'ok');
|
|
||||||
showSmallConfirm(result.message || `Zurückgegeben: ${result.item_name || ''}`, 'ok');
|
|
||||||
await loadLibraryItems();
|
|
||||||
return true;
|
|
||||||
} catch (err) {
|
|
||||||
console.error('Return by code failed:', err);
|
|
||||||
setScanStatus('Fehler bei Rückgabe.', 'error');
|
|
||||||
showSmallConfirm('Fehler bei Rückgabe.', 'error');
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
try {
|
try {
|
||||||
setScanStatus('Verarbeite Mediencode...', 'warn');
|
setScanStatus('Verarbeite Mediencode...', 'warn');
|
||||||
const response = await fetch('/api/library_scan_action', {
|
const response = await fetch('/api/library_scan_action', {
|
||||||
@@ -1103,6 +1077,33 @@
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
async function returnByCode(code) {
|
||||||
|
if (!code) return;
|
||||||
|
setScanStatus('Verarbeite Rückgabe...', 'warn');
|
||||||
|
try {
|
||||||
|
const resp = await fetch('/api/library_return_by_code', {
|
||||||
|
method: 'POST',
|
||||||
|
headers: {'Content-Type': 'application/json'},
|
||||||
|
body: JSON.stringify({ item_code: code })
|
||||||
|
});
|
||||||
|
const result = await resp.json();
|
||||||
|
if (!resp.ok || !result.ok) {
|
||||||
|
setScanStatus(result.message || 'Rückgabe fehlgeschlagen.', 'error');
|
||||||
|
showSmallConfirm(result.message || 'Rückgabe fehlgeschlagen.', 'error');
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
setScanStatus(result.message || `Zurückgegeben: ${result.item_name || ''}`, 'ok');
|
||||||
|
showSmallConfirm(result.message || `Zurückgegeben: ${result.item_name || ''}`, 'ok');
|
||||||
|
await loadLibraryItems();
|
||||||
|
return true;
|
||||||
|
} catch (err) {
|
||||||
|
console.error('Return by code failed:', err);
|
||||||
|
setScanStatus('Fehler bei Rückgabe.', 'error');
|
||||||
|
showSmallConfirm('Fehler bei Rückgabe.', 'error');
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
function scanIntoEditCode() {
|
function scanIntoEditCode() {
|
||||||
const scanReaderWrap = document.getElementById('scanReaderWrap');
|
const scanReaderWrap = document.getElementById('scanReaderWrap');
|
||||||
const editCodeInput = document.getElementById('edit-code4');
|
const editCodeInput = document.getElementById('edit-code4');
|
||||||
@@ -1399,9 +1400,34 @@
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
// Edit Modal Form processing
|
|
||||||
const editForm = document.getElementById('editLibraryForm');
|
const editForm = document.getElementById('editLibraryForm');
|
||||||
if (editForm) {
|
if (editForm) {
|
||||||
|
editForm.addEventListener('submit', async function (e) {
|
||||||
|
e.preventDefault();
|
||||||
|
|
||||||
|
const itemId = document.getElementById('editLibraryItemId').value;
|
||||||
|
const currentItem = libraryItems.find(i => i._id === itemId);
|
||||||
|
if (!currentItem) return;
|
||||||
|
|
||||||
|
const codeInputs = Array.from(document.querySelectorAll('#editLibraryCodesContainer input[data-item-id]'));
|
||||||
|
|
||||||
|
// Daten aus dem Formular sammeln
|
||||||
|
const sharedPayload = {
|
||||||
|
name: document.getElementById('editLibraryName').value,
|
||||||
|
item_type: document.getElementById('editLibraryType').value,
|
||||||
|
isbn: document.getElementById('editLibraryIsbn').value,
|
||||||
|
ort: document.getElementById('editLibraryLocation').value,
|
||||||
|
beschreibung: document.getElementById('editLibraryDescription').value,
|
||||||
|
ansch_jahr: currentItem.Anschaffungsjahr || '',
|
||||||
|
ansch_kost: currentItem.Anschaffungskosten || '',
|
||||||
|
reservierbar: currentItem.Reservierbar !== false,
|
||||||
|
};
|
||||||
|
|
||||||
|
const codeByItemId = new Map(codeInputs.map(input => [input.dataset.itemId, (input.value || '').trim()]));
|
||||||
|
const groupMembers = editLibraryState.groupMembers.length > 0 ? editLibraryState.groupMembers : [currentItem];
|
||||||
|
const isGroupedEdit = Boolean(currentItem.SeriesGroupId) && groupMembers.length > 1;
|
||||||
|
|
||||||
|
// API-Aufruf
|
||||||
try {
|
try {
|
||||||
if (isGroupedEdit) {
|
if (isGroupedEdit) {
|
||||||
const payload = {
|
const payload = {
|
||||||
@@ -1467,36 +1493,12 @@
|
|||||||
console.error('Update failed:', error);
|
console.error('Update failed:', error);
|
||||||
alert('Netzwerkfehler beim Aktualisieren des Mediums.');
|
alert('Netzwerkfehler beim Aktualisieren des Mediums.');
|
||||||
}
|
}
|
||||||
editForm.addEventListener('submit', async function (e) {
|
|
||||||
e.preventDefault();
|
|
||||||
|
|
||||||
const itemId = document.getElementById('editLibraryItemId').value;
|
|
||||||
const currentItem = libraryItems.find(i => i._id === itemId);
|
|
||||||
if (!currentItem) return;
|
|
||||||
|
|
||||||
const codeInputs = Array.from(document.querySelectorAll('#editLibraryCodesContainer input[data-item-id]'));
|
|
||||||
|
|
||||||
const sharedPayload = {
|
|
||||||
name: document.getElementById('editLibraryName').value,
|
|
||||||
item_type: document.getElementById('editLibraryType').value,
|
|
||||||
isbn: document.getElementById('editLibraryIsbn').value,
|
|
||||||
ort: document.getElementById('editLibraryLocation').value,
|
|
||||||
beschreibung: document.getElementById('editLibraryDescription').value,
|
|
||||||
ansch_jahr: currentItem.Anschaffungsjahr || '',
|
|
||||||
ansch_kost: currentItem.Anschaffungskosten || '',
|
|
||||||
reservierbar: currentItem.Reservierbar !== false,
|
|
||||||
};
|
|
||||||
const codeByItemId = new Map(codeInputs.map(input => [input.dataset.itemId, (input.value || '').trim()]));
|
|
||||||
const groupMembers = editLibraryState.groupMembers.length > 0 ? editLibraryState.groupMembers : [currentItem];
|
|
||||||
const isGroupedEdit = Boolean(currentItem.SeriesGroupId) && groupMembers.length > 1;
|
|
||||||
|
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
async function fetchLibraryGroupMembers(seriesGroupId) {
|
async function fetchLibraryGroupMembers(seriesGroupId) {
|
||||||
if (!seriesGroupId) return [];
|
if (!seriesGroupId) return [];
|
||||||
|
|
||||||
try {
|
try {
|
||||||
const response = await fetch(`/api/library_group/${encodeURIComponent(seriesGroupId)}`);
|
const response = await fetch(`/api/library_group/${encodeURIComponent(seriesGroupId)}`);
|
||||||
if (!response.ok) {
|
if (!response.ok) {
|
||||||
@@ -1571,7 +1573,7 @@
|
|||||||
editLibraryState.seriesGroupId = item.SeriesGroupId || '';
|
editLibraryState.seriesGroupId = item.SeriesGroupId || '';
|
||||||
editLibraryState.groupMembers = [];
|
editLibraryState.groupMembers = [];
|
||||||
|
|
||||||
// 1. Felder befüllen
|
// Felder befüllen
|
||||||
document.getElementById('editLibraryItemId').value = item._id;
|
document.getElementById('editLibraryItemId').value = item._id;
|
||||||
document.getElementById('editLibraryName').value = item.Name;
|
document.getElementById('editLibraryName').value = item.Name;
|
||||||
document.getElementById('editLibraryType').value = item.ItemType;
|
document.getElementById('editLibraryType').value = item.ItemType;
|
||||||
@@ -1593,7 +1595,6 @@
|
|||||||
function closeEditLibraryModal() {
|
function closeEditLibraryModal() {
|
||||||
document.getElementById('editLibraryModal').style.display = 'none';
|
document.getElementById('editLibraryModal').style.display = 'none';
|
||||||
}
|
}
|
||||||
}
|
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<div id="editLibraryModal" class="modal" style="display:none;">
|
<div id="editLibraryModal" class="modal" style="display:none;">
|
||||||
|
|||||||
Reference in New Issue
Block a user