Compare commits

..

24 Commits

Author SHA1 Message Date
Jürgen Mummert 68e991c053 feat: add frontend map module with maplibre and spiderfy 2026-02-24 18:24:10 +01:00
Jürgen Mummert 8aa09e893b Switch event filter selects back to native controls 2026-02-24 17:46:25 +01:00
Jürgen Mummert ac203b37ce Persist event filter state across reload and navigation 2026-02-23 21:54:27 +01:00
Jürgen Mummert 4b62e72382 Add svg class support for organization logo figures 2026-02-23 21:40:30 +01:00
Jürgen Mummert 97e4f639a0 Use Tom Select CDN major version 2 2026-02-23 21:28:15 +01:00
Jürgen Mummert b714bbeb1b Blur Tom Select only for mouse and touch selection 2026-02-23 21:22:59 +01:00
Jürgen Mummert 21c18f94a0 Improve Tom Select usability and accessibility defaults 2026-02-23 20:54:25 +01:00
Jürgen Mummert 0402c74824 Fix Tom Select input wrapping and restore arrow icon 2026-02-23 20:49:26 +01:00
Jürgen Mummert e3c13c989b Keep Tom Select setup core-only 2026-02-23 20:43:43 +01:00
Jürgen Mummert 15db77186b Add Tom Select arrow and disable input autocomplete 2026-02-23 20:38:21 +01:00
Jürgen Mummert 573d5c12e5 Configure Tom Select placeholders and sortable options 2026-02-23 20:28:50 +01:00
Jürgen Mummert 2bd9f6849c Use Tom Select defaults for event filter 2026-02-23 20:23:23 +01:00
Jürgen Mummert 0e0a888fa9 Replace SlimSelect with Tom Select in event filter 2026-02-23 20:16:40 +01:00
Jürgen Mummert 5d3905632d Fix SlimSelect dropdown scrolling regression 2026-02-23 20:03:08 +01:00
Jürgen Mummert fce467fa87 Harden SlimSelect scroll lock on macOS browsers 2026-02-23 20:00:36 +01:00
Jürgen Mummert f08406ec12 Fix SlimSelect scroll chaining in sticky event filter 2026-02-23 19:57:54 +01:00
Jürgen Mummert f3d4c857e0 Harden organization listing tag enrichment and simplify listener 2026-02-22 17:53:17 +01:00
Jürgen Mummert ff608f7833 Fix organization listing numeric tag rendering and template mapping 2026-02-22 17:41:36 +01:00
Jürgen Mummert 00f65ffd45 Fix nullable logger guard in organization listing listener 2026-02-22 17:12:29 +01:00
Jürgen Mummert 142cab2203 Broaden organization tag enrichment fallbacks for production data variants 2026-02-22 17:10:39 +01:00
Jürgen Mummert acf3d02d13 Add diagnostics for unresolved org tag enrichment rows 2026-02-22 17:06:08 +01:00
Jürgen Mummert add43674cf Add title-based tag enrichment fallback for listing rows 2026-02-22 17:04:01 +01:00
Jürgen Mummert a04c6de362 Add fallback tag relation lookup for organization listing 2026-02-22 17:02:56 +01:00
Jürgen Mummert f8cd256348 Fix org listing data-tags and keep template project-specific 2026-02-22 17:00:04 +01:00
11 changed files with 964 additions and 380 deletions
+2
View File
@@ -14,3 +14,5 @@ services:
tags: tags:
- { name: contao.callback, table: tl_organization, target: config.onbeforesubmit, method: onBeforeSubmit } - { name: contao.callback, table: tl_organization, target: config.onbeforesubmit, method: onBeforeSubmit }
- { name: contao.callback, table: tl_location, target: config.onbeforesubmit, method: onBeforeSubmit } - { name: contao.callback, table: tl_location, target: config.onbeforesubmit, method: onBeforeSubmit }
MummertMedia\EventManagerBundle\Service\MapModuleDataProvider: ~
+14
View File
@@ -3,11 +3,13 @@
declare(strict_types=1); declare(strict_types=1);
use Contao\Database; use Contao\Database;
use Contao\Controller;
use Contao\StringUtil; use Contao\StringUtil;
$GLOBALS['TL_DCA']['tl_module']['palettes']['member_organizations'] = '{title_legend},name,headline,type;{eventmanager_legend},editPage;{protected_legend:hide},protected;{expert_legend:hide},guests,cssID'; $GLOBALS['TL_DCA']['tl_module']['palettes']['member_organizations'] = '{title_legend},name,headline,type;{eventmanager_legend},editPage;{protected_legend:hide},protected;{expert_legend:hide},guests,cssID';
$GLOBALS['TL_DCA']['tl_module']['palettes']['member_events'] = '{title_legend},name,headline,type;{eventmanager_legend},editPage;{protected_legend:hide},protected;{expert_legend:hide},guests,cssID'; $GLOBALS['TL_DCA']['tl_module']['palettes']['member_events'] = '{title_legend},name,headline,type;{eventmanager_legend},editPage;{protected_legend:hide},protected;{expert_legend:hide},guests,cssID';
$GLOBALS['TL_DCA']['tl_module']['palettes']['event_filter'] = '{title_legend},name,headline,type;{eventmanager_legend},cal_calendar,eventListDomId;{protected_legend:hide},protected;{expert_legend:hide},guests,cssID'; $GLOBALS['TL_DCA']['tl_module']['palettes']['event_filter'] = '{title_legend},name,headline,type;{eventmanager_legend},cal_calendar,eventListDomId;{protected_legend:hide},protected;{expert_legend:hide},guests,cssID';
$GLOBALS['TL_DCA']['tl_module']['palettes']['eventmanager_map'] = '{title_legend},name,headline,type;{protected_legend:hide},protected;{expert_legend:hide},guests,cssID';
$GLOBALS['TL_DCA']['tl_module']['palettes']['organization_edit'] = '{title_legend},name,headline,type;{eventmanager_legend},listPage,logoFolder,organizationTypeTags;{protected_legend:hide},protected;{expert_legend:hide},guests,cssID'; $GLOBALS['TL_DCA']['tl_module']['palettes']['organization_edit'] = '{title_legend},name,headline,type;{eventmanager_legend},listPage,logoFolder,organizationTypeTags;{protected_legend:hide},protected;{expert_legend:hide},guests,cssID';
$GLOBALS['TL_DCA']['tl_module']['palettes']['event_edit'] = '{title_legend},name,headline,type;{eventmanager_legend},listPage,eventFolder,termsPage,frontendAuthorId,frontendArchiveId,eventTypeTags;{protected_legend:hide},protected;{expert_legend:hide},guests,cssID'; $GLOBALS['TL_DCA']['tl_module']['palettes']['event_edit'] = '{title_legend},name,headline,type;{eventmanager_legend},listPage,eventFolder,termsPage,frontendAuthorId,frontendArchiveId,eventTypeTags;{protected_legend:hide},protected;{expert_legend:hide},guests,cssID';
@@ -157,3 +159,15 @@ $GLOBALS['TL_DCA']['tl_module']['fields']['eventListDomId'] = [
'eval' => ['includeBlankOption' => true, 'chosen' => true, 'tl_class' => 'w50'], 'eval' => ['includeBlankOption' => true, 'chosen' => true, 'tl_class' => 'w50'],
'sql' => ['type' => 'string', 'length' => 128, 'default' => ''], 'sql' => ['type' => 'string', 'length' => 128, 'default' => ''],
]; ];
if (isset($GLOBALS['TL_DCA']['tl_module']['fields']['list_layout'])) {
$GLOBALS['TL_DCA']['tl_module']['fields']['list_layout']['options_callback'] = static function (): array {
$options = Controller::getTemplateGroup('list_');
if (!isset($options['list_default_organisationen'])) {
$options['list_default_organisationen'] = 'list_default_organisationen';
}
return $options;
};
}
+1
View File
@@ -10,4 +10,5 @@ $GLOBALS['TL_LANG']['FMD']['member_organizations'] = ['Meine Organisationen', 'L
$GLOBALS['TL_LANG']['FMD']['organization_edit'] = ['Organisation bearbeiten', 'Bearbeitungsformular für eine Organisation.']; $GLOBALS['TL_LANG']['FMD']['organization_edit'] = ['Organisation bearbeiten', 'Bearbeitungsformular für eine Organisation.'];
$GLOBALS['TL_LANG']['FMD']['member_events'] = ['Meine Veranstaltungen', 'Listet Veranstaltungen der zugeordneten Organisationen auf.']; $GLOBALS['TL_LANG']['FMD']['member_events'] = ['Meine Veranstaltungen', 'Listet Veranstaltungen der zugeordneten Organisationen auf.'];
$GLOBALS['TL_LANG']['FMD']['event_filter'] = ['Eventfilter', 'Filter für kommende Veranstaltungen (Tags, Orte, Veranstalter).']; $GLOBALS['TL_LANG']['FMD']['event_filter'] = ['Eventfilter', 'Filter für kommende Veranstaltungen (Tags, Orte, Veranstalter).'];
$GLOBALS['TL_LANG']['FMD']['eventmanager_map'] = ['Eventkarte', 'Zeigt Veranstaltungsorte, Organisationen und Events auf einer Karte an.'];
$GLOBALS['TL_LANG']['FMD']['event_edit'] = ['Veranstaltung bearbeiten', 'Bearbeitungsformular für eine Veranstaltung.']; $GLOBALS['TL_LANG']['FMD']['event_edit'] = ['Veranstaltung bearbeiten', 'Bearbeitungsformular für eine Veranstaltung.'];
+1
View File
@@ -10,4 +10,5 @@ $GLOBALS['TL_LANG']['FMD']['member_organizations'] = ['My organizations', 'Lists
$GLOBALS['TL_LANG']['FMD']['organization_edit'] = ['Edit organization', 'Edit form for one organization.']; $GLOBALS['TL_LANG']['FMD']['organization_edit'] = ['Edit organization', 'Edit form for one organization.'];
$GLOBALS['TL_LANG']['FMD']['member_events'] = ['My events', 'Lists events of the member organizations.']; $GLOBALS['TL_LANG']['FMD']['member_events'] = ['My events', 'Lists events of the member organizations.'];
$GLOBALS['TL_LANG']['FMD']['event_filter'] = ['Event filter', 'Filters upcoming events (tags, locations, organizers).']; $GLOBALS['TL_LANG']['FMD']['event_filter'] = ['Event filter', 'Filters upcoming events (tags, locations, organizers).'];
$GLOBALS['TL_LANG']['FMD']['eventmanager_map'] = ['Event map', 'Displays locations, organizations and events on a map.'];
$GLOBALS['TL_LANG']['FMD']['event_edit'] = ['Edit event', 'Edit form for one event.']; $GLOBALS['TL_LANG']['FMD']['event_edit'] = ['Edit event', 'Edit form for one event.'];
+149 -60
View File
@@ -2,8 +2,8 @@
<div class="select-filters"> <div class="select-filters">
<div class="widget-select category"> <div class="widget-select category">
<label for="tag-filter" class="visually-hidden">Kategorie wählen</label> <label for="tag-filter" class="visually-hidden">Kategorie wählen</label>
<select id="tag-filter"> <select id="tag-filter" placeholder="Kategorie wählen" autocomplete="off">
<option value="all" data-placeholder="true">Kategorie wählen</option> <option value="">Kategorie wählen</option>
{% for tag in tagButtons|default([]) %} {% for tag in tagButtons|default([]) %}
<option value="tag-{{ tag.id }}">{{ tag.title }} ({{ tag.count }})</option> <option value="tag-{{ tag.id }}">{{ tag.title }} ({{ tag.count }})</option>
{% endfor %} {% endfor %}
@@ -12,8 +12,8 @@
<div class="widget-select places"> <div class="widget-select places">
<label for="location-filter" class="visually-hidden">Ort wählen</label> <label for="location-filter" class="visually-hidden">Ort wählen</label>
<select id="location-filter"> <select id="location-filter" placeholder="Ort wählen" autocomplete="off">
<option value="all" data-placeholder="true">Ort wählen</option> <option value="">Ort wählen</option>
{% for location in locations|default([]) %} {% for location in locations|default([]) %}
<option value="location-{{ location.id }}">{{ location.title }} ({{ location.count }})</option> <option value="location-{{ location.id }}">{{ location.title }} ({{ location.count }})</option>
{% endfor %} {% endfor %}
@@ -22,8 +22,8 @@
<div class="widget-select org"> <div class="widget-select org">
<label for="org-filter" class="visually-hidden">Veranstalter wählen</label> <label for="org-filter" class="visually-hidden">Veranstalter wählen</label>
<select id="org-filter"> <select id="org-filter" placeholder="Veranstalter wählen" autocomplete="off">
<option value="all" data-placeholder="true">Veranstalter wählen</option> <option value="">Veranstalter wählen</option>
{% for organization in organizations|default([]) %} {% for organization in organizations|default([]) %}
<option value="org-{{ organization.id }}">{{ organization.title }} ({{ organization.count }})</option> <option value="org-{{ organization.id }}">{{ organization.title }} ({{ organization.count }})</option>
{% endfor %} {% endfor %}
@@ -31,7 +31,7 @@
</div> </div>
</div> </div>
<button type="button" id="eventfilter-reset" class="eventfilter-reset" hidden>Filter zurücksetzen</button> <button type="button" id="eventfilter-reset" class="eventfilter-reset" aria-label="Alle Filter zurücksetzen" aria-controls="{{ targetEventListId|default('eventlist')|e('html_attr') }}" hidden>Filter zurücksetzen</button>
<p id="eventfilter-status" class="visually-hidden" aria-live="polite"></p> <p id="eventfilter-status" class="visually-hidden" aria-live="polite"></p>
</div> </div>
@@ -68,23 +68,21 @@
pointer-events: none; pointer-events: none;
} }
#eventfilters .widget-select.active .ss-main { #eventfilters .widget-select.active select {
outline: 2px solid currentColor; outline: 3px solid currentColor;
outline-offset: 2px; outline-offset: 3px;
} }
#eventfilters .ss-main:focus-visible { #eventfilters select:focus-visible {
outline: 2px solid currentColor; outline: 3px solid currentColor;
outline-offset: 2px; outline-offset: 3px;
} }
#eventfilters .eventfilter-reset[hidden] { #eventfilters .eventfilter-reset[hidden] {
display: none; display: none;
} }
</style>
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/slim-select@3/dist/slimselect.css"> </style>
<script src="https://cdn.jsdelivr.net/npm/slim-select@3/dist/slimselect.min.js"></script>
<script type="module"> <script type="module">
const filters = document.getElementById('eventfilters'); const filters = document.getElementById('eventfilters');
@@ -111,31 +109,118 @@
const orgWidget = orgSelect?.closest('.widget-select'); const orgWidget = orgSelect?.closest('.widget-select');
const resetButton = filters.querySelector('#eventfilter-reset'); const resetButton = filters.querySelector('#eventfilter-reset');
const status = filters.querySelector('#eventfilter-status'); const status = filters.querySelector('#eventfilter-status');
const stateStorageKey = 'event-filter-state';
const stateQueryKey = 'event_filter';
const animationMs = 220; const animationMs = 220;
let hideTimers = new WeakMap(); let hideTimers = new WeakMap();
let currentFilter = { type: 'all', value: 'all' }; let currentFilter = { type: 'all', value: '' };
let suppressedChangeEvents = 0; let suppressedChangeEvents = 0;
const initSlimSelect = (selectElement) => { const hasOptionValue = (selectElement, value) => {
if (!selectElement || 'undefined' === typeof window.SlimSelect) { if (!selectElement) {
return null; return false;
} }
return new window.SlimSelect({ return Array.from(selectElement.options).some((option) => option.value === value);
select: selectElement,
settings: {
showSearch: false,
allowDeselect: false,
},
});
}; };
const tagSlim = initSlimSelect(tagSelect); const rawValueToFilterState = (rawValue) => {
const locationSlim = initSlimSelect(locationSelect); const value = (rawValue || '').trim();
const orgSlim = initSlimSelect(orgSelect);
const setSelectValue = (selectElement, slimInstance, value) => { if (!value) {
return { type: 'all', value: '' };
}
if (value.startsWith('tag-') && hasOptionValue(tagSelect, value)) {
return { type: 'tag', value: value.replace('tag-', '') };
}
if (value.startsWith('location-') && hasOptionValue(locationSelect, value)) {
return { type: 'location', value: value.replace('location-', '') };
}
if (value.startsWith('org-') && hasOptionValue(orgSelect, value)) {
return { type: 'org', value: value.replace('org-', '') };
}
return { type: 'all', value: '' };
};
const filterStateToRawValue = (filterState) => {
if (!filterState.value || filterState.type === 'all') {
return '';
}
if (filterState.type === 'tag') {
return `tag-${filterState.value}`;
}
if (filterState.type === 'location') {
return `location-${filterState.value}`;
}
if (filterState.type === 'org') {
return `org-${filterState.value}`;
}
return '';
};
const readUrlState = () => {
const url = new URL(window.location.href);
return (url.searchParams.get(stateQueryKey) || '').trim();
};
const writeUrlState = (value) => {
const url = new URL(window.location.href);
if (value) {
url.searchParams.set(stateQueryKey, value);
} else {
url.searchParams.delete(stateQueryKey);
}
window.history.replaceState(window.history.state, '', url);
};
const readStoredState = () => {
try {
return (window.sessionStorage.getItem(stateStorageKey) || '').trim();
} catch (error) {
return '';
}
};
const writeStoredState = (value) => {
try {
if (value) {
window.sessionStorage.setItem(stateStorageKey, value);
} else {
window.sessionStorage.removeItem(stateStorageKey);
}
} catch (error) {
// noop
}
};
const syncState = (filterState) => {
const rawValue = filterStateToRawValue(filterState);
writeStoredState(rawValue);
writeUrlState(rawValue);
};
const applyControlState = (filterState) => {
const tagValue = filterState.type === 'tag' ? `tag-${filterState.value}` : '';
const locationValue = filterState.type === 'location' ? `location-${filterState.value}` : '';
const orgValue = filterState.type === 'org' ? `org-${filterState.value}` : '';
setSelectValue(tagSelect, tagValue);
setSelectValue(locationSelect, locationValue);
setSelectValue(orgSelect, orgValue);
};
const setSelectValue = (selectElement, value) => {
if (!selectElement) { if (!selectElement) {
return; return;
} }
@@ -147,11 +232,7 @@
suppressedChangeEvents += 1; suppressedChangeEvents += 1;
try { try {
if (slimInstance) {
slimInstance.setSelected(value);
} else {
selectElement.value = value; selectElement.value = value;
}
} finally { } finally {
queueMicrotask(() => { queueMicrotask(() => {
suppressedChangeEvents = Math.max(0, suppressedChangeEvents - 1); suppressedChangeEvents = Math.max(0, suppressedChangeEvents - 1);
@@ -190,9 +271,9 @@
}; };
const setActiveControl = ({ type, value }) => { const setActiveControl = ({ type, value }) => {
const hasActiveTag = type === 'tag' && value !== 'all'; const hasActiveTag = type === 'tag' && Boolean(value);
const hasActiveLocation = type === 'location' && value !== 'all'; const hasActiveLocation = type === 'location' && Boolean(value);
const hasActiveOrg = type === 'org' && value !== 'all'; const hasActiveOrg = type === 'org' && Boolean(value);
tagWidget?.classList.toggle('active', hasActiveTag); tagWidget?.classList.toggle('active', hasActiveTag);
locationWidget?.classList.toggle('active', hasActiveLocation); locationWidget?.classList.toggle('active', hasActiveLocation);
@@ -209,7 +290,7 @@
.filter(Boolean); .filter(Boolean);
const matches = (eventItem, filterState) => { const matches = (eventItem, filterState) => {
if (filterState.value === 'all') { if (!filterState.value || filterState.type === 'all') {
return true; return true;
} }
@@ -225,10 +306,6 @@
return parseIdList(eventItem.dataset.org).includes(filterState.value); return parseIdList(eventItem.dataset.org).includes(filterState.value);
} }
if (filterState.type === 'all') {
return true;
}
return true; return true;
}; };
@@ -271,6 +348,7 @@
}); });
updateStatus(filterState); updateStatus(filterState);
syncState(filterState);
}; };
tagSelect?.addEventListener('change', () => { tagSelect?.addEventListener('change', () => {
@@ -280,12 +358,12 @@
const selectedValue = tagSelect.value; const selectedValue = tagSelect.value;
setSelectValue(locationSelect, locationSlim, 'all'); setSelectValue(locationSelect, '');
setSelectValue(orgSelect, orgSlim, 'all'); setSelectValue(orgSelect, '');
applyFilter( applyFilter(
selectedValue === 'all' !selectedValue
? { type: 'all', value: 'all' } ? { type: 'all', value: '' }
: { type: 'tag', value: selectedValue.replace('tag-', '') }, : { type: 'tag', value: selectedValue.replace('tag-', '') },
); );
}); });
@@ -297,12 +375,12 @@
const selectedValue = locationSelect.value; const selectedValue = locationSelect.value;
setSelectValue(tagSelect, tagSlim, 'all'); setSelectValue(tagSelect, '');
setSelectValue(orgSelect, orgSlim, 'all'); setSelectValue(orgSelect, '');
applyFilter( applyFilter(
selectedValue === 'all' !selectedValue
? { type: 'all', value: 'all' } ? { type: 'all', value: '' }
: { type: 'location', value: selectedValue.replace('location-', '') }, : { type: 'location', value: selectedValue.replace('location-', '') },
); );
}); });
@@ -314,23 +392,34 @@
const selectedValue = orgSelect.value; const selectedValue = orgSelect.value;
setSelectValue(tagSelect, tagSlim, 'all'); setSelectValue(tagSelect, '');
setSelectValue(locationSelect, locationSlim, 'all'); setSelectValue(locationSelect, '');
applyFilter( applyFilter(
selectedValue === 'all' !selectedValue
? { type: 'all', value: 'all' } ? { type: 'all', value: '' }
: { type: 'org', value: selectedValue.replace('org-', '') }, : { type: 'org', value: selectedValue.replace('org-', '') },
); );
}); });
resetButton?.addEventListener('click', () => { resetButton?.addEventListener('click', () => {
setSelectValue(tagSelect, tagSlim, 'all'); setSelectValue(tagSelect, '');
setSelectValue(locationSelect, locationSlim, 'all'); setSelectValue(locationSelect, '');
setSelectValue(orgSelect, orgSlim, 'all'); setSelectValue(orgSelect, '');
applyFilter({ type: 'all', value: 'all' }); applyFilter({ type: 'all', value: '' });
}); });
applyFilter(currentFilter); const urlState = readUrlState();
const storedState = readStoredState();
const initialState = rawValueToFilterState(urlState || storedState);
applyControlState(initialState);
applyFilter(initialState);
window.addEventListener('popstate', () => {
const stateFromUrl = rawValueToFilterState(readUrlState());
applyControlState(stateFromUrl);
applyFilter(stateFromUrl);
});
</script> </script>
@@ -0,0 +1,17 @@
<div
id="{{ mapContainerId|e('html_attr') }}"
class="eventmanager-map"
data-eventmanager-map="1"
data-map-style="{{ mapStyleUrl|e('html_attr') }}"
data-map-data-id="{{ mapDataElementId|e('html_attr') }}"
></div>
<style>
.eventmanager-map {
width: 100%;
min-height: 420px;
}
</style>
<script type="application/json" id="{{ mapDataElementId|e('html_attr') }}">{{ mapItemsJson|raw }}</script>
<script type="module" src="{{ asset('bundles/eventmanager/assets/map-module.js') }}"></script>
+331
View File
@@ -0,0 +1,331 @@
import Spiderfy from 'https://cdn.jsdelivr.net/npm/@nazka/map-gl-js-spiderfy@1.2.10/dist/index.modern.js';
const MAP_SELECTOR = '[data-eventmanager-map="1"]';
const escapeHtml = (value) => {
const stringValue = String(value ?? '');
return stringValue
.replace(/&/g, '&amp;')
.replace(/</g, '&lt;')
.replace(/>/g, '&gt;')
.replace(/"/g, '&quot;')
.replace(/'/g, '&#039;');
};
const parseItems = (container) => {
const dataElementId = container.dataset.mapDataId || '';
if (!dataElementId) {
return [];
}
const payload = document.getElementById(dataElementId);
if (!payload) {
return [];
}
try {
const parsed = JSON.parse(payload.textContent || '[]');
if (!Array.isArray(parsed)) {
return [];
}
const unique = new Map();
parsed.forEach((item) => {
if (!item || !['event', 'location', 'organisation'].includes(item.type)) {
return;
}
const id = Number(item.id || 0);
const latitude = Number(item.latitude);
const longitude = Number(item.longitude);
if (!Number.isFinite(id) || id <= 0 || !Number.isFinite(latitude) || !Number.isFinite(longitude)) {
return;
}
unique.set(`${item.type}:${id}`, {
type: item.type,
id,
title: String(item.title || ''),
latitude,
longitude,
extra: item.extra && typeof item.extra === 'object' ? item.extra : {},
});
});
return Array.from(unique.values());
} catch (error) {
return [];
}
};
const popupHtmlFor = (item) => {
if (item.type === 'event') {
const locationTitle = escapeHtml(item.extra.locationTitle || '');
const startDate = escapeHtml(item.extra.startDate || '');
return [
`<strong>${escapeHtml(item.title)}</strong>`,
locationTitle ? `<div>${locationTitle}</div>` : '',
startDate ? `<div>${startDate}</div>` : '',
].join('');
}
return `<strong>${escapeHtml(item.title)}</strong>`;
};
const toFeature = (item) => ({
type: 'Feature',
geometry: {
type: 'Point',
coordinates: [item.longitude, item.latitude],
},
properties: {
id: item.id,
type: item.type,
title: item.title,
popupHtml: popupHtmlFor(item),
},
});
const addSimpleMarker = (map, item) => {
const popup = new maplibregl.Popup({ offset: 20 }).setHTML(popupHtmlFor(item));
new maplibregl.Marker()
.setLngLat([item.longitude, item.latitude])
.setPopup(popup)
.addTo(map);
};
const initEventLayers = (map, eventItems) => {
const sourceId = 'eventmanager-events-source';
const clusterLayerId = 'eventmanager-events-clusters';
const clusterCountLayerId = 'eventmanager-events-cluster-count';
const unclusteredLayerId = 'eventmanager-events-unclustered';
const features = eventItems.map(toFeature);
map.addSource(sourceId, {
type: 'geojson',
data: {
type: 'FeatureCollection',
features,
},
cluster: true,
clusterMaxZoom: 22,
clusterRadius: 22,
});
map.addLayer({
id: clusterLayerId,
type: 'circle',
source: sourceId,
filter: ['has', 'point_count'],
paint: {
'circle-radius': 18,
'circle-opacity': 0.8,
},
});
map.addLayer({
id: clusterCountLayerId,
type: 'symbol',
source: sourceId,
filter: ['has', 'point_count'],
layout: {
'text-field': ['get', 'point_count'],
'text-size': 12,
},
});
map.addLayer({
id: unclusteredLayerId,
type: 'circle',
source: sourceId,
filter: ['!', ['has', 'point_count']],
paint: {
'circle-radius': 9,
'circle-stroke-width': 2,
},
});
const openEventPopup = (feature, coordinatesOverride = null) => {
const popupHtml = feature?.properties?.popupHtml || '';
const rawCoords = coordinatesOverride || feature?.geometry?.coordinates || null;
if (!Array.isArray(rawCoords) || rawCoords.length !== 2) {
return;
}
const [lng, lat] = rawCoords.map((coord) => Number(coord));
if (!Number.isFinite(lng) || !Number.isFinite(lat)) {
return;
}
new maplibregl.Popup({ offset: 15 })
.setLngLat([lng, lat])
.setHTML(String(popupHtml))
.addTo(map);
};
map.on('click', unclusteredLayerId, (event) => {
const feature = event.features && event.features[0] ? event.features[0] : null;
if (!feature) {
return;
}
openEventPopup(feature, event.lngLat ? [event.lngLat.lng, event.lngLat.lat] : null);
});
map.on('mouseenter', unclusteredLayerId, () => {
map.getCanvas().style.cursor = 'pointer';
});
map.on('mouseleave', unclusteredLayerId, () => {
map.getCanvas().style.cursor = '';
});
if (typeof Spiderfy === 'function') {
const spiderfy = new Spiderfy(map, {
closeOnLeafClick: true,
onLeafClick: (feature, spiderEvent) => {
const clickCoordinates = spiderEvent?.lngLat
? [spiderEvent.lngLat.lng, spiderEvent.lngLat.lat]
: null;
openEventPopup(feature, clickCoordinates);
},
});
spiderfy.applyTo(clusterLayerId);
} else {
map.on('click', clusterLayerId, (event) => {
const feature = event.features && event.features[0] ? event.features[0] : null;
if (!feature) {
return;
}
const clusterId = feature.properties?.cluster_id;
if (undefined === clusterId || null === clusterId) {
return;
}
const source = map.getSource(sourceId);
if (!source || typeof source.getClusterExpansionZoom !== 'function') {
return;
}
source.getClusterExpansionZoom(clusterId, (error, zoom) => {
if (error) {
return;
}
map.easeTo({
center: event.lngLat,
zoom,
});
});
});
}
map.on('mouseenter', clusterLayerId, () => {
map.getCanvas().style.cursor = 'pointer';
});
map.on('mouseleave', clusterLayerId, () => {
map.getCanvas().style.cursor = '';
});
};
const initSingleMap = (container) => {
if (container.dataset.mapInitialized === '1') {
return;
}
const items = parseItems(container);
if (!items.length || typeof maplibregl === 'undefined') {
return;
}
container.dataset.mapInitialized = '1';
if (typeof pmtiles !== 'undefined' && !window.__eventmanagerPmtilesRegistered) {
const protocol = new pmtiles.Protocol();
maplibregl.addProtocol('pmtiles', protocol.tile);
window.__eventmanagerPmtilesRegistered = true;
}
const style = container.dataset.mapStyle || 'https://maps.mummert.media/metadaten/world-light.json';
const map = new maplibregl.Map({
container,
style,
zoom: 12,
pitch: 0,
bearing: 0,
center: [items[0].longitude, items[0].latitude],
});
map.addControl(new maplibregl.NavigationControl({ visualizePitch: true }));
const fitBounds = (coordinates) => {
const points = coordinates.filter((coord) => Array.isArray(coord) && coord.length === 2);
if (!points.length) {
return;
}
if (1 === points.length) {
map.setCenter(points[0]);
map.setZoom(14);
return;
}
const bounds = new maplibregl.LngLatBounds();
points.forEach((coord) => bounds.extend(coord));
map.fitBounds(bounds, {
padding: 60,
maxZoom: 15,
});
};
map.on('load', () => {
const nonEventItems = items.filter((item) => item.type !== 'event');
const eventItems = items.filter((item) => item.type === 'event');
const allCoordinates = items.map((item) => [item.longitude, item.latitude]);
nonEventItems.forEach((item) => {
addSimpleMarker(map, item);
});
if (eventItems.length) {
initEventLayers(map, eventItems);
}
fitBounds(allCoordinates);
});
};
const bootstrapMapModules = () => {
const modules = document.querySelectorAll(MAP_SELECTOR);
modules.forEach((container) => initSingleMap(container));
};
if ('loading' === document.readyState) {
document.addEventListener('DOMContentLoaded', bootstrapMapModules, { once: true });
} else {
bootstrapMapModules();
}
@@ -0,0 +1,40 @@
<?php
declare(strict_types=1);
namespace MummertMedia\EventManagerBundle\Controller\Frontend;
use Contao\CoreBundle\Controller\FrontendModule\AbstractFrontendModuleController;
use Contao\CoreBundle\DependencyInjection\Attribute\AsFrontendModule;
use Contao\CoreBundle\Twig\FragmentTemplate;
use Contao\ModuleModel;
use MummertMedia\EventManagerBundle\Service\MapModuleDataProvider;
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpFoundation\Response;
#[AsFrontendModule(type: 'eventmanager_map', category: 'eventmanager', template: 'frontend/event_map')]
class EventMapController extends AbstractFrontendModuleController
{
private const MAP_STYLE_URL = 'https://maps.mummert.media/metadaten/world-light.json';
public function __construct(
private readonly MapModuleDataProvider $mapModuleDataProvider,
) {
}
protected function getResponse(FragmentTemplate $template, ModuleModel $model, Request $request): Response
{
$containerId = sprintf('eventmanager-map-%d', (int) ($model->id ?? 0));
$dataElementId = sprintf('%s-data', $containerId);
$template->set('mapContainerId', $containerId);
$template->set('mapDataElementId', $dataElementId);
$template->set('mapStyleUrl', self::MAP_STYLE_URL);
$template->set('mapItemsJson', json_encode(
$this->mapModuleDataProvider->getMapItems(),
\JSON_HEX_TAG | \JSON_HEX_AMP | \JSON_HEX_APOS | \JSON_HEX_QUOT | \JSON_UNESCAPED_UNICODE | \JSON_THROW_ON_ERROR,
));
return $template->getResponse();
}
}
@@ -10,12 +10,14 @@ use Contao\Template;
use Doctrine\DBAL\ArrayParameterType; use Doctrine\DBAL\ArrayParameterType;
use Doctrine\DBAL\Connection; use Doctrine\DBAL\Connection;
use Doctrine\DBAL\ParameterType; use Doctrine\DBAL\ParameterType;
use Psr\Log\LoggerInterface;
#[AsHook('parseTemplate', method: 'onParseTemplate')] #[AsHook('parseTemplate', method: 'onParseTemplate')]
class OrganizationListingTemplateDataListener class OrganizationListingTemplateDataListener
{ {
public function __construct( public function __construct(
private readonly Connection $connection, private readonly Connection $connection,
private readonly ?LoggerInterface $logger = null,
) { ) {
} }
@@ -49,26 +51,79 @@ class OrganizationListingTemplateDataListener
return; return;
} }
$organizationTagMap = $this->fetchOrganizationTagMap(array_values(array_unique(array_values($rowToOrganizationIdMap)))); $organizationIds = array_values(array_unique(array_values($rowToOrganizationIdMap)));
$organizationLogoUuidMap = $this->fetchOrganizationLogoUuidMap(array_values(array_unique(array_values($rowToOrganizationIdMap)))); $organizationTagMap = $this->fetchOrganizationTagMap($organizationIds);
$organizationLogoMap = $this->fetchOrganizationLogoMap($organizationIds);
$organizationTagLabelMap = [];
$rowTagIdsList = [];
foreach ($organizationTagMap as $tagData) {
foreach (($tagData['ids'] ?? []) as $index => $tagId) {
$label = trim((string) (($tagData['labels'][$index] ?? '') ?: ''));
if ('' !== $tagId && '' !== $label && !isset($organizationTagLabelMap[(string) $tagId])) {
$organizationTagLabelMap[(string) $tagId] = $label;
}
}
}
foreach ($rowToOrganizationIdMap as $rowIndex => $organizationId) { foreach ($rowToOrganizationIdMap as $rowIndex => $organizationId) {
$tagData = $organizationTagMap[$organizationId] ?? ['labels' => [], 'slugs' => []];
$logoUuid = $organizationLogoUuidMap[$organizationId] ?? '';
if (!isset($tbody[$rowIndex]) || !\is_array($tbody[$rowIndex])) { if (!isset($tbody[$rowIndex]) || !\is_array($tbody[$rowIndex])) {
continue; continue;
} }
$tbody[$rowIndex]['tag_labels']['content'] = implode(', ', $tagData['labels']); $tagData = $organizationTagMap[$organizationId] ?? ['ids' => [], 'labels' => []];
$tbody[$rowIndex]['tag_slugs']['content'] = implode(',', $tagData['slugs']); $logoData = $organizationLogoMap[$organizationId] ?? ['uuid' => '', 'isSvg' => false];
$tbody[$rowIndex]['tags']['content'] = implode(', ', $tagData['labels']); $logoUuid = (string) ($logoData['uuid'] ?? '');
$logoIsSvg = (bool) ($logoData['isSvg'] ?? false);
$tagIdsCsv = implode(',', $tagData['ids']);
$tagLabelsCsv = implode(', ', $tagData['labels']);
$tbody[$rowIndex]['tag_ids']['content'] = $tagIdsCsv;
$tbody[$rowIndex]['tag_labels']['content'] = $tagLabelsCsv;
$tbody[$rowIndex]['tags']['content'] = $tagLabelsCsv;
if ('' !== $logoUuid) { if ('' !== $logoUuid) {
$tbody[$rowIndex]['logo_uuid']['content'] = $logoUuid; $tbody[$rowIndex]['logo_uuid']['content'] = $logoUuid;
$tbody[$rowIndex]['logo_is_svg']['content'] = $logoIsSvg ? '1' : '';
} }
} }
foreach ($tbody as $rowIndex => $row) {
if (!\is_array($row)) {
$rowTagIdsList[] = '';
continue;
}
$organizationId = $rowToOrganizationIdMap[(int) $rowIndex] ?? 0;
$rowTagIdsList[] = ($organizationId > 0 && isset($organizationTagMap[$organizationId]))
? implode(',', $organizationTagMap[$organizationId]['ids'] ?? [])
: '';
}
if (null !== $this->logger) {
$rowsWithoutTagIds = 0;
foreach ($rowToOrganizationIdMap as $organizationId) {
if (!isset($organizationTagMap[$organizationId]) || [] === ($organizationTagMap[$organizationId]['ids'] ?? [])) {
++$rowsWithoutTagIds;
}
}
if ($rowsWithoutTagIds > 0) {
$this->logger->warning('Organization listing enrichment found rows without tag IDs.', [
'template' => (string) $template->getName(),
'totalRows' => \count($tbody),
'mappedRows' => \count($rowToOrganizationIdMap),
'rowsWithoutTagIds' => $rowsWithoutTagIds,
]);
}
}
$template->organization_tag_label_map = $organizationTagLabelMap;
$template->organization_row_tag_ids_list = $rowTagIdsList;
$template->tbody = $tbody; $template->tbody = $tbody;
} }
@@ -76,6 +131,10 @@ class OrganizationListingTemplateDataListener
private function extractOrganizationId(array $row): int private function extractOrganizationId(array $row): int
{ {
foreach (['id', 'organization_id', 'org_id'] as $fieldName) { foreach (['id', 'organization_id', 'org_id'] as $fieldName) {
if (isset($row[$fieldName]) && \is_scalar($row[$fieldName]) && ctype_digit((string) $row[$fieldName])) {
return (int) $row[$fieldName];
}
$value = $this->extractRowFieldContent($row, $fieldName); $value = $this->extractRowFieldContent($row, $fieldName);
if ('' !== $value && ctype_digit($value)) { if ('' !== $value && ctype_digit($value)) {
@@ -83,29 +142,23 @@ class OrganizationListingTemplateDataListener
} }
} }
$urlCandidates = [];
foreach ($row as $column) { foreach ($row as $column) {
if (!\is_array($column)) { if (!\is_array($column)) {
continue; continue;
} }
if (isset($column['url']) && \is_scalar($column['url'])) { foreach (['url', 'href'] as $urlField) {
$urlCandidates[] = (string) $column['url']; if (!isset($column[$urlField]) || !\is_scalar($column[$urlField])) {
continue;
} }
if (isset($column['href']) && \is_scalar($column['href'])) { $organizationId = $this->extractIdFromUrl((string) $column[$urlField]);
$urlCandidates[] = (string) $column['href'];
}
}
foreach ($urlCandidates as $url) {
$organizationId = $this->extractIdFromUrl($url);
if ($organizationId > 0) { if ($organizationId > 0) {
return $organizationId; return $organizationId;
} }
} }
}
return 0; return 0;
} }
@@ -113,7 +166,15 @@ class OrganizationListingTemplateDataListener
/** @param array<string, mixed> $row */ /** @param array<string, mixed> $row */
private function extractRowFieldContent(array $row, string $fieldName): string private function extractRowFieldContent(array $row, string $fieldName): string
{ {
if (!isset($row[$fieldName]) || !\is_array($row[$fieldName])) { if (!isset($row[$fieldName])) {
return '';
}
if (\is_scalar($row[$fieldName])) {
return trim((string) $row[$fieldName]);
}
if (!\is_array($row[$fieldName])) {
return ''; return '';
} }
@@ -152,7 +213,7 @@ class OrganizationListingTemplateDataListener
} }
/** @param list<int> $organizationIds /** @param list<int> $organizationIds
* @return array<int, array{labels: list<string>, slugs: list<string>}> * @return array<int, array{ids: list<string>, labels: list<string>}>
*/ */
private function fetchOrganizationTagMap(array $organizationIds): array private function fetchOrganizationTagMap(array $organizationIds): array
{ {
@@ -161,11 +222,27 @@ class OrganizationListingTemplateDataListener
} }
$rows = $this->connection->executeQuery( $rows = $this->connection->executeQuery(
'SELECT r.pid AS organization_id, r.tag_id, t.tag AS label FROM tl_tags_rel r INNER JOIN tl_tags t ON t.id = r.tag_id WHERE r.ptable = ? AND r.field = ? AND r.pid IN (?) ORDER BY r.pid ASC, r.tag_id ASC', 'SELECT r.pid AS organization_id, r.tag_id, t.tag AS label
FROM tl_tags_rel r
INNER JOIN tl_tags t ON t.id = r.tag_id
WHERE r.ptable = ? AND r.field = ? AND r.pid IN (?)
ORDER BY r.pid ASC, r.tag_id ASC',
['tl_organization', 'tags', $organizationIds], ['tl_organization', 'tags', $organizationIds],
[ParameterType::STRING, ParameterType::STRING, ArrayParameterType::INTEGER], [ParameterType::STRING, ParameterType::STRING, ArrayParameterType::INTEGER],
)->fetchAllAssociative(); )->fetchAllAssociative();
if ([] === $rows) {
$rows = $this->connection->executeQuery(
'SELECT r.pid AS organization_id, r.tag_id, t.tag AS label
FROM tl_tags_rel r
INNER JOIN tl_tags t ON t.id = r.tag_id
WHERE r.ptable = ? AND r.pid IN (?)
ORDER BY r.pid ASC, r.tag_id ASC',
['tl_organization', $organizationIds],
[ParameterType::STRING, ArrayParameterType::INTEGER],
)->fetchAllAssociative();
}
$map = []; $map = [];
$seen = []; $seen = [];
@@ -174,43 +251,37 @@ class OrganizationListingTemplateDataListener
$tagId = (int) ($row['tag_id'] ?? 0); $tagId = (int) ($row['tag_id'] ?? 0);
$label = trim((string) ($row['label'] ?? '')); $label = trim((string) ($row['label'] ?? ''));
if ($organizationId <= 0 || $tagId <= 0 || '' === $label) { if ($organizationId <= 0 || $tagId <= 0 || '' === $label || isset($seen[$organizationId][$tagId])) {
continue;
}
if (isset($seen[$organizationId][$tagId])) {
continue; continue;
} }
$seen[$organizationId][$tagId] = true; $seen[$organizationId][$tagId] = true;
$map[$organizationId]['ids'][] = (string) $tagId;
$map[$organizationId]['labels'][] = $label; $map[$organizationId]['labels'][] = $label;
$slug = $this->slugify($label);
if ('' !== $slug) {
$map[$organizationId]['slugs'][] = $slug;
}
} }
foreach ($map as $organizationId => $tagData) { foreach ($map as $organizationId => $tagData) {
$map[$organizationId]['ids'] = array_values(array_unique($tagData['ids'] ?? []));
$map[$organizationId]['labels'] = array_values(array_unique($tagData['labels'] ?? [])); $map[$organizationId]['labels'] = array_values(array_unique($tagData['labels'] ?? []));
$map[$organizationId]['slugs'] = array_values(array_unique($tagData['slugs'] ?? []));
} }
return $map; return $map;
} }
/** @param list<int> $organizationIds /** @param list<int> $organizationIds
* @return array<int, string> * @return array<int, array{uuid: string, isSvg: bool}>
*/ */
private function fetchOrganizationLogoUuidMap(array $organizationIds): array private function fetchOrganizationLogoMap(array $organizationIds): array
{ {
if ([] === $organizationIds) { if ([] === $organizationIds) {
return []; return [];
} }
$rows = $this->connection->executeQuery( $rows = $this->connection->executeQuery(
'SELECT o.id AS organization_id, o.logo AS logo_uuid FROM tl_organization o WHERE o.id IN (?)', 'SELECT o.id AS organization_id, o.logo AS logo_uuid, f.extension AS file_extension, f.path AS file_path
FROM tl_organization o
LEFT JOIN tl_files f ON f.uuid = o.logo
WHERE o.id IN (?)',
[$organizationIds], [$organizationIds],
[ArrayParameterType::INTEGER], [ArrayParameterType::INTEGER],
)->fetchAllAssociative(); )->fetchAllAssociative();
@@ -220,12 +291,22 @@ class OrganizationListingTemplateDataListener
foreach ($rows as $row) { foreach ($rows as $row) {
$organizationId = (int) ($row['organization_id'] ?? 0); $organizationId = (int) ($row['organization_id'] ?? 0);
$logoUuid = $this->normalizeUuid($row['logo_uuid'] ?? null); $logoUuid = $this->normalizeUuid($row['logo_uuid'] ?? null);
$extension = strtolower(trim((string) ($row['file_extension'] ?? '')));
if ('' === $extension && isset($row['file_path']) && \is_scalar($row['file_path'])) {
$extension = strtolower((string) pathinfo((string) $row['file_path'], PATHINFO_EXTENSION));
}
$isSvg = 'svg' === $extension;
if ($organizationId <= 0 || '' === $logoUuid) { if ($organizationId <= 0 || '' === $logoUuid) {
continue; continue;
} }
$map[$organizationId] = $logoUuid; $map[$organizationId] = [
'uuid' => $logoUuid,
'isSvg' => $isSvg,
];
} }
return $map; return $map;
@@ -258,24 +339,4 @@ class OrganizationListingTemplateDataListener
return ''; return '';
} }
private function slugify(string $value): string
{
$value = trim(mb_strtolower($value));
if ('' === $value) {
return '';
}
$value = strtr($value, [
'ä' => 'ae',
'ö' => 'oe',
'ü' => 'ue',
'ß' => 'ss',
]);
$value = preg_replace('/[^a-z0-9]+/u', '-', $value) ?? '';
$value = trim($value, '-');
return $value;
}
} }
+286
View File
@@ -0,0 +1,286 @@
<?php
declare(strict_types=1);
namespace MummertMedia\EventManagerBundle\Service;
use Contao\Config;
use Contao\Date;
use Doctrine\DBAL\Connection;
use Doctrine\DBAL\Query\QueryBuilder;
class MapModuleDataProvider
{
/**
* @var array<string,array<string,true>>
*/
private array $tableColumns = [];
public function __construct(
private readonly Connection $connection,
) {
}
/**
* @return list<array{type:string,id:int,title:string,latitude:float,longitude:float,extra:array<string,mixed>}>
*/
public function getMapItems(): array
{
$locationTable = $this->resolveExistingTable(['tl_location']);
$organizationTable = $this->resolveExistingTable(['tl_organization', 'tl_organisation']);
if (null === $locationTable) {
return [];
}
$items = [];
$seen = [];
foreach ($this->fetchOrganizationRows($organizationTable) as $row) {
$id = (int) ($row['id'] ?? 0);
if ($id <= 0 || isset($seen['organisation'][$id])) {
continue;
}
$coords = $this->extractCoordinates($row['latitude'] ?? null, $row['longitude'] ?? null);
if (null === $coords) {
continue;
}
$seen['organisation'][$id] = true;
$items[] = [
'type' => 'organisation',
'id' => $id,
'title' => trim((string) ($row['title'] ?? '')),
'latitude' => $coords['latitude'],
'longitude' => $coords['longitude'],
'extra' => [],
];
}
foreach ($this->fetchLocationRows($locationTable) as $row) {
$id = (int) ($row['id'] ?? 0);
if ($id <= 0 || isset($seen['location'][$id])) {
continue;
}
$coords = $this->extractCoordinates($row['latitude'] ?? null, $row['longitude'] ?? null);
if (null === $coords) {
continue;
}
$seen['location'][$id] = true;
$items[] = [
'type' => 'location',
'id' => $id,
'title' => trim((string) ($row['title'] ?? '')),
'latitude' => $coords['latitude'],
'longitude' => $coords['longitude'],
'extra' => [],
];
}
foreach ($this->fetchEventRows($locationTable) as $row) {
$id = (int) ($row['event_id'] ?? 0);
if ($id <= 0 || isset($seen['event'][$id])) {
continue;
}
$coords = $this->extractCoordinates($row['latitude'] ?? null, $row['longitude'] ?? null);
if (null === $coords) {
continue;
}
$seen['event'][$id] = true;
$items[] = [
'type' => 'event',
'id' => $id,
'title' => trim((string) ($row['event_title'] ?? '')),
'latitude' => $coords['latitude'],
'longitude' => $coords['longitude'],
'extra' => [
'locationTitle' => trim((string) ($row['location_title'] ?? '')),
'startDate' => $this->formatStartDate((int) ($row['startDate'] ?? 0)),
],
];
}
return $items;
}
/**
* @return list<array<string,mixed>>
*/
private function fetchOrganizationRows(?string $table): array
{
if (null === $table) {
return [];
}
$qb = $this->connection->createQueryBuilder();
$qb
->select('o.id', 'o.title', 'o.latitude', 'o.longitude')
->from($table, 'o')
->orderBy('o.id', 'ASC');
$this->applyPublicationConstraints($qb, 'o', $table);
return $qb->executeQuery()->fetchAllAssociative();
}
/**
* @return list<array<string,mixed>>
*/
private function fetchLocationRows(string $locationTable): array
{
$qb = $this->connection->createQueryBuilder();
$qb
->select('l.id', 'l.title', 'l.latitude', 'l.longitude')
->from($locationTable, 'l')
->orderBy('l.id', 'ASC');
$this->applyPublicationConstraints($qb, 'l', $locationTable);
return $qb->executeQuery()->fetchAllAssociative();
}
/**
* @return list<array<string,mixed>>
*/
private function fetchEventRows(string $locationTable): array
{
if (!$this->tableExists('tl_calendar_events')) {
return [];
}
$qb = $this->connection->createQueryBuilder();
$qb
->select(
'e.id AS event_id',
'e.title AS event_title',
'e.startDate',
'l.title AS location_title',
'l.latitude',
'l.longitude'
)
->from('tl_calendar_events', 'e')
->innerJoin('e', $locationTable, 'l', 'l.id = e.location_id')
->andWhere('e.location_id > 0')
->orderBy('e.id', 'ASC');
$this->applyPublicationConstraints($qb, 'e', 'tl_calendar_events');
$this->applyPublicationConstraints($qb, 'l', $locationTable);
return $qb->executeQuery()->fetchAllAssociative();
}
private function applyPublicationConstraints(QueryBuilder $qb, string $alias, string $table): void
{
$columns = $this->getColumnMap($table);
$now = time();
if (isset($columns['published'])) {
$qb
->andWhere(sprintf('%s.published = :%s_published', $alias, $alias))
->setParameter(sprintf('%s_published', $alias), '1');
}
if (isset($columns['start'])) {
$qb
->andWhere(sprintf('(%1$s.start IS NULL OR %1$s.start = 0 OR %1$s.start <= :%1$s_start_now)', $alias))
->setParameter(sprintf('%s_start_now', $alias), $now);
}
if (isset($columns['stop'])) {
$qb
->andWhere(sprintf('(%1$s.stop IS NULL OR %1$s.stop = 0 OR %1$s.stop > :%1$s_stop_now)', $alias))
->setParameter(sprintf('%s_stop_now', $alias), $now);
}
}
/**
* @return array{latitude:float,longitude:float}|null
*/
private function extractCoordinates(mixed $latitude, mixed $longitude): ?array
{
if (null === $latitude || null === $longitude) {
return null;
}
$lat = trim(str_replace(',', '.', (string) $latitude));
$lng = trim(str_replace(',', '.', (string) $longitude));
if ('' === $lat || '' === $lng || !is_numeric($lat) || !is_numeric($lng)) {
return null;
}
return [
'latitude' => (float) $lat,
'longitude' => (float) $lng,
];
}
private function formatStartDate(int $timestamp): string
{
if ($timestamp <= 0) {
return '';
}
$format = (string) Config::get('dateFormat');
return Date::parse('' !== $format ? $format : 'd.m.Y', $timestamp);
}
/**
* @param list<string> $candidates
*/
private function resolveExistingTable(array $candidates): ?string
{
foreach ($candidates as $candidate) {
if ($this->tableExists($candidate)) {
return $candidate;
}
}
return null;
}
private function tableExists(string $table): bool
{
try {
return $this->connection->createSchemaManager()->tablesExist([$table]);
} catch (\Throwable) {
return false;
}
}
/**
* @return array<string,true>
*/
private function getColumnMap(string $table): array
{
if (isset($this->tableColumns[$table])) {
return $this->tableColumns[$table];
}
$columns = [];
try {
foreach ($this->connection->createSchemaManager()->listTableColumns($table) as $name => $column) {
$columns[strtolower((string) $name)] = true;
}
} catch (\Throwable) {
$columns = [];
}
$this->tableColumns[$table] = $columns;
return $columns;
}
}
@@ -1,258 +0,0 @@
{% extends '@Contao/block_searchable.html.twig' %}
{% set wrapperAttributes = attrs()
.addClass(['ce_table', 'listing'])
.mergeWith(wrapperAttributes|default)
%}
{% block content %}
{% set legacyTagLabels = {
'10': 'Sport',
'11': 'Kultur',
'12': 'Politik',
'13': 'Soziales',
'14': 'Freizeit',
'15': 'Bildung',
'16': 'Religion',
'17': 'Natur',
'18': 'Gesellschaft'
} %}
{% if searchable %}
<div class="list_search">
<form method="get">
<div class="formbody">
<input type="hidden" name="order_by" value="{{ order_by }}">
<input type="hidden" name="sort" value="{{ sort }}">
{% if per_page %}
<input type="hidden" name="per_page" value="{{ per_page }}">
{% endif %}
<div class="widget widget-select">
<label for="ctrl_search" class="invisible">{{ fields_label }}</label>
<select name="search" id="ctrl_search" class="select">
{{ search_fields|raw }}
</select>
</div>
<div class="widget widget-text">
<label for="ctrl_for" class="invisible">{{ keywords_label }}</label>
<input type="text" name="for" id="ctrl_for" class="text" value="{{ for }}">
</div>
<div class="widget widget-submit">
<button type="submit" class="submit">{{ search_label }}</button>
</div>
</div>
</form>
</div>
{% endif %}
{% if per_page %}
<div class="list_per_page">
<form method="get">
<div class="formbody">
<input type="hidden" name="order_by" value="{{ order_by }}">
<input type="hidden" name="sort" value="{{ sort }}">
<input type="hidden" name="search" value="{{ search }}">
<input type="hidden" name="for" value="{{ for }}">
<div class="widget widget-select">
<label for="ctrl_per_page" class="invisible">{{ per_page_label }}</label>
<select name="per_page" id="ctrl_per_page" class="select">
<option value="10"{% if 10 == per_page %} selected{% endif %}>10</option>
<option value="20"{% if 20 == per_page %} selected{% endif %}>20</option>
<option value="30"{% if 30 == per_page %} selected{% endif %}>30</option>
<option value="50"{% if 50 == per_page %} selected{% endif %}>50</option>
<option value="100"{% if 100 == per_page %} selected{% endif %}>100</option>
<option value="250"{% if 250 == per_page %} selected{% endif %}>250</option>
<option value="500"{% if 500 == per_page %} selected{% endif %}>500</option>
</select>
</div>
<div class="widget widget-submit">
<button type="submit" class="submit">{{ per_page_label }}</button>
</div>
</div>
</form>
</div>
{% endif %}
{% if searchable and for and not tbody|default %}
{{ no_results }}
{% else %}
{% set tagOptions = {} %}
{% for row in tbody|default([]) %}
{% set tagsRaw = row.tag_labels.content|default(row.tags.content|default(''))|striptags %}
{% set tagsPrepared = tagsRaw|replace({'&nbsp;': '', '&amp;nbsp;': '', ' ': '', ';': ',', '|': ',', '/': ',', ', ': ',', ' ,': ','}) %}
{% set tagParts = tagsPrepared is not empty ? tagsPrepared|split(',') : [] %}
{% for part in tagParts %}
{% set tagValue = part|striptags|replace({'&nbsp;': '', '&amp;nbsp;': '', ' ': ''})|trim %}
{% if legacyTagLabels[tagValue] is defined %}
{% set tagLabel = legacyTagLabels[tagValue] %}
{% elseif tagValue matches '/^\\d+$/' %}
{% set tagLabel = '' %}
{% elseif tagValue matches '/^[\\p{L}\\p{N}\\s._,&+\\-\\/]+$/u' %}
{% set tagLabel = tagValue %}
{% else %}
{% set tagLabel = '' %}
{% endif %}
{% if tagLabel is not empty %}
{% set tagSlug = tagLabel|lower|replace({'ä': 'ae', 'ö': 'oe', 'ü': 'ue', 'ß': 'ss', ' ': '-', '/': '-', '&': '-', '+': '-', '.': '', ',': '', '(': '', ')': '', '"': '', "'": ''}) %}
{% if tagSlug is not empty and tagOptions[tagSlug] is not defined %}
{% set tagOptions = tagOptions|merge({ (tagSlug): tagLabel }) %}
{% endif %}
{% endif %}
{% endfor %}
{% endfor %}
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/slim-select@3/dist/slimselect.min.css">
<div id="orgfilters" class="controls filters">
<label for="org-tag-filter" class="visually-hidden">Nach Typ filtern</label>
<select id="org-tag-filter" class="select" data-placeholder="Typ wählen">
<option value="">Alle</option>
{% for slug, label in tagOptions %}
<option value="{{ slug }}">{{ label }}</option>
{% endfor %}
</select>
<button type="button" id="org-filter-reset" class="submit" style="display:none;">Filter zurücksetzen</button>
</div>
<div id="org">
<div id="org-list">
{% for row in tbody|default([]) %}
{% set tagSlugsRaw = row.tag_slugs.content|default('')|trim %}
{% set tagsRaw = row.tag_labels.content|default(row.tags.content|default(''))|striptags %}
{% set tagsPrepared = tagsRaw|replace({'&nbsp;': '', '&amp;nbsp;': '', ' ': '', ';': ',', '|': ',', '/': ',', ', ': ',', ' ,': ','}) %}
{% set tagParts = tagsPrepared is not empty ? tagsPrepared|split(',') : [] %}
{% set tagClasses = [] %}
{% set tagSlugs = [] %}
{% if tagSlugsRaw is not empty %}
{% for slug in tagSlugsRaw|split(',') %}
{% set cleanedSlug = slug|trim %}
{% if cleanedSlug is not empty %}
{% set tagSlugs = tagSlugs|merge([cleanedSlug]) %}
{% set tagClasses = tagClasses|merge(['tag-' ~ cleanedSlug]) %}
{% endif %}
{% endfor %}
{% endif %}
{% for part in tagParts if tagSlugsRaw is empty %}
{% set tagValue = part|striptags|replace({'&nbsp;': '', '&amp;nbsp;': '', ' ': ''})|trim %}
{% if legacyTagLabels[tagValue] is defined %}
{% set tagLabel = legacyTagLabels[tagValue] %}
{% elseif tagValue matches '/^\\d+$/' %}
{% set tagLabel = '' %}
{% elseif tagValue matches '/^[\\p{L}\\p{N}\\s._,&+\\-\\/]+$/u' %}
{% set tagLabel = tagValue %}
{% else %}
{% set tagLabel = '' %}
{% endif %}
{% if tagLabel is not empty %}
{% set tagSlug = tagLabel|lower|replace({'ä': 'ae', 'ö': 'oe', 'ü': 'ue', 'ß': 'ss', ' ': '-', '/': '-', '&': '-', '+': '-', '.': '', ',': '', '(': '', ')': '', '"': '', "'": ''}) %}
{% if tagSlug is not empty %}
{% set tagClasses = tagClasses|merge(['tag-' ~ tagSlug]) %}
{% set tagSlugs = tagSlugs|merge([tagSlug]) %}
{% endif %}
{% endif %}
{% endfor %}
{% set title = row.title.content|default('') %}
{% set logoUuid = row.logo_uuid.content|default('')|trim %}
{% set lastCol = row|last %}
<div class="org-item{% if tagClasses|length %} {{ tagClasses|join(' ') }}{% endif %}"{% if tagSlugs|length %} data-tags="{{ tagSlugs|join(',') }}"{% endif %}>
<div class="wrapper">
{% if logoUuid is not empty %}
<div class="logo">{{ ('{{figure::' ~ logoUuid ~ '}}')|insert_tag_raw }}</div>
{% endif %}
{% if title is not empty %}
<div class="title">{{ title|sanitize_html }}</div>
{% endif %}
{% if details and lastCol and lastCol.url|default %}
<a class="details" href="{{ lastCol.url }}" title="{{ title|striptags }} - Details"></a>
{% endif %}
</div>
</div>
{% endfor %}
</div>
</div>
{% endif %}
{% if pagination is defined %}
{{ pagination|raw }}
{% endif %}
<script src="https://cdn.jsdelivr.net/npm/slim-select@3/dist/slimselect.min.js"></script>
<script>
(function () {
const selectElement = document.querySelector('#org-tag-filter');
const resetButton = document.querySelector('#org-filter-reset');
const items = Array.from(document.querySelectorAll('#org-list .org-item'));
if (!selectElement || !items.length || typeof SlimSelect === 'undefined') {
return;
}
const slim = new SlimSelect({
select: selectElement,
settings: {
allowDeselect: true,
showSearch: false,
placeholderText: 'Alle'
}
});
const applyFilter = function (selectedTag) {
const activeTag = selectedTag || '';
if (!activeTag) {
items.forEach(function (item) {
item.style.removeProperty('display');
});
if (resetButton) {
resetButton.style.display = 'none';
}
return;
}
items.forEach(function (item) {
const itemTags = (item.getAttribute('data-tags') || '').split(',').filter(Boolean);
item.style.display = itemTags.includes(activeTag) ? '' : 'none';
});
if (resetButton) {
resetButton.style.display = activeTag ? '' : 'none';
}
};
selectElement.addEventListener('change', function () {
applyFilter(selectElement.value || '');
});
if (resetButton) {
resetButton.addEventListener('click', function () {
slim.setSelected('');
applyFilter('');
});
}
if (selectElement.value) {
applyFilter(selectElement.value);
}
})();
</script>
{% endblock %}