From 08e3a10e03fedc8fae2fab8f2ca20fa2fc4af85b Mon Sep 17 00:00:00 2001
From: Dennis Eichhorn <spl1nes.com@googlemail.com>
Date: Mon, 2 Oct 2017 09:19:20 +0200
Subject: [PATCH] fix #31

---
 Models/Task.php                   | 10 ++++++++++
 Models/TaskElement.php            | 16 ++++++++++++++++
 Models/TaskElementMapper.php      |  4 ++--
 Models/TaskMapper.php             |  4 ++--
 Theme/Backend/task-single.tpl.php | 22 ++++++++++++++++++++--
 5 files changed, 50 insertions(+), 6 deletions(-)

diff --git a/Models/Task.php b/Models/Task.php
index 620c83d..bc99062 100644
--- a/Models/Task.php
+++ b/Models/Task.php
@@ -153,6 +153,16 @@ class Task implements \JsonSerializable
         return $key;
     }
 
+    public function getMedia() : array
+    {
+        return $this->media;
+    }
+
+    public function addMedia($media) /* : void */
+    {
+        $this->media[] = $media;
+    }
+
     public function isCc(int $id) : bool
     {
         return false;
diff --git a/Models/TaskElement.php b/Models/TaskElement.php
index 4e53507..04afb27 100644
--- a/Models/TaskElement.php
+++ b/Models/TaskElement.php
@@ -91,6 +91,12 @@ class TaskElement implements \JsonSerializable
      */
     private $forwarded = 0;
 
+    /**
+     * Media.
+     *
+     * @var array
+     * @since 1.0.0
+     */
     private $media = [];
 
     /**
@@ -153,6 +159,16 @@ class TaskElement implements \JsonSerializable
         }
     }
 
+    public function getMedia() : array
+    {
+        return $this->media;
+    }
+
+    public function addMedia($media) /* : void */
+    {
+        $this->media[] = $media;
+    }
+
     /**
      * @return string
      *
diff --git a/Models/TaskElementMapper.php b/Models/TaskElementMapper.php
index 480d8ca..e50a062 100644
--- a/Models/TaskElementMapper.php
+++ b/Models/TaskElementMapper.php
@@ -58,8 +58,8 @@ class TaskElementMapper extends DataMapperAbstract
         'media' => [
             'mapper'         => MediaMapper::class,
             'table'          => 'task_element_media',
-            'dst'            => 'task_element_media_dst',
-            'src'            => 'task_element_media_src',
+            'dst'            => 'task_element_media_src',
+            'src'            => 'task_element_media_dst',
         ],
     ];
 
diff --git a/Models/TaskMapper.php b/Models/TaskMapper.php
index c632920..2f6d732 100644
--- a/Models/TaskMapper.php
+++ b/Models/TaskMapper.php
@@ -71,8 +71,8 @@ class TaskMapper extends DataMapperAbstract
         'media' => [ // todo: maybe make this a has one and then link to collection instead of single media files!
             'mapper'         => MediaMapper::class,
             'table'          => 'task_media',
-            'dst'            => 'task_media_dst',
-            'src'            => 'task_media_src',
+            'dst'            => 'task_media_src',
+            'src'            => 'task_media_dst',
         ],
     ];
 
diff --git a/Theme/Backend/task-single.tpl.php b/Theme/Backend/task-single.tpl.php
index 691dbea..3068142 100644
--- a/Theme/Backend/task-single.tpl.php
+++ b/Theme/Backend/task-single.tpl.php
@@ -16,6 +16,7 @@
  * @var \Modules\Tasks\Models\Task $task
  */
 $task      = $this->getData('task');
+$taskMedia = $task->getMedia();
 $elements  = $task->getTaskElements();
 $cElements = count($elements);
 
@@ -39,6 +40,15 @@ echo $this->getData('nav')->render(); ?>
                     <?= $this->printHtml($task->getDescription()); ?>
                 </blockquote>
             </div>
+
+            <?php if(!empty($taskMedia)) : ?>
+            <div class="inner">
+                <?php foreach($taskMedia as $media) : ?>
+                <span><?= $media->getName(); ?></span>
+                <?php endforeach; ?>
+            </div>
+            <?php endif; ?>
+
             <div class="inner">
                 <div class="pAlignTable">
                     <div class="vCenterTable wf-100">Created <?= $this->printHtml($task->getCreatedBy()->getName1()); ?></div>
@@ -60,13 +70,21 @@ echo $this->getData('nav')->render(); ?>
                     <span class="vCenterTable tag <?= $this->printHtml($color); ?>"><?= $this->getHtml('S' . $element->getStatus()) ?></span>
                 </div>
 
-            <?php if ($element->getDescription() !== '') : ?>
+                <?php if ($element->getDescription() !== '') : ?>
                     <div class="inner">
                         <blockquote>
                             <?= $this->printHtml($element->getDescription()); ?>
                         </blockquote>
                     </div>
-            <?php endif; ?>
+                <?php endif; ?>
+
+                <?php $elementMedia = $element->getMedia(); if(!empty($elementMedia)) : ?>
+                <div class="inner">
+                    <?php foreach($elementMedia as $media) : ?>
+                    <span><?= $media->getName(); ?></span>
+                    <?php endforeach; ?>
+                </div>
+                <?php endif; ?>
 
                 <div class="inner pAlignTable">
                 <?php if ($element->getForwarded() !== 0) : ?>