Went through todos

Controller/BackendController.php

@@ -15,9 +15,12 @@ declare(strict_types=1);
 namespace Modules\EventManagement\Controller;
 
 use Modules\EventManagement\Models\EventMapper;
+use Modules\EventManagement\Models\ProgressType;
 use phpOMS\Asset\AssetType;
 use phpOMS\Contract\RenderableInterface;
+use phpOMS\DataStorage\Database\Query\Builder;
 use phpOMS\DataStorage\Database\Query\OrderType;
+use phpOMS\Math\Number\Numbers;
 use phpOMS\Message\RequestAbstract;
 use phpOMS\Message\ResponseAbstract;
 use phpOMS\Views\View;
@@ -51,9 +54,58 @@ final class BackendController extends Controller
         $view->setTemplate('/Modules/EventManagement/Theme/Backend/eventmanagement-list');
         $view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1004201001, $request, $response);
 
-        /** @var \Modules\EventManagement\Models\Event[] $events */
+        $view->data['events'] = EventMapper::getAll()
-        $events               = EventMapper::getAll()->sort('id', OrderType::DESC)->limit(25)->executeGetArray();
+            ->sort('id', OrderType::DESC)
-        $view->data['events'] = $events;
+            ->limit(25)->executeGetArray();
+
+        // Evaluate progress
+        $view->data['progress'] = [];
+
+        $taskProgress = [];
+
+        $now = new \DateTime('now');
+
+        /** @var \Modules\EventManagement\Models\Event $event */
+        foreach ($view->data['events'] as $event) {
+            if ($event->progressType === ProgressType::TASKS) {
+                $taskProgress[] = $event->id;
+            } elseif ($event->progressType === ProgressType::LINEAR) {
+                $duration = (int) $event->start->diff($event->end)->format('%a');
+                $progress = (int) $event->start->diff($now)->format('%a');
+
+                $view->data['progress'][$event->id] = (int) \min(100, $duration / $progress * 100);
+            } elseif ($event->progressType === ProgressType::EXPONENTIAL) {
+                $duration = (int) $event->start->diff($event->end)->format('%a');
+                $progress = (int) $event->start->diff($now)->format('%a');
+
+                $view->data['progress'][$event->id] = (int) Numbers::remapRangeExponentially($progress, $duration);
+            } elseif ($event->progressType === ProgressType::LOG) {
+                $duration = (int) $event->start->diff($event->end)->format('%a');
+                $progress = (int) $event->start->diff($now)->format('%a');
+
+                $view->data['progress'][$event->id] = (int) Numbers::remapRangeLog($progress, $duration);
+            } else {
+                $view->data['progress'][$event->id] = $event->progress;
+            }
+        }
+
+        // Count tasks per event where tasks are used as progress indication
+        $eventIds = \implode(',', $taskProgress);
+
+        $sql = <<<SQL
+        SELECT eventmanagement_task_relation_dst as id,
+            COUNT(eventmanagement_task_relation_src) as total_tasks,
+            SUM(task.task_status = 1 OR task.task_status = 2) AS open_tasks
+        FROM eventmanagement_task_relation
+        LEFT JOIN task ON eventmanagement_task_relation.eventmanagement_task_relation_src = task.task_id
+        WHERE eventmanagement_task_relation_dst IN ({$eventIds});
+        SQL;
+
+        $query   = new Builder($this->app->dbPool->get());
+        $results = $query->raw($sql)->execute()?->fetchAll(\PDO::FETCH_ASSOC) ?? [];
+        foreach ($results as $result) {
+            $view->data['progress'][$result['id']] = (int) (($result['total_tasks'] - $result['open_tasks']) / $result['total_tasks']);
+        }
 
         return $view;
     }

Models/Event.php

@@ -27,6 +27,9 @@ use phpOMS\Stdlib\Base\FloatInt;
  * @license OMS License 2.0
  * @link    https://jingga.app
  * @since   1.0.0
+ *
+ * @feature Add milestones
+ *      https://github.com/Karaka-Management/oms-EventManagement/issues/2
  */
 class Event
 {

Theme/Backend/eventmanagement-list.tpl.php

@@ -12,11 +12,6 @@
  */
 declare(strict_types=1);
 
-$footerView = new \phpOMS\Views\PaginationView($this->l11nManager, $this->request, $this->response);
-$footerView->setTemplate('/Web/Templates/Lists/Footer/PaginationBig');
-$footerView->setPages(20);
-$footerView->setPage(1);
-
 $events = $this->data['events'];
 
 echo $this->data['nav']->render(); ?>
@@ -29,19 +24,22 @@ echo $this->data['nav']->render(); ?>
             <table class="default sticky">
                 <thead>
                 <tr>
+                    <td><?= $this->getHtml('Progress'); ?>
                     <td class="wf-100"><?= $this->getHtml('Title'); ?>
                     <td><?= $this->getHtml('Start'); ?>
                     <td><?= $this->getHtml('End'); ?>
                 <tbody>
-                <?php $count = 0; foreach ($events as $key => $value) : ++$count;
+                <?php $count = 0;
-                $url         = \phpOMS\Uri\UriFactory::build('eventmanagement/view?{?}&id=' . $value->id); ?>
+                foreach ($events as $key => $value) : ++$count;
+                    $url = \phpOMS\Uri\UriFactory::build('{/base}/eventmanagement/view?{?}&id=' . $value->id); ?>
                 <tr tabindex="0" data-href="<?= $url; ?>">
+                    <td data-label="<?= $this->getHtml('Progress'); ?>"><a href="<?= $url; ?>"><?= $this->data['progress'][$value->id] ?? 0; ?> %</a>
                     <td data-label="<?= $this->getHtml('Name'); ?>"><a href="<?= $url; ?>"><?= $this->printHtml($value->name); ?></a>
                     <td data-label="<?= $this->getHtml('Start'); ?>"><a href="<?= $url; ?>"><?= $this->printHtml($value->start?->format('Y-m-d')); ?></a>
                     <td data-label="<?= $this->getHtml('End'); ?>"><a href="<?= $url; ?>"><?= $this->printHtml($value->end?->format('Y-m-d')); ?></a>
                 <?php endforeach; ?>
                 <?php if ($count === 0) : ?>
-                <tr><td colspan="5" class="empty"><?= $this->getHtml('Empty', '0', '0'); ?>
+                <tr><td colspan="4" class="empty"><?= $this->getHtml('Empty', '0', '0'); ?>
                 <?php endif; ?>
             </table>
             </div>