solve bug 0000074

domjos1994 · Aug 29, 2019 · 0d1ed6e · 0d1ed6e
1 parent 0d8cbf8
commit 0d1ed6e
Show file tree

Hide file tree

Showing 3 changed files with 50 additions and 2 deletions.
diff --git a/Classes/Controller/TimelineController.php b/Classes/Controller/TimelineController.php
@@ -2,10 +2,17 @@
 
 namespace DominicJoas\Timeline\Controller;
 
+use DominicJoas\Timeline\Domain\Model\TimelineEvent;
 use DominicJoas\Timeline\Domain\Repository\TimelineEventRepository;
+
+use Exception;
+use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3\CMS\Extbase\Mvc\Controller\ActionController;
 use TYPO3\CMS\Extbase\Configuration\ConfigurationManagerInterface;
 
+use GeorgRinger\News\Domain\Model\Dto\NewsDemand;
+use GeorgRinger\News\Domain\Repository\NewsRepository;
+
 class TimelineController extends ActionController {
     private $timelineEventRepository;
     protected $configurationManager;
@@ -59,6 +66,38 @@ public function injectConfigurationManager(ConfigurationManagerInterface $config
         }
     }
 
+    public function createTimeLineEventsFromNews() {
+        $events = [];
+        try {
+            $pages = $this->configurationManager->getContentObject()->data['pages'];
+            $objManager = GeneralUtility::makeInstance('TYPO3\\CMS\\Extbase\\Object\\ObjectManager');
+            $newsRepository = $objManager->get(NewsRepository::class);
+            $demand = $objManager->get(NewsDemand::class);
+            $demand->setStoragePage($pages);
+            $demand->setPid($pages);
+            $entries = $newsRepository->findDemanded($demand);
+
+            $counter = 0;
+            foreach ($entries as $entry) {
+                if($entry->getPid()==$pages) {
+                    $event = new TimelineEvent();
+                    $event->setTitle($entry->getTitle());
+                    $event->setDescription($entry->getDescription());
+                    $event->setStartDate($entry->getStarttime());
+                    $event->setEndDate($entry->getEndtime());
+                    if($entry->getRelatedLinks()!=null) {
+                        if($entry->getRelatedLinks()->count()!=0) {
+                            $event->setEventLink($entry->getRelatedLinks()[0]->getUri());
+                        }
+                    }
+                    $events[$counter] = $event;
+                    $counter++;
+                }
+            }
+        } catch (Exception $ex) {}
+        return $events;
+    }
+
     public function listAction() {
         $uid = $this->configurationManager->getContentObject()->data['_LOCALIZED_UID'];
         if($uid==null) {
@@ -76,6 +115,11 @@ public function listAction() {
             $timelineEvents = $query->toArray();
         }
 
+        $newsEvents = $this->createTimeLineEventsFromNews();
+        if(count($newsEvents)!=0) {
+            $timelineEvents = $newsEvents;
+        }
+
         $uniqueIDs = null;
         for($i = 0;$i<=count($timelineEvents)-1; $i++) {
             $uniqueIDs[$i] = uniqid(rand(), true);

diff --git a/ext_emconf.php b/ext_emconf.php
@@ -19,12 +19,12 @@
   'author_email' => '[email protected]',
   'state' => 'beta',
   'clearCacheOnLoad' => true,
-  'version' => '0.0.4',
+  'version' => '0.0.5',
   'constraints' => 
   array (
     'depends' => 
     array (
-      'typo3' => '7.6.0-9.5.99',
+      'typo3' => '8.7.0-9.5.99',
     ),
     'conflicts' => 
     array (

diff --git a/ext_localconf.php b/ext_localconf.php
@@ -1,5 +1,7 @@
 <?php
 
+use GeorgRinger\News\Domain\Repository\NewsRepository;
+
 defined('TYPO3_MODE') || die('Access denied.');
 
 call_user_func(function($extKey) {
@@ -27,3 +29,5 @@
         }'
     );
 }, $_EXTKEY);
+
+\TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(\TYPO3\CMS\Extbase\Object\Container\Container::class)->registerImplementation(NewsRepository::class, NewsRepository::class);