Add historical overview for detailed organ information

module/Decision/config/module.config.php

@@ -249,26 +249,35 @@
                 ],
                 'priority' => 100,
             ],
-            'organ' => [
+            'organs' => [
                 'type' => Literal::class,
                 'options' => [
-                    'route' => '/organ',
+                    'route' => '/organs',
                     'defaults' => [
                         'controller' => OrganController::class,
                         'action' => 'index',
                     ],
                 ],
                 'may_terminate' => true,
                 'child_routes' => [
-                    'show' => [
+                    'history' => [
+                        'type' => Literal::class,
+                        'options' => [
+                            'route' => '/history',
+                            'defaults' => [
+                                'action' => 'history',
+                            ],
+                        ],
+                    ],
+                    'view' => [
                         'type' => Segment::class,
                         'options' => [
-                            'route' => '/show/:organ',
+                            'route' => '/view/:organ',
                             'constraints' => [
                                 'organ' => '[0-9]+',
                             ],
                             'defaults' => [
-                                'action' => 'show',
+                                'action' => 'view',
                             ],
                         ],
                     ],
@@ -400,6 +409,9 @@
         'template_path_stack' => [
             'decision' => __DIR__ . '/../view/',
         ],
+        'template_map' => [
+            'decision/organ/history' => __DIR__ . '/../view/decision/organ/index.phtml',
+        ],
     ],
     'doctrine' => [
         'driver' => [

module/Decision/src/Controller/OrganController.php

@@ -23,15 +23,26 @@ public function indexAction(): ViewModel
     {
         return new ViewModel(
             [
+                'historical' => false,
                 'organs' => $this->organService->getOrgans(),
             ],
         );
     }
 
+    public function historyAction(): ViewModel
+    {
+        return new ViewModel(
+            [
+                'historical' => true,
+                'organs' => $this->organService->getOrgans(true),
+            ],
+        );
+    }
+
     /**
      * Show an organ.
      */
-    public function showAction(): ViewModel
+    public function viewAction(): ViewModel
     {
         $organId = (int) $this->params()->fromRoute('organ');
         $organ = $this->organService->getOrgan($organId);

module/Decision/src/Service/Organ.php

@@ -70,13 +70,17 @@ public function __construct(
      *
      * @return OrganModel[]
      */
-    public function getOrgans(): array
+    public function getOrgans(bool $abrogated = false): array
     {
         if (!$this->aclService->isAllowed('list', 'organ')) {
             throw new NotAllowedException($this->translator->translate('Not allowed to view the list of organs'));
         }
 
-        return $this->organMapper->findActive();
+        if (!$abrogated) {
+            return $this->organMapper->findActive();
+        }
+
+        return $this->organMapper->findAbrogated();
     }
 
     /**

module/Decision/view/decision/member/index.phtml

@@ -68,7 +68,7 @@ $this->headTitle($this->translate('Members'));
             <div class="col-md-12">
                 <h2><?= $this->translate('Association') ?></h2>
                 <div class="grid grid-col-5">
-                    <a href="<?= $this->url('organ') ?>" class="panel panel-image align-middle">
+                    <a href="<?= $this->url('organs') ?>" class="panel panel-image align-middle">
                         <div class="big-icon fas fa-sitemap"></div>
                         <div class="panel-heading"><?= $this->translate('Organs') ?></div>
                     </a>

module/Decision/view/decision/organ/index.phtml

@@ -8,6 +8,7 @@ use Laminas\View\Renderer\PhpRenderer;
 
 /**
  * @var PhpRenderer|HelperTrait $this
+ * @var bool $historical
  * @var OrganModel[] $organs
  */
 
@@ -22,11 +23,14 @@ $this->headTitle($this->translate('Organ list'));
                 <th><?= $this->translate('Abbreviation') ?></th>
                 <th><?= $this->translate('Name') ?></th>
                 <th><?= $this->translate('Type') ?></th>
+                <?php if ($historical): ?>
+                    <th><?= $this->translate('Abrogation Date') ?></th>
+                <?php endif; ?>
             </tr>
             </thead>
             <tbody>
             <?php foreach ($organs as $organ): ?>
-                <?php $url = $this->url('organ/show', ['organ' => $organ->getId()]) ?>
+                <?php $url = $this->url('organs/view', ['organ' => $organ->getId()]) ?>
                 <tr>
                     <td>
                         <a style="display: block; height: 100%; width:100%" href="<?= $url ?>">
@@ -43,6 +47,11 @@ $this->headTitle($this->translate('Organ list'));
                             <?= $organ->getType()->getName($this->plugin('translate')->getTranslator()) ?>
                         </a>
                     </td>
+                    <?php if ($historical): ?>
+                        <td>
+                            <?= $organ->getAbrogationDate()?->format('Y-m-d') ?>
+                        </td>
+                    <?php endif; ?>
                 </tr>
             <?php endforeach; ?>
             </tbody>