Compare commits
36 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 229f99ea19 | |||
| 51a92ea45e | |||
| 1a4811cb02 | |||
| fc2508af22 | |||
| ba321fdc23 | |||
| d5bfb66eee | |||
| dedf8868b5 | |||
| fb58c50f18 | |||
| 621ce8dc8b | |||
| 40aaa747d9 | |||
| 68e991c053 | |||
| 8aa09e893b | |||
| ac203b37ce | |||
| 4b62e72382 | |||
| 97e4f639a0 | |||
| b714bbeb1b | |||
| 21c18f94a0 | |||
| 0402c74824 | |||
| e3c13c989b | |||
| 15db77186b | |||
| 573d5c12e5 | |||
| 2bd9f6849c | |||
| 0e0a888fa9 | |||
| 5d3905632d | |||
| fce467fa87 | |||
| f08406ec12 | |||
| f3d4c857e0 | |||
| ff608f7833 | |||
| 00f65ffd45 | |||
| 142cab2203 | |||
| acf3d02d13 | |||
| add43674cf | |||
| a04c6de362 | |||
| f8cd256348 | |||
| 8c9ea29170 | |||
| 8c5921d02a |
@@ -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: ~
|
||||||
|
|||||||
+179
-2
@@ -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;{eventmanager_legend},mapShowOrganizations,mapOrganizationListPage,organizationTypeTags,mapShowExternalOrganizations,mapShowEvents,mapInitialDisplay,mapEventColor,mapOrganizationColor,mapPitch,mapCenterMode;{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';
|
||||||
|
|
||||||
@@ -72,15 +74,33 @@ $GLOBALS['TL_DCA']['tl_module']['fields']['organizationTypeTags'] = [
|
|||||||
'exclude' => true,
|
'exclude' => true,
|
||||||
'inputType' => 'checkbox',
|
'inputType' => 'checkbox',
|
||||||
'options_callback' => static function () {
|
'options_callback' => static function () {
|
||||||
|
$database = Database::getInstance();
|
||||||
|
$labelExpression = $database->fieldExists('title', 'tl_tags')
|
||||||
|
? "COALESCE(NULLIF(t.title, ''), t.tag)"
|
||||||
|
: 't.tag';
|
||||||
|
|
||||||
$rows = Database::getInstance()
|
$rows = Database::getInstance()
|
||||||
->prepare('SELECT DISTINCT t.id, t.tag FROM tl_tags t LEFT JOIN tl_tags_rel r ON r.tag_id=t.id AND r.ptable=? AND r.field=? ORDER BY t.tag ASC')
|
->prepare(sprintf(
|
||||||
|
'SELECT DISTINCT t.id, %1$s AS label
|
||||||
|
FROM tl_tags_rel r
|
||||||
|
INNER JOIN tl_tags t ON t.id=r.tag_id
|
||||||
|
WHERE r.ptable=? AND r.field=?
|
||||||
|
ORDER BY label ASC',
|
||||||
|
$labelExpression,
|
||||||
|
))
|
||||||
->execute('tl_organization', 'tags')
|
->execute('tl_organization', 'tags')
|
||||||
->fetchAllAssoc();
|
->fetchAllAssoc();
|
||||||
|
|
||||||
$options = [];
|
$options = [];
|
||||||
|
|
||||||
foreach ($rows as $row) {
|
foreach ($rows as $row) {
|
||||||
$options[(int) $row['id']] = (string) $row['tag'];
|
$label = trim((string) ($row['label'] ?? ''));
|
||||||
|
|
||||||
|
if ('' === $label) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
$options[(int) $row['id']] = $label;
|
||||||
}
|
}
|
||||||
|
|
||||||
return $options;
|
return $options;
|
||||||
@@ -157,3 +177,160 @@ $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' => ''],
|
||||||
];
|
];
|
||||||
|
|
||||||
|
$GLOBALS['TL_DCA']['tl_module']['palettes']['__selector__'][] = 'mapCenterMode';
|
||||||
|
$GLOBALS['TL_DCA']['tl_module']['palettes']['__selector__'][] = 'mapInitialDisplay';
|
||||||
|
$GLOBALS['TL_DCA']['tl_module']['subpalettes']['mapCenterMode_custom'] = 'mapCenterLat,mapCenterLng,mapCenterZoom';
|
||||||
|
$GLOBALS['TL_DCA']['tl_module']['subpalettes']['mapInitialDisplay_organization_tag'] = 'mapInitialOrganizationTagId';
|
||||||
|
|
||||||
|
$GLOBALS['TL_DCA']['tl_module']['fields']['mapShowOrganizations'] = [
|
||||||
|
'label' => &$GLOBALS['TL_LANG']['tl_module']['mapShowOrganizations'],
|
||||||
|
'exclude' => true,
|
||||||
|
'inputType' => 'checkbox',
|
||||||
|
'eval' => ['tl_class' => 'w50 m12'],
|
||||||
|
'sql' => ['type' => 'string', 'length' => 1, 'fixed' => true, 'default' => ''],
|
||||||
|
];
|
||||||
|
|
||||||
|
$GLOBALS['TL_DCA']['tl_module']['fields']['mapOrganizationListPage'] = [
|
||||||
|
'label' => &$GLOBALS['TL_LANG']['tl_module']['mapOrganizationListPage'],
|
||||||
|
'exclude' => true,
|
||||||
|
'inputType' => 'pageTree',
|
||||||
|
'eval' => ['fieldType' => 'radio', 'mandatory' => false, 'tl_class' => 'w50'],
|
||||||
|
'sql' => ['type' => 'integer', 'unsigned' => true, 'default' => 0],
|
||||||
|
];
|
||||||
|
|
||||||
|
$GLOBALS['TL_DCA']['tl_module']['fields']['mapShowExternalOrganizations'] = [
|
||||||
|
'label' => &$GLOBALS['TL_LANG']['tl_module']['mapShowExternalOrganizations'],
|
||||||
|
'exclude' => true,
|
||||||
|
'inputType' => 'checkbox',
|
||||||
|
'eval' => ['tl_class' => 'w50 m12'],
|
||||||
|
'sql' => ['type' => 'string', 'length' => 1, 'fixed' => true, 'default' => ''],
|
||||||
|
];
|
||||||
|
|
||||||
|
$GLOBALS['TL_DCA']['tl_module']['fields']['mapShowEvents'] = [
|
||||||
|
'label' => &$GLOBALS['TL_LANG']['tl_module']['mapShowEvents'],
|
||||||
|
'exclude' => true,
|
||||||
|
'inputType' => 'checkbox',
|
||||||
|
'eval' => ['tl_class' => 'w50 m12'],
|
||||||
|
'sql' => ['type' => 'string', 'length' => 1, 'fixed' => true, 'default' => ''],
|
||||||
|
];
|
||||||
|
|
||||||
|
$GLOBALS['TL_DCA']['tl_module']['fields']['mapInitialDisplay'] = [
|
||||||
|
'label' => &$GLOBALS['TL_LANG']['tl_module']['mapInitialDisplay'],
|
||||||
|
'exclude' => true,
|
||||||
|
'inputType' => 'select',
|
||||||
|
'options' => ['random', 'events', 'organization_tag'],
|
||||||
|
'reference' => &$GLOBALS['TL_LANG']['tl_module']['mapInitialDisplay_options'],
|
||||||
|
'eval' => ['mandatory' => true, 'submitOnChange' => true, 'tl_class' => 'w50', 'includeBlankOption' => false],
|
||||||
|
'sql' => ['type' => 'string', 'length' => 32, 'default' => 'random'],
|
||||||
|
];
|
||||||
|
|
||||||
|
$GLOBALS['TL_DCA']['tl_module']['fields']['mapInitialOrganizationTagId'] = [
|
||||||
|
'label' => &$GLOBALS['TL_LANG']['tl_module']['mapInitialOrganizationTagId'],
|
||||||
|
'exclude' => true,
|
||||||
|
'inputType' => 'select',
|
||||||
|
'options_callback' => static function (): array {
|
||||||
|
$database = Database::getInstance();
|
||||||
|
$labelExpression = $database->fieldExists('title', 'tl_tags')
|
||||||
|
? "COALESCE(NULLIF(t.title, ''), t.tag)"
|
||||||
|
: 't.tag';
|
||||||
|
|
||||||
|
$rows = $database
|
||||||
|
->prepare(sprintf(
|
||||||
|
'SELECT DISTINCT t.id, %1$s AS label
|
||||||
|
FROM tl_tags_rel r
|
||||||
|
INNER JOIN tl_tags t ON t.id=r.tag_id
|
||||||
|
WHERE r.ptable=? AND r.field=?
|
||||||
|
ORDER BY label ASC',
|
||||||
|
$labelExpression,
|
||||||
|
))
|
||||||
|
->execute('tl_organization', 'tags')
|
||||||
|
->fetchAllAssoc();
|
||||||
|
|
||||||
|
$options = [];
|
||||||
|
|
||||||
|
foreach ($rows as $row) {
|
||||||
|
$label = trim((string) ($row['label'] ?? ''));
|
||||||
|
|
||||||
|
if ('' === $label) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
$options[(int) $row['id']] = $label;
|
||||||
|
}
|
||||||
|
|
||||||
|
return $options;
|
||||||
|
},
|
||||||
|
'eval' => ['includeBlankOption' => true, 'chosen' => true, 'tl_class' => 'w50'],
|
||||||
|
'sql' => ['type' => 'integer', 'unsigned' => true, 'default' => 0],
|
||||||
|
];
|
||||||
|
|
||||||
|
$GLOBALS['TL_DCA']['tl_module']['fields']['mapEventColor'] = [
|
||||||
|
'label' => &$GLOBALS['TL_LANG']['tl_module']['mapEventColor'],
|
||||||
|
'exclude' => true,
|
||||||
|
'inputType' => 'text',
|
||||||
|
'eval' => ['maxlength' => 7, 'rgxp' => 'hexcolor', 'colorpicker' => true, 'tl_class' => 'w50'],
|
||||||
|
'sql' => ['type' => 'string', 'length' => 7, 'default' => '#BC5067'],
|
||||||
|
];
|
||||||
|
|
||||||
|
$GLOBALS['TL_DCA']['tl_module']['fields']['mapOrganizationColor'] = [
|
||||||
|
'label' => &$GLOBALS['TL_LANG']['tl_module']['mapOrganizationColor'],
|
||||||
|
'exclude' => true,
|
||||||
|
'inputType' => 'text',
|
||||||
|
'eval' => ['maxlength' => 7, 'rgxp' => 'hexcolor', 'colorpicker' => true, 'tl_class' => 'w50'],
|
||||||
|
'sql' => ['type' => 'string', 'length' => 7, 'default' => '#BC5067'],
|
||||||
|
];
|
||||||
|
|
||||||
|
$GLOBALS['TL_DCA']['tl_module']['fields']['mapCenterMode'] = [
|
||||||
|
'label' => &$GLOBALS['TL_LANG']['tl_module']['mapCenterMode'],
|
||||||
|
'exclude' => true,
|
||||||
|
'inputType' => 'select',
|
||||||
|
'options' => ['markers', 'custom'],
|
||||||
|
'reference' => &$GLOBALS['TL_LANG']['tl_module']['mapCenterMode_options'],
|
||||||
|
'eval' => ['submitOnChange' => true, 'mandatory' => true, 'tl_class' => 'clr w50', 'includeBlankOption' => false],
|
||||||
|
'sql' => ['type' => 'string', 'length' => 16, 'default' => 'markers'],
|
||||||
|
];
|
||||||
|
|
||||||
|
$GLOBALS['TL_DCA']['tl_module']['fields']['mapCenterLat'] = [
|
||||||
|
'label' => &$GLOBALS['TL_LANG']['tl_module']['mapCenterLat'],
|
||||||
|
'exclude' => true,
|
||||||
|
'inputType' => 'text',
|
||||||
|
'eval' => ['maxlength' => 32, 'tl_class' => 'w50'],
|
||||||
|
'sql' => ['type' => 'string', 'length' => 32, 'default' => ''],
|
||||||
|
];
|
||||||
|
|
||||||
|
$GLOBALS['TL_DCA']['tl_module']['fields']['mapCenterLng'] = [
|
||||||
|
'label' => &$GLOBALS['TL_LANG']['tl_module']['mapCenterLng'],
|
||||||
|
'exclude' => true,
|
||||||
|
'inputType' => 'text',
|
||||||
|
'eval' => ['maxlength' => 32, 'tl_class' => 'w50'],
|
||||||
|
'sql' => ['type' => 'string', 'length' => 32, 'default' => ''],
|
||||||
|
];
|
||||||
|
|
||||||
|
$GLOBALS['TL_DCA']['tl_module']['fields']['mapCenterZoom'] = [
|
||||||
|
'label' => &$GLOBALS['TL_LANG']['tl_module']['mapCenterZoom'],
|
||||||
|
'exclude' => true,
|
||||||
|
'inputType' => 'text',
|
||||||
|
'eval' => ['rgxp' => 'digit', 'maxlength' => 2, 'tl_class' => 'w50'],
|
||||||
|
'sql' => ['type' => 'smallint', 'unsigned' => true, 'default' => 12],
|
||||||
|
];
|
||||||
|
|
||||||
|
$GLOBALS['TL_DCA']['tl_module']['fields']['mapPitch'] = [
|
||||||
|
'label' => &$GLOBALS['TL_LANG']['tl_module']['mapPitch'],
|
||||||
|
'exclude' => true,
|
||||||
|
'inputType' => 'text',
|
||||||
|
'eval' => ['rgxp' => 'digit', 'maxlength' => 2, 'tl_class' => 'w50'],
|
||||||
|
'sql' => ['type' => 'smallint', 'unsigned' => true, 'default' => 0],
|
||||||
|
];
|
||||||
|
|
||||||
|
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;
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|||||||
@@ -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.'];
|
||||||
|
|||||||
@@ -13,3 +13,25 @@ $GLOBALS['TL_LANG']['tl_module']['frontendArchiveId'] = ['ID des Newsarchivs', '
|
|||||||
$GLOBALS['TL_LANG']['tl_module']['eventListDomId'] = ['Eventlisten-ID (DOM)', 'Wählen Sie die ID der Eventliste, die durch das Event-Filter-Modul gefiltert werden soll.'];
|
$GLOBALS['TL_LANG']['tl_module']['eventListDomId'] = ['Eventlisten-ID (DOM)', 'Wählen Sie die ID der Eventliste, die durch das Event-Filter-Modul gefiltert werden soll.'];
|
||||||
$GLOBALS['TL_LANG']['tl_module']['organizationTypeTags'] = ['Anzuzeigende Organisationstypen', 'Optional: Begrenzen Sie die im Frontend anzeigbaren Organisationstyp-Tags. Leer = alle.'];
|
$GLOBALS['TL_LANG']['tl_module']['organizationTypeTags'] = ['Anzuzeigende Organisationstypen', 'Optional: Begrenzen Sie die im Frontend anzeigbaren Organisationstyp-Tags. Leer = alle.'];
|
||||||
$GLOBALS['TL_LANG']['tl_module']['eventTypeTags'] = ['Anzuzeigende Veranstaltungstypen', 'Optional: Begrenzen Sie die im Frontend anzeigbaren Veranstaltungstyp-Tags. Leer = alle.'];
|
$GLOBALS['TL_LANG']['tl_module']['eventTypeTags'] = ['Anzuzeigende Veranstaltungstypen', 'Optional: Begrenzen Sie die im Frontend anzeigbaren Veranstaltungstyp-Tags. Leer = alle.'];
|
||||||
|
$GLOBALS['TL_LANG']['tl_module']['mapShowOrganizations'] = ['Organisationen anzeigen', 'Wenn aktiviert, werden Organisations-Marker auf der Karte dargestellt.'];
|
||||||
|
$GLOBALS['TL_LANG']['tl_module']['mapOrganizationListPage'] = ['Seite für Organisationsliste', 'Optional: Seite, auf der die Organisationsliste liegt. Wird für den Link „mehr Infos“ im Organisations-Popup verwendet.'];
|
||||||
|
$GLOBALS['TL_LANG']['tl_module']['mapShowExternalOrganizations'] = ['Externe Organisationen anzeigen', 'Wenn aktiviert, werden externe Organisationen (isExternal=1) zusätzlich auf der Karte dargestellt. Standard: nein.'];
|
||||||
|
$GLOBALS['TL_LANG']['tl_module']['mapShowEvents'] = ['Veranstaltungen anzeigen', 'Wenn aktiviert, werden Event- (inkl. Orts-) Marker auf der Karte dargestellt.'];
|
||||||
|
$GLOBALS['TL_LANG']['tl_module']['mapInitialDisplay'] = ['Initiale Anzeige', 'Definiert, welche Marker beim Laden der Karte initial angezeigt werden.'];
|
||||||
|
$GLOBALS['TL_LANG']['tl_module']['mapInitialDisplay_options'] = [
|
||||||
|
'random' => 'Zufällig',
|
||||||
|
'events' => 'Veranstaltungen',
|
||||||
|
'organization_tag' => 'Organisation mit Tag',
|
||||||
|
];
|
||||||
|
$GLOBALS['TL_LANG']['tl_module']['mapInitialOrganizationTagId'] = ['Initialer Organisationstag', 'Wählen Sie den Tag, der initial angezeigt werden soll (nur bei „Organisation mit Tag“).'];
|
||||||
|
$GLOBALS['TL_LANG']['tl_module']['mapEventColor'] = ['Event-Farbe (Kreise/Linien)', 'Farbe für Event-Cluster, Event-Punkte und Spiderfy-Verbindungslinien (Hex, z. B. #BC5067).'];
|
||||||
|
$GLOBALS['TL_LANG']['tl_module']['mapOrganizationColor'] = ['Organisationsfarbe', 'Einheitliche Farbe für alle Organisations-Marker (Hex, z. B. #BC5067).'];
|
||||||
|
$GLOBALS['TL_LANG']['tl_module']['mapCenterMode'] = ['Karten-Zentrierung', 'Wählen Sie, ob die Karte anhand der Marker oder mit festen Koordinaten zentriert werden soll.'];
|
||||||
|
$GLOBALS['TL_LANG']['tl_module']['mapCenterMode_options'] = [
|
||||||
|
'markers' => 'Anhand der Marker (alle Marker sichtbar)',
|
||||||
|
'custom' => 'Feste Geodaten + Zoom-Level',
|
||||||
|
];
|
||||||
|
$GLOBALS['TL_LANG']['tl_module']['mapCenterLat'] = ['Breitengrad (Center)', 'Breitengrad für die feste Kartenzentrierung, z. B. 51.0538'];
|
||||||
|
$GLOBALS['TL_LANG']['tl_module']['mapCenterLng'] = ['Längengrad (Center)', 'Längengrad für die feste Kartenzentrierung, z. B. 13.3080'];
|
||||||
|
$GLOBALS['TL_LANG']['tl_module']['mapCenterZoom'] = ['Zoom-Level (Center)', 'Zoom-Level für die feste Kartenzentrierung (z. B. 12).'];
|
||||||
|
$GLOBALS['TL_LANG']['tl_module']['mapPitch'] = ['Pitch (Neigung)', 'Kartenneigung in Grad (0-85). Standard bei leerer Angabe: 0.'];
|
||||||
|
|||||||
@@ -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.'];
|
||||||
|
|||||||
@@ -13,3 +13,25 @@ $GLOBALS['TL_LANG']['tl_module']['frontendArchiveId'] = ['News archive ID', 'Arc
|
|||||||
$GLOBALS['TL_LANG']['tl_module']['eventListDomId'] = ['Event list ID (DOM)', 'Select the event list ID that should be filtered by the event filter module.'];
|
$GLOBALS['TL_LANG']['tl_module']['eventListDomId'] = ['Event list ID (DOM)', 'Select the event list ID that should be filtered by the event filter module.'];
|
||||||
$GLOBALS['TL_LANG']['tl_module']['organizationTypeTags'] = ['Displayed organization types', 'Optional: Limit which organization type tags can be selected in the frontend. Empty = all.'];
|
$GLOBALS['TL_LANG']['tl_module']['organizationTypeTags'] = ['Displayed organization types', 'Optional: Limit which organization type tags can be selected in the frontend. Empty = all.'];
|
||||||
$GLOBALS['TL_LANG']['tl_module']['eventTypeTags'] = ['Displayed event types', 'Optional: Limit which event type tags can be selected in the frontend. Empty = all.'];
|
$GLOBALS['TL_LANG']['tl_module']['eventTypeTags'] = ['Displayed event types', 'Optional: Limit which event type tags can be selected in the frontend. Empty = all.'];
|
||||||
|
$GLOBALS['TL_LANG']['tl_module']['mapShowOrganizations'] = ['Show organizations', 'If enabled, organization markers are rendered on the map.'];
|
||||||
|
$GLOBALS['TL_LANG']['tl_module']['mapOrganizationListPage'] = ['Organization list page', 'Optional: page containing the organization list. Used for the "more info" link in organization popups.'];
|
||||||
|
$GLOBALS['TL_LANG']['tl_module']['mapShowExternalOrganizations'] = ['Show external organizations', 'If enabled, external organizations (isExternal=1) are additionally rendered on the map. Default: no.'];
|
||||||
|
$GLOBALS['TL_LANG']['tl_module']['mapShowEvents'] = ['Show events', 'If enabled, event markers (including related locations) are rendered on the map.'];
|
||||||
|
$GLOBALS['TL_LANG']['tl_module']['mapInitialDisplay'] = ['Initial display', 'Defines which markers are initially shown when the map is loaded.'];
|
||||||
|
$GLOBALS['TL_LANG']['tl_module']['mapInitialDisplay_options'] = [
|
||||||
|
'random' => 'Random',
|
||||||
|
'events' => 'Events',
|
||||||
|
'organization_tag' => 'Organization with tag',
|
||||||
|
];
|
||||||
|
$GLOBALS['TL_LANG']['tl_module']['mapInitialOrganizationTagId'] = ['Initial organization tag', 'Select the tag to be initially shown (only for "Organization with tag").'];
|
||||||
|
$GLOBALS['TL_LANG']['tl_module']['mapEventColor'] = ['Event color (circles/lines)', 'Color for event clusters, event points and spiderfy connector lines (hex, e.g. #BC5067).'];
|
||||||
|
$GLOBALS['TL_LANG']['tl_module']['mapOrganizationColor'] = ['Organization color', 'Unified color for all organization markers (hex, e.g. #BC5067).'];
|
||||||
|
$GLOBALS['TL_LANG']['tl_module']['mapCenterMode'] = ['Map centering', 'Choose whether the map should center by markers or fixed coordinates.'];
|
||||||
|
$GLOBALS['TL_LANG']['tl_module']['mapCenterMode_options'] = [
|
||||||
|
'markers' => 'By markers (fit all visible markers)',
|
||||||
|
'custom' => 'Fixed coordinates + zoom level',
|
||||||
|
];
|
||||||
|
$GLOBALS['TL_LANG']['tl_module']['mapCenterLat'] = ['Center latitude', 'Latitude for fixed map centering, e.g. 51.0538'];
|
||||||
|
$GLOBALS['TL_LANG']['tl_module']['mapCenterLng'] = ['Center longitude', 'Longitude for fixed map centering, e.g. 13.3080'];
|
||||||
|
$GLOBALS['TL_LANG']['tl_module']['mapCenterZoom'] = ['Center zoom level', 'Zoom level for fixed map centering (e.g. 12).'];
|
||||||
|
$GLOBALS['TL_LANG']['tl_module']['mapPitch'] = ['Pitch', 'Map pitch in degrees (0-85). Default when empty: 0.'];
|
||||||
|
|||||||
@@ -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,115 @@
|
|||||||
|
{% set tags = mapOrganizationTags|default([]) %}
|
||||||
|
{% set showOrganizations = mapShowOrganizations|default(false) %}
|
||||||
|
{% set showEvents = mapShowEvents|default(false) %}
|
||||||
|
{% set showTagButtons = showOrganizations and tags is iterable and tags|length > 0 %}
|
||||||
|
{% set showEventButton = showOrganizations and showEvents %}
|
||||||
|
{% set showFilterButtons = showTagButtons or showEventButton %}
|
||||||
|
|
||||||
|
<section
|
||||||
|
id="{{ mapFilterWrapperId|e('html_attr') }}"
|
||||||
|
class="eventmanager-map-filter"
|
||||||
|
data-map-filter-wrapper="1"
|
||||||
|
role="region"
|
||||||
|
aria-label="Kartenfilter"
|
||||||
|
>
|
||||||
|
{% if showFilterButtons %}
|
||||||
|
<button
|
||||||
|
type="button"
|
||||||
|
class="eventmanager-map-filter__toggle is-expanded"
|
||||||
|
data-map-filter-toggle="1"
|
||||||
|
aria-expanded="true"
|
||||||
|
aria-controls="{{ mapFilterGroupId|e('html_attr') }}"
|
||||||
|
>
|
||||||
|
<span class="eventmanager-map-filter__toggle-label eventmanager-map-filter__toggle-label--expand">Filter einblenden</span>
|
||||||
|
<span class="eventmanager-map-filter__toggle-label eventmanager-map-filter__toggle-label--collapse">Filter ausblenden</span>
|
||||||
|
</button>
|
||||||
|
{% endif %}
|
||||||
|
|
||||||
|
<div
|
||||||
|
id="{{ mapFilterGroupId|e('html_attr') }}"
|
||||||
|
class="eventmanager-map-filter__group"
|
||||||
|
role="group"
|
||||||
|
aria-label="Organisationstypen"
|
||||||
|
>
|
||||||
|
{% if showTagButtons %}
|
||||||
|
{% for tag in tags %}
|
||||||
|
<button
|
||||||
|
type="button"
|
||||||
|
class="eventmanager-map-filter__tag"
|
||||||
|
data-map-tag-filter="{{ tag.id|e('html_attr') }}"
|
||||||
|
aria-pressed="false"
|
||||||
|
>{{ tag.label|e }}</button>
|
||||||
|
{% endfor %}
|
||||||
|
{% endif %}
|
||||||
|
{% if showEventButton %}
|
||||||
|
<button
|
||||||
|
type="button"
|
||||||
|
class="eventmanager-map-filter__tag"
|
||||||
|
data-map-event-toggle="1"
|
||||||
|
aria-pressed="false"
|
||||||
|
>Veranstaltungen</button>
|
||||||
|
{% endif %}
|
||||||
|
|
||||||
|
<button
|
||||||
|
type="button"
|
||||||
|
class="eventmanager-map-filter__tag"
|
||||||
|
data-map-style-mode="street"
|
||||||
|
aria-pressed="true"
|
||||||
|
>Straße</button>
|
||||||
|
|
||||||
|
<button
|
||||||
|
type="button"
|
||||||
|
class="eventmanager-map-filter__tag"
|
||||||
|
data-map-style-mode="satellite"
|
||||||
|
aria-pressed="false"
|
||||||
|
>Satellit</button>
|
||||||
|
</div>
|
||||||
|
</section>
|
||||||
|
|
||||||
|
<div
|
||||||
|
id="{{ mapContainerId|e('html_attr') }}"
|
||||||
|
class="eventmanager-map"
|
||||||
|
data-eventmanager-map="1"
|
||||||
|
data-map-filter-wrapper-id="{{ mapFilterWrapperId|default('')|e('html_attr') }}"
|
||||||
|
data-map-style="{{ mapStyleUrl|e('html_attr') }}"
|
||||||
|
data-map-data-id="{{ mapDataElementId|e('html_attr') }}"
|
||||||
|
data-map-event-color="{{ mapEventColor|default('#BC5067')|e('html_attr') }}"
|
||||||
|
data-map-organization-color="{{ mapOrganizationColor|default('#BC5067')|e('html_attr') }}"
|
||||||
|
data-map-initial-display="{{ mapInitialDisplay|default('all')|e('html_attr') }}"
|
||||||
|
data-map-initial-tag-id="{{ mapInitialTagId|default(0)|e('html_attr') }}"
|
||||||
|
data-map-center-mode="{{ mapCenterMode|default('markers')|e('html_attr') }}"
|
||||||
|
data-map-center-lat="{{ mapCenterLat|default('')|e('html_attr') }}"
|
||||||
|
data-map-center-lng="{{ mapCenterLng|default('')|e('html_attr') }}"
|
||||||
|
data-map-center-zoom="{{ mapCenterZoom|default(12)|e('html_attr') }}"
|
||||||
|
data-map-pitch="{{ mapPitch|default(0)|e('html_attr') }}"
|
||||||
|
></div>
|
||||||
|
|
||||||
|
<style>
|
||||||
|
.eventmanager-map-filter {
|
||||||
|
display: grid;
|
||||||
|
gap: .5rem;
|
||||||
|
margin-bottom: .75rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
.eventmanager-map-filter__group {
|
||||||
|
display: flex;
|
||||||
|
flex-wrap: wrap;
|
||||||
|
gap: .5rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
.eventmanager-map-filter__tag[aria-pressed="true"] {
|
||||||
|
font-weight: 600;
|
||||||
|
}
|
||||||
|
|
||||||
|
.eventmanager-map {
|
||||||
|
width: 100%;
|
||||||
|
min-height: 420px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.maplibregl-popup {
|
||||||
|
z-index: 2147483647;
|
||||||
|
}
|
||||||
|
</style>
|
||||||
|
|
||||||
|
<script type="application/json" id="{{ mapDataElementId|e('html_attr') }}">{{ mapItemsJson|raw }}</script>
|
||||||
|
<script type="module" src="/bundles/mummertmediaeventmanager/assets/map-module.js?v=20260226i"></script>
|
||||||
File diff suppressed because it is too large
Load Diff
+1
File diff suppressed because one or more lines are too long
@@ -0,0 +1,178 @@
|
|||||||
|
<?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\PageModel;
|
||||||
|
use Contao\StringUtil;
|
||||||
|
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';
|
||||||
|
private const DEFAULT_CENTER_MODE = 'markers';
|
||||||
|
private const DEFAULT_EVENT_COLOR = '#BC5067';
|
||||||
|
private const DEFAULT_INITIAL_DISPLAY = 'random';
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @var list<string>
|
||||||
|
*/
|
||||||
|
private const ALLOWED_INITIAL_DISPLAYS = ['random', 'events', 'organization_tag'];
|
||||||
|
|
||||||
|
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);
|
||||||
|
$filterWrapperId = sprintf('%s-filter', $containerId);
|
||||||
|
$filterGroupId = sprintf('%s-filter-group', $containerId);
|
||||||
|
$showOrganizations = '1' === (string) ($model->mapShowOrganizations ?? '');
|
||||||
|
$showExternalOrganizations = '1' === (string) ($model->mapShowExternalOrganizations ?? '');
|
||||||
|
$showEvents = '1' === (string) ($model->mapShowEvents ?? '');
|
||||||
|
$selectedOrganizationTagIds = array_values(array_unique(array_filter(
|
||||||
|
array_map('intval', StringUtil::deserialize($model->organizationTypeTags ?? null, true)),
|
||||||
|
static fn (int $tagId): bool => $tagId > 0,
|
||||||
|
)));
|
||||||
|
$availableOrganizationTags = $this->mapModuleDataProvider->getOrganizationTags();
|
||||||
|
$availableOrganizationTagIds = array_map(
|
||||||
|
static fn (array $tag): int => (int) ($tag['id'] ?? 0),
|
||||||
|
$availableOrganizationTags,
|
||||||
|
);
|
||||||
|
$selectedOrganizationTagIds = [] === $selectedOrganizationTagIds
|
||||||
|
? []
|
||||||
|
: array_values(array_intersect($selectedOrganizationTagIds, $availableOrganizationTagIds));
|
||||||
|
$organizationListPageId = (int) ($model->mapOrganizationListPage ?? 0);
|
||||||
|
$organizationListBaseUrl = $this->buildOrganizationListBaseUrl($organizationListPageId, $request);
|
||||||
|
$initialDisplay = (string) ($model->mapInitialDisplay ?? self::DEFAULT_INITIAL_DISPLAY);
|
||||||
|
$initialOrganizationTagId = (int) ($model->mapInitialOrganizationTagId ?? 0);
|
||||||
|
$centerMode = (string) ($model->mapCenterMode ?? self::DEFAULT_CENTER_MODE);
|
||||||
|
$mapPitch = $this->normalizePitch($model->mapPitch ?? 0);
|
||||||
|
$eventColor = $this->normalizeHexColor((string) ($model->mapEventColor ?? self::DEFAULT_EVENT_COLOR));
|
||||||
|
$organizationColor = $this->normalizeHexColor((string) ($model->mapOrganizationColor ?? $eventColor), $eventColor);
|
||||||
|
|
||||||
|
if (!in_array($centerMode, ['markers', 'custom'], true)) {
|
||||||
|
$centerMode = self::DEFAULT_CENTER_MODE;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!in_array($initialDisplay, self::ALLOWED_INITIAL_DISPLAYS, true)) {
|
||||||
|
$initialDisplay = self::DEFAULT_INITIAL_DISPLAY;
|
||||||
|
}
|
||||||
|
|
||||||
|
if ($initialOrganizationTagId < 0) {
|
||||||
|
$initialOrganizationTagId = 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
$template->set('mapContainerId', $containerId);
|
||||||
|
$template->set('mapDataElementId', $dataElementId);
|
||||||
|
$template->set('mapFilterWrapperId', $filterWrapperId);
|
||||||
|
$template->set('mapFilterGroupId', $filterGroupId);
|
||||||
|
$template->set('mapStyleUrl', self::MAP_STYLE_URL);
|
||||||
|
$template->set('mapShowOrganizations', $showOrganizations);
|
||||||
|
$template->set('mapShowEvents', $showEvents);
|
||||||
|
$template->set('mapCenterMode', $centerMode);
|
||||||
|
$template->set('mapEventColor', $eventColor);
|
||||||
|
$template->set('mapOrganizationColor', $organizationColor);
|
||||||
|
$template->set('mapInitialDisplay', $initialDisplay);
|
||||||
|
$template->set('mapInitialTagId', $initialOrganizationTagId);
|
||||||
|
$template->set('mapCenterLat', trim((string) ($model->mapCenterLat ?? '')));
|
||||||
|
$template->set('mapCenterLng', trim((string) ($model->mapCenterLng ?? '')));
|
||||||
|
$template->set('mapCenterZoom', (int) ($model->mapCenterZoom ?? 12));
|
||||||
|
$template->set('mapPitch', $mapPitch);
|
||||||
|
$template->set('mapItemsJson', json_encode(
|
||||||
|
$this->mapModuleDataProvider->getMapItems($showOrganizations, $showEvents, $showExternalOrganizations, $selectedOrganizationTagIds, $organizationListBaseUrl),
|
||||||
|
\JSON_HEX_TAG | \JSON_HEX_AMP | \JSON_HEX_APOS | \JSON_HEX_QUOT | \JSON_UNESCAPED_UNICODE | \JSON_THROW_ON_ERROR,
|
||||||
|
));
|
||||||
|
$template->set('mapOrganizationTags', $this->mapModuleDataProvider->getOrganizationTags($selectedOrganizationTagIds));
|
||||||
|
|
||||||
|
return $template->getResponse();
|
||||||
|
}
|
||||||
|
|
||||||
|
private function normalizeHexColor(string $value, string $fallback = self::DEFAULT_EVENT_COLOR): string
|
||||||
|
{
|
||||||
|
$normalized = strtoupper(trim($value));
|
||||||
|
|
||||||
|
if (preg_match('/^#[0-9A-F]{6}$/', $normalized)) {
|
||||||
|
return $normalized;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (preg_match('/^[0-9A-F]{6}$/', $normalized)) {
|
||||||
|
return '#'.$normalized;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (preg_match('/^#[0-9A-F]{3}$/', $normalized)) {
|
||||||
|
return sprintf(
|
||||||
|
'#%1$s%1$s%2$s%2$s%3$s%3$s',
|
||||||
|
$normalized[1],
|
||||||
|
$normalized[2],
|
||||||
|
$normalized[3],
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (preg_match('/^[0-9A-F]{3}$/', $normalized)) {
|
||||||
|
return sprintf(
|
||||||
|
'#%1$s%1$s%2$s%2$s%3$s%3$s',
|
||||||
|
$normalized[0],
|
||||||
|
$normalized[1],
|
||||||
|
$normalized[2],
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
return $fallback;
|
||||||
|
}
|
||||||
|
|
||||||
|
private function normalizePitch(mixed $value): int
|
||||||
|
{
|
||||||
|
if (!is_scalar($value)) {
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
$parsedPitch = (int) round((float) str_replace(',', '.', (string) $value));
|
||||||
|
|
||||||
|
if ($parsedPitch < 0) {
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
if ($parsedPitch > 85) {
|
||||||
|
return 85;
|
||||||
|
}
|
||||||
|
|
||||||
|
return $parsedPitch;
|
||||||
|
}
|
||||||
|
|
||||||
|
private function buildOrganizationListBaseUrl(int $pageId, Request $request): string
|
||||||
|
{
|
||||||
|
if ($pageId <= 0) {
|
||||||
|
return '';
|
||||||
|
}
|
||||||
|
|
||||||
|
$pageModel = PageModel::findById($pageId);
|
||||||
|
|
||||||
|
if (null === $pageModel) {
|
||||||
|
return '';
|
||||||
|
}
|
||||||
|
|
||||||
|
$frontendUrl = trim((string) $pageModel->getFrontendUrl());
|
||||||
|
|
||||||
|
if ('' === $frontendUrl) {
|
||||||
|
return '';
|
||||||
|
}
|
||||||
|
|
||||||
|
if (preg_match('#^https?://#i', $frontendUrl)) {
|
||||||
|
return $frontendUrl;
|
||||||
|
}
|
||||||
|
|
||||||
|
return rtrim($request->getSchemeAndHttpHost(), '/').'/'.ltrim($frontendUrl, '/');
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,342 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
declare(strict_types=1);
|
||||||
|
|
||||||
|
namespace MummertMedia\EventManagerBundle\EventListener;
|
||||||
|
|
||||||
|
use Contao\CoreBundle\DependencyInjection\Attribute\AsHook;
|
||||||
|
use Contao\StringUtil;
|
||||||
|
use Contao\Template;
|
||||||
|
use Doctrine\DBAL\ArrayParameterType;
|
||||||
|
use Doctrine\DBAL\Connection;
|
||||||
|
use Doctrine\DBAL\ParameterType;
|
||||||
|
use Psr\Log\LoggerInterface;
|
||||||
|
|
||||||
|
#[AsHook('parseTemplate', method: 'onParseTemplate')]
|
||||||
|
class OrganizationListingTemplateDataListener
|
||||||
|
{
|
||||||
|
public function __construct(
|
||||||
|
private readonly Connection $connection,
|
||||||
|
private readonly ?LoggerInterface $logger = null,
|
||||||
|
) {
|
||||||
|
}
|
||||||
|
|
||||||
|
public function onParseTemplate(Template $template): void
|
||||||
|
{
|
||||||
|
if ('list_default_organisationen' !== (string) $template->getName()) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
$tbody = $template->tbody;
|
||||||
|
|
||||||
|
if (!\is_array($tbody) || [] === $tbody) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
$rowToOrganizationIdMap = [];
|
||||||
|
|
||||||
|
foreach ($tbody as $rowIndex => $row) {
|
||||||
|
if (!\is_array($row)) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
$organizationId = $this->extractOrganizationId($row);
|
||||||
|
|
||||||
|
if ($organizationId > 0) {
|
||||||
|
$rowToOrganizationIdMap[(int) $rowIndex] = $organizationId;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if ([] === $rowToOrganizationIdMap) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
$organizationIds = 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) {
|
||||||
|
if (!isset($tbody[$rowIndex]) || !\is_array($tbody[$rowIndex])) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
$tagData = $organizationTagMap[$organizationId] ?? ['ids' => [], 'labels' => []];
|
||||||
|
$logoData = $organizationLogoMap[$organizationId] ?? ['uuid' => '', 'isSvg' => false];
|
||||||
|
$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) {
|
||||||
|
$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;
|
||||||
|
}
|
||||||
|
|
||||||
|
/** @param array<string, mixed> $row */
|
||||||
|
private function extractOrganizationId(array $row): int
|
||||||
|
{
|
||||||
|
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);
|
||||||
|
|
||||||
|
if ('' !== $value && ctype_digit($value)) {
|
||||||
|
return (int) $value;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
foreach ($row as $column) {
|
||||||
|
if (!\is_array($column)) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
foreach (['url', 'href'] as $urlField) {
|
||||||
|
if (!isset($column[$urlField]) || !\is_scalar($column[$urlField])) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
$organizationId = $this->extractIdFromUrl((string) $column[$urlField]);
|
||||||
|
|
||||||
|
if ($organizationId > 0) {
|
||||||
|
return $organizationId;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
/** @param array<string, mixed> $row */
|
||||||
|
private function extractRowFieldContent(array $row, string $fieldName): string
|
||||||
|
{
|
||||||
|
if (!isset($row[$fieldName])) {
|
||||||
|
return '';
|
||||||
|
}
|
||||||
|
|
||||||
|
if (\is_scalar($row[$fieldName])) {
|
||||||
|
return trim((string) $row[$fieldName]);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!\is_array($row[$fieldName])) {
|
||||||
|
return '';
|
||||||
|
}
|
||||||
|
|
||||||
|
$field = $row[$fieldName];
|
||||||
|
|
||||||
|
if (!isset($field['content']) || !\is_scalar($field['content'])) {
|
||||||
|
return '';
|
||||||
|
}
|
||||||
|
|
||||||
|
return trim((string) $field['content']);
|
||||||
|
}
|
||||||
|
|
||||||
|
private function extractIdFromUrl(string $url): int
|
||||||
|
{
|
||||||
|
$parts = parse_url($url);
|
||||||
|
|
||||||
|
if (!\is_array($parts) || !isset($parts['query'])) {
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
parse_str((string) $parts['query'], $query);
|
||||||
|
|
||||||
|
foreach (['show', 'id'] as $queryKey) {
|
||||||
|
if (!isset($query[$queryKey])) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
$value = $query[$queryKey];
|
||||||
|
|
||||||
|
if (\is_scalar($value) && ctype_digit((string) $value)) {
|
||||||
|
return (int) $value;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
/** @param list<int> $organizationIds
|
||||||
|
* @return array<int, array{ids: list<string>, labels: list<string>}>
|
||||||
|
*/
|
||||||
|
private function fetchOrganizationTagMap(array $organizationIds): array
|
||||||
|
{
|
||||||
|
if ([] === $organizationIds) {
|
||||||
|
return [];
|
||||||
|
}
|
||||||
|
|
||||||
|
$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',
|
||||||
|
['tl_organization', 'tags', $organizationIds],
|
||||||
|
[ParameterType::STRING, ParameterType::STRING, ArrayParameterType::INTEGER],
|
||||||
|
)->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 = [];
|
||||||
|
$seen = [];
|
||||||
|
|
||||||
|
foreach ($rows as $row) {
|
||||||
|
$organizationId = (int) ($row['organization_id'] ?? 0);
|
||||||
|
$tagId = (int) ($row['tag_id'] ?? 0);
|
||||||
|
$label = trim((string) ($row['label'] ?? ''));
|
||||||
|
|
||||||
|
if ($organizationId <= 0 || $tagId <= 0 || '' === $label || isset($seen[$organizationId][$tagId])) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
$seen[$organizationId][$tagId] = true;
|
||||||
|
$map[$organizationId]['ids'][] = (string) $tagId;
|
||||||
|
$map[$organizationId]['labels'][] = $label;
|
||||||
|
}
|
||||||
|
|
||||||
|
foreach ($map as $organizationId => $tagData) {
|
||||||
|
$map[$organizationId]['ids'] = array_values(array_unique($tagData['ids'] ?? []));
|
||||||
|
$map[$organizationId]['labels'] = array_values(array_unique($tagData['labels'] ?? []));
|
||||||
|
}
|
||||||
|
|
||||||
|
return $map;
|
||||||
|
}
|
||||||
|
|
||||||
|
/** @param list<int> $organizationIds
|
||||||
|
* @return array<int, array{uuid: string, isSvg: bool}>
|
||||||
|
*/
|
||||||
|
private function fetchOrganizationLogoMap(array $organizationIds): array
|
||||||
|
{
|
||||||
|
if ([] === $organizationIds) {
|
||||||
|
return [];
|
||||||
|
}
|
||||||
|
|
||||||
|
$rows = $this->connection->executeQuery(
|
||||||
|
'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],
|
||||||
|
[ArrayParameterType::INTEGER],
|
||||||
|
)->fetchAllAssociative();
|
||||||
|
|
||||||
|
$map = [];
|
||||||
|
|
||||||
|
foreach ($rows as $row) {
|
||||||
|
$organizationId = (int) ($row['organization_id'] ?? 0);
|
||||||
|
$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) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
$map[$organizationId] = [
|
||||||
|
'uuid' => $logoUuid,
|
||||||
|
'isSvg' => $isSvg,
|
||||||
|
];
|
||||||
|
}
|
||||||
|
|
||||||
|
return $map;
|
||||||
|
}
|
||||||
|
|
||||||
|
private function normalizeUuid(mixed $value): string
|
||||||
|
{
|
||||||
|
if (null === $value) {
|
||||||
|
return '';
|
||||||
|
}
|
||||||
|
|
||||||
|
if (\is_resource($value)) {
|
||||||
|
$value = stream_get_contents($value) ?: '';
|
||||||
|
}
|
||||||
|
|
||||||
|
$trimmed = trim((string) $value);
|
||||||
|
|
||||||
|
if ('' === $trimmed) {
|
||||||
|
return '';
|
||||||
|
}
|
||||||
|
|
||||||
|
if (preg_match('/^[0-9a-fA-F-]{36}$/', $trimmed)) {
|
||||||
|
return strtolower($trimmed);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (16 === strlen($trimmed)) {
|
||||||
|
return StringUtil::binToUuid($trimmed);
|
||||||
|
}
|
||||||
|
|
||||||
|
return '';
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
@@ -0,0 +1,585 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
declare(strict_types=1);
|
||||||
|
|
||||||
|
namespace MummertMedia\EventManagerBundle\Service;
|
||||||
|
|
||||||
|
use Contao\CalendarEventsModel;
|
||||||
|
use Contao\CoreBundle\Framework\ContaoFramework;
|
||||||
|
use Contao\CoreBundle\Routing\ContentUrlGenerator;
|
||||||
|
use Doctrine\DBAL\ArrayParameterType;
|
||||||
|
use Doctrine\DBAL\Connection;
|
||||||
|
use Doctrine\DBAL\ParameterType;
|
||||||
|
use Doctrine\DBAL\Query\QueryBuilder;
|
||||||
|
use Symfony\Component\Routing\Exception\ExceptionInterface;
|
||||||
|
use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
|
||||||
|
|
||||||
|
class MapModuleDataProvider
|
||||||
|
{
|
||||||
|
/**
|
||||||
|
* @var array<string,array<string,true>>
|
||||||
|
*/
|
||||||
|
private array $tableColumns = [];
|
||||||
|
|
||||||
|
public function __construct(
|
||||||
|
private readonly Connection $connection,
|
||||||
|
private readonly ContaoFramework $framework,
|
||||||
|
private readonly ContentUrlGenerator $urlGenerator,
|
||||||
|
) {
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @return list<array{type:string,markerType:string,id:int,title:string,latitude:float,longitude:float,extra:array<string,mixed>}>
|
||||||
|
*/
|
||||||
|
public function getMapItems(bool $includeOrganizations = true, bool $includeEvents = true, bool $includeExternalOrganizations = false, array $selectedOrganizationTagIds = [], string $organizationListBaseUrl = ''): array
|
||||||
|
{
|
||||||
|
if (!$includeOrganizations && !$includeEvents) {
|
||||||
|
return [];
|
||||||
|
}
|
||||||
|
|
||||||
|
$selectedOrganizationTagIds = array_values(array_unique(array_map(
|
||||||
|
static fn (int|string $tagId): string => (string) (int) $tagId,
|
||||||
|
array_filter($selectedOrganizationTagIds, static fn (int|string $tagId): bool => (int) $tagId > 0),
|
||||||
|
)));
|
||||||
|
|
||||||
|
$locationTable = $this->resolveExistingTable(['tl_location']);
|
||||||
|
$organizationTable = $this->resolveExistingTable(['tl_organization', 'tl_organisation']);
|
||||||
|
$locationGeoColumns = null !== $locationTable ? $this->resolveGeoColumns($locationTable) : null;
|
||||||
|
|
||||||
|
if (null === $locationTable || null === $locationGeoColumns) {
|
||||||
|
return [];
|
||||||
|
}
|
||||||
|
|
||||||
|
$items = [];
|
||||||
|
$seen = [];
|
||||||
|
$organizationRows = $includeOrganizations
|
||||||
|
? $this->fetchOrganizationRows($organizationTable, $locationTable, $locationGeoColumns, $includeExternalOrganizations)
|
||||||
|
: [];
|
||||||
|
$organizationTagMap = $this->fetchOrganizationTagMap(array_values(array_unique(array_map(
|
||||||
|
static fn (array $row): int => (int) ($row['id'] ?? 0),
|
||||||
|
$organizationRows,
|
||||||
|
))));
|
||||||
|
|
||||||
|
if ($includeOrganizations) {
|
||||||
|
foreach ($organizationRows as $row) {
|
||||||
|
$id = (int) ($row['id'] ?? 0);
|
||||||
|
|
||||||
|
if ($id <= 0 || isset($seen['organisation'][$id])) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
$locationId = (int) ($row['location_id'] ?? 0);
|
||||||
|
|
||||||
|
if ($locationId > 0) {
|
||||||
|
$coords = $this->extractCoordinates($row['location_latitude'] ?? null, $row['location_longitude'] ?? null);
|
||||||
|
|
||||||
|
if (null === $coords) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
$coords = $this->extractCoordinates($row['latitude'] ?? null, $row['longitude'] ?? null);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (null === $coords) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
$seen['organisation'][$id] = true;
|
||||||
|
$tagData = $organizationTagMap[$id] ?? ['ids' => [], 'labels' => []];
|
||||||
|
|
||||||
|
if ([] !== $selectedOrganizationTagIds
|
||||||
|
&& [] === array_intersect($selectedOrganizationTagIds, $tagData['ids'] ?? [])) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
$items[] = [
|
||||||
|
'type' => 'organisation',
|
||||||
|
'markerType' => $this->buildOrganizationMarkerType($tagData['ids']),
|
||||||
|
'id' => $id,
|
||||||
|
'title' => trim((string) ($row['title'] ?? '')),
|
||||||
|
'latitude' => $coords['latitude'],
|
||||||
|
'longitude' => $coords['longitude'],
|
||||||
|
'extra' => [
|
||||||
|
'organizationTagIds' => $tagData['ids'],
|
||||||
|
'organizationTagLabels' => $tagData['labels'],
|
||||||
|
'detailUrl' => $this->buildOrganizationDetailUrl($organizationListBaseUrl, $id),
|
||||||
|
],
|
||||||
|
];
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if ($includeEvents) {
|
||||||
|
foreach ($this->fetchEventRows($locationTable, $locationGeoColumns) 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',
|
||||||
|
'markerType' => 'event',
|
||||||
|
'id' => $id,
|
||||||
|
'title' => trim((string) ($row['event_title'] ?? '')),
|
||||||
|
'latitude' => $coords['latitude'],
|
||||||
|
'longitude' => $coords['longitude'],
|
||||||
|
'extra' => [
|
||||||
|
'locationTitle' => trim((string) ($row['location_title'] ?? '')),
|
||||||
|
'startDate' => $this->formatStartDateTime(
|
||||||
|
(int) ($row['startDate'] ?? 0),
|
||||||
|
(string) ($row['addTime'] ?? ''),
|
||||||
|
(int) ($row['startTime'] ?? 0),
|
||||||
|
),
|
||||||
|
'detailUrl' => $this->resolveEventDetailUrl($id),
|
||||||
|
],
|
||||||
|
];
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return $items;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @return list<array{id:int,label:string}>
|
||||||
|
*/
|
||||||
|
public function getOrganizationTags(array $selectedTagIds = []): array
|
||||||
|
{
|
||||||
|
if (!$this->tableExists('tl_tags') || !$this->tableExists('tl_tags_rel')) {
|
||||||
|
return [];
|
||||||
|
}
|
||||||
|
|
||||||
|
$selectedTagIds = array_values(array_unique(array_filter(
|
||||||
|
array_map('intval', $selectedTagIds),
|
||||||
|
static fn (int $tagId): bool => $tagId > 0,
|
||||||
|
)));
|
||||||
|
|
||||||
|
$columns = $this->getColumnMap('tl_tags');
|
||||||
|
$labelColumn = isset($columns['title']) ? 'title' : (isset($columns['tag']) ? 'tag' : null);
|
||||||
|
|
||||||
|
if (null === $labelColumn) {
|
||||||
|
return [];
|
||||||
|
}
|
||||||
|
|
||||||
|
$qb = $this->connection->createQueryBuilder();
|
||||||
|
$qb
|
||||||
|
->select('DISTINCT t.id', sprintf('t.%s AS label', $labelColumn))
|
||||||
|
->from('tl_tags_rel', 'r')
|
||||||
|
->innerJoin('r', 'tl_tags', 't', 't.id = r.tag_id')
|
||||||
|
->andWhere('r.ptable = :organization_ptable')
|
||||||
|
->andWhere('(r.field = :organization_field OR r.field IS NULL OR r.field = \'\')')
|
||||||
|
->setParameter('organization_ptable', 'tl_organization')
|
||||||
|
->setParameter('organization_field', 'tags')
|
||||||
|
->orderBy(sprintf('t.%s', $labelColumn), 'ASC');
|
||||||
|
|
||||||
|
if ([] !== $selectedTagIds) {
|
||||||
|
$qb
|
||||||
|
->andWhere('t.id IN (:selectedTagIds)')
|
||||||
|
->setParameter('selectedTagIds', $selectedTagIds, ArrayParameterType::INTEGER);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (isset($columns['invisible'])) {
|
||||||
|
$qb->andWhere("(t.invisible IS NULL OR t.invisible = '' OR t.invisible = '0')");
|
||||||
|
}
|
||||||
|
|
||||||
|
$rows = $qb->executeQuery()->fetchAllAssociative();
|
||||||
|
$tags = [];
|
||||||
|
$seen = [];
|
||||||
|
|
||||||
|
foreach ($rows as $row) {
|
||||||
|
$id = (int) ($row['id'] ?? 0);
|
||||||
|
$label = trim((string) ($row['label'] ?? ''));
|
||||||
|
|
||||||
|
if ($id <= 0 || '' === $label || isset($seen[$id])) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
$seen[$id] = true;
|
||||||
|
$tags[] = [
|
||||||
|
'id' => $id,
|
||||||
|
'label' => $label,
|
||||||
|
];
|
||||||
|
}
|
||||||
|
|
||||||
|
return $tags;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @param list<int> $organizationIds
|
||||||
|
* @return array<int, array{ids: list<string>, labels: list<string>}>
|
||||||
|
*/
|
||||||
|
private function fetchOrganizationTagMap(array $organizationIds): array
|
||||||
|
{
|
||||||
|
$organizationIds = array_values(array_unique(array_filter($organizationIds, static fn (int $id): bool => $id > 0)));
|
||||||
|
|
||||||
|
if ([] === $organizationIds || !$this->tableExists('tl_tags_rel') || !$this->tableExists('tl_tags')) {
|
||||||
|
return [];
|
||||||
|
}
|
||||||
|
|
||||||
|
$tagColumns = $this->getColumnMap('tl_tags');
|
||||||
|
$tagLabelColumn = isset($tagColumns['title']) ? 'title' : (isset($tagColumns['tag']) ? 'tag' : null);
|
||||||
|
|
||||||
|
if (null === $tagLabelColumn) {
|
||||||
|
return [];
|
||||||
|
}
|
||||||
|
|
||||||
|
$rows = $this->connection->executeQuery(
|
||||||
|
sprintf(
|
||||||
|
'SELECT r.pid AS organization_id, r.tag_id, t.%s 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',
|
||||||
|
$tagLabelColumn,
|
||||||
|
),
|
||||||
|
['tl_organization', 'tags', $organizationIds],
|
||||||
|
[ParameterType::STRING, ParameterType::STRING, ArrayParameterType::INTEGER],
|
||||||
|
)->fetchAllAssociative();
|
||||||
|
|
||||||
|
if ([] === $rows) {
|
||||||
|
$rows = $this->connection->executeQuery(
|
||||||
|
sprintf(
|
||||||
|
'SELECT r.pid AS organization_id, r.tag_id, t.%s 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',
|
||||||
|
$tagLabelColumn,
|
||||||
|
),
|
||||||
|
['tl_organization', $organizationIds],
|
||||||
|
[ParameterType::STRING, ArrayParameterType::INTEGER],
|
||||||
|
)->fetchAllAssociative();
|
||||||
|
}
|
||||||
|
|
||||||
|
$map = [];
|
||||||
|
$seen = [];
|
||||||
|
|
||||||
|
foreach ($rows as $row) {
|
||||||
|
$organizationId = (int) ($row['organization_id'] ?? 0);
|
||||||
|
$tagId = (int) ($row['tag_id'] ?? 0);
|
||||||
|
$label = trim((string) ($row['label'] ?? ''));
|
||||||
|
|
||||||
|
if ($organizationId <= 0 || $tagId <= 0 || isset($seen[$organizationId][$tagId])) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
$seen[$organizationId][$tagId] = true;
|
||||||
|
$map[$organizationId]['ids'][] = (string) $tagId;
|
||||||
|
|
||||||
|
if ('' !== $label) {
|
||||||
|
$map[$organizationId]['labels'][] = $label;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
foreach ($map as $organizationId => $tagData) {
|
||||||
|
$map[$organizationId]['ids'] = array_values(array_unique($tagData['ids'] ?? []));
|
||||||
|
$map[$organizationId]['labels'] = array_values(array_unique($tagData['labels'] ?? []));
|
||||||
|
}
|
||||||
|
|
||||||
|
return $map;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @param list<string> $tagIds
|
||||||
|
*/
|
||||||
|
private function buildOrganizationMarkerType(array $tagIds): string
|
||||||
|
{
|
||||||
|
$firstTagId = (string) ($tagIds[0] ?? '');
|
||||||
|
|
||||||
|
if ('' !== $firstTagId && ctype_digit($firstTagId) && (int) $firstTagId > 0) {
|
||||||
|
return sprintf('organisation-tag-%d', (int) $firstTagId);
|
||||||
|
}
|
||||||
|
|
||||||
|
return 'organisation';
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @return list<array<string,mixed>>
|
||||||
|
*/
|
||||||
|
private function fetchOrganizationRows(?string $table, string $locationTable, array $locationGeoColumns, bool $includeExternalOrganizations): array
|
||||||
|
{
|
||||||
|
if (null === $table) {
|
||||||
|
return [];
|
||||||
|
}
|
||||||
|
|
||||||
|
$organizationGeoColumns = $this->resolveGeoColumns($table);
|
||||||
|
$organizationColumns = $this->getColumnMap($table);
|
||||||
|
$hasLocationReference = isset($organizationColumns['location_id']);
|
||||||
|
|
||||||
|
if (null === $organizationGeoColumns && !$hasLocationReference) {
|
||||||
|
return [];
|
||||||
|
}
|
||||||
|
|
||||||
|
$qb = $this->connection->createQueryBuilder();
|
||||||
|
$qb
|
||||||
|
->select('o.id', 'o.title')
|
||||||
|
->from($table, 'o')
|
||||||
|
->orderBy('o.id', 'ASC');
|
||||||
|
|
||||||
|
if (null !== $organizationGeoColumns) {
|
||||||
|
$qb
|
||||||
|
->addSelect(sprintf('o.%s AS latitude', $organizationGeoColumns['latitude']))
|
||||||
|
->addSelect(sprintf('o.%s AS longitude', $organizationGeoColumns['longitude']));
|
||||||
|
}
|
||||||
|
|
||||||
|
if ($hasLocationReference) {
|
||||||
|
$qb
|
||||||
|
->addSelect('o.location_id')
|
||||||
|
->leftJoin('o', $locationTable, 'ol', 'ol.id = o.location_id')
|
||||||
|
->addSelect(sprintf('ol.%s AS location_latitude', $locationGeoColumns['latitude']))
|
||||||
|
->addSelect(sprintf('ol.%s AS location_longitude', $locationGeoColumns['longitude']));
|
||||||
|
|
||||||
|
$this->applyPublicationConstraints($qb, 'ol', $locationTable);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!$includeExternalOrganizations && isset($organizationColumns['isexternal'])) {
|
||||||
|
$qb->andWhere("(o.isExternal IS NULL OR o.isExternal = '' OR o.isExternal = '0')");
|
||||||
|
}
|
||||||
|
|
||||||
|
$this->applyPublicationConstraints($qb, 'o', $table);
|
||||||
|
|
||||||
|
return $qb->executeQuery()->fetchAllAssociative();
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @return list<array<string,mixed>>
|
||||||
|
*/
|
||||||
|
private function fetchLocationRows(string $locationTable, array $locationGeoColumns): array
|
||||||
|
{
|
||||||
|
$qb = $this->connection->createQueryBuilder();
|
||||||
|
$qb
|
||||||
|
->select('l.id', 'l.title')
|
||||||
|
->addSelect(sprintf('l.%s AS latitude', $locationGeoColumns['latitude']))
|
||||||
|
->addSelect(sprintf('l.%s AS longitude', $locationGeoColumns['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 $locationGeoColumns): array
|
||||||
|
{
|
||||||
|
if (!$this->tableExists('tl_calendar_events')) {
|
||||||
|
return [];
|
||||||
|
}
|
||||||
|
|
||||||
|
$eventColumns = $this->getColumnMap('tl_calendar_events');
|
||||||
|
$today = strtotime('today');
|
||||||
|
|
||||||
|
$qb = $this->connection->createQueryBuilder();
|
||||||
|
$qb
|
||||||
|
->select(
|
||||||
|
'e.id AS event_id',
|
||||||
|
'e.title AS event_title',
|
||||||
|
'e.startDate',
|
||||||
|
'e.addTime',
|
||||||
|
'e.startTime',
|
||||||
|
'l.title AS location_title',
|
||||||
|
sprintf('l.%s AS latitude', $locationGeoColumns['latitude']),
|
||||||
|
sprintf('l.%s AS longitude', $locationGeoColumns['longitude'])
|
||||||
|
)
|
||||||
|
->from('tl_calendar_events', 'e')
|
||||||
|
->innerJoin('e', $locationTable, 'l', 'l.id = e.location_id')
|
||||||
|
->andWhere('e.location_id > 0')
|
||||||
|
->orderBy('e.id', 'ASC');
|
||||||
|
|
||||||
|
if (isset($eventColumns['startdate'])) {
|
||||||
|
$qb
|
||||||
|
->andWhere('e.startDate >= :event_start_date_from')
|
||||||
|
->setParameter('event_start_date_from', $today);
|
||||||
|
}
|
||||||
|
|
||||||
|
$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;
|
||||||
|
}
|
||||||
|
|
||||||
|
$latitudeFloat = (float) $lat;
|
||||||
|
$longitudeFloat = (float) $lng;
|
||||||
|
|
||||||
|
if (
|
||||||
|
($latitudeFloat < -90.0 || $latitudeFloat > 90.0)
|
||||||
|
|| ($longitudeFloat < -180.0 || $longitudeFloat > 180.0)
|
||||||
|
|| (0.0 === $latitudeFloat && 0.0 === $longitudeFloat)
|
||||||
|
) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
return [
|
||||||
|
'latitude' => $latitudeFloat,
|
||||||
|
'longitude' => $longitudeFloat,
|
||||||
|
];
|
||||||
|
}
|
||||||
|
|
||||||
|
private function formatStartDateTime(int $startDate, string $addTime, int $startTime): string
|
||||||
|
{
|
||||||
|
if ($startDate <= 0) {
|
||||||
|
return '';
|
||||||
|
}
|
||||||
|
|
||||||
|
$formattedDate = date('d.m.Y', $startDate);
|
||||||
|
|
||||||
|
if ('1' !== $addTime || $startTime <= 0) {
|
||||||
|
return $formattedDate;
|
||||||
|
}
|
||||||
|
|
||||||
|
return sprintf('%s %s Uhr', $formattedDate, date('H:i', $startTime));
|
||||||
|
}
|
||||||
|
|
||||||
|
private function resolveEventDetailUrl(int $eventId): string
|
||||||
|
{
|
||||||
|
if ($eventId <= 0) {
|
||||||
|
return '';
|
||||||
|
}
|
||||||
|
|
||||||
|
$eventModel = $this->framework
|
||||||
|
->getAdapter(CalendarEventsModel::class)
|
||||||
|
->findById($eventId);
|
||||||
|
|
||||||
|
if (null === $eventModel) {
|
||||||
|
return '';
|
||||||
|
}
|
||||||
|
|
||||||
|
try {
|
||||||
|
return (string) $this->urlGenerator->generate($eventModel, [], UrlGeneratorInterface::ABSOLUTE_PATH);
|
||||||
|
} catch (ExceptionInterface) {
|
||||||
|
return '';
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private function buildOrganizationDetailUrl(string $baseUrl, int $organizationId): string
|
||||||
|
{
|
||||||
|
$normalizedBaseUrl = trim($baseUrl);
|
||||||
|
|
||||||
|
if ('' === $normalizedBaseUrl || $organizationId <= 0) {
|
||||||
|
return '';
|
||||||
|
}
|
||||||
|
|
||||||
|
$separator = str_contains($normalizedBaseUrl, '?') ? '&' : '?';
|
||||||
|
|
||||||
|
return sprintf('%s%sshow=%d', $normalizedBaseUrl, $separator, $organizationId);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @param list<string> $candidates
|
||||||
|
*/
|
||||||
|
private function resolveExistingTable(array $candidates): ?string
|
||||||
|
{
|
||||||
|
foreach ($candidates as $candidate) {
|
||||||
|
if ($this->tableExists($candidate)) {
|
||||||
|
return $candidate;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @return array{latitude:string,longitude:string}|null
|
||||||
|
*/
|
||||||
|
private function resolveGeoColumns(string $table): ?array
|
||||||
|
{
|
||||||
|
$columns = $this->getColumnMap($table);
|
||||||
|
|
||||||
|
if (isset($columns['latitude'], $columns['longitude'])) {
|
||||||
|
return [
|
||||||
|
'latitude' => 'latitude',
|
||||||
|
'longitude' => 'longitude',
|
||||||
|
];
|
||||||
|
}
|
||||||
|
|
||||||
|
if (isset($columns['lat'], $columns['lng'])) {
|
||||||
|
return [
|
||||||
|
'latitude' => 'lat',
|
||||||
|
'longitude' => 'lng',
|
||||||
|
];
|
||||||
|
}
|
||||||
|
|
||||||
|
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;
|
||||||
|
}
|
||||||
|
}
|
||||||
Reference in New Issue
Block a user