Selaa lähdekoodia

Merge branch 'develop' into 'feature/v8-5582'

# Conflicts:
#   src/Entity/Organization/Parameters.php
Vincent G. 1 vuosi sitten
vanhempi
commit
8ba944dcf1

+ 1 - 0
config/opentalent/enum.yaml

@@ -63,6 +63,7 @@ parameters:
           organization_bulletin_period: 'App\Enum\Organization\BulletinPeriodEnum'
           organization_bulletin_output: 'App\Enum\Organization\BulletinOutputEnum'
           organization_bulletin_send_to: 'App\Enum\Organization\SendToBulletinEnum'
+          organization_bulletin_criteria_sort: 'App\Enum\Organization\BulletinCriteriaSortEnum'
           organization_setting_country: 'App\Enum\Organization\CountryEnum'
           address_postal_organization: 'App\Enum\Organization\AddressPostalOrganizationTypeEnum'
 

+ 15 - 0
src/Entity/Organization/Parameters.php

@@ -131,6 +131,10 @@ class Parameters
     #[ORM\Column(length: 255, nullable: true, enumType: SendToBulletinEnum::class, options: ['default' => SendToBulletinEnum::STUDENTS_AND_THEIR_GUARDIANS])]
     private ?SendToBulletinEnum $bulletinReceiver = SendToBulletinEnum::STUDENTS_AND_THEIR_GUARDIANS;
 
+    #[ORM\Column(length: 255, nullable: false, options: ['default' => 'BY_CRITERIA_INSERT'])]
+    #[Assert\Choice(callback: ['\\App\\Enum\\Organization\\BulletinCriteriaSortEnum', 'toArray'], message: 'invalid-bulletin-criteria-sort')]
+    private string $bulletinCriteriaSort = "BY_CRITERIA_INSERT";
+
     #[ORM\Column(length: 255, nullable: true)]
     private ?string $usernameSMS = null;
 
@@ -460,6 +464,17 @@ class Parameters
         return $this;
     }
 
+    public function getBulletinCriteriaSort(): string
+    {
+        return $this->bulletinCriteriaSort;
+    }
+
+    public function setBulletinCriteriaSort(string $bulletinCriteriaSort): self
+    {
+        $this->bulletinCriteriaSort = $bulletinCriteriaSort;
+        return $this;
+    }
+
     public function getUsernameSMS(): ?string
     {
         return $this->usernameSMS;

+ 15 - 0
src/Enum/Organization/BulletinCriteriaSortEnum.php

@@ -0,0 +1,15 @@
+<?php
+declare(strict_types=1);
+
+namespace App\Enum\Organization;
+
+use MyCLabs\Enum\Enum;
+
+/**
+ * Type de tri des critères des bulletins
+ */
+class BulletinCriteriaSortEnum extends Enum
+{
+    private const ALPHANUM = 'ALPHANUM';
+    private const BY_CRITERIA_INSERT = 'BY_CRITERIA_INSERT';
+}