From 65a785ce8787100fbb6f3c75c03706d0c4108245 Mon Sep 17 00:00:00 2001
From: Dennis Eichhorn <spl1nnes.com@googlemail.com>
Date: Fri, 8 Dec 2023 21:52:33 +0000
Subject: [PATCH] bug fixes

---
 Controller/BackendController.php  |  2 +-
 ICAL.txt                          |  2 +-
 Models/TaskMapper.php             | 16 ++++++++++++++++
 Theme/Backend/task-single.tpl.php |  2 +-
 4 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/Controller/BackendController.php b/Controller/BackendController.php
index 28cfa90..bb67d01 100755
--- a/Controller/BackendController.php
+++ b/Controller/BackendController.php
@@ -128,7 +128,7 @@ final class BackendController extends Controller implements DashboardElementInte
         }
 
         // given
-        // @todo: this should also include forwarded tasks
+        // @todo this should also include forwarded tasks
         /** @var \Modules\Tasks\Models\Task[] $given */
         $given = TaskMapper::getAll()
             ->with('createdBy')
diff --git a/ICAL.txt b/ICAL.txt
index 019045f..f1b55ed 100755
--- a/ICAL.txt
+++ b/ICAL.txt
@@ -1,6 +1,6 @@
 # Individual Contributor License Agreement ("CLA") 1.0
 
-Thank you for your interest in Karaka-Management (the "Company"). In order to clarify the intellectual property license granted with Contributions from any person or entity, the Company must provide a Contributor License Agreement ("CLA") on file that has been made available to each Contributor. This license is for your protection as a Contributor as well as the protection of the Company and its users; it does not change your rights to use your own Contributions for any other purpose.
+Thank you for your interest in Jingga e. K. (the "Company"). In order to clarify the intellectual property license granted with Contributions from any person or entity, the Company must provide a Contributor License Agreement ("CLA") on file that has been made available to each Contributor. This license is for your protection as a Contributor as well as the protection of the Company and its users; it does not change your rights to use your own Contributions for any other purpose.
 
 By contributing to the Company You accept and agree to the following terms and conditions for Your present and future Contributions submitted to the Company. In return, the Company shall not use Your Contributions in a way that is contrary to the public benefit or inconsistent with its bylaws in effect at the time of the Contribution. Except for the license granted herein to the Company and recipients of software distributed by the Company, You reserve all right, title, and interest in and to Your Contributions.
 
diff --git a/Models/TaskMapper.php b/Models/TaskMapper.php
index a238507..b334f0e 100755
--- a/Models/TaskMapper.php
+++ b/Models/TaskMapper.php
@@ -335,6 +335,22 @@ final class TaskMapper extends DataMapperFactory
             ->orWhere(self::TABLE . '_d1.task_created_by', '=', $user)
             ->groupBy(self::PRIMARYFIELD);
 
+        // @todo Improving query performance by using raw queries and result arrays for large responses like this
+        $sql = <<<SQL
+        SELECT DISTINCT task.*, account.*
+        FROM task
+        INNER JOIN task_element ON task.task_id = task_element.task_element_task
+        INNER JOIN task_account ON task_element.task_element_id = task_account.task_account_task_element
+        INNER JOIN account ON task.task_created_by = account.account_id
+        WHERE
+            task.task_status != 1
+            AND (
+                task_account.task_account_account = $user
+                OR task.task_created_by = $user
+            )
+        LIMIT 25;
+        SQL;
+
         return self::getAll()->query($query);
     }
 
diff --git a/Theme/Backend/task-single.tpl.php b/Theme/Backend/task-single.tpl.php
index ef6854e..8f3aaa3 100755
--- a/Theme/Backend/task-single.tpl.php
+++ b/Theme/Backend/task-single.tpl.php
@@ -167,7 +167,7 @@ echo $this->data['nav']->render(); ?>
             <?php if ($task->isEditable) : ?>
                 <template id="taskElementContentTpl">
                     <div class="taskElement-content">
-                        <!-- todo: bind js after adding template -->
+                        <!-- @todo bind js after adding template -->
                         <?= $this->getData('editor')->render('task-element-edit'); ?>
                         <?= $this->getData('editor')->getData('text')->render(
                                 'task-element-edit',