Allow KCC to have organ regulations

Contrary to what we originally agreed in during implementation, the board believes it is still desirable to have the option for KCCs enabled. Original discussion: #357 (comment)
GEWIS · Jun 19, 2024 · 8682a1f · 8682a1f
1 parent 2dbfbb7
commit 8682a1f
Show file tree

Hide file tree

Showing 6 changed files with 59 additions and 41 deletions.
diff --git a/module/Application/language/en.po b/module/Application/language/en.po
diff --git a/module/Application/language/gewisdb.pot b/module/Application/language/gewisdb.pot
diff --git a/module/Application/language/nl.po b/module/Application/language/nl.po
diff --git a/module/Database/src/Form/OrganRegulation.php b/module/Database/src/Form/OrganRegulation.php
@@ -52,7 +52,6 @@ public function __construct(
                     [
                         'value' => 'kcc',
                         'label' => $this->translator->translate('Financial Audit Committee'),
-                        'disabled' => true,
                     ],
                     [
                         'value' => 'rva',
@@ -135,7 +134,7 @@ public function getInputFilterSpecification(): array
                         'options' => [
                             'messages' => [
                                 Callback::INVALID_VALUE => $this->translator->translate(
-                                    'Organ regulations can only be created for \'committee\' or \'fraternity\'.',
+                                    'Organ regulations can only be created for \'committee\', \'fraternity\', or \'financial audit committee\'.',
                                 ),
                             ],
                             'callback' => [$this, 'organTypeNotDisabled'],

diff --git a/module/Database/src/Hydrator/OrganRegulation.php b/module/Database/src/Hydrator/OrganRegulation.php
@@ -37,10 +37,12 @@ public function hydrate(
             $data['type'] = OrganTypes::from($data['type']);
         }
 
-        // Only allow committees and fraternities. This should already be handled by the form, just a fail-safe.
+        // Only allow committees, fraternities, and financial audit committees. This should already be handled by the
+        // form, so this is just a fail-safe.
         if (
             OrganTypes::Committee !== $data['type']
             && OrganTypes::Fraternity !== $data['type']
+            && OrganTypes::KCC !== $data['type']
         ) {
             throw new UnexpectedValueException('Unexpected organ type for organ regulation.');
         }

diff --git a/module/Database/src/Model/SubDecision/OrganRegulation.php b/module/Database/src/Model/SubDecision/OrganRegulation.php
@@ -170,7 +170,10 @@ protected function getAlternativeTemplate(): string
      */
     public function getContent(): string
     {
-        if (OrganTypes::Committee === $this->getOrganType()) {
+        if (
+            OrganTypes::Committee === $this->getOrganType()
+            || OrganTypes::KCC === $this->getOrganType()
+        ) {
             $organType = 'commissie';
         } elseif (OrganTypes::Fraternity === $this->getOrganType()) {
             $organType = 'dispuuts';
@@ -193,7 +196,10 @@ public function getContent(): string
 
     public function getAlternativeContent(): string
     {
-        if (OrganTypes::Committee === $this->getOrganType()) {
+        if (
+            OrganTypes::Committee === $this->getOrganType()
+            || OrganTypes::KCC === $this->getOrganType()
+        ) {
             $organType = 'committee ';
         } elseif (OrganTypes::Fraternity === $this->getOrganType()) {
             $organType = 'fraternity ';