@@ -986,7 +993,7 @@ function renderAdminGruppen(gruppen) {
▶
@@ -1262,6 +1269,7 @@ function openGruppeModal(editId) {
document.getElementById('gName').value = g.name || '';
document.getElementById('gVon').value = g.von || '';
document.getElementById('gDesc').value = g.beschreibung || '';
+ document.getElementById('gVanilla').checked = g.vanillaAvailable || false;
const imgWrap = document.getElementById('gCurrentImgWrap');
if (g.bild) { document.getElementById('gCurrentImg').src = 'data:image/png;base64,' + g.bild; imgWrap.style.display = 'flex'; }
else imgWrap.style.display = 'none';
@@ -1270,6 +1278,7 @@ function openGruppeModal(editId) {
document.getElementById('gName').value = '';
document.getElementById('gVon').value = '';
document.getElementById('gDesc').value = '';
+ document.getElementById('gVanilla').checked = false;
document.getElementById('gCurrentImgWrap').style.display = 'none';
}
gruppeModal.classList.add('open');
@@ -1348,7 +1357,7 @@ gruppeModalSave.addEventListener('click', async () => {
let bildBase64 = null;
const fi = document.getElementById('gBild');
if (fi.files.length > 0) bildBase64 = await toBase64(fi.files[0]);
- const payload = { name, von: document.getElementById('gVon').value.trim() || null, beschreibung: document.getElementById('gDesc').value.trim() || null, bild: bildBase64 };
+ const payload = { name, von: document.getElementById('gVon').value.trim() || null, beschreibung: document.getElementById('gDesc').value.trim() || null, vanillaAvailable: document.getElementById('gVanilla').checked, bild: bildBase64 };
const isEdit = currentEditGruppeId != null;
fetch(isEdit ? `/admin/aufgabengruppen/${currentEditGruppeId}` : '/admin/aufgabengruppen', {
method: isEdit ? 'PUT' : 'POST', headers: { 'Content-Type': 'application/json' }, body: JSON.stringify(payload)
diff --git a/bin/main/static/community/event-detail.html b/bin/main/static/community/event-detail.html
index 4d8fa3b..63b13f4 100644
--- a/bin/main/static/community/event-detail.html
+++ b/bin/main/static/community/event-detail.html
@@ -195,6 +195,7 @@ function renderPage(evt) {
const totalAttendees = (evt.attendees || []).length;
const attending = evt.attendingMe;
+ const isPast = new Date(evt.startAt) < new Date();
document.getElementById('content').innerHTML = `
` : ''}
Vergangene Veranstaltungen
@@ -517,8 +520,8 @@ function renderPage() {
${locHeaderHtml}
${hoursHtml}
${gallerySection}
- ${feedSection}
- ${eventsSection}`;
+ ${eventsSection}
+ ${feedSection}`;
}
}
@@ -587,15 +590,27 @@ async function loadEvents() {
if (!list) return;
const now = new Date();
- const future = events.filter(e => new Date(e.startAt) >= now);
+ const future = events.filter(e => new Date(e.startAt) >= now)
+ .sort((a, b) => new Date(a.startAt) - new Date(b.startAt));
const past = events.filter(e => new Date(e.startAt) < now)
- .slice(-5) // letzte 5
+ .slice(-3) // letzte 3
.reverse(); // neueste zuerst
- list.innerHTML = future.length
- ? future.map(e => buildEventCard(e, false)).join('')
+ const preview = future.slice(0, 3);
+ list.innerHTML = preview.length
+ ? preview.map(e => buildEventCard(e, false)).join('')
: '
Keine bevorstehenden Veranstaltungen.
';
+ const linkWrap = document.getElementById('allEventsLinkWrap');
+ if (linkWrap) {
+ if (future.length > 3) {
+ document.getElementById('allEventsLink').href = `/community/location-events.html?id=${locationId}`;
+ linkWrap.style.display = '';
+ } else {
+ linkWrap.style.display = 'none';
+ }
+ }
+
const pastSection = document.getElementById('pastEventsSection');
if (past.length && pastSection) {
document.getElementById('pastEventList').innerHTML = past.map(e => buildEventCard(e, true)).join('');
@@ -1358,11 +1373,15 @@ function renderLocPost(p) {
` : '';
+ const authorUrl = p.posterType === 'LOCATION'
+ ? `/community/location-detail.html?id=${p.locationId || p.authorId}`
+ : `/community/benutzer.html?userId=${p.authorId}`;
+
return `