Compare commits
12 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 142cab2203 | |||
| acf3d02d13 | |||
| add43674cf | |||
| a04c6de362 | |||
| f8cd256348 | |||
| 8c9ea29170 | |||
| 8c5921d02a | |||
| c4a7150f41 | |||
| 993b3aa774 | |||
| a03612dc9c | |||
| b525f37862 | |||
| 1b477c24da |
@@ -3,6 +3,7 @@
|
|||||||
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';
|
||||||
@@ -157,3 +158,15 @@ $GLOBALS['TL_DCA']['tl_module']['fields']['eventListDomId'] = [
|
|||||||
'eval' => ['includeBlankOption' => true, 'chosen' => true, 'tl_class' => 'w50'],
|
'eval' => ['includeBlankOption' => true, 'chosen' => true, 'tl_class' => 'w50'],
|
||||||
'sql' => ['type' => 'string', 'length' => 128, 'default' => ''],
|
'sql' => ['type' => 'string', 'length' => 128, 'default' => ''],
|
||||||
];
|
];
|
||||||
|
|
||||||
|
if (isset($GLOBALS['TL_DCA']['tl_module']['fields']['list_layout'])) {
|
||||||
|
$GLOBALS['TL_DCA']['tl_module']['fields']['list_layout']['options_callback'] = static function (): array {
|
||||||
|
$options = Controller::getTemplateGroup('list_');
|
||||||
|
|
||||||
|
if (!isset($options['list_default_organisationen'])) {
|
||||||
|
$options['list_default_organisationen'] = 'list_default_organisationen';
|
||||||
|
}
|
||||||
|
|
||||||
|
return $options;
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|||||||
@@ -1,14 +1,19 @@
|
|||||||
<div id="eventfilters" data-eventlist-id="{{ targetEventListId|default('eventlist')|e('html_attr') }}">
|
<div id="eventfilters" data-eventlist-id="{{ targetEventListId|default('eventlist')|e('html_attr') }}">
|
||||||
<button type="button" data-filter-tag="all" class="active" aria-pressed="true">Alle</button>
|
<div class="select-filters">
|
||||||
|
<div class="widget-select category">
|
||||||
|
<label for="tag-filter" class="visually-hidden">Kategorie wählen</label>
|
||||||
|
<select id="tag-filter">
|
||||||
|
<option value="all" data-placeholder="true">Kategorie wählen</option>
|
||||||
{% for tag in tagButtons|default([]) %}
|
{% for tag in tagButtons|default([]) %}
|
||||||
<button type="button" data-filter-tag="{{ tag.id }}" aria-pressed="false">{{ tag.title }} ({{ tag.count }})</button>
|
<option value="tag-{{ tag.id }}">{{ tag.title }} ({{ tag.count }})</option>
|
||||||
{% endfor %}
|
{% endfor %}
|
||||||
|
</select>
|
||||||
|
</div>
|
||||||
|
|
||||||
<div class="widget-select places">
|
<div class="widget-select places">
|
||||||
<label for="location-filter" class="visually-hidden">Orte:</label>
|
<label for="location-filter" class="visually-hidden">Ort wählen</label>
|
||||||
<select id="location-filter">
|
<select id="location-filter">
|
||||||
<option value="all">Orte</option>
|
<option value="all" data-placeholder="true">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 %}
|
||||||
@@ -16,14 +21,17 @@
|
|||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="widget-select org">
|
<div class="widget-select org">
|
||||||
<label for="org-filter" class="visually-hidden">Veranstalter:</label>
|
<label for="org-filter" class="visually-hidden">Veranstalter wählen</label>
|
||||||
<select id="org-filter">
|
<select id="org-filter">
|
||||||
<option value="all">Veranstalter</option>
|
<option value="all" data-placeholder="true">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 %}
|
||||||
</select>
|
</select>
|
||||||
</div>
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<button type="button" id="eventfilter-reset" class="eventfilter-reset" 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>
|
||||||
@@ -60,19 +68,24 @@
|
|||||||
pointer-events: none;
|
pointer-events: none;
|
||||||
}
|
}
|
||||||
|
|
||||||
#eventfilters .active,
|
#eventfilters .widget-select.active .ss-main {
|
||||||
#eventfilters select.active {
|
|
||||||
outline: 2px solid currentColor;
|
outline: 2px solid currentColor;
|
||||||
outline-offset: 2px;
|
outline-offset: 2px;
|
||||||
}
|
}
|
||||||
|
|
||||||
#eventfilters button:focus-visible,
|
#eventfilters .ss-main:focus-visible {
|
||||||
#eventfilters select:focus-visible {
|
|
||||||
outline: 2px solid currentColor;
|
outline: 2px solid currentColor;
|
||||||
outline-offset: 2px;
|
outline-offset: 2px;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#eventfilters .eventfilter-reset[hidden] {
|
||||||
|
display: none;
|
||||||
|
}
|
||||||
</style>
|
</style>
|
||||||
|
|
||||||
|
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/slim-select@3/dist/slimselect.css">
|
||||||
|
<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');
|
||||||
|
|
||||||
@@ -90,14 +103,61 @@
|
|||||||
list?.classList.add('event-filter-target-list');
|
list?.classList.add('event-filter-target-list');
|
||||||
|
|
||||||
const events = list ? Array.from(list.querySelectorAll(':scope > .event')) : [];
|
const events = list ? Array.from(list.querySelectorAll(':scope > .event')) : [];
|
||||||
const tagButtons = Array.from(filters.querySelectorAll('button[data-filter-tag]'));
|
const tagSelect = filters.querySelector('#tag-filter');
|
||||||
const locationSelect = filters.querySelector('#location-filter');
|
const locationSelect = filters.querySelector('#location-filter');
|
||||||
const orgSelect = filters.querySelector('#org-filter');
|
const orgSelect = filters.querySelector('#org-filter');
|
||||||
|
const tagWidget = tagSelect?.closest('.widget-select');
|
||||||
|
const locationWidget = locationSelect?.closest('.widget-select');
|
||||||
|
const orgWidget = orgSelect?.closest('.widget-select');
|
||||||
|
const resetButton = filters.querySelector('#eventfilter-reset');
|
||||||
const status = filters.querySelector('#eventfilter-status');
|
const status = filters.querySelector('#eventfilter-status');
|
||||||
|
|
||||||
const animationMs = 220;
|
const animationMs = 220;
|
||||||
let hideTimers = new WeakMap();
|
let hideTimers = new WeakMap();
|
||||||
let currentFilter = { type: 'tag', value: 'all' };
|
let currentFilter = { type: 'all', value: 'all' };
|
||||||
|
let suppressedChangeEvents = 0;
|
||||||
|
|
||||||
|
const initSlimSelect = (selectElement) => {
|
||||||
|
if (!selectElement || 'undefined' === typeof window.SlimSelect) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
return new window.SlimSelect({
|
||||||
|
select: selectElement,
|
||||||
|
settings: {
|
||||||
|
showSearch: false,
|
||||||
|
allowDeselect: false,
|
||||||
|
},
|
||||||
|
});
|
||||||
|
};
|
||||||
|
|
||||||
|
const tagSlim = initSlimSelect(tagSelect);
|
||||||
|
const locationSlim = initSlimSelect(locationSelect);
|
||||||
|
const orgSlim = initSlimSelect(orgSelect);
|
||||||
|
|
||||||
|
const setSelectValue = (selectElement, slimInstance, value) => {
|
||||||
|
if (!selectElement) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (selectElement.value === value) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
suppressedChangeEvents += 1;
|
||||||
|
|
||||||
|
try {
|
||||||
|
if (slimInstance) {
|
||||||
|
slimInstance.setSelected(value);
|
||||||
|
} else {
|
||||||
|
selectElement.value = value;
|
||||||
|
}
|
||||||
|
} finally {
|
||||||
|
queueMicrotask(() => {
|
||||||
|
suppressedChangeEvents = Math.max(0, suppressedChangeEvents - 1);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
const clearHideTimer = (eventItem) => {
|
const clearHideTimer = (eventItem) => {
|
||||||
const timer = hideTimers.get(eventItem);
|
const timer = hideTimers.get(eventItem);
|
||||||
@@ -130,18 +190,16 @@
|
|||||||
};
|
};
|
||||||
|
|
||||||
const setActiveControl = ({ type, value }) => {
|
const setActiveControl = ({ type, value }) => {
|
||||||
tagButtons.forEach((button) => {
|
const hasActiveTag = type === 'tag' && value !== 'all';
|
||||||
const isActive = type === 'tag' && button.dataset.filterTag === value;
|
const hasActiveLocation = type === 'location' && value !== 'all';
|
||||||
button.classList.toggle('active', isActive);
|
const hasActiveOrg = type === 'org' && value !== 'all';
|
||||||
button.setAttribute('aria-pressed', isActive ? 'true' : 'false');
|
|
||||||
});
|
|
||||||
|
|
||||||
if (locationSelect) {
|
tagWidget?.classList.toggle('active', hasActiveTag);
|
||||||
locationSelect.classList.toggle('active', type === 'location');
|
locationWidget?.classList.toggle('active', hasActiveLocation);
|
||||||
}
|
orgWidget?.classList.toggle('active', hasActiveOrg);
|
||||||
|
|
||||||
if (orgSelect) {
|
if (resetButton) {
|
||||||
orgSelect.classList.toggle('active', type === 'org');
|
resetButton.hidden = !(hasActiveTag || hasActiveLocation || hasActiveOrg);
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -167,6 +225,10 @@
|
|||||||
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;
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -178,9 +240,9 @@
|
|||||||
const visibleCount = events.filter((eventItem) => !eventItem.hidden).length;
|
const visibleCount = events.filter((eventItem) => !eventItem.hidden).length;
|
||||||
let filterText = 'alle';
|
let filterText = 'alle';
|
||||||
|
|
||||||
if (filterState.type === 'tag' && filterState.value !== 'all') {
|
if (filterState.type === 'tag' && tagSelect) {
|
||||||
const activeButton = tagButtons.find((button) => button.dataset.filterTag === filterState.value);
|
const option = tagSelect.options[tagSelect.selectedIndex];
|
||||||
filterText = activeButton ? activeButton.textContent.trim() : `Tag ${filterState.value}`;
|
filterText = option ? option.textContent.trim() : 'Kategorie wählen';
|
||||||
}
|
}
|
||||||
|
|
||||||
if (filterState.type === 'location' && locationSelect) {
|
if (filterState.type === 'location' && locationSelect) {
|
||||||
@@ -211,47 +273,64 @@
|
|||||||
updateStatus(filterState);
|
updateStatus(filterState);
|
||||||
};
|
};
|
||||||
|
|
||||||
tagButtons.forEach((button) => {
|
tagSelect?.addEventListener('change', () => {
|
||||||
button.addEventListener('click', () => {
|
if (suppressedChangeEvents > 0) {
|
||||||
if (locationSelect) {
|
return;
|
||||||
locationSelect.value = 'all';
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (orgSelect) {
|
const selectedValue = tagSelect.value;
|
||||||
orgSelect.value = 'all';
|
|
||||||
}
|
|
||||||
|
|
||||||
applyFilter({ type: 'tag', value: button.dataset.filterTag ?? 'all' });
|
setSelectValue(locationSelect, locationSlim, 'all');
|
||||||
});
|
setSelectValue(orgSelect, orgSlim, 'all');
|
||||||
});
|
|
||||||
|
|
||||||
locationSelect?.addEventListener('change', () => {
|
|
||||||
const selectedValue = locationSelect.value;
|
|
||||||
|
|
||||||
if (orgSelect) {
|
|
||||||
orgSelect.value = 'all';
|
|
||||||
}
|
|
||||||
|
|
||||||
applyFilter(
|
applyFilter(
|
||||||
selectedValue === 'all'
|
selectedValue === 'all'
|
||||||
? { type: 'tag', value: 'all' }
|
? { type: 'all', value: 'all' }
|
||||||
|
: { type: 'tag', value: selectedValue.replace('tag-', '') },
|
||||||
|
);
|
||||||
|
});
|
||||||
|
|
||||||
|
locationSelect?.addEventListener('change', () => {
|
||||||
|
if (suppressedChangeEvents > 0) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
const selectedValue = locationSelect.value;
|
||||||
|
|
||||||
|
setSelectValue(tagSelect, tagSlim, 'all');
|
||||||
|
setSelectValue(orgSelect, orgSlim, 'all');
|
||||||
|
|
||||||
|
applyFilter(
|
||||||
|
selectedValue === 'all'
|
||||||
|
? { type: 'all', value: 'all' }
|
||||||
: { type: 'location', value: selectedValue.replace('location-', '') },
|
: { type: 'location', value: selectedValue.replace('location-', '') },
|
||||||
);
|
);
|
||||||
});
|
});
|
||||||
|
|
||||||
orgSelect?.addEventListener('change', () => {
|
orgSelect?.addEventListener('change', () => {
|
||||||
|
if (suppressedChangeEvents > 0) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
const selectedValue = orgSelect.value;
|
const selectedValue = orgSelect.value;
|
||||||
|
|
||||||
if (locationSelect) {
|
setSelectValue(tagSelect, tagSlim, 'all');
|
||||||
locationSelect.value = 'all';
|
setSelectValue(locationSelect, locationSlim, 'all');
|
||||||
}
|
|
||||||
|
|
||||||
applyFilter(
|
applyFilter(
|
||||||
selectedValue === 'all'
|
selectedValue === 'all'
|
||||||
? { type: 'tag', value: 'all' }
|
? { type: 'all', value: 'all' }
|
||||||
: { type: 'org', value: selectedValue.replace('org-', '') },
|
: { type: 'org', value: selectedValue.replace('org-', '') },
|
||||||
);
|
);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
resetButton?.addEventListener('click', () => {
|
||||||
|
setSelectValue(tagSelect, tagSlim, 'all');
|
||||||
|
setSelectValue(locationSelect, locationSlim, 'all');
|
||||||
|
setSelectValue(orgSelect, orgSlim, 'all');
|
||||||
|
|
||||||
|
applyFilter({ type: 'all', value: 'all' });
|
||||||
|
});
|
||||||
|
|
||||||
applyFilter(currentFilter);
|
applyFilter(currentFilter);
|
||||||
</script>
|
</script>
|
||||||
|
|||||||
@@ -0,0 +1,508 @@
|
|||||||
|
<?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,
|
||||||
|
) {
|
||||||
|
}
|
||||||
|
|
||||||
|
public function onParseTemplate(Template $template): void
|
||||||
|
{
|
||||||
|
if ('list_default_organisationen' !== (string) $template->getName()) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
$tbody = $template->tbody;
|
||||||
|
|
||||||
|
if (!\is_array($tbody) || [] === $tbody) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
$rowToOrganizationIdMap = [];
|
||||||
|
$rowToTitleMap = [];
|
||||||
|
|
||||||
|
$resolvedByRowIdCount = 0;
|
||||||
|
$resolvedByTitleToIdCount = 0;
|
||||||
|
$enrichedByTitleTagFallbackCount = 0;
|
||||||
|
|
||||||
|
foreach ($tbody as $rowIndex => $row) {
|
||||||
|
if (!\is_array($row)) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
$organizationId = $this->extractOrganizationId($row);
|
||||||
|
|
||||||
|
if ($organizationId > 0) {
|
||||||
|
$rowToOrganizationIdMap[(int) $rowIndex] = $organizationId;
|
||||||
|
++$resolvedByRowIdCount;
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
$title = $this->extractRowFieldContent($row, 'title');
|
||||||
|
|
||||||
|
if ('' !== $title) {
|
||||||
|
$rowToTitleMap[(int) $rowIndex] = $this->normalizeTitle($title);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if ([] !== $rowToTitleMap) {
|
||||||
|
$titleToOrganizationIdMap = $this->resolveOrganizationIdsByTitle(array_values(array_unique(array_filter($rowToTitleMap))));
|
||||||
|
|
||||||
|
foreach ($rowToTitleMap as $rowIndex => $title) {
|
||||||
|
if (isset($rowToOrganizationIdMap[$rowIndex])) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
$organizationId = $titleToOrganizationIdMap[$title] ?? 0;
|
||||||
|
|
||||||
|
if ($organizationId > 0) {
|
||||||
|
$rowToOrganizationIdMap[$rowIndex] = $organizationId;
|
||||||
|
++$resolvedByTitleToIdCount;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if ([] === $rowToOrganizationIdMap) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
$organizationTagMap = $this->fetchOrganizationTagMap(array_values(array_unique(array_values($rowToOrganizationIdMap))));
|
||||||
|
$organizationLogoUuidMap = $this->fetchOrganizationLogoUuidMap(array_values(array_unique(array_values($rowToOrganizationIdMap))));
|
||||||
|
$organizationTagMapByTitle = $this->fetchOrganizationTagMapByTitle(array_values(array_unique(array_filter($rowToTitleMap))));
|
||||||
|
|
||||||
|
foreach ($rowToOrganizationIdMap as $rowIndex => $organizationId) {
|
||||||
|
$tagData = $organizationTagMap[$organizationId] ?? ['labels' => [], 'slugs' => []];
|
||||||
|
$logoUuid = $organizationLogoUuidMap[$organizationId] ?? '';
|
||||||
|
|
||||||
|
if (!isset($tbody[$rowIndex]) || !\is_array($tbody[$rowIndex])) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
$tbody[$rowIndex]['tag_labels']['content'] = implode(', ', $tagData['labels']);
|
||||||
|
$tbody[$rowIndex]['tag_slugs']['content'] = implode(',', $tagData['slugs']);
|
||||||
|
$tbody[$rowIndex]['tags']['content'] = implode(', ', $tagData['labels']);
|
||||||
|
|
||||||
|
if ('' !== $logoUuid) {
|
||||||
|
$tbody[$rowIndex]['logo_uuid']['content'] = $logoUuid;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
foreach ($tbody as $rowIndex => $row) {
|
||||||
|
if (!\is_array($row) || isset($rowToOrganizationIdMap[$rowIndex])) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
$title = $this->normalizeTitle($this->extractRowFieldContent($row, 'title'));
|
||||||
|
|
||||||
|
if ('' === $title || !isset($organizationTagMapByTitle[$title])) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
$tagData = $organizationTagMapByTitle[$title];
|
||||||
|
|
||||||
|
$tbody[$rowIndex]['tag_labels']['content'] = implode(', ', $tagData['labels']);
|
||||||
|
$tbody[$rowIndex]['tag_slugs']['content'] = implode(',', $tagData['slugs']);
|
||||||
|
$tbody[$rowIndex]['tags']['content'] = implode(', ', $tagData['labels']);
|
||||||
|
++$enrichedByTitleTagFallbackCount;
|
||||||
|
}
|
||||||
|
|
||||||
|
$rowsWithoutTagSlugs = 0;
|
||||||
|
$sampleUnresolvedTitles = [];
|
||||||
|
|
||||||
|
foreach ($tbody as $row) {
|
||||||
|
if (!\is_array($row)) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
$tagSlugs = $this->extractRowFieldContent($row, 'tag_slugs');
|
||||||
|
|
||||||
|
if ('' !== $tagSlugs) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
++$rowsWithoutTagSlugs;
|
||||||
|
|
||||||
|
if (\count($sampleUnresolvedTitles) < 10) {
|
||||||
|
$title = $this->normalizeTitle($this->extractRowFieldContent($row, 'title'));
|
||||||
|
|
||||||
|
if ('' !== $title) {
|
||||||
|
$sampleUnresolvedTitles[] = $title;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if ($rowsWithoutTagSlugs > 0) {
|
||||||
|
$this->logger->warning('Organization listing tag enrichment left rows without tag slugs.', [
|
||||||
|
'template' => (string) $template->getName(),
|
||||||
|
'totalRows' => \count($tbody),
|
||||||
|
'resolvedByRowId' => $resolvedByRowIdCount,
|
||||||
|
'resolvedByTitleToId' => $resolvedByTitleToIdCount,
|
||||||
|
'enrichedByTitleTagFallback' => $enrichedByTitleTagFallbackCount,
|
||||||
|
'rowsWithoutTagSlugs' => $rowsWithoutTagSlugs,
|
||||||
|
'sampleUnresolvedTitles' => array_values(array_unique($sampleUnresolvedTitles)),
|
||||||
|
]);
|
||||||
|
}
|
||||||
|
|
||||||
|
$template->tbody = $tbody;
|
||||||
|
}
|
||||||
|
|
||||||
|
/** @param array<string, mixed> $row */
|
||||||
|
private function extractOrganizationId(array $row): int
|
||||||
|
{
|
||||||
|
foreach (['id', 'organization_id', 'org_id'] as $fieldName) {
|
||||||
|
$value = $this->extractRowFieldContent($row, $fieldName);
|
||||||
|
|
||||||
|
if ('' !== $value && ctype_digit($value)) {
|
||||||
|
return (int) $value;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
$urlCandidates = [];
|
||||||
|
|
||||||
|
foreach ($row as $column) {
|
||||||
|
if (!\is_array($column)) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (isset($column['url']) && \is_scalar($column['url'])) {
|
||||||
|
$urlCandidates[] = (string) $column['url'];
|
||||||
|
}
|
||||||
|
|
||||||
|
if (isset($column['href']) && \is_scalar($column['href'])) {
|
||||||
|
$urlCandidates[] = (string) $column['href'];
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
foreach ($urlCandidates as $url) {
|
||||||
|
$organizationId = $this->extractIdFromUrl($url);
|
||||||
|
|
||||||
|
if ($organizationId > 0) {
|
||||||
|
return $organizationId;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
/** @param array<string, mixed> $row */
|
||||||
|
private function extractRowFieldContent(array $row, string $fieldName): string
|
||||||
|
{
|
||||||
|
if (!isset($row[$fieldName]) || !\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<string> $titles
|
||||||
|
* @return array<string, int>
|
||||||
|
*/
|
||||||
|
private function resolveOrganizationIdsByTitle(array $titles): array
|
||||||
|
{
|
||||||
|
if ([] === $titles) {
|
||||||
|
return [];
|
||||||
|
}
|
||||||
|
|
||||||
|
$rows = $this->connection->executeQuery(
|
||||||
|
'SELECT o.id, o.title FROM tl_organization o WHERE o.title IN (?)',
|
||||||
|
[$titles],
|
||||||
|
[ArrayParameterType::STRING],
|
||||||
|
)->fetchAllAssociative();
|
||||||
|
|
||||||
|
$titleToIdsMap = [];
|
||||||
|
|
||||||
|
foreach ($rows as $row) {
|
||||||
|
$organizationId = (int) ($row['id'] ?? 0);
|
||||||
|
$title = $this->normalizeTitle((string) ($row['title'] ?? ''));
|
||||||
|
|
||||||
|
if ($organizationId <= 0 || '' === $title) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
$titleToIdsMap[$title][] = $organizationId;
|
||||||
|
}
|
||||||
|
|
||||||
|
$titleToOrganizationIdMap = [];
|
||||||
|
|
||||||
|
foreach ($titleToIdsMap as $title => $organizationIds) {
|
||||||
|
$organizationIds = array_values(array_unique(array_map('intval', $organizationIds)));
|
||||||
|
|
||||||
|
if (1 === \count($organizationIds)) {
|
||||||
|
$titleToOrganizationIdMap[$title] = $organizationIds[0];
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return $titleToOrganizationIdMap;
|
||||||
|
}
|
||||||
|
|
||||||
|
private function normalizeTitle(string $title): string
|
||||||
|
{
|
||||||
|
$title = html_entity_decode($title, ENT_QUOTES | ENT_HTML5, 'UTF-8');
|
||||||
|
$title = trim(strip_tags($title));
|
||||||
|
|
||||||
|
return preg_replace('/\s+/u', ' ', $title) ?? '';
|
||||||
|
}
|
||||||
|
|
||||||
|
/** @param list<int> $organizationIds
|
||||||
|
* @return array<int, array{labels: list<string>, slugs: 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();
|
||||||
|
}
|
||||||
|
|
||||||
|
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.field = ? AND r.pid IN (?) ORDER BY r.pid ASC, r.tag_id ASC',
|
||||||
|
['tags', $organizationIds],
|
||||||
|
[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.pid IN (?) ORDER BY r.pid ASC, r.tag_id ASC',
|
||||||
|
[$organizationIds],
|
||||||
|
[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) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (isset($seen[$organizationId][$tagId])) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
$seen[$organizationId][$tagId] = true;
|
||||||
|
$map[$organizationId]['labels'][] = $label;
|
||||||
|
|
||||||
|
$slug = $this->slugify($label);
|
||||||
|
|
||||||
|
if ('' !== $slug) {
|
||||||
|
$map[$organizationId]['slugs'][] = $slug;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
foreach ($map as $organizationId => $tagData) {
|
||||||
|
$map[$organizationId]['labels'] = array_values(array_unique($tagData['labels'] ?? []));
|
||||||
|
$map[$organizationId]['slugs'] = array_values(array_unique($tagData['slugs'] ?? []));
|
||||||
|
}
|
||||||
|
|
||||||
|
return $map;
|
||||||
|
}
|
||||||
|
|
||||||
|
/** @param list<string> $titles
|
||||||
|
* @return array<string, array{labels: list<string>, slugs: list<string>}>
|
||||||
|
*/
|
||||||
|
private function fetchOrganizationTagMapByTitle(array $titles): array
|
||||||
|
{
|
||||||
|
if ([] === $titles) {
|
||||||
|
return [];
|
||||||
|
}
|
||||||
|
|
||||||
|
$rows = $this->connection->executeQuery(
|
||||||
|
'SELECT o.title, r.tag_id, t.tag AS label FROM tl_organization o INNER JOIN tl_tags_rel r ON r.pid = o.id AND r.ptable = ? INNER JOIN tl_tags t ON t.id = r.tag_id WHERE o.title IN (?) ORDER BY o.title ASC, r.tag_id ASC',
|
||||||
|
['tl_organization', $titles],
|
||||||
|
[ParameterType::STRING, ArrayParameterType::STRING],
|
||||||
|
)->fetchAllAssociative();
|
||||||
|
|
||||||
|
if ([] === $rows) {
|
||||||
|
$rows = $this->connection->executeQuery(
|
||||||
|
'SELECT o.title, r.tag_id, t.tag AS label FROM tl_organization o INNER JOIN tl_tags_rel r ON r.pid = o.id AND r.field = ? INNER JOIN tl_tags t ON t.id = r.tag_id WHERE o.title IN (?) ORDER BY o.title ASC, r.tag_id ASC',
|
||||||
|
['tags', $titles],
|
||||||
|
[ParameterType::STRING, ArrayParameterType::STRING],
|
||||||
|
)->fetchAllAssociative();
|
||||||
|
}
|
||||||
|
|
||||||
|
if ([] === $rows) {
|
||||||
|
$rows = $this->connection->executeQuery(
|
||||||
|
'SELECT o.title, r.tag_id, t.tag AS label FROM tl_organization o INNER JOIN tl_tags_rel r ON r.pid = o.id INNER JOIN tl_tags t ON t.id = r.tag_id WHERE o.title IN (?) ORDER BY o.title ASC, r.tag_id ASC',
|
||||||
|
[$titles],
|
||||||
|
[ArrayParameterType::STRING],
|
||||||
|
)->fetchAllAssociative();
|
||||||
|
}
|
||||||
|
|
||||||
|
$map = [];
|
||||||
|
$seen = [];
|
||||||
|
|
||||||
|
foreach ($rows as $row) {
|
||||||
|
$title = $this->normalizeTitle((string) ($row['title'] ?? ''));
|
||||||
|
$tagId = (int) ($row['tag_id'] ?? 0);
|
||||||
|
$label = trim((string) ($row['label'] ?? ''));
|
||||||
|
|
||||||
|
if ('' === $title || $tagId <= 0 || '' === $label) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (isset($seen[$title][$tagId])) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
$seen[$title][$tagId] = true;
|
||||||
|
$map[$title]['labels'][] = $label;
|
||||||
|
|
||||||
|
$slug = $this->slugify($label);
|
||||||
|
|
||||||
|
if ('' !== $slug) {
|
||||||
|
$map[$title]['slugs'][] = $slug;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
foreach ($map as $title => $tagData) {
|
||||||
|
$map[$title]['labels'] = array_values(array_unique($tagData['labels'] ?? []));
|
||||||
|
$map[$title]['slugs'] = array_values(array_unique($tagData['slugs'] ?? []));
|
||||||
|
}
|
||||||
|
|
||||||
|
return $map;
|
||||||
|
}
|
||||||
|
|
||||||
|
/** @param list<int> $organizationIds
|
||||||
|
* @return array<int, string>
|
||||||
|
*/
|
||||||
|
private function fetchOrganizationLogoUuidMap(array $organizationIds): array
|
||||||
|
{
|
||||||
|
if ([] === $organizationIds) {
|
||||||
|
return [];
|
||||||
|
}
|
||||||
|
|
||||||
|
$rows = $this->connection->executeQuery(
|
||||||
|
'SELECT o.id AS organization_id, o.logo AS logo_uuid FROM tl_organization o 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);
|
||||||
|
|
||||||
|
if ($organizationId <= 0 || '' === $logoUuid) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
$map[$organizationId] = $logoUuid;
|
||||||
|
}
|
||||||
|
|
||||||
|
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 '';
|
||||||
|
}
|
||||||
|
|
||||||
|
private function slugify(string $value): string
|
||||||
|
{
|
||||||
|
$value = trim(mb_strtolower($value));
|
||||||
|
|
||||||
|
if ('' === $value) {
|
||||||
|
return '';
|
||||||
|
}
|
||||||
|
|
||||||
|
$value = strtr($value, [
|
||||||
|
'ä' => 'ae',
|
||||||
|
'ö' => 'oe',
|
||||||
|
'ü' => 'ue',
|
||||||
|
'ß' => 'ss',
|
||||||
|
]);
|
||||||
|
|
||||||
|
$value = preg_replace('/[^a-z0-9]+/u', '-', $value) ?? '';
|
||||||
|
$value = trim($value, '-');
|
||||||
|
|
||||||
|
return $value;
|
||||||
|
}
|
||||||
|
}
|
||||||
Reference in New Issue
Block a user