enhance displaying subevents, fixed ordering issue

heimrichhannot · Feb 19, 2025 · 584ec56 · 584ec56
1 parent d53d821
commit 584ec56
Show file tree

Hide file tree

Showing 5 changed files with 45 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,11 @@
 # Changelog
 All notable changes to this project will be documented in this file.
 
+## [2.7.0] - 2025-02-19
+- Changed: better indication of parent event
+- Changed: added urls to parent events
+- Fixed: default order directive in model using non existing field
+
 ## [2.6.1] - 2025-02-18
 - Fixed: missing token on subevents link in backend
 - Fixed: performance issue on memberDocents field

diff --git a/classes/EventListener/Hooks/ParseTemplateListener.php b/classes/EventListener/Hooks/ParseTemplateListener.php
@@ -2,10 +2,13 @@
 
 namespace HeimrichHannot\CalendarPlus\EventListener\Hooks;
 
+use Contao\Backend;
 use Contao\CalendarModel;
 use Contao\Input;
+use Contao\System;
 use Contao\Template;
 use HeimrichHannot\CalendarPlus\CalendarPlusEventsModel;
+use HeimrichHannot\UtilsBundle\Util\Utils;
 
 class ParseTemplateListener
 {
@@ -24,9 +27,17 @@ public function __invoke(Template $template): void
                 return;
             }
 
+            $utils = System::getContainer()->get(Utils::class);
+
             $headlineParts = explode('> <', $template->headline);
             unset($headlineParts[array_key_last($headlineParts)]);
-            $headlineParts[] = 'span>'.$eventModel->title.'</span';
+            $eventUrl = $utils->routing()->generateBackendRoute([
+                'do' => 'calendar',
+                'table' => 'tl_calendar_events',
+                'id' => $eventId,
+                'act' => 'edit',
+            ]);
+            $headlineParts[] = 'span><a href="'. $eventUrl .'">'.$eventModel->title.'</a></span';
             $headlineParts[] = 'span>'.$GLOBALS['TL_LANG']['MSC']['subevents'].'</span>';
 
             $template->headline = implode('> <', $headlineParts);

diff --git a/dca/tl_calendar_events.php b/dca/tl_calendar_events.php
@@ -230,6 +230,27 @@ public static function filterSubEvents()
 
             if ($intEpid) {
                 $arrDca['list']['sorting']['mode'] = 1;
+                $arrDca['list']['sorting']['header_callback'] = static function (array $labels, DataContainer $dc) use ($intEpid): array {
+                    $parentEvent = CalendarPlusEventsModel::findByPk($intEpid);
+                    $archive = CalendarPlusModel::findByPk($parentEvent?->pid);
+                    if (!$parentEvent || !$archive) {
+                        return $labels;
+                    }
+
+                    $utils = \Contao\System::getContainer()->get(Utils::class);
+                    $eventUrl = $utils->routing()->generateBackendRoute([
+                        'do' => 'calendar',
+                        'table' => 'tl_calendar_events',
+                        'id' => $intEpid,
+                        'act' => 'edit',
+                    ]);
+
+                    $header = [
+                        ($GLOBALS['TL_LANG']['tl_calendar_events']['reference']['archive'] ?? 'Calendar') => $archive->title,
+                        ($GLOBALS['TL_LANG']['tl_calendar_events']['parentEvent'][0] ?? 'Event') => '<a href="'.$eventUrl.'">'.$parentEvent->title.'</a>',
+                    ];
+                    return $header;
+                };
                 $arrDca['list']['label']['format'] = '%s <span style="color:#999;padding-left:3px">[%s]</span>';
                 $arrDca['list']['label']['fields'] = ['title', 'startDate', 'startTime'];
                 $arrDca['list']['label']['label_callback'] = static function (array $row, string $label) {

diff --git a/languages/de/tl_calendar_events.php b/languages/de/tl_calendar_events.php
@@ -61,4 +61,9 @@
 /**
  * Buttons
  */
-$arrLang['showSubEvents'] = ['Unterveranstaltungen anzeigen', 'Unterveranstaltungen von ID %s anzeigen'];
+$arrLang['showSubEvents'] = ['Unterveranstaltungen anzeigen', 'Unterveranstaltungen von ID %s anzeigen'];
+
+/**
+ * References
+ */
+$arrLang['reference']['archive'] = 'Kalender';
diff --git a/models/CalendarPlusEventsModel.php b/models/CalendarPlusEventsModel.php
@@ -724,7 +724,7 @@ public static function findPublishedSubEvents($varId, array $arrOptions = [])
         $arrColumns = ["($t.parentEvent=?)"];
 
         if (!isset($arrOptions['order'])) {
-            $arrOptions['order'] = "$t.startTime, $t.sorting ASC";
+            $arrOptions['order'] = "$t.startTime";
         }
 
         if (!BE_USER_LOGGED_IN) {