From 4be72bdc7ce3ac591fc08e16714252f4017a915c Mon Sep 17 00:00:00 2001
From: pedrod <pedro.devogelaere@vtk.be>
Date: Thu, 19 Oct 2023 14:43:48 +0000
Subject: [PATCH 1/9] members upload action

---
 .../Controller/Admin/RoleController.php       |  31 ++++
 .../Controller/Admin/UnitController.php       | 137 ++++++++++++++++++
 module/CommonBundle/Form/Admin/Unit/Csv.php   |  51 +++++++
 .../Resources/config/install/acl.config.php   |   4 +-
 .../common/admin/role/delete-all-members.twig |   3 +
 .../views/common/admin/role/manage.twig       |  83 +++++++++++
 .../views/common/admin/unit/csv-upload.twig   |  14 ++
 .../views/common/admin/unit/manage.twig       |   9 ++
 .../admin/unit/partials/navigation.twig       |   3 +
 .../views/common/admin/unit/template.twig     |   1 +
 .../Controller/Admin/ArticleController.php    |   1 -
 .../Form/Admin/Article/Csv.php                |   8 +-
 .../Form/Admin/Article/Edit.php               |   2 +-
 .../views/logistics/admin/order/view.twig     |   9 --
 14 files changed, 341 insertions(+), 15 deletions(-)
 create mode 100644 module/CommonBundle/Form/Admin/Unit/Csv.php
 create mode 100644 module/CommonBundle/Resources/views/common/admin/role/delete-all-members.twig
 create mode 100644 module/CommonBundle/Resources/views/common/admin/unit/csv-upload.twig
 create mode 100644 module/CommonBundle/Resources/views/common/admin/unit/template.twig

diff --git a/module/CommonBundle/Controller/Admin/RoleController.php b/module/CommonBundle/Controller/Admin/RoleController.php
index cd2ed9563b..3791ab2e48 100644
--- a/module/CommonBundle/Controller/Admin/RoleController.php
+++ b/module/CommonBundle/Controller/Admin/RoleController.php
@@ -185,6 +185,37 @@ public function deleteMemberAction()
         );
     }
 
+    // This function deletes all members belonging to a role belonging to a unit, like this each year the roles can be
+    // updated more easily
+    public function deleteAllMembersAction()
+    {
+        $this->initAjax();
+
+        $units = $this->getEntityManager()
+            ->getRepository('CommonBundle\Entity\General\Organization\Unit')
+            ->findAll();
+
+        foreach ($units as $unit) {
+            $roles = $unit->getRoles();
+            foreach ($roles as $role) {
+                $users = $this->getEntityManager()
+                    ->getRepository('CommonBundle\Entity\User\Person')
+                    ->findAllByRole($role);
+                foreach ($users as $user) {
+                    $user->removeRole($role);
+                }
+            }
+        }
+
+        $this->getEntityManager()->flush();
+
+        return new ViewModel(
+            array(
+                'result' => (object) array('status' => 'success'),
+            )
+        );
+    }
+
     public function pruneAction()
     {
         $roles = $this->getEntityManager()
diff --git a/module/CommonBundle/Controller/Admin/UnitController.php b/module/CommonBundle/Controller/Admin/UnitController.php
index 97d24f952f..ed49983896 100644
--- a/module/CommonBundle/Controller/Admin/UnitController.php
+++ b/module/CommonBundle/Controller/Admin/UnitController.php
@@ -18,6 +18,7 @@
  * UnitController
  *
  * @author Pieter Maene <pieter.maene@litus.cc>
+ * @author Pedro Devogelaere <pedro.devogelaere@vtk.be>
  */
 class UnitController extends \CommonBundle\Component\Controller\ActionController\AdminController
 {
@@ -410,6 +411,142 @@ public function pruneAction()
         return new ViewModel();
     }
 
+    public function csvUploadAction()
+    {
+        $form = $this->getForm('common_unit_csv');
+
+        $academicYear = $this->getAcademicYearEntity();
+        if ($academicYear === null) {
+            return new ViewModel();
+        }
+
+        if ($this->getRequest()->isPost()) {
+            $formData = $this->getRequest()->getPost();
+            $fileData = $this->getRequest()->getFiles();
+
+            $fileName = $fileData['file']['tmp_name'];
+
+            $membersArray = array();
+
+            $open = fopen($fileName, 'r');
+            if ($open != false) {
+                $data = fgetcsv($open, 10000, ',');
+
+                while ($data !== false) {
+                    $membersArray[] = $data;
+                    $data = fgetcsv($open, 10000, ',');
+                }
+                fclose($open);
+            }
+
+            $form->setData($formData);
+
+            if ($form->isValid()) {
+                $count = 0;
+
+                array_shift($membersArray);                 // Remove header
+                $total = count($membersArray);
+                foreach ($membersArray as $data) {
+                    if (in_array(null, array_slice($data, 0, 3))) {
+                        error_log('fail');
+                        continue;
+                    }
+
+                    $name = $data[0];
+                    $academic = $this->getEntityManager()
+                        ->getRepository('CommonBundle\Entity\User\Person\Academic')
+                        ->findOneByUsername($data[1]);
+                    $unit = $this->getEntityManager()
+                        ->getRepository('CommonBundle\Entity\General\Organization\Unit')
+                        ->findOneById($data[2]);
+                    $description = $data[3];
+                    $coordinator = $data[4]?:0;
+
+                    $repositoryCheck = $this->getEntityManager()
+                        ->getRepository('CommonBundle\Entity\User\Person\Organization\UnitMap\Academic')
+                        ->findOneBy(
+                            array(
+                                'unit'         => $unit,
+                                'academic'     => $academic,
+                                'academicYear' => $academicYear,
+                            )
+                        );
+
+                    if ($repositoryCheck === null) {
+                        $member = new UnitMapAcademic($academic, $academicYear, $unit, $coordinator, $description);
+
+                        $this->getEntityManager()->persist($member);
+                    }
+
+                    $count += 1;
+                }
+                $this->getEntityManager()->flush();
+
+                $this->flashMessenger()->success(
+                    'Succes',
+                    $count . '/' . $total . ' members imported'
+                );
+
+                $this->redirect()->toRoute(
+                    'common_admin_unit',
+                    array(
+                        'action' => 'manage',
+                    )
+                );
+
+                return new ViewModel();
+            }
+        }
+
+        return new ViewModel(
+            array(
+                'form' => $form,
+            )
+        );
+    }
+
+    public function templateAction()
+    {
+        $file = new CsvFile();
+
+        $unit = $this->getUnitEntity();
+
+        $heading = array(
+            'name',
+            'r-number',
+            'unit id',
+            'description',
+            'coordinator (bool)',
+        );
+
+        $results = array();
+        $results[] = array(
+            '',
+            '',
+            $unit->getId(),
+            '',
+            '',
+        );
+
+        $document = new CsvGenerator($heading, $results);
+        $document->generateDocument($file);
+
+        $headers = new Headers();
+        $headers->addHeaders(
+            array(
+                'Content-Disposition' => 'attachment; filename="unit_members_template.csv"',
+                'Content-Type'        => 'text/csv',
+            )
+        );
+        $this->getResponse()->setHeaders($headers);
+
+        return new ViewModel(
+            array(
+                'data' => $file->getContent(),
+            )
+        );
+    }
+
     /**
      * @return Unit|null
      */
diff --git a/module/CommonBundle/Form/Admin/Unit/Csv.php b/module/CommonBundle/Form/Admin/Unit/Csv.php
new file mode 100644
index 0000000000..a521d16d4f
--- /dev/null
+++ b/module/CommonBundle/Form/Admin/Unit/Csv.php
@@ -0,0 +1,51 @@
+<?php
+
+namespace CommonBundle\Form\Admin\Unit;
+
+/**
+ * The form used to add multiple members across different units via CSV.
+ *
+ * @author Pedro Devogelaere <pedro.devogelaere@vtk.be>
+ */
+class Csv extends \CommonBundle\Component\Form\Admin\Form
+{
+    const FILE_SIZE = '10MB';
+
+    protected $hydrator = 'CommonBundle\Hydrator\General\Organization\Academic';
+
+    public function init()
+    {
+        parent::init();
+
+        $this->add(
+            array(
+                'type'       => 'file',
+                'name'       => 'file',
+                'label'      => 'Members csv',
+                'attributes' => array(
+                    'data-help' => 'The maximum file size is ' . self::FILE_SIZE . '.',
+                ),
+                'options'    => array(
+                    'input' => array(
+                        'validators' => array(
+                            array(
+                                'name'    => 'FileSize',
+                                'options' => array(
+                                    'max' => self::FILE_SIZE,
+                                ),
+                            ),
+                            array(
+                                'name'    => 'FileExtension',
+                                'options' => array(
+                                    'extension' => 'csv',
+                                ),
+                            ),
+                        ),
+                    ),
+                ),
+            )
+        );
+
+        $this->addSubmit('Add', 'member_csv file_add');
+    }
+}
\ No newline at end of file
diff --git a/module/CommonBundle/Resources/config/install/acl.config.php b/module/CommonBundle/Resources/config/install/acl.config.php
index 352a1bca6e..91bf0c746e 100644
--- a/module/CommonBundle/Resources/config/install/acl.config.php
+++ b/module/CommonBundle/Resources/config/install/acl.config.php
@@ -24,13 +24,13 @@
             'typeahead',
         ),
         'common_admin_role' => array(
-            'add', 'edit', 'delete', 'deleteMember', 'manage', 'members', 'prune',
+            'add', 'edit', 'delete', 'deleteMember', 'deleteAllMembers', 'manage', 'members', 'prune',
         ),
         'common_admin_session' => array(
             'expire',
         ),
         'common_admin_unit' => array(
-            'add', 'delete', 'deleteMember', 'edit', 'manage', 'members', 'prune', 'csv'
+            'add', 'delete', 'deleteMember', 'edit', 'manage', 'members', 'prune', 'csv', 'csvUpload', 'template',
         ),
         'common_admin_visit' => array(
             'manage', 'search',
diff --git a/module/CommonBundle/Resources/views/common/admin/role/delete-all-members.twig b/module/CommonBundle/Resources/views/common/admin/role/delete-all-members.twig
new file mode 100644
index 0000000000..54f0735f49
--- /dev/null
+++ b/module/CommonBundle/Resources/views/common/admin/role/delete-all-members.twig
@@ -0,0 +1,3 @@
+{% autoescape false %}
+    {{ result|json_encode }}
+{% endautoescape %}
diff --git a/module/CommonBundle/Resources/views/common/admin/role/manage.twig b/module/CommonBundle/Resources/views/common/admin/role/manage.twig
index adafa38821..0a282fe84e 100644
--- a/module/CommonBundle/Resources/views/common/admin/role/manage.twig
+++ b/module/CommonBundle/Resources/views/common/admin/role/manage.twig
@@ -18,6 +18,19 @@
         </div>
     </div>
 
+    <div class="flashmessage success_message full_width members_removed_success hide">
+        <div class="title">Success</div>
+        <div class="content">
+            <p>The members were successfully removed!</p>
+        </div>
+    </div>
+    <div class="flashmessage error_message full_width members_removed_error hide">
+        <div class="title">Error</div>
+        <div class="content">
+            <p>An error occurred while trying to delete the members.</p>
+        </div>
+    </div>
+
     <div id="controller_action">
         <table class="manage">
             <thead>
@@ -74,6 +87,30 @@
         </div>
     </div>
 
+    <div class="modal hide fade" id="removeMembers" tabindex="-1">
+        <div class="modal-dialog">
+            <div class="modal-content">
+                <div class="modal-header">
+                    <span>Litus Admin</span>
+                    /Delete Members
+                </div>
+                <div class="modal-body">
+                    <p>
+                        You are about to delete all the members from roles linked to units!
+                        Please note that this operation cannot be undone!
+                    </p>
+                    <p>
+                        Are you sure you want to continue?
+                    </p>
+                    <div class="footer">
+                        <button class="delete">Yes</button>
+                        <button class="cancel" data-dismiss="modal">No</button>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+
     {% if hasAccess('common_admin_role', 'prune') %}
         <aside>
             <div class="sidebox">
@@ -89,12 +126,31 @@
             </div>
         </aside>
     {% endif %}
+
+    {% if hasAccess('common_admin_role', 'deleteAllMembers') %}
+        <aside>
+            <div class="sidebox">
+                <div class="title">Delete Members</div>
+                <div class="content">
+                    <p>
+                        <i>Please hit the link below to delete all members from the roles linked to units!</i>
+                    </p>
+                    <p>
+                        <a href="#" class="delete-members">
+                            &rarr; Delete Members
+                        </a>
+                    </p>
+                </div>
+            </div>
+        </aside>
+    {% endif %}
 {% endblock %}
 
 {% block content_script %}
     <script type="text/javascript">
         $(document).ready(function () {
             $('.item .delete').click(openModal);
+            $('.delete-members').click(openDeleteMembersModal);
         });
 
         function openModal(e) {
@@ -121,10 +177,37 @@
             removeRole.modal();
         }
 
+        function openDeleteMembersModal(e) {
+            var $this = $(this);
+            e.preventDefault();
+            var removeMembers = $('#removeMembers');
+            removeMembers.find('.cancel').one('click', function () {
+                removeMembers.modal('hide');
+            });
+            removeMembers.find('.delete').unbind('click').click(function () {
+                $.post('{{ url('common_admin_role', {"action": "deleteAllMembers"})}}', function (data) {
+                    if (data && 'success' == data.status) {
+                        $('.flashmessage').addClass('hide');
+                        $('.members_removed_success').removeClass('hide');
+                        removeMembers.modal('hide');
+                    } else {
+                        errorRemoveMembers();
+                    }
+                }, 'json').error(errorRemoveMembers);
+            });
+            removeMembers.modal();
+        }
+
         function errorRemove() {
             $('.flashmessage').addClass('hide');
             $('.role_removed_error').removeClass('hide');
             $('#removeRole').modal('hide');
         }
+
+        function errorRemoveMembers() {
+            $('.flashmessage').addClass('hide');
+            $('.members_removed_error').removeClass('hide');
+            $('#removeMembers').modal('hide');
+        }
     </script>
 {% endblock %}
diff --git a/module/CommonBundle/Resources/views/common/admin/unit/csv-upload.twig b/module/CommonBundle/Resources/views/common/admin/unit/csv-upload.twig
new file mode 100644
index 0000000000..0fbf035feb
--- /dev/null
+++ b/module/CommonBundle/Resources/views/common/admin/unit/csv-upload.twig
@@ -0,0 +1,14 @@
+{% extends 'admin/base.twig' %}
+
+{% block content %}
+    {% include 'common/admin/unit/partials/navigation.twig' %}
+
+    {% include 'common/admin/unit/partials/manage-years.twig' %}
+
+    {% include 'admin/partials/flashMessenger.twig' %}
+
+    <div id="controller_action">
+        {% import 'admin/partials/form.twig' as forms %}
+        {{ forms.renderForm(form) }}
+    </div>
+{% endblock %}
diff --git a/module/CommonBundle/Resources/views/common/admin/unit/manage.twig b/module/CommonBundle/Resources/views/common/admin/unit/manage.twig
index 9665c0d531..3f78ecc8ff 100644
--- a/module/CommonBundle/Resources/views/common/admin/unit/manage.twig
+++ b/module/CommonBundle/Resources/views/common/admin/unit/manage.twig
@@ -36,6 +36,9 @@
                         <td>{{ unit.getName() }}</td>
                         <td>{% if unit.isActive() %}&times;{% endif %}</td>
                         <td class="actions">
+                            {% if hasAccess('common_admin_unit', 'template') %}
+                                <a href="{{ url('common_admin_unit', {"action": "template", "id": unit.getId()}) }}" class="file_edit">Template</a>
+                            {% endif %}
                             {% if hasAccess('common_admin_unit', 'members') %}
                                 <a href="{{ url('common_admin_unit', {"action": "members", "id": unit.getId(), "academicyear": activeAcademicYear.getCode()}) }}" class="unit_member_edit">Members</a>
                             {% endif %}
@@ -68,6 +71,9 @@
                         <td>{{ workgroup.getName() }}</td>
                         <td>{% if workgroup.isActive() %}&times;{% endif %}</td>
                         <td class="actions">
+                            {% if hasAccess('common_admin_unit', 'template') %}
+                                <a href="{{ url('common_admin_unit', {"action": "template", "id": unit.getId()}) }}" class="file_edit">Template</a>
+                            {% endif %}
                             {% if hasAccess('common_admin_unit', 'members') %}
                                 <a href="{{ url('common_admin_unit', {"action": "members", "id": workgroup.getId(), "academicyear": activeAcademicYear.getCode()}) }}" class="unit_member_edit">Members</a>
                             {% endif %}
@@ -100,6 +106,9 @@
                         <td>{{ unit.getName() }}</td>
                         <td>{% if unit.isActive() %}&times;{% endif %}</td>
                         <td class="actions">
+                            {% if hasAccess('common_admin_unit', 'template') %}
+                                <a href="{{ url('common_admin_unit', {"action": "template", "id": unit.getId()}) }}" class="file_edit">Template</a>
+                            {% endif %}
                             {% if hasAccess('common_admin_unit', 'members') %}
                                 <a href="{{ url('common_admin_unit', {"action": "members", "id": unit.getId(), "academicyear": activeAcademicYear.getCode()}) }}" class="unit_member_edit">Members</a>
                             {% endif %}
diff --git a/module/CommonBundle/Resources/views/common/admin/unit/partials/navigation.twig b/module/CommonBundle/Resources/views/common/admin/unit/partials/navigation.twig
index 59fcf497d5..5a419ee3ee 100644
--- a/module/CommonBundle/Resources/views/common/admin/unit/partials/navigation.twig
+++ b/module/CommonBundle/Resources/views/common/admin/unit/partials/navigation.twig
@@ -6,6 +6,9 @@
             {% if hasAccess('common_admin_unit', 'csv') %}
                 <li><a {% if 'csv' == getParam('csv') %} class="active" {% endif %} href="{{ url("common_admin_unit", {"action": "csv", "academicyear": activeAcademicYear.getCode()}) }}">CSV</a></li>
             {% endif %}
+            {% if hasAccess('common_admin_unit', 'csvUpload') %}
+                <li><a {% if 'csv' == getParam('csvUpload') %} class="active" {% endif %} href="{{ url("common_admin_unit", {"action": "csvUpload", "academicyear": activeAcademicYear.getCode()}) }}">CSV Upload Members</a></li>
+            {% endif %}
             {% if hasAccess('common_admin_unit', 'add') %}
                 <li><a {% if 'add' == getParam('action') %} class="active" {% endif %} href="{{ url("common_admin_unit", {"action": "add"}) }}">Add</a></li>
             {% endif %}
diff --git a/module/CommonBundle/Resources/views/common/admin/unit/template.twig b/module/CommonBundle/Resources/views/common/admin/unit/template.twig
new file mode 100644
index 0000000000..1930e6cabc
--- /dev/null
+++ b/module/CommonBundle/Resources/views/common/admin/unit/template.twig
@@ -0,0 +1 @@
+{{ data|raw }}
diff --git a/module/LogisticsBundle/Controller/Admin/ArticleController.php b/module/LogisticsBundle/Controller/Admin/ArticleController.php
index 5ae980387a..36b9e7f747 100644
--- a/module/LogisticsBundle/Controller/Admin/ArticleController.php
+++ b/module/LogisticsBundle/Controller/Admin/ArticleController.php
@@ -201,7 +201,6 @@ public function csvAction()
                 $unit = $this->getEntityManager()
                     ->getRepository('CommonBundle\Entity\General\Organization\Unit')
                     ->findOneById($formData['unit']);
-                error_log($unit->getName());
 
                 array_shift($articleArray);                 // Remove header
                 foreach ($articleArray as $data) {
diff --git a/module/LogisticsBundle/Form/Admin/Article/Csv.php b/module/LogisticsBundle/Form/Admin/Article/Csv.php
index 28ad4895f8..44a65d213b 100644
--- a/module/LogisticsBundle/Form/Admin/Article/Csv.php
+++ b/module/LogisticsBundle/Form/Admin/Article/Csv.php
@@ -1,7 +1,11 @@
 <?php
 
 namespace LogisticsBundle\Form\Admin\Article;
-
+/**
+ * The form used to add articles via CSV .
+ *
+ * @author Pedro Devogelaere <pedro.devogelaere@vtk.be>
+ */
 class Csv extends \CommonBundle\Component\Form\Admin\Form
 {
     const FILE_SIZE = '10MB';
@@ -60,7 +64,7 @@ public function init()
             )
         );
 
-        $this->addSubmit('Add', 'article_csv');
+        $this->addSubmit('Add', 'article_csv file_add');
     }
 
     /**
diff --git a/module/LogisticsBundle/Form/Admin/Article/Edit.php b/module/LogisticsBundle/Form/Admin/Article/Edit.php
index 2a1409b562..554e10abd0 100644
--- a/module/LogisticsBundle/Form/Admin/Article/Edit.php
+++ b/module/LogisticsBundle/Form/Admin/Article/Edit.php
@@ -7,7 +7,7 @@
  *
  * @author Niels Avonds <niels.avonds@litus.cc>
  */
-class Edit extends \LogisticsBundle\Form\Admin\Article\Add
+class Edit extends \CommonBundle\Form\Admin\Unit\Add
 {
     public function init()
     {
diff --git a/module/LogisticsBundle/Resources/views/logistics/admin/order/view.twig b/module/LogisticsBundle/Resources/views/logistics/admin/order/view.twig
index 0c08a34831..90c794b95c 100644
--- a/module/LogisticsBundle/Resources/views/logistics/admin/order/view.twig
+++ b/module/LogisticsBundle/Resources/views/logistics/admin/order/view.twig
@@ -213,10 +213,6 @@
                 <div class="modal-body" style="padding-left: 20%">
                     <h1>Order: <b class="orderName"></b></h1>
                     <div>{{ forms.renderForm(orderForm) }}</div>
-{#                    <div class="footer" style="margin-top:15px">#}
-{#                        <button class="edit">Review</button>#}
-{#                        <button class="cancel" data-dismiss="modal">Close</button>#}
-{#                    </div>#}
                 </div>
             </div>
         </div>
@@ -234,11 +230,6 @@
                     <div>
                         {{ forms.renderForm(articleForm) }}
                     </div>
-                    {#                    <div>{{ forms.renderForm(articleForm) }}</div>#}
-{#                    <div class="footer" style="margin-top:15px">#}
-{#                        <button class="edit">Review</button>#}
-{#                        <button class="cancel" data-dismiss="modal">Close</button>#}
-{#                    </div>#}
                 </div>
             </div>
         </div>

From 644888df4781c7f03a4dc7a8c68d44b9fda2838b Mon Sep 17 00:00:00 2001
From: pedrod <pedro.devogelaere@vtk.be>
Date: Thu, 19 Oct 2023 15:28:16 +0000
Subject: [PATCH 2/9] display both direct and unit members in roles

---
 .../Controller/Admin/RoleController.php       | 97 ++++++++++++-------
 .../Resources/config/install/acl.config.php   |  2 +-
 .../common/admin/role/delete-all-members.twig |  3 -
 .../views/common/admin/role/members.twig      | 17 +++-
 .../admin/unit/partials/navigation.twig       |  2 +-
 5 files changed, 81 insertions(+), 40 deletions(-)
 delete mode 100644 module/CommonBundle/Resources/views/common/admin/role/delete-all-members.twig

diff --git a/module/CommonBundle/Controller/Admin/RoleController.php b/module/CommonBundle/Controller/Admin/RoleController.php
index 3791ab2e48..c069d3fadb 100644
--- a/module/CommonBundle/Controller/Admin/RoleController.php
+++ b/module/CommonBundle/Controller/Admin/RoleController.php
@@ -3,8 +3,10 @@
 namespace CommonBundle\Controller\Admin;
 
 use CommonBundle\Component\Acl\Acl;
+use CommonBundle\Component\Util\AcademicYear;
 use CommonBundle\Entity\Acl\Action;
 use CommonBundle\Entity\Acl\Role;
+use CommonBundle\Entity\General\AcademicYear as AcademicYearEntity;
 use CommonBundle\Entity\User\Person;
 use Laminas\View\Model\ViewModel;
 
@@ -80,14 +82,39 @@ public function membersAction()
             return new ViewModel();
         }
 
+        $academicYear = $this->getAcademicYearEntity();
+        if ($academicYear === null) {
+            return new ViewModel();
+        }
+
         $members = $this->getEntityManager()
             ->getRepository('CommonBundle\Entity\User\Person')
             ->findAllByRole($role);
 
+        $units = $this->getEntityManager()
+            ->getRepository('CommonBundle\Entity\General\Organization\Unit')
+            ->findAll();
+        $unitMembers = array();
+        foreach ($units as $unit) {
+            $unitRoles = $unit->getRoles();
+            foreach ($unitRoles as $unitRole) {
+                if ($unitRole == $role) {
+                    $unitMembers = array_unique(array_merge(
+                        $unitMembers,
+                        $this->getEntityManager()
+                        ->getRepository('CommonBundle\Entity\User\Person\Organization\UnitMap')
+                        ->findBy(array('unit' => $unit, 'academicYear' => $academicYear))
+                    ),
+                        SORT_REGULAR);
+                }
+            }
+        }
+
         return new ViewModel(
             array(
-                'role'    => $role,
-                'members' => $members,
+                'role'          => $role,
+                'members'       => $members,
+                'unitMembers'   => $unitMembers,
             )
         );
     }
@@ -185,37 +212,6 @@ public function deleteMemberAction()
         );
     }
 
-    // This function deletes all members belonging to a role belonging to a unit, like this each year the roles can be
-    // updated more easily
-    public function deleteAllMembersAction()
-    {
-        $this->initAjax();
-
-        $units = $this->getEntityManager()
-            ->getRepository('CommonBundle\Entity\General\Organization\Unit')
-            ->findAll();
-
-        foreach ($units as $unit) {
-            $roles = $unit->getRoles();
-            foreach ($roles as $role) {
-                $users = $this->getEntityManager()
-                    ->getRepository('CommonBundle\Entity\User\Person')
-                    ->findAllByRole($role);
-                foreach ($users as $user) {
-                    $user->removeRole($role);
-                }
-            }
-        }
-
-        $this->getEntityManager()->flush();
-
-        return new ViewModel(
-            array(
-                'result' => (object) array('status' => 'success'),
-            )
-        );
-    }
-
     public function pruneAction()
     {
         $roles = $this->getEntityManager()
@@ -301,6 +297,41 @@ private function getPersonEntity()
         return $person;
     }
 
+    /**
+     * @return \CommonBundle\Entity\General\AcademicYear|null
+     */
+    private function getAcademicYearEntity()
+    {
+        if ($this->getParam('academicyear') === null) {
+            return $this->getCurrentAcademicYear();
+        }
+
+        $start = AcademicYear::getDateTime($this->getParam('academicyear'));
+        $start->setTime(0, 0);
+
+        $academicYear = $this->getEntityManager()
+            ->getRepository('CommonBundle\Entity\General\AcademicYear')
+            ->findOneByUniversityStart($start);
+
+        if (!($academicYear instanceof AcademicYearEntity)) {
+            $this->flashMessenger()->error(
+                'Error',
+                'No academic year was found!'
+            );
+
+            $this->redirect()->toRoute(
+                'common_admin_unit',
+                array(
+                    'action' => 'manage',
+                )
+            );
+
+            return;
+        }
+
+        return $academicYear;
+    }
+
     /**
      * @return null
      */
diff --git a/module/CommonBundle/Resources/config/install/acl.config.php b/module/CommonBundle/Resources/config/install/acl.config.php
index 91bf0c746e..af3ceb7f7b 100644
--- a/module/CommonBundle/Resources/config/install/acl.config.php
+++ b/module/CommonBundle/Resources/config/install/acl.config.php
@@ -24,7 +24,7 @@
             'typeahead',
         ),
         'common_admin_role' => array(
-            'add', 'edit', 'delete', 'deleteMember', 'deleteAllMembers', 'manage', 'members', 'prune',
+            'add', 'edit', 'delete', 'deleteMember', 'manage', 'members', 'prune',
         ),
         'common_admin_session' => array(
             'expire',
diff --git a/module/CommonBundle/Resources/views/common/admin/role/delete-all-members.twig b/module/CommonBundle/Resources/views/common/admin/role/delete-all-members.twig
deleted file mode 100644
index 54f0735f49..0000000000
--- a/module/CommonBundle/Resources/views/common/admin/role/delete-all-members.twig
+++ /dev/null
@@ -1,3 +0,0 @@
-{% autoescape false %}
-    {{ result|json_encode }}
-{% endautoescape %}
diff --git a/module/CommonBundle/Resources/views/common/admin/role/members.twig b/module/CommonBundle/Resources/views/common/admin/role/members.twig
index 3b1da9e7db..7742ec4aa7 100644
--- a/module/CommonBundle/Resources/views/common/admin/role/members.twig
+++ b/module/CommonBundle/Resources/views/common/admin/role/members.twig
@@ -22,12 +22,12 @@
         <h1>Role</h1>
         <p>Name: <b>{{ role.getName() }}</b></p>
 
-        <h1>Members</h1>
+        <h1>Direct members</h1>
 
         <table class="full_width manage">
             <tr>
                 <th>Name</th>
-                <th width="90px">Actions</th>
+                <th style="width: 90px">Actions</th>
             </tr>
             {% for member in members %}
                 <tr class="item item-{{ member.getId() }}">
@@ -40,6 +40,19 @@
                 </tr>
             {% endfor %}
         </table>
+
+        <h1>Unit members</h1>
+
+        <table class="full_width manage">
+            <tr>
+                <th>Name</th>
+            </tr>
+            {% for member in unitMembers %}
+                <tr class="item item-{{ member.getId() }}">
+                    <td>{{ member.getFullName() }}</td>
+                </tr>
+            {% endfor %}
+        </table>
     </div>
 
     <div class="modal fade" id="removeMember" tabindex="-1">
diff --git a/module/CommonBundle/Resources/views/common/admin/unit/partials/navigation.twig b/module/CommonBundle/Resources/views/common/admin/unit/partials/navigation.twig
index 5a419ee3ee..3d5f3140f9 100644
--- a/module/CommonBundle/Resources/views/common/admin/unit/partials/navigation.twig
+++ b/module/CommonBundle/Resources/views/common/admin/unit/partials/navigation.twig
@@ -7,7 +7,7 @@
                 <li><a {% if 'csv' == getParam('csv') %} class="active" {% endif %} href="{{ url("common_admin_unit", {"action": "csv", "academicyear": activeAcademicYear.getCode()}) }}">CSV</a></li>
             {% endif %}
             {% if hasAccess('common_admin_unit', 'csvUpload') %}
-                <li><a {% if 'csv' == getParam('csvUpload') %} class="active" {% endif %} href="{{ url("common_admin_unit", {"action": "csvUpload", "academicyear": activeAcademicYear.getCode()}) }}">CSV Upload Members</a></li>
+                <li><a {% if 'csv' == getParam('csvUpload') %} class="active" {% endif %} href="{{ url("common_admin_unit", {"action": "csvUpload", "academicyear": activeAcademicYear.getCode()}) }}">Upload Members</a></li>
             {% endif %}
             {% if hasAccess('common_admin_unit', 'add') %}
                 <li><a {% if 'add' == getParam('action') %} class="active" {% endif %} href="{{ url("common_admin_unit", {"action": "add"}) }}">Add</a></li>

From a781334366408213b5d5be717950ef9b46bd25bf Mon Sep 17 00:00:00 2001
From: pedrod <pedro.devogelaere@vtk.be>
Date: Thu, 19 Oct 2023 18:23:25 +0000
Subject: [PATCH 3/9] changed logistics index to transport

---
 .../views/common/admin/role/manage.twig       | 59 -------------------
 .../views/common/admin/role/members.twig      | 56 ++++++++++--------
 .../Controller/LogisticsController.php        |  4 +-
 .../Controller/LeaseController.php            |  4 +-
 ...Controller.php => TransportController.php} |  2 +-
 .../Resources/config/assetic.config.php       |  2 +-
 .../Resources/config/install/acl.config.php   |  4 +-
 .../Resources/config/install/roles.config.php |  2 +-
 .../Resources/config/router.config.php        | 14 ++---
 .../Resources/layouts/logistics/base.twig     | 12 +---
 .../logistics/{index => transport}/add.twig   |  0
 .../{index => transport}/delete.twig          |  0
 .../logistics/{index => transport}/edit.twig  |  0
 .../{index => transport}/export.twig          |  0
 .../logistics/{index => transport}/fetch.twig |  0
 .../logistics/{index => transport}/index.twig | 16 ++---
 .../logistics/{index => transport}/move.twig  |  0
 17 files changed, 57 insertions(+), 118 deletions(-)
 rename module/LogisticsBundle/Controller/{IndexController.php => TransportController.php} (99%)
 rename module/LogisticsBundle/Resources/views/logistics/{index => transport}/add.twig (100%)
 rename module/LogisticsBundle/Resources/views/logistics/{index => transport}/delete.twig (100%)
 rename module/LogisticsBundle/Resources/views/logistics/{index => transport}/edit.twig (100%)
 rename module/LogisticsBundle/Resources/views/logistics/{index => transport}/export.twig (100%)
 rename module/LogisticsBundle/Resources/views/logistics/{index => transport}/fetch.twig (100%)
 rename module/LogisticsBundle/Resources/views/logistics/{index => transport}/index.twig (92%)
 rename module/LogisticsBundle/Resources/views/logistics/{index => transport}/move.twig (100%)

diff --git a/module/CommonBundle/Resources/views/common/admin/role/manage.twig b/module/CommonBundle/Resources/views/common/admin/role/manage.twig
index 0a282fe84e..7f09f704a8 100644
--- a/module/CommonBundle/Resources/views/common/admin/role/manage.twig
+++ b/module/CommonBundle/Resources/views/common/admin/role/manage.twig
@@ -18,19 +18,6 @@
         </div>
     </div>
 
-    <div class="flashmessage success_message full_width members_removed_success hide">
-        <div class="title">Success</div>
-        <div class="content">
-            <p>The members were successfully removed!</p>
-        </div>
-    </div>
-    <div class="flashmessage error_message full_width members_removed_error hide">
-        <div class="title">Error</div>
-        <div class="content">
-            <p>An error occurred while trying to delete the members.</p>
-        </div>
-    </div>
-
     <div id="controller_action">
         <table class="manage">
             <thead>
@@ -126,31 +113,12 @@
             </div>
         </aside>
     {% endif %}
-
-    {% if hasAccess('common_admin_role', 'deleteAllMembers') %}
-        <aside>
-            <div class="sidebox">
-                <div class="title">Delete Members</div>
-                <div class="content">
-                    <p>
-                        <i>Please hit the link below to delete all members from the roles linked to units!</i>
-                    </p>
-                    <p>
-                        <a href="#" class="delete-members">
-                            &rarr; Delete Members
-                        </a>
-                    </p>
-                </div>
-            </div>
-        </aside>
-    {% endif %}
 {% endblock %}
 
 {% block content_script %}
     <script type="text/javascript">
         $(document).ready(function () {
             $('.item .delete').click(openModal);
-            $('.delete-members').click(openDeleteMembersModal);
         });
 
         function openModal(e) {
@@ -177,37 +145,10 @@
             removeRole.modal();
         }
 
-        function openDeleteMembersModal(e) {
-            var $this = $(this);
-            e.preventDefault();
-            var removeMembers = $('#removeMembers');
-            removeMembers.find('.cancel').one('click', function () {
-                removeMembers.modal('hide');
-            });
-            removeMembers.find('.delete').unbind('click').click(function () {
-                $.post('{{ url('common_admin_role', {"action": "deleteAllMembers"})}}', function (data) {
-                    if (data && 'success' == data.status) {
-                        $('.flashmessage').addClass('hide');
-                        $('.members_removed_success').removeClass('hide');
-                        removeMembers.modal('hide');
-                    } else {
-                        errorRemoveMembers();
-                    }
-                }, 'json').error(errorRemoveMembers);
-            });
-            removeMembers.modal();
-        }
-
         function errorRemove() {
             $('.flashmessage').addClass('hide');
             $('.role_removed_error').removeClass('hide');
             $('#removeRole').modal('hide');
         }
-
-        function errorRemoveMembers() {
-            $('.flashmessage').addClass('hide');
-            $('.members_removed_error').removeClass('hide');
-            $('#removeMembers').modal('hide');
-        }
     </script>
 {% endblock %}
diff --git a/module/CommonBundle/Resources/views/common/admin/role/members.twig b/module/CommonBundle/Resources/views/common/admin/role/members.twig
index 7742ec4aa7..c711577224 100644
--- a/module/CommonBundle/Resources/views/common/admin/role/members.twig
+++ b/module/CommonBundle/Resources/views/common/admin/role/members.twig
@@ -22,37 +22,41 @@
         <h1>Role</h1>
         <p>Name: <b>{{ role.getName() }}</b></p>
 
-        <h1>Direct members</h1>
+        {% if members %}
+            <h1>Direct members</h1>
 
-        <table class="full_width manage">
-            <tr>
-                <th>Name</th>
-                <th style="width: 90px">Actions</th>
-            </tr>
-            {% for member in members %}
-                <tr class="item item-{{ member.getId() }}">
-                    <td>{{ member.getFullName() }}</td>
-                    <td>
-                        {% if hasAccess('common_admin_role', 'deleteMember') %}
-                            <a href="#" data-id="{{ member.getId() }}" data-name="{{ member.getFullName() }}" class="delete">Delete</a>
-                        {% endif %}
-                    </td>
+            <table class="full_width manage">
+                <tr>
+                    <th>Name</th>
+                    <th style="width: 90px">Actions</th>
                 </tr>
-            {% endfor %}
-        </table>
+                {% for member in members %}
+                    <tr class="item item-{{ member.getId() }}">
+                        <td>{{ member.getFullName() }}</td>
+                        <td>
+                            {% if hasAccess('common_admin_role', 'deleteMember') %}
+                                <a href="#" data-id="{{ member.getId() }}" data-name="{{ member.getFullName() }}" class="delete">Delete</a>
+                            {% endif %}
+                        </td>
+                    </tr>
+                {% endfor %}
+            </table>
+        {% endif %}
 
-        <h1>Unit members</h1>
+        {% if unitMembers %}
+            <h1>Unit members</h1>
 
-        <table class="full_width manage">
-            <tr>
-                <th>Name</th>
-            </tr>
-            {% for member in unitMembers %}
-                <tr class="item item-{{ member.getId() }}">
-                    <td>{{ member.getFullName() }}</td>
+            <table class="full_width manage">
+                <tr>
+                    <th>Name</th>
                 </tr>
-            {% endfor %}
-        </table>
+                {% for member in unitMembers %}
+                    <tr class="item item-{{ member.getId() }}">
+                        <td>{{ member.getFullName() }}</td>
+                    </tr>
+                {% endfor %}
+            </table>
+        {% endif %}
     </div>
 
     <div class="modal fade" id="removeMember" tabindex="-1">
diff --git a/module/LogisticsBundle/Component/Controller/LogisticsController.php b/module/LogisticsBundle/Component/Controller/LogisticsController.php
index 4bdda192ff..f74c9b4f8b 100644
--- a/module/LogisticsBundle/Component/Controller/LogisticsController.php
+++ b/module/LogisticsBundle/Component/Controller/LogisticsController.php
@@ -50,8 +50,8 @@ public function getAuthenticationHandler()
             'action'         => 'index',
             'controller'     => 'common_index',
 
-            'auth_route'     => 'logistics_index',
-            'redirect_route' => 'logistics_index',
+            'auth_route'     => 'logistics_catalog',
+            'redirect_route' => 'logistics_catalog',
         );
     }
 
diff --git a/module/LogisticsBundle/Controller/LeaseController.php b/module/LogisticsBundle/Controller/LeaseController.php
index 61e8bd6afb..9ed03fdae8 100644
--- a/module/LogisticsBundle/Controller/LeaseController.php
+++ b/module/LogisticsBundle/Controller/LeaseController.php
@@ -236,7 +236,7 @@ private function getPersonEntity()
                 'No person was authenticated!'
             );
 
-            $this->redirect()->toRoute('logistics_index');
+            $this->redirect()->toRoute('logistics_catalog');
 
             return;
         }
@@ -290,4 +290,4 @@ private function getItemEntity($id = null)
 
         return $item;
     }
-}
+}
\ No newline at end of file
diff --git a/module/LogisticsBundle/Controller/IndexController.php b/module/LogisticsBundle/Controller/TransportController.php
similarity index 99%
rename from module/LogisticsBundle/Controller/IndexController.php
rename to module/LogisticsBundle/Controller/TransportController.php
index e6fcf5ef8a..af4b849800 100644
--- a/module/LogisticsBundle/Controller/IndexController.php
+++ b/module/LogisticsBundle/Controller/TransportController.php
@@ -13,7 +13,7 @@
 /**
  * @author Niels Avonds <niels.avonds@litus.cc>
  */
-class IndexController extends \LogisticsBundle\Component\Controller\LogisticsController
+class TransportController extends \LogisticsBundle\Component\Controller\LogisticsController
 {
     public function indexAction()
     {
diff --git a/module/LogisticsBundle/Resources/config/assetic.config.php b/module/LogisticsBundle/Resources/config/assetic.config.php
index d16594c24e..a5c4bb922e 100644
--- a/module/LogisticsBundle/Resources/config/assetic.config.php
+++ b/module/LogisticsBundle/Resources/config/assetic.config.php
@@ -95,7 +95,7 @@
             '@common_jqueryui_css',
             '@common_jqueryui_datepicker_css',
         ),
-        'logistics_index' => array(
+        'logistics_transport' => array(
             '@common_jquery',
             '@common_jqueryui',
             '@common_remote_typeahead',
diff --git a/module/LogisticsBundle/Resources/config/install/acl.config.php b/module/LogisticsBundle/Resources/config/install/acl.config.php
index 36f58c7154..a65c3c3c0d 100644
--- a/module/LogisticsBundle/Resources/config/install/acl.config.php
+++ b/module/LogisticsBundle/Resources/config/install/acl.config.php
@@ -26,7 +26,7 @@
         'logistics_admin_inventory' => array(
             'add', 'manage',
         ),
-        'logistics_index' => array(
+        'logistics_transport' => array(
             'add', 'delete', 'edit', 'export', 'fetch', 'index', 'move',
         ),
         'logistics_lease' => array(
@@ -45,4 +45,4 @@
             'index', 'add', 'edit', 'reserve',
         )
     ),
-);
+);
\ No newline at end of file
diff --git a/module/LogisticsBundle/Resources/config/install/roles.config.php b/module/LogisticsBundle/Resources/config/install/roles.config.php
index 2733fe3199..d0fb4bc9ed 100644
--- a/module/LogisticsBundle/Resources/config/install/roles.config.php
+++ b/module/LogisticsBundle/Resources/config/install/roles.config.php
@@ -6,7 +6,7 @@
         'parents' => array(
         ),
         'actions' => array(
-            'logistics_index' => array(
+            'logistics_transport' => array(
                 'fetch', 'index',
             ),
             'logistics_auth' => array(
diff --git a/module/LogisticsBundle/Resources/config/router.config.php b/module/LogisticsBundle/Resources/config/router.config.php
index 67e5dfae07..362af02748 100644
--- a/module/LogisticsBundle/Resources/config/router.config.php
+++ b/module/LogisticsBundle/Resources/config/router.config.php
@@ -140,10 +140,10 @@
                 ),
             ),
         ),
-        'logistics_index' => array(
+        'logistics_transport' => array(
             'type'    => 'Laminas\Router\Http\Segment',
             'options' => array(
-                'route'       => '[/:language]/logistics[/:action][/date/:date][/:id][/]',
+                'route'       => '[/:language]/logistics/transport[/:action][/date/:date][/:id][/]',
                 'constraints' => array(
                     'action'   => '[a-zA-Z][a-zA-Z0-9_-]*',
                     'language' => '(en|nl)',
@@ -151,7 +151,7 @@
                     'id'       => '[0-9]*',
                 ),
                 'defaults'    => array(
-                    'controller' => 'logistics_index',
+                    'controller' => 'logistics_transport',
                     'action'     => 'index',
                 ),
             ),
@@ -180,7 +180,7 @@
                     'token'    => '[a-zA-Z0-9_-]*',
                 ),
                 'defaults'    => array(
-                    'controller' => 'logistics_index',
+                    'controller' => 'logistics_transport',
                     'action'     => 'export',
                 ),
             ),
@@ -194,7 +194,7 @@
                     'end'   => '[0-9]*',
                 ),
                 'defaults'    => array(
-                    'controller' => 'logistics_index',
+                    'controller' => 'logistics_transport',
                     'action'     => 'fetch',
                 ),
             ),
@@ -251,7 +251,7 @@
         'logistics_catalog_typeahead' => array(
             'type'    => 'Laminas\Router\Http\Segment',
             'options' => array(
-                'route'       => '[/:language]/logistics/catalog[/:order]/typeahead[/:string][/]',
+                'route'       => '[/:language]/logistics[/:order]/typeahead[/:string][/]',
                 'constraints' => array(
                     'order'    => '[0-9]*',
                     'language' => '(en|nl)',
@@ -291,7 +291,7 @@
         'logistics_admin_lease'             => 'LogisticsBundle\Controller\Admin\LeaseController',
         'logistics_admin_inventory'         => 'LogisticsBundle\Controller\Admin\InventoryController',
 
-        'logistics_index'                   => 'LogisticsBundle\Controller\IndexController',
+        'logistics_transport'               => 'LogisticsBundle\Controller\TransportController',
         'logistics_auth'                    => 'LogisticsBundle\Controller\AuthController',
         'logistics_piano'                   => 'LogisticsBundle\Controller\PianoController',
         'logistics_lease'                   => 'LogisticsBundle\Controller\LeaseController',
diff --git a/module/LogisticsBundle/Resources/layouts/logistics/base.twig b/module/LogisticsBundle/Resources/layouts/logistics/base.twig
index b982e6056d..b1f324626c 100644
--- a/module/LogisticsBundle/Resources/layouts/logistics/base.twig
+++ b/module/LogisticsBundle/Resources/layouts/logistics/base.twig
@@ -32,9 +32,9 @@
                                 <a href="{{ url('logistics_inventory', {"language": language.getAbbrev()}) }}">{{ translate('Flesserke') }}</a>
                             </li>
                         {% endif %}
-                        {% if hasAccess('logistics_index', 'index') %}
-                            <li {% if 'logistics_index' == getParam('controller') %} class="active" {% endif %}>
-                                <a href="{{ url("logistics_index", {"language": language.getAbbrev()}) }}">{{ translate('Transport') }}</a>
+                        {% if hasAccess('logistics_transport', 'index') %}
+                            <li {% if 'logistics_transport' == getParam('controller') %} class="active" {% endif %}>
+                                <a href="{{ url("logistics_transport", {"language": language.getAbbrev()}) }}">{{ translate('Transport') }}</a>
                             </li>
                         {% endif %}
                         {% if hasAccess('logistics_piano', 'index') %}
@@ -46,12 +46,6 @@
 {#                            <li {% if 'logistics_lease' == getParam('controller') %}class="active"{% endif %}>#}
 {#                                <a href="{{ url('logistics_lease', {"language": language.getAbbrev()}) }}">{{ translate('Lease') }}</a>#}
 {#                            </li>#}
-{#                        {% endif %}#}
-
-{#                        {% if hasAccess('logistics_inventory', 'add') %}#}
-{#                            <li {% if 'logistics_inventory' == getParam('controller') %}class="active"{% endif %}>#}
-{#                                <a href="{{ url('logistics_inventory', {"language": language.getAbbrev(), 'action': 'add'}) }}">{{ translate('Flesserke Form') }}</a>#}
-{#                            </li>#}
 {#                        {% endif %}#}
                     </ul>
                     <ul class="nav navbar-nav pull-right lang-nav hidden-sm hidden-xs">
diff --git a/module/LogisticsBundle/Resources/views/logistics/index/add.twig b/module/LogisticsBundle/Resources/views/logistics/transport/add.twig
similarity index 100%
rename from module/LogisticsBundle/Resources/views/logistics/index/add.twig
rename to module/LogisticsBundle/Resources/views/logistics/transport/add.twig
diff --git a/module/LogisticsBundle/Resources/views/logistics/index/delete.twig b/module/LogisticsBundle/Resources/views/logistics/transport/delete.twig
similarity index 100%
rename from module/LogisticsBundle/Resources/views/logistics/index/delete.twig
rename to module/LogisticsBundle/Resources/views/logistics/transport/delete.twig
diff --git a/module/LogisticsBundle/Resources/views/logistics/index/edit.twig b/module/LogisticsBundle/Resources/views/logistics/transport/edit.twig
similarity index 100%
rename from module/LogisticsBundle/Resources/views/logistics/index/edit.twig
rename to module/LogisticsBundle/Resources/views/logistics/transport/edit.twig
diff --git a/module/LogisticsBundle/Resources/views/logistics/index/export.twig b/module/LogisticsBundle/Resources/views/logistics/transport/export.twig
similarity index 100%
rename from module/LogisticsBundle/Resources/views/logistics/index/export.twig
rename to module/LogisticsBundle/Resources/views/logistics/transport/export.twig
diff --git a/module/LogisticsBundle/Resources/views/logistics/index/fetch.twig b/module/LogisticsBundle/Resources/views/logistics/transport/fetch.twig
similarity index 100%
rename from module/LogisticsBundle/Resources/views/logistics/index/fetch.twig
rename to module/LogisticsBundle/Resources/views/logistics/transport/fetch.twig
diff --git a/module/LogisticsBundle/Resources/views/logistics/index/index.twig b/module/LogisticsBundle/Resources/views/logistics/transport/index.twig
similarity index 92%
rename from module/LogisticsBundle/Resources/views/logistics/index/index.twig
rename to module/LogisticsBundle/Resources/views/logistics/transport/index.twig
index a7f35b410b..f50969d97c 100644
--- a/module/LogisticsBundle/Resources/views/logistics/index/index.twig
+++ b/module/LogisticsBundle/Resources/views/logistics/transport/index.twig
@@ -57,7 +57,7 @@
 
         <div>{{ translate('Please login to view car rides.') }}</div>
     {% else %}
-        {% if hasAccess('logistics_index', 'export') %}
+        {% if hasAccess('logistics_transport', 'export') %}
             <div class="pull-right" style="line-height: 50px">
                 <div class="btn-group">
                     <a class="btn btn-default" href="{{ url('logistics_export') }}"><span class="glyphicon glyphicon-arrow-down"></span> {{ translate('Download') }}</a>
@@ -76,7 +76,7 @@
 
         <div id="calendar"></div>
 
-        {% if hasAccess('logistics_index', 'add') %}
+        {% if hasAccess('logistics_transport', 'add') %}
             <div id="reservationForm" class="hide">
                 {% import 'site/partials/form.twig' as forms %}
                 {{ forms.renderForm(form) }}
@@ -94,13 +94,13 @@
 
             $('#calendar').logisticsCalendar({
                 fetchUrl: '{{ url('logistics_reservation_fetch') }}',
-                moveUrl: '{{ url('logistics_index', {'action': 'move'}) }}',
-                addUrl: '{{ url('logistics_index', {'action': 'add'}) }}',
-                editUrl: '{{ url('logistics_index', {'action': 'edit'}) }}',
-                deleteUrl: '{{ url('logistics_index', {'action': 'delete'}) }}',
+                moveUrl: '{{ url('logistics_transport', {'action': 'move'}) }}',
+                addUrl: '{{ url('logistics_transport', {'action': 'add'}) }}',
+                editUrl: '{{ url('logistics_transport', {'action': 'edit'}) }}',
+                deleteUrl: '{{ url('logistics_transport', {'action': 'delete'}) }}',
                 passengerTypeaheadUrl: '{{ url("common_admin_academic_typeahead", {}) }}',
-                editable: {% if hasAccess('logistics_index', 'add') %}true{% else %}false {% endif %},
-                deletable: {% if hasAccess('logistics_index', 'delete') %}true{% else %}false {% endif %},
+                editable: {% if hasAccess('logistics_transport', 'add') %}true{% else %}false {% endif %},
+                deletable: {% if hasAccess('logistics_transport', 'delete') %}true{% else %}false {% endif %},
                 form: $('#reservationForm'),
                 monthNames: [
                     '{{ translate('January') }}',
diff --git a/module/LogisticsBundle/Resources/views/logistics/index/move.twig b/module/LogisticsBundle/Resources/views/logistics/transport/move.twig
similarity index 100%
rename from module/LogisticsBundle/Resources/views/logistics/index/move.twig
rename to module/LogisticsBundle/Resources/views/logistics/transport/move.twig

From 6ea8f47c41b8eca37dc5948ece1b75e584c1ab5b Mon Sep 17 00:00:00 2001
From: pedrod <pedro.devogelaere@vtk.be>
Date: Thu, 19 Oct 2023 18:33:32 +0000
Subject: [PATCH 4/9] changed logistics index to transport

---
 module/LogisticsBundle/Resources/config/router.config.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/module/LogisticsBundle/Resources/config/router.config.php b/module/LogisticsBundle/Resources/config/router.config.php
index 362af02748..f8d9dac150 100644
--- a/module/LogisticsBundle/Resources/config/router.config.php
+++ b/module/LogisticsBundle/Resources/config/router.config.php
@@ -234,7 +234,7 @@
         'logistics_catalog' => array(
             'type'    => 'Laminas\Router\Http\Segment',
             'options' => array(
-                'route'       => '[/:language]/logistics/catalog[/:action[/:order][/request/:request][/page/:page]][/]',
+                'route'       => '[/:language]/logistics[/catalog][/:action[/:order][/request/:request][/page/:page]][/]',
                 'constraints' => array(
                     'action'   => '[a-zA-Z][a-zA-Z0-9_-]*',
                     'order'    => '[0-9]*',

From dfc72381b53b7087f1f231a3113b2bc752f0578d Mon Sep 17 00:00:00 2001
From: pedrod <pedro.devogelaere@vtk.be>
Date: Thu, 19 Oct 2023 20:13:36 +0000
Subject: [PATCH 5/9] fix

---
 module/LogisticsBundle/Controller/AuthController.php         | 5 +----
 module/LogisticsBundle/Controller/LeaseController.php        | 2 +-
 module/LogisticsBundle/Resources/config/router.config.php    | 4 ++--
 module/LogisticsBundle/Resources/layouts/logistics/base.twig | 2 +-
 4 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/module/LogisticsBundle/Controller/AuthController.php b/module/LogisticsBundle/Controller/AuthController.php
index 934ca51f89..9a1fff7eaa 100644
--- a/module/LogisticsBundle/Controller/AuthController.php
+++ b/module/LogisticsBundle/Controller/AuthController.php
@@ -48,10 +48,7 @@ public function loginAction()
         }
 
         $this->redirect()->toRoute(
-            'logistics_catalog',
-            array(
-                'language' => $this->getLanguage()->getAbbrev(),
-            )
+            'logistics_catalog'
         );
 
         return new ViewModel();
diff --git a/module/LogisticsBundle/Controller/LeaseController.php b/module/LogisticsBundle/Controller/LeaseController.php
index 9ed03fdae8..aab92a3f60 100644
--- a/module/LogisticsBundle/Controller/LeaseController.php
+++ b/module/LogisticsBundle/Controller/LeaseController.php
@@ -236,7 +236,7 @@ private function getPersonEntity()
                 'No person was authenticated!'
             );
 
-            $this->redirect()->toRoute('logistics_catalog');
+            $this->redirect()->toRoute('logistics_transport');
 
             return;
         }
diff --git a/module/LogisticsBundle/Resources/config/router.config.php b/module/LogisticsBundle/Resources/config/router.config.php
index f8d9dac150..d7bd346431 100644
--- a/module/LogisticsBundle/Resources/config/router.config.php
+++ b/module/LogisticsBundle/Resources/config/router.config.php
@@ -234,7 +234,7 @@
         'logistics_catalog' => array(
             'type'    => 'Laminas\Router\Http\Segment',
             'options' => array(
-                'route'       => '[/:language]/logistics[/catalog][/:action[/:order][/request/:request][/page/:page]][/]',
+                'route'       => '[/:language]/logistics/catalog[/:action[/:order][/request/:request][/page/:page]][/]',
                 'constraints' => array(
                     'action'   => '[a-zA-Z][a-zA-Z0-9_-]*',
                     'order'    => '[0-9]*',
@@ -251,7 +251,7 @@
         'logistics_catalog_typeahead' => array(
             'type'    => 'Laminas\Router\Http\Segment',
             'options' => array(
-                'route'       => '[/:language]/logistics[/:order]/typeahead[/:string][/]',
+                'route'       => '[/:language]/logistics/catalog[/:order]/typeahead[/:string][/]',
                 'constraints' => array(
                     'order'    => '[0-9]*',
                     'language' => '(en|nl)',
diff --git a/module/LogisticsBundle/Resources/layouts/logistics/base.twig b/module/LogisticsBundle/Resources/layouts/logistics/base.twig
index b1f324626c..0c17bf662b 100644
--- a/module/LogisticsBundle/Resources/layouts/logistics/base.twig
+++ b/module/LogisticsBundle/Resources/layouts/logistics/base.twig
@@ -24,7 +24,7 @@
                     <ul class="nav navbar-nav">
                         {% if hasAccess('logistics_catalog', 'overview') %}
                             <li {% if 'logistics_catalog' == getParam('controller') %}class="active"{% endif %}>
-                                <a href="{{ url('logistics_catalog', {"language": language.getAbbrev()}) }}">{{ translate('Material') }}</a>
+                                <a href="{{ url('logistics_catalog', {"language": language.getAbbrev()}) }}">{{ translate('Requests') }}</a>
                             </li>
                         {% endif %}
                         {% if hasAccess('logistics_inventory', 'index') %}

From 35779b74a79f5255df02dd951212a227e12d3bce Mon Sep 17 00:00:00 2001
From: Robbe Serry <robbeserry@gmail.com>
Date: Sat, 21 Oct 2023 11:26:19 +0000
Subject: [PATCH 6/9] Revert "temporary poc translation change"

This reverts commit 5ba0631e122e56ba5c8e0bf412e1409429a290bd.
---
 module/CommonBundle/Resources/translations/site.en.php | 3 +--
 module/CommonBundle/Resources/translations/site.nl.php | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/module/CommonBundle/Resources/translations/site.en.php b/module/CommonBundle/Resources/translations/site.en.php
index 5fa8359ab9..065b179e00 100644
--- a/module/CommonBundle/Resources/translations/site.en.php
+++ b/module/CommonBundle/Resources/translations/site.en.php
@@ -101,8 +101,7 @@
     'International Student'                                                                                                                                                                                                                                                      => 'International Student',
     'I am an international student'                                                                                                                                                                                                                                              => 'I am an international student',
 
-//    'The POC\'ers are elected! You can find your POC\'ers here!'                                                                                                                                                                                                                 => 'The POC\'ers are elected! You can find your POC\'ers here!',
-    'The POC\'ers are elected! You can find your POC\'ers here!'                                                                                                                                                                                                                 => 'Below you can find the candidate POC for this academic year. If you wish to file an objection against one of the candidates, send an email to neucom@vtk.be before Monday, October 16, 11:59 PM.',
+    'The POC\'ers are elected! You can find your POC\'ers here!'                                                                                                                                                                                                                 => 'The POC\'ers are elected! You can find your POC\'ers here!',
     'We could not find any POC\'ers for you, try again later!'                                                                                                                                                                                                                   => 'We could not find any POC\'ers for you, try again later!',
     'Please login to see your POC\'ers!'                                                                                                                                                                                                                                         => 'Please login to see your POC\'ers!',
     'Visit the POC page for more '                                                                                                                                                                                                                                               => 'Visit the POC page for more ',
diff --git a/module/CommonBundle/Resources/translations/site.nl.php b/module/CommonBundle/Resources/translations/site.nl.php
index 798d23887d..453109ece4 100644
--- a/module/CommonBundle/Resources/translations/site.nl.php
+++ b/module/CommonBundle/Resources/translations/site.nl.php
@@ -106,8 +106,7 @@
     'International Student'                                                                                                                                                                                                                                                      => 'Internationale Student',
     'I am an international student'                                                                                                                                                                                                                                              => 'Ik ben een internationale student',
 
-//    'The POC\'ers are elected! You can find your POC\'ers here!'                                                                                                                                                                                                                 => 'De POC\'ers zijn verkozen! Hieronder kan jij jouw POC\'ers vinden! ',
-    'The POC\'ers are elected! You can find your POC\'ers here!'                                                                                                                                                                                                                 => 'Hieronder kun je de kandidaat-RiVers voor dit academiejaar terugvinden. Indien je wenst een bezwaar in te dienen tegen een van de kandidaten, stuur je een e-mail naar neucom@vtk.be voor maandag 16 oktober 23u59.',
+    'The POC\'ers are elected! You can find your POC\'ers here!'                                                                                                                                                                                                                 => 'De POC\'ers zijn verkozen! Hieronder kan jij jouw POC\'ers vinden! ',
     'We could not find any POC\'ers for you, try again later!'                                                                                                                                                                                                                   => 'We konden geen POC\'ers voor jou vinden, probeer later nog eens !',
     'Please login to see your POC\'ers!'                                                                                                                                                                                                                                         => 'Login om jouw POC\'ers te bekijken',
     'Visit the POC page for more '                                                                                                                                                                                                                                               => 'Bezoek de POC pagina voor meer ',

From 21aa5754df1f017eea088a5fe81fe432b304082a Mon Sep 17 00:00:00 2001
From: Robbe Serry <robbeserry@gmail.com>
Date: Sat, 21 Oct 2023 12:28:58 +0000
Subject: [PATCH 7/9] add no-reply email to tickets

---
 .../Resources/config/install/configuration.config.php      | 5 +++++
 module/TicketBundle/Controller/TicketController.php        | 7 ++++++-
 module/TicketBundle/Entity/Ticket.php                      | 7 ++++++-
 3 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/module/CommonBundle/Resources/config/install/configuration.config.php b/module/CommonBundle/Resources/config/install/configuration.config.php
index cb90e87a23..5552395298 100644
--- a/module/CommonBundle/Resources/config/install/configuration.config.php
+++ b/module/CommonBundle/Resources/config/install/configuration.config.php
@@ -202,6 +202,11 @@
         'value'       => 'it@vtk.be',
         'description' => 'The mail address of system administrator',
     ),
+    array(
+        'key'         => 'system_no-reply_mail',
+        'value'       => 'no-reply@vtk.be',
+        'description' => 'The no-reply mail address',
+    ),
     array(
         'key'         => 'fallback_language',
         'value'       => 'nl',
diff --git a/module/TicketBundle/Controller/TicketController.php b/module/TicketBundle/Controller/TicketController.php
index 0c9df39258..69c228129c 100644
--- a/module/TicketBundle/Controller/TicketController.php
+++ b/module/TicketBundle/Controller/TicketController.php
@@ -1004,6 +1004,10 @@ private function sendMail(Ticket $ticket)
             ->getRepository('CommonBundle\Entity\General\Config')
             ->getConfigValue('ticket.confirmation_email_from');
 
+        $noreplyAddress = $this->getEntityManager()
+            ->getRepository('CpmmonBundle\Entity\General\Config')
+            ->getConfifValue('system_no-reply_mail');
+
         if ($ticket->getPerson()) {
             $person = $ticket->getPerson();
             $fullName = $person->getFullName();
@@ -1034,7 +1038,8 @@ private function sendMail(Ticket $ticket)
 
         $mail->setEncoding('UTF-8')
             ->setBody(str_replace(array('{{ fullname }}', '{{ event }}', '{{ option }}', '{{ paylink }}'), array($fullName, $eventName, $optionString, $payLink), $mailBody))
-            ->setFrom($mailFrom)
+            ->setFrom($noreplyAddress)
+            ->setReplyTo($mailFrom)
             ->addTo($mailTo)
             ->addBcc($mailFrom)
             ->addBcc($this->getEntityManager()
diff --git a/module/TicketBundle/Entity/Ticket.php b/module/TicketBundle/Entity/Ticket.php
index 22d7aa7fad..2d53fa5647 100644
--- a/module/TicketBundle/Entity/Ticket.php
+++ b/module/TicketBundle/Entity/Ticket.php
@@ -607,6 +607,10 @@ public function sendQrMail($controller, $language)
             ->getRepository('CommonBundle\Entity\General\Config')
             ->getConfigValue('ticket.subscription_mail_name');
 
+        $noreplyAddress = $entityManager
+            ->getRepository('CpmmonBundle\Entity\General\Config')
+            ->getConfifValue('system_no-reply_mail');
+
         $url = $controller->url()
             ->fromRoute(
                 'ticket',
@@ -644,7 +648,8 @@ public function sendQrMail($controller, $language)
         $mail = new Message();
         $mail->setEncoding('UTF-8')
             ->setBody($newMessage)
-            ->setFrom($mailAddress, $mailName)
+            ->setFrom($noreplyAddress, $mailName)
+            ->setReplyTo($mailAddress, $mailName)
             ->addTo($this->getEmail(), $this->getFullName())
             ->setSubject($subject)
             ->addBcc($entityManager

From 9bda3ae3f1dc4ec1dc5e84a369741af370bab337 Mon Sep 17 00:00:00 2001
From: Robbe Serry <robbeserry@gmail.com>
Date: Sat, 21 Oct 2023 12:40:40 +0000
Subject: [PATCH 8/9] fix typo

---
 module/TicketBundle/Controller/TicketController.php | 4 ++--
 module/TicketBundle/Entity/Ticket.php               | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/module/TicketBundle/Controller/TicketController.php b/module/TicketBundle/Controller/TicketController.php
index 69c228129c..1dcef8c4eb 100644
--- a/module/TicketBundle/Controller/TicketController.php
+++ b/module/TicketBundle/Controller/TicketController.php
@@ -1005,8 +1005,8 @@ private function sendMail(Ticket $ticket)
             ->getConfigValue('ticket.confirmation_email_from');
 
         $noreplyAddress = $this->getEntityManager()
-            ->getRepository('CpmmonBundle\Entity\General\Config')
-            ->getConfifValue('system_no-reply_mail');
+            ->getRepository('CommonBundle\Entity\General\Config')
+            ->getConfigValue('system_no-reply_mail');
 
         if ($ticket->getPerson()) {
             $person = $ticket->getPerson();
diff --git a/module/TicketBundle/Entity/Ticket.php b/module/TicketBundle/Entity/Ticket.php
index 2d53fa5647..a81b213f9e 100644
--- a/module/TicketBundle/Entity/Ticket.php
+++ b/module/TicketBundle/Entity/Ticket.php
@@ -608,8 +608,8 @@ public function sendQrMail($controller, $language)
             ->getConfigValue('ticket.subscription_mail_name');
 
         $noreplyAddress = $entityManager
-            ->getRepository('CpmmonBundle\Entity\General\Config')
-            ->getConfifValue('system_no-reply_mail');
+            ->getRepository('CommonBundle\Entity\General\Config')
+            ->getConfigValue('system_no-reply_mail');
 
         $url = $controller->url()
             ->fromRoute(

From 073999fd1cfbc03e73156a1f5453acf6345c118c Mon Sep 17 00:00:00 2001
From: pedrod <pedro.devogelaere@vtk.be>
Date: Sat, 21 Oct 2023 17:15:23 +0000
Subject: [PATCH 9/9] router fix

---
 module/LogisticsBundle/Controller/AuthController.php   | 10 ++++++++--
 .../LogisticsBundle/Resources/config/router.config.php |  4 ++--
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/module/LogisticsBundle/Controller/AuthController.php b/module/LogisticsBundle/Controller/AuthController.php
index 9a1fff7eaa..28795b4b65 100644
--- a/module/LogisticsBundle/Controller/AuthController.php
+++ b/module/LogisticsBundle/Controller/AuthController.php
@@ -48,7 +48,10 @@ public function loginAction()
         }
 
         $this->redirect()->toRoute(
-            'logistics_catalog'
+            'logistics_catalog',
+            array(
+                'language' => $this->getLanguage()->getAbbrev(),
+            )
         );
 
         return new ViewModel();
@@ -108,7 +111,10 @@ public function shibbolethAction()
                             );
                         } else {
                             $this->redirect()->toRoute(
-                                'logistics_catalog'
+                                'logistics_catalog',
+                                array(
+                                    'language' => $this->getLanguage()->getAbbrev(),
+                                )
                             );
                         }
 
diff --git a/module/LogisticsBundle/Resources/config/router.config.php b/module/LogisticsBundle/Resources/config/router.config.php
index d7bd346431..cb60ba3141 100644
--- a/module/LogisticsBundle/Resources/config/router.config.php
+++ b/module/LogisticsBundle/Resources/config/router.config.php
@@ -234,7 +234,7 @@
         'logistics_catalog' => array(
             'type'    => 'Laminas\Router\Http\Segment',
             'options' => array(
-                'route'       => '[/:language]/logistics/catalog[/:action[/:order][/request/:request][/page/:page]][/]',
+                'route'       => '[/:language]/logistics[/catalog[/:action[/:order][/request/:request][/page/:page]]][/]',
                 'constraints' => array(
                     'action'   => '[a-zA-Z][a-zA-Z0-9_-]*',
                     'order'    => '[0-9]*',
@@ -291,11 +291,11 @@
         'logistics_admin_lease'             => 'LogisticsBundle\Controller\Admin\LeaseController',
         'logistics_admin_inventory'         => 'LogisticsBundle\Controller\Admin\InventoryController',
 
+        'logistics_catalog'                 => 'LogisticsBundle\Controller\CatalogController',
         'logistics_transport'               => 'LogisticsBundle\Controller\TransportController',
         'logistics_auth'                    => 'LogisticsBundle\Controller\AuthController',
         'logistics_piano'                   => 'LogisticsBundle\Controller\PianoController',
         'logistics_lease'                   => 'LogisticsBundle\Controller\LeaseController',
-        'logistics_catalog'                 => 'LogisticsBundle\Controller\CatalogController',
         'logistics_inventory'               => 'LogisticsBundle\Controller\InventoryController',
     ),
 );