Inactive member organ members and fixes to installation/discharge UX

module/Checker/src/Service/Installation.php

@@ -91,11 +91,13 @@ public function getActiveMembers(?MeetingModel $meeting): array
 
         $members = [];
         foreach ($installations as $installation) {
-            $member = $installation->getMember()->getLidnr();
+            if ('Inactief Lid' !== $installation->getFunction()) {
+                $member = $installation->getMember()->getLidnr();
 
-            // Doing checks against the keys is a lot faster, and we do not need a lot of information.
-            if (!array_key_exists($member, $members)) {
-                $members[$member] = '';
+                // Doing checks against the keys is a lot faster, and we do not need a lot of information.
+                if (!array_key_exists($member, $members)) {
+                    $members[$member] = '';
+                }
             }
         }
 

module/Database/src/Controller/MeetingController.php

@@ -196,7 +196,7 @@ public function decisionformAction(): Response|ViewModel
      */
     public function deleteAction(): ViewModel
     {
-        $type = $this->params()->fromRoute('type');
+        $type = MeetingTypes::from($this->params()->fromRoute('type'));
         $number = (int) $this->params()->fromRoute('number');
         $point = (int) $this->params()->fromRoute('point');
         $decision = (int) $this->params()->fromRoute('decision');

module/Database/src/Controller/OrganController.php

@@ -62,14 +62,22 @@ public function infoAction(): JsonModel
 
         foreach ($foundation->getReferences() as $reference) {
             if ($reference instanceof InstallationModel) {
-                $data['members'][] = [
+                $member = $reference->getMember();
+
+                if (!array_key_exists($member->getLidnr(), $data['members'])) {
+                    $data['members'][$member->getLidnr()] = [
+                        'member' => $member->toArray(),
+                        'installations' => [],
+                    ];
+                }
+
+                $data['members'][$member->getLidnr()]['installations'][] = [
                     'meeting_type' => $reference->getDecision()->getMeeting()->getType(),
                     'meeting_number' => $reference->getDecision()->getMeeting()->getNumber(),
                     'decision_point' => $reference->getDecision()->getPoint(),
                     'decision_number' => $reference->getDecision()->getNumber(),
                     'subdecision_number' => $reference->getNumber(),
                     'function' => $reference->getFunction(),
-                    'member' => $reference->getMember()->toArray(),
                 ];
             }
         }

module/Database/src/Form/Fieldset/MemberFunction.php

@@ -32,6 +32,7 @@ protected function getValueOptions(
 
         if ($withmember) {
             $array['Lid'] = 'Lid';
+            $array['Inactief Lid'] = 'Inactief Lid';
         }
 
         foreach ($service->getAllFunctions() as $function) {

module/Database/src/Hydrator/Foundation.php

@@ -44,7 +44,10 @@ public function hydrate(array $data, $object): DecisionModel
         foreach ($data['members'] as $install) {
             // if an installation has a different function than 'member'
             // also add a member installation
-            if ($install['function'] != 'Lid') {
+            if (
+                'Lid' !== $install['function']
+                && 'Inactief Lid' !== $install['function']
+            ) {
                 $installation = new InstallationModel();
                 $installation->setNumber($num++);
                 $installation->setFoundation($foundation);

module/Database/src/Mapper/Member.php

@@ -120,7 +120,7 @@ public function find(int $lidnr): ?MemberModel
             ->where('m.lidnr = :lidnr')
             ->leftJoin('m.installations', 'r')
             ->leftJoin('m.lists', 'l')
-            ->andWhere('(r.function = \'Lid\' OR r.function IS NULL)');
+            ->andWhere('(r.function = \'Lid\' OR r.function = \'Inactief Lid\' OR r.function IS NULL)');
 
         // discharges
         $qbn = $this->em->createQueryBuilder();

module/Database/view/database/meeting/abolishform.phtml

@@ -55,8 +55,31 @@ $(document).ready(function () {
                     // show all members
                     $('#div-members-abolish').show();
                     var content = '';
-                    $.each(data.json.members, function(idx, install) {
-                        content += '<li>' + install.member.fullName + ' (' + install.function + ')</li>';
+                    $.each(data.json.members, function(idx, member) {
+                        var installationCount = member.installations.length;
+                        var functionCount = 0;
+                        content += '<li>' + member.member.fullName + ' (';
+
+                        $.each(member.installations, function (idx, install) {
+                            content += install.function;
+
+                            if (
+                                2 === installationCount
+                                && 0 === functionCount
+                            ) {
+                                content += ' en ';
+                            } else if (2 < installationCount) {
+                                content += ', ';
+
+                                if (functionCount === installationCount - 1) {
+                                    content += 'en ';
+                                }
+                            }
+
+                            functionCount++;
+                        });
+
+                        content += ')</li>';
                     });
                     $('#members-abolish').html(content);
 

module/Database/view/database/meeting/delete.phtml

@@ -11,7 +11,7 @@ Besluit verwijderd.
 $form->prepare();
 
 $form->setAttribute('action', $this->url('meeting/decision/delete', array(
-    'type' => $type,
+    'type' => $type->value,
     'number' => $number,
     'point' => $point,
     'decision' => $decision
@@ -24,7 +24,7 @@ echo $this->form()->openTag($form);
 
 <p>
 Weet je zeker dat besluit
-<?= $type . " $number.$point.$decision " ?>
+<?= $type->value . " $number.$point.$decision " ?>
 verwijderd moet worden?
 </p>
 <div class="form-group">