Fix event filter location and tags column mapping

contao/dca/tl_module.php

@@ -7,6 +7,7 @@ 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_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;{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';
 

contao/languages/de/modules.php

@@ -9,4 +9,5 @@ $GLOBALS['TL_LANG']['FMD']['eventmanager'] = 'Event-Manager';
 $GLOBALS['TL_LANG']['FMD']['member_organizations'] = ['Meine Organisationen', 'Listet Organisationen des eingeloggten Mitglieds auf.'];
 $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']['event_filter'] = ['Eventfilter', 'Filter für kommende Veranstaltungen (Tags, Orte, Veranstalter).'];
 $GLOBALS['TL_LANG']['FMD']['event_edit'] = ['Veranstaltung bearbeiten', 'Bearbeitungsformular für eine Veranstaltung.'];

contao/languages/en/modules.php

@@ -9,4 +9,5 @@ $GLOBALS['TL_LANG']['FMD']['eventmanager'] = 'Event manager';
 $GLOBALS['TL_LANG']['FMD']['member_organizations'] = ['My organizations', 'Lists organizations of the logged-in member.'];
 $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']['event_filter'] = ['Event filter', 'Filters upcoming events (tags, locations, organizers).'];
 $GLOBALS['TL_LANG']['FMD']['event_edit'] = ['Edit event', 'Edit form for one event.'];

contao/templates/frontend/event_filter.html.twig

@@ -0,0 +1,27 @@
+<div id="eventfilters">
+    <button type="button" data-filter-tag="all">Alle</button>
+
+    {% for tag in tagButtons|default([]) %}
+        <button type="button" data-filter-tag="{{ tag.id }}">{{ tag.title }} ({{ tag.count }})</button>
+    {% endfor %}
+
+    <div class="widget-select places">
+        <label for="location-filter">Orte:</label>
+        <select id="location-filter">
+            <option value="all">Orte</option>
+            {% for location in locations|default([]) %}
+                <option value="location-{{ location.id }}">{{ location.title }} ({{ location.count }})</option>
+            {% endfor %}
+        </select>
+    </div>
+
+    <div class="widget-select org">
+        <label for="org-filter">Veranstalter:</label>
+        <select id="org-filter">
+            <option value="all">Veranstalter</option>
+            {% for organization in organizations|default([]) %}
+                <option value="org-{{ organization.id }}">{{ organization.title }} ({{ organization.count }})</option>
+            {% endfor %}
+        </select>
+    </div>
+</div>

src/Controller/Frontend/EventFilterController.php

@@ -0,0 +1,190 @@
+<?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 Contao\StringUtil;
+use Doctrine\DBAL\ArrayParameterType;
+use Doctrine\DBAL\Connection;
+use Doctrine\DBAL\ParameterType;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\Response;
+
+#[AsFrontendModule(type: 'event_filter', category: 'eventmanager', template: 'frontend/event_filter')]
+class EventFilterController extends AbstractFrontendModuleController
+{
+    public function __construct(
+        private readonly Connection $connection,
+    ) {
+    }
+
+    protected function getResponse(FragmentTemplate $template, ModuleModel $model, Request $request): Response
+    {
+        $calendarIds = array_map('intval', StringUtil::deserialize($model->cal_calendar, true));
+        $eventIds = $this->findUpcomingEventIds($calendarIds);
+
+        $template->set('tagButtons', $this->findTagButtons($eventIds));
+        $template->set('locations', $this->findLocations($eventIds));
+        $template->set('organizations', $this->findOrganizations($eventIds));
+
+        return $template->getResponse();
+    }
+
+    /**
+     * @param list<int> $calendarIds
+     *
+     * @return list<int>
+     */
+    private function findUpcomingEventIds(array $calendarIds): array
+    {
+        $today = strtotime('today');
+
+        if ([] === $calendarIds) {
+            $rows = $this->connection->executeQuery(
+                <<<'SQL'
+                    SELECT e.id
+                    FROM tl_calendar_events e
+                    WHERE e.published='1'
+                      AND (e.startTime>=? OR e.endTime>=?)
+                    ORDER BY e.startTime ASC
+                SQL,
+                [$today, $today],
+                [ParameterType::INTEGER, ParameterType::INTEGER],
+            )->fetchFirstColumn();
+        } else {
+            $rows = $this->connection->executeQuery(
+                <<<'SQL'
+                    SELECT e.id
+                    FROM tl_calendar_events e
+                    WHERE e.pid IN (?)
+                      AND e.published='1'
+                      AND (e.startTime>=? OR e.endTime>=?)
+                    ORDER BY e.startTime ASC
+                SQL,
+                [$calendarIds, $today, $today],
+                [ArrayParameterType::INTEGER, ParameterType::INTEGER, ParameterType::INTEGER],
+            )->fetchFirstColumn();
+        }
+
+        return array_values(array_unique(array_map('intval', $rows)));
+    }
+
+    /**
+     * @param list<int> $eventIds
+     *
+     * @return list<array{id:int,title:string,count:int}>
+     */
+    private function findTagButtons(array $eventIds): array
+    {
+        if ([] === $eventIds) {
+            return [];
+        }
+
+        $rows = $this->connection->executeQuery(
+            <<<'SQL'
+                                SELECT t.id, t.tag, COUNT(DISTINCT r.pid) AS total
+                FROM tl_tags_rel r
+                INNER JOIN tl_tags t ON t.id=r.tag_id
+                WHERE r.ptable='tl_calendar_events'
+                  AND r.field='tags'
+                                    AND r.pid IN (?)
+                GROUP BY t.id, t.tag
+                ORDER BY t.tag ASC
+            SQL,
+            [$eventIds],
+            [ArrayParameterType::INTEGER],
+        )->fetchAllAssociative();
+
+        $items = [];
+
+        foreach ($rows as $row) {
+            $items[] = [
+                'id' => (int) ($row['id'] ?? 0),
+                'title' => (string) ($row['tag'] ?? ''),
+                'count' => (int) ($row['total'] ?? 0),
+            ];
+        }
+
+        return $items;
+    }
+
+    /**
+     * @param list<int> $eventIds
+     *
+     * @return list<array{id:int,title:string,count:int}>
+     */
+    private function findLocations(array $eventIds): array
+    {
+        if ([] === $eventIds) {
+            return [];
+        }
+
+        $rows = $this->connection->executeQuery(
+            <<<'SQL'
+                SELECT l.id, l.title, COUNT(e.id) AS total
+                FROM tl_calendar_events e
+                                INNER JOIN tl_location l ON l.id=e.location_id
+                WHERE e.id IN (?)
+                                    AND e.location_id>0
+                GROUP BY l.id, l.title
+                ORDER BY l.title ASC
+            SQL,
+            [$eventIds],
+            [ArrayParameterType::INTEGER],
+        )->fetchAllAssociative();
+
+        $items = [];
+
+        foreach ($rows as $row) {
+            $items[] = [
+                'id' => (int) ($row['id'] ?? 0),
+                'title' => (string) ($row['title'] ?? ''),
+                'count' => (int) ($row['total'] ?? 0),
+            ];
+        }
+
+        return $items;
+    }
+
+    /**
+     * @param list<int> $eventIds
+     *
+     * @return list<array{id:int,title:string,count:int}>
+     */
+    private function findOrganizations(array $eventIds): array
+    {
+        if ([] === $eventIds) {
+            return [];
+        }
+
+        $rows = $this->connection->executeQuery(
+            <<<'SQL'
+                SELECT o.id, o.title, COUNT(DISTINCT rel.event_id) AS total
+                FROM tl_calendar_events_organization rel
+                INNER JOIN tl_organization o ON o.id=rel.organization_id
+                WHERE rel.event_id IN (?)
+                GROUP BY o.id, o.title
+                ORDER BY o.title ASC
+            SQL,
+            [$eventIds],
+            [ArrayParameterType::INTEGER],
+        )->fetchAllAssociative();
+
+        $items = [];
+
+        foreach ($rows as $row) {
+            $items[] = [
+                'id' => (int) ($row['id'] ?? 0),
+                'title' => (string) ($row['title'] ?? ''),
+                'count' => (int) ($row['total'] ?? 0),
+            ];
+        }
+
+        return $items;
+    }
+}

src/EventListener/EventFullTemplateDataListener.php

@@ -0,0 +1,265 @@
+<?php
+
+declare(strict_types=1);
+
+namespace MummertMedia\EventManagerBundle\EventListener;
+
+use Contao\CoreBundle\DependencyInjection\Attribute\AsHook;
+use Contao\StringUtil;
+use Contao\Template;
+use Doctrine\DBAL\Connection;
+use Doctrine\DBAL\ParameterType;
+
+#[AsHook('parseTemplate', method: 'onParseTemplate')]
+class EventFullTemplateDataListener
+{
+    public function __construct(
+        private readonly Connection $connection,
+    ) {
+    }
+
+    public function onParseTemplate(Template $template): void
+    {
+        $templateName = (string) $template->getName();
+
+        if (!str_starts_with($templateName, 'event_full')) {
+            return;
+        }
+
+        $data = $template->getData();
+        $eventId = (int) ($data['id'] ?? 0);
+
+        if ($eventId <= 0) {
+            return;
+        }
+
+        $locationId = isset($data['location_id']) ? (int) $data['location_id'] : 0;
+
+        $locationRow = $this->fetchLocationRow($locationId);
+        $organizations = $this->fetchOrganizations($eventId);
+        $tags = $this->fetchTags($eventId);
+
+        $template->location_row = $locationRow;
+        $template->organizations = $organizations;
+        $template->tags = $tags;
+        $template->has_tag_21 = \in_array(21, array_map(static fn (array $tag): int => (int) ($tag['id'] ?? 0), $tags), true);
+
+        if ($locationRow && '' !== ($locationRow['lng'] ?? '') && '' !== ($locationRow['lat'] ?? '') && 58 !== (int) ($locationRow['id'] ?? 0)) {
+            $this->registerMapAssets();
+            $template->show_location_map = true;
+        } else {
+            $template->show_location_map = false;
+        }
+
+        $template->location_fields = $this->toFlatLocationFields($locationRow);
+        $template->organization_fields = $this->toFlatOrganizationFields($organizations);
+        $template->tag_fields = $this->toFlatTagFields($tags);
+    }
+
+    /** @return array<string, string> */
+    private function fetchLocationRow(int $locationId): array
+    {
+        if ($locationId <= 0) {
+            return [];
+        }
+
+        $row = $this->connection->createQueryBuilder()
+            ->select('*')
+            ->from('tl_location')
+            ->where('id = :id')
+            ->setParameter('id', $locationId, ParameterType::INTEGER)
+            ->setMaxResults(1)
+            ->executeQuery()
+            ->fetchAssociative();
+
+        if (false === $row || null === $row) {
+            return [];
+        }
+
+        $normalized = [];
+
+        foreach ($row as $column => $value) {
+            $normalized[$column] = $this->toString($value);
+        }
+
+        if ('' !== ($normalized['image'] ?? '')) {
+            $normalized['image_uuid'] = $this->normalizeUuid($normalized['image']);
+        }
+
+        return $normalized;
+    }
+
+    /** @return list<array<string, string>> */
+    private function fetchOrganizations(int $eventId): array
+    {
+        $rows = $this->connection->createQueryBuilder()
+            ->select('o.*')
+            ->from('tl_calendar_events_organization', 'ceo')
+            ->innerJoin('ceo', 'tl_organization', 'o', 'o.id = ceo.organization_id')
+            ->where('ceo.event_id = :eventId')
+            ->setParameter('eventId', $eventId, ParameterType::INTEGER)
+            ->orderBy('ceo.organization_id', 'ASC')
+            ->executeQuery()
+            ->fetchAllAssociative();
+
+        $organizations = [];
+
+        foreach ($rows as $row) {
+            $normalized = [];
+
+            foreach ($row as $column => $value) {
+                $normalized[$column] = $this->toString($value);
+            }
+
+            if ('' !== ($normalized['logo'] ?? '')) {
+                $normalized['logo_uuid'] = $this->normalizeUuid($normalized['logo']);
+            }
+
+            $organizations[] = $normalized;
+        }
+
+        return $organizations;
+    }
+
+    /** @return list<array<string, string>> */
+    private function fetchTags(int $eventId): array
+    {
+        $rows = $this->connection->createQueryBuilder()
+            ->select('t.*')
+            ->from('tl_tags_rel', 'r')
+            ->innerJoin('r', 'tl_tags', 't', 't.id = r.tag_id')
+            ->where('r.ptable = :ptable')
+            ->andWhere('r.field = :field')
+            ->andWhere('r.pid = :pid')
+            ->setParameter('ptable', 'tl_calendar_events')
+            ->setParameter('field', 'tags')
+            ->setParameter('pid', $eventId, ParameterType::INTEGER)
+            ->orderBy('r.tag_id', 'ASC')
+            ->executeQuery()
+            ->fetchAllAssociative();
+
+        $tags = [];
+
+        foreach ($rows as $row) {
+            $title = '';
+
+            if (isset($row['title']) && '' !== (string) $row['title']) {
+                $title = (string) $row['title'];
+            } elseif (isset($row['tag'])) {
+                $title = (string) $row['tag'];
+            }
+
+            $tags[] = [
+                'id' => (string) ((int) ($row['id'] ?? 0)),
+                'title' => $title,
+                'tag' => (string) ($row['tag'] ?? ''),
+            ];
+        }
+
+        return $tags;
+    }
+
+    /** @param array<string, string> $locationRow
+     *  @return array<string, string>
+     */
+    private function toFlatLocationFields(array $locationRow): array
+    {
+        $fields = [];
+
+        foreach ($locationRow as $column => $value) {
+            $fields['location_'.$column] = $value;
+        }
+
+        return $fields;
+    }
+
+    /** @param list<array<string, string>> $organizations
+     *  @return array<string, string>
+     */
+    private function toFlatOrganizationFields(array $organizations): array
+    {
+        $fields = [];
+        $index = 1;
+
+        foreach ($organizations as $organization) {
+            foreach ($organization as $column => $value) {
+                $fields['organization'.$index.'_'.$column] = $value;
+            }
+
+            ++$index;
+        }
+
+        return $fields;
+    }
+
+    /** @param list<array<string, string>> $tags
+     *  @return array<string, string>
+     */
+    private function toFlatTagFields(array $tags): array
+    {
+        $fields = [];
+        $index = 1;
+
+        foreach ($tags as $tag) {
+            $fields['tag'.$index.'_title'] = (string) ($tag['title'] ?? '');
+            ++$index;
+        }
+
+        return $fields;
+    }
+
+    private function normalizeUuid(string $value): string
+    {
+        $trimmed = trim($value);
+
+        if (preg_match('/^[0-9a-fA-F-]{36}$/', $trimmed)) {
+            return strtolower($trimmed);
+        }
+
+        if (16 === strlen($trimmed)) {
+            return StringUtil::binToUuid($trimmed);
+        }
+
+        return $trimmed;
+    }
+
+    private function registerMapAssets(): void
+    {
+        $GLOBALS['TL_JAVASCRIPT'] ??= [];
+        $GLOBALS['TL_CSS'] ??= [];
+
+        $jsAssets = [
+            'https://maps.mummert.media/libraries/maplibre-gl.js',
+            'https://maps.mummert.media/libraries/pmtiles.js',
+        ];
+
+        foreach ($jsAssets as $asset) {
+            if (!\in_array($asset, $GLOBALS['TL_JAVASCRIPT'], true)) {
+                $GLOBALS['TL_JAVASCRIPT'][] = $asset;
+            }
+        }
+
+        $cssAsset = 'https://maps.mummert.media/libraries/maplibre-gl.css';
+
+        if (!\in_array($cssAsset, $GLOBALS['TL_CSS'], true)) {
+            $GLOBALS['TL_CSS'][] = $cssAsset;
+        }
+    }
+
+    private function toString(mixed $value): string
+    {
+        if (null === $value) {
+            return '';
+        }
+
+        if (\is_bool($value)) {
+            return $value ? '1' : '0';
+        }
+
+        if (\is_scalar($value)) {
+            return (string) $value;
+        }
+
+        return json_encode($value, JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES) ?: '';
+    }
+}

src/EventListener/EventTeaserDataAttributesListener.php

@@ -25,12 +25,14 @@ class EventTeaserDataAttributesListener
         $tagMap = $this->fetchTagMap($eventIds);
         $organizationMap = $this->fetchOrganizationMap($eventIds);
         $locationMap = $this->fetchLocationMap($eventIds);
+        $locationTitleMap = $this->fetchLocationTitleMap($locationMap);
 
         foreach ($events as $dayKey => $eventsPerDay) {
             foreach ($eventsPerDay as $timeKey => $eventsPerTime) {
                 foreach ($eventsPerTime as $index => $event) {
                     if (!isset($event['id'])) {
                         $events[$dayKey][$timeKey][$index]['location_id'] = null;
+                        $events[$dayKey][$timeKey][$index]['location_title'] = '';
                         $events[$dayKey][$timeKey][$index]['event_tags'] = '';
                         $events[$dayKey][$timeKey][$index]['event_org'] = '';
 
@@ -45,6 +47,11 @@ class EventTeaserDataAttributesListener
                         $events[$dayKey][$timeKey][$index]['location_id'] = $locationMap[$eventId] ?? null;
                     }
 
+                    $locationId = $events[$dayKey][$timeKey][$index]['location_id'];
+                    $events[$dayKey][$timeKey][$index]['location_title'] = null !== $locationId
+                        ? ($locationTitleMap[(int) $locationId] ?? '')
+                        : '';
+
                     $events[$dayKey][$timeKey][$index]['event_tags'] = implode(',', $tagMap[$eventId] ?? []);
                     $events[$dayKey][$timeKey][$index]['event_org'] = implode(',', $organizationMap[$eventId] ?? []);
                 }
@@ -183,4 +190,36 @@ class EventTeaserDataAttributesListener
 
         return $map;
     }
+
+    /** @param array<int, int|null> $locationMap
+     *  @return array<int, string>
+     */
+    private function fetchLocationTitleMap(array $locationMap): array
+    {
+        $locationIds = array_values(array_unique(array_filter(array_map('intval', $locationMap), static fn (int $id): bool => $id > 0)));
+
+        if ([] === $locationIds) {
+            return [];
+        }
+
+        $rows = $this->connection->executeQuery(
+            'SELECT id, title FROM tl_location WHERE id IN (?)',
+            [$locationIds],
+            [ArrayParameterType::INTEGER],
+        )->fetchAllAssociative();
+
+        $map = [];
+
+        foreach ($rows as $row) {
+            $locationId = (int) ($row['id'] ?? 0);
+
+            if ($locationId <= 0) {
+                continue;
+            }
+
+            $map[$locationId] = (string) ($row['title'] ?? '');
+        }
+
+        return $map;
+    }
 }