Compare commits
4
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
3c9eb7091f | ||
|
|
7abcac5f04 | ||
|
|
742c5d5b56 | ||
|
|
0952d6de13 |
No files matched your search
+205
-17
@@ -1,10 +1,15 @@
|
||||
<?php
|
||||
include_once __DIR__ . '/../controller/DatabaseController.php';
|
||||
include_once __DIR__ . '/../controller/RoutesController.php';
|
||||
include_once __DIR__ . '/../modules/ConsoleLog.php';
|
||||
|
||||
$conn = db_connect();
|
||||
$view = $_GET['view'] ?? 'show';
|
||||
$selectedService = $_GET['service'] ?? null;
|
||||
$view = $_GET['view'] ?? 'show';
|
||||
$selectedService = $_GET['service'] ?? null;
|
||||
|
||||
// --- Suchfilter auslesen ---
|
||||
$searchWer = $_GET['search_wer'] ?? '';
|
||||
$searchWas = $_GET['search_was'] ?? '';
|
||||
|
||||
// --- LOGIK: Überstunden-Eintrag (Abbau) speichern ---
|
||||
if ($_SERVER['REQUEST_METHOD'] === 'POST' && isset($_POST['add_entry'])) {
|
||||
@@ -14,10 +19,10 @@ if ($_SERVER['REQUEST_METHOD'] === 'POST' && isset($_POST['add_entry'])) {
|
||||
$rueckgabe = $_POST['rueckgabe'];
|
||||
|
||||
DatabaseInsert(
|
||||
"Vergabe",
|
||||
"WAS, WER, WANN, RUECKGABE",
|
||||
$was,
|
||||
$wer,
|
||||
"Vergabe",
|
||||
"WAS, WER, WANN, RUECKGABE",
|
||||
$was,
|
||||
$wer,
|
||||
$wann,
|
||||
$rueckgabe
|
||||
);
|
||||
@@ -29,16 +34,47 @@ if ($_SERVER['REQUEST_METHOD'] === 'POST' && isset($_POST['add_entry'])) {
|
||||
if ($_SERVER['REQUEST_METHOD'] === 'POST' && isset($_POST['delete_entry'])) {
|
||||
$id = $_POST['id'];
|
||||
|
||||
DatabaseDelete("Vergabe", "ID = ?", $id);
|
||||
ConsoleLog("$id");
|
||||
|
||||
DatabaseUpdate(
|
||||
"Vergabe",
|
||||
"STATUS = ?",
|
||||
"ID = ?",
|
||||
1,
|
||||
$id
|
||||
);
|
||||
|
||||
redirectToWebsite((new getSpecificData())->getReferer());
|
||||
exit;
|
||||
}
|
||||
|
||||
// --- Dynamic Query mit kombiniertem Suchfilter ---
|
||||
$whereClause = "STATUS IS NULL";
|
||||
if (!empty($searchWer)) {
|
||||
$whereClause .= " AND WER LIKE '%" . $conn->real_escape_string($searchWer) . "%'";
|
||||
}
|
||||
if (!empty($searchWas)) {
|
||||
$whereClause .= " AND WAS LIKE '%" . $conn->real_escape_string($searchWas) . "%'";
|
||||
}
|
||||
|
||||
$entries = DatabaseShow(
|
||||
"Vergabe"
|
||||
"Vergabe",
|
||||
"ID, WAS, WER, WANN, RUECKGABE",
|
||||
$whereClause
|
||||
);
|
||||
|
||||
$searchEntries = DatabaseShow(
|
||||
"Vergabe",
|
||||
);
|
||||
|
||||
$existingWas = [];
|
||||
$existingWer = [];
|
||||
foreach ($searchEntries as $entry) {
|
||||
if (!empty($entry['WAS'])) $existingWas[$entry['WAS']] = true;
|
||||
if (!empty($entry['WER'])) $existingWer[$entry['WER']] = true;
|
||||
}
|
||||
$existingWas = array_keys($existingWas);
|
||||
$existingWer = array_keys($existingWer);
|
||||
?>
|
||||
|
||||
<div class="arbeitsberichte-wrapper">
|
||||
@@ -55,25 +91,73 @@ $entries = DatabaseShow(
|
||||
<input type="date" name="rueckgabe" value="<?= date('Y-m-d') ?>" required>
|
||||
</div>
|
||||
|
||||
<div class="form-group">
|
||||
<div class="form-group autocomplete-wrapper">
|
||||
<label>An wen</label>
|
||||
<input type="text" name="wer" placeholder="Name eingeben" required>
|
||||
<input type="text" name="wer" id="wer-input" placeholder="Name eingeben" required autocomplete="off">
|
||||
<div class="autocomplete-suggestions" id="wer-suggestions"></div>
|
||||
</div>
|
||||
|
||||
<div class="form-group">
|
||||
<div class="form-group autocomplete-wrapper">
|
||||
<label>Was</label>
|
||||
<input type="text" name="was" placeholder="Gegenstand eingeben" required>
|
||||
<input type="text" name="was" id="was-input" placeholder="Gegenstand eingeben" required autocomplete="off">
|
||||
<div class="autocomplete-suggestions" id="was-suggestions"></div>
|
||||
</div>
|
||||
|
||||
<button type="submit" name="add_entry" class="btn-submit-vergabe">
|
||||
💾 Speichern
|
||||
Speichern
|
||||
</button>
|
||||
|
||||
</form>
|
||||
</div>
|
||||
|
||||
<div class="vergabe-form" style="margin-top: 30px;">
|
||||
<form method="GET" action="" class="vergabe-grid" id="search-form">
|
||||
<input type="hidden" name="view" value="<?= htmlspecialchars($view) ?>">
|
||||
<?php if ($selectedService): ?>
|
||||
<input type="hidden" name="service" value="<?= htmlspecialchars($selectedService) ?>">
|
||||
<?php endif; ?>
|
||||
|
||||
<div class="form-group autocomplete-wrapper">
|
||||
<label for="search-wer-input">Nach Person filtern</label>
|
||||
<input type="text" name="search_wer" id="search-wer-input" value="<?= htmlspecialchars($searchWer) ?>" placeholder="Name eingeben..." autocomplete="off">
|
||||
<div class="autocomplete-suggestions" id="search-wer-suggestions"></div>
|
||||
</div>
|
||||
|
||||
<div class="form-group autocomplete-wrapper">
|
||||
<label for="search-was-input">Nach Gegenstand filtern</label>
|
||||
<input type="text" name="search_was" id="search-was-input" value="<?= htmlspecialchars($searchWas) ?>" placeholder="Gegenstand eingeben..." autocomplete="off">
|
||||
<div class="autocomplete-suggestions" id="search-was-suggestions"></div>
|
||||
</div>
|
||||
|
||||
<div style="display: flex; gap: 10px; align-items: flex-end;">
|
||||
<button type="submit" class="btn-submit-vergabe" style="margin: 0; flex-grow: 1;">
|
||||
Suchen
|
||||
</button>
|
||||
|
||||
<?php if (!empty($searchWer) || !empty($searchWas)): ?>
|
||||
<a href="?view=<?= urlencode($view) ?><?= $selectedService ? '&service=' . urlencode($selectedService) : '' ?>" class="btn-delete" style="text-decoration: none; padding: 10px; display: inline-block; text-align: center; white-space: nowrap; margin: 0;">
|
||||
Zurücksetzen
|
||||
</a>
|
||||
<?php endif; ?>
|
||||
</div>
|
||||
</form>
|
||||
</div>
|
||||
|
||||
<div class="table-container" style="margin-top: 30px;">
|
||||
<h3>Aktuelle Vergaben</h3>
|
||||
|
||||
<h3>
|
||||
<?php
|
||||
if (!empty($searchWer) && !empty($searchWas)) {
|
||||
echo "Gefiltert nach: " . htmlspecialchars($searchWer) . " ➔ " . htmlspecialchars($searchWas);
|
||||
} elseif (!empty($searchWer)) {
|
||||
echo "Vergaben für: " . htmlspecialchars($searchWer);
|
||||
} elseif (!empty($searchWas)) {
|
||||
echo "Ausgeliehene Gegenstände: " . htmlspecialchars($searchWas);
|
||||
} else {
|
||||
echo "Aktuelle Vergaben";
|
||||
}
|
||||
?>
|
||||
</h3>
|
||||
|
||||
<?php if (!empty($entries)): ?>
|
||||
<table class="db-table mobile-responsive-table">
|
||||
<thead>
|
||||
@@ -96,7 +180,7 @@ $entries = DatabaseShow(
|
||||
<form method="POST" onsubmit="return confirm('Möchtest du diesen Eintrag wirklich löschen?');" style="margin: 0;">
|
||||
<input type="hidden" name="id" value="<?= $entry['ID'] ?? '' ?>">
|
||||
<button type="submit" name="delete_entry" class="btn-delete">
|
||||
🗑️ Löschen
|
||||
Löschen
|
||||
</button>
|
||||
</form>
|
||||
</td>
|
||||
@@ -108,4 +192,108 @@ $entries = DatabaseShow(
|
||||
<p>Keine Einträge vorhanden.</p>
|
||||
<?php endif; ?>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<script>
|
||||
// Parameter `submitOnSelect` hinzugefügt (Standard: false)
|
||||
function setupAutocomplete(inputId, suggestionsId, data, submitOnSelect = false) {
|
||||
const input = document.getElementById(inputId);
|
||||
const box = document.getElementById(suggestionsId);
|
||||
if (!input || !box) return;
|
||||
|
||||
let items = [];
|
||||
let activeIndex = -1;
|
||||
|
||||
function render(list) {
|
||||
box.innerHTML = '';
|
||||
items = list;
|
||||
activeIndex = -1;
|
||||
if (list.length === 0) {
|
||||
box.style.display = 'none';
|
||||
return;
|
||||
}
|
||||
list.forEach((val, i) => {
|
||||
const div = document.createElement('div');
|
||||
div.textContent = val;
|
||||
div.addEventListener('mousedown', (e) => {
|
||||
e.preventDefault();
|
||||
selectItem(i);
|
||||
});
|
||||
box.appendChild(div);
|
||||
});
|
||||
box.style.display = 'block';
|
||||
}
|
||||
|
||||
function updateActive() {
|
||||
[...box.children].forEach((el, i) => {
|
||||
el.classList.toggle('active', i === activeIndex);
|
||||
});
|
||||
if (activeIndex >= 0) {
|
||||
box.children[activeIndex].scrollIntoView({
|
||||
block: 'nearest'
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
function selectItem(i) {
|
||||
if (items[i] !== undefined) {
|
||||
input.value = items[i];
|
||||
}
|
||||
box.style.display = 'none';
|
||||
activeIndex = -1;
|
||||
|
||||
// NEU: Wenn gewünscht, schicke das übergeordnete Formular sofort ab
|
||||
if (submitOnSelect) {
|
||||
const form = input.closest('form');
|
||||
if (form) form.submit();
|
||||
}
|
||||
}
|
||||
|
||||
input.addEventListener('input', () => {
|
||||
const val = input.value.toLowerCase();
|
||||
if (val.length === 0) {
|
||||
box.style.display = 'none';
|
||||
return;
|
||||
}
|
||||
const filtered = data.filter(d => d.toLowerCase().includes(val));
|
||||
render(filtered);
|
||||
});
|
||||
|
||||
input.addEventListener('keydown', (e) => {
|
||||
if (box.style.display !== 'block') return;
|
||||
|
||||
if (e.key === 'ArrowDown') {
|
||||
e.preventDefault();
|
||||
activeIndex = Math.min(activeIndex + 1, items.length - 1);
|
||||
updateActive();
|
||||
} else if (e.key === 'ArrowUp') {
|
||||
e.preventDefault();
|
||||
activeIndex = Math.max(activeIndex - 1, 0);
|
||||
updateActive();
|
||||
} else if (e.key === 'Tab' || e.key === 'Enter') {
|
||||
if (activeIndex >= 0) {
|
||||
e.preventDefault();
|
||||
selectItem(activeIndex);
|
||||
} else {
|
||||
box.style.display = 'none';
|
||||
}
|
||||
} else if (e.key === 'Escape') {
|
||||
box.style.display = 'none';
|
||||
}
|
||||
});
|
||||
|
||||
document.addEventListener('click', (e) => {
|
||||
if (e.target !== input) {
|
||||
box.style.display = 'none';
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
// 1. Normales Autocomplete für das Eintragungs-Formular (schickt nicht automatisch ab)
|
||||
setupAutocomplete('was-input', 'was-suggestions', <?= json_encode($existingWas) ?>);
|
||||
setupAutocomplete('wer-input', 'wer-suggestions', <?= json_encode($existingWer) ?>);
|
||||
|
||||
// 2. Such-Autocomplete: Hier wird als 4. Parameter `true` übergeben, damit sofort abgesendet wird!
|
||||
setupAutocomplete('search-wer-input', 'search-wer-suggestions', <?= json_encode($existingWer) ?>, true);
|
||||
setupAutocomplete('search-was-input', 'search-was-suggestions', <?= json_encode($existingWas) ?>, true);
|
||||
</script>
|
||||
@@ -1401,4 +1401,39 @@ body.dark-mode .berichte-form input:focus {
|
||||
margin: 15px;
|
||||
padding: 20px;
|
||||
}
|
||||
}
|
||||
|
||||
.autocomplete-wrapper {
|
||||
position: relative;
|
||||
}
|
||||
|
||||
.autocomplete-suggestions {
|
||||
display: none;
|
||||
position: absolute;
|
||||
top: 100%;
|
||||
left: 0;
|
||||
right: 0;
|
||||
background: var(--card-bg);
|
||||
color: var(--text);
|
||||
border: 1px solid var(--input-border);
|
||||
border-top: none;
|
||||
max-height: 180px;
|
||||
overflow-y: auto;
|
||||
z-index: 1000;
|
||||
box-shadow: 0 4px 8px rgba(0, 0, 0, 0.15);
|
||||
}
|
||||
|
||||
.autocomplete-suggestions div {
|
||||
padding: 8px 10px;
|
||||
cursor: pointer;
|
||||
}
|
||||
|
||||
.autocomplete-suggestions div:hover,
|
||||
.autocomplete-suggestions div.active {
|
||||
background: rgba(0, 123, 255, 0.15);
|
||||
}
|
||||
|
||||
body.dark-mode .autocomplete-suggestions div:hover,
|
||||
body.dark-mode .autocomplete-suggestions div.active {
|
||||
background: rgba(0, 123, 255, 0.25);
|
||||
}
|
||||
Reference in new issue
Block a user