Commit d84f6ff9 authored by Bertrand Gauthier's avatar Bertrand Gauthier
Browse files

Formulaire de saisie d'une qualité de membre du jury : possibilité de...

Formulaire de saisie d'une qualité de membre du jury : possibilité de spécifier 'aucun rang' (ex : émérites).
parent 22daf562
Loading
Loading
Loading
Loading
+1 −1
Changes for module/Soutenance/src/Soutenance/Entity/Mapping/Soutenance.Entity.Qualite.dcm.xml: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@
        </id>

        <field name="libelle"           type="string"       length="128"        column="libelle"        nullable="false"/>
        <field name="rang"              type="string"       length="1"          column="rang"           nullable="false"/>
        <field name="rang"              type="string"       length="1"          column="rang"           nullable="true"/>
        <field name="hdr"               type="string"       length="1"          column="hdr"            nullable="false"/>
        <field name="emeritat"          type="string"       length="1"          column="emeritat"       nullable="false"/>
        <field name="justificatif"      type="string"       length="1"          column="justificatif"   nullable="false"/>
+13 −4
Changes for module/Soutenance/src/Soutenance/Entity/Membre.php: 13 added lines, 4 removed lines.
Original line number Diff line number Diff line
@@ -109,6 +109,18 @@ class Membre implements HistoriqueAwareInterface {
        return $civilite;
    }

    public function getCiviliteCourte(): string
    {
        if ($this->getIndividu()) {
            return $this->getIndividu()->getCivilite() ?: '-';
        }

        if ($this->getGenre() === 'F') return "Mme";
        if ($this->getGenre() === 'H') return "M.";

        return '-';
    }

    /**
     * @return string
     */
@@ -168,10 +180,7 @@ class Membre implements HistoriqueAwareInterface {
        return $this;
    }

    /**
     * @return string
     */
    public function getRang()
    public function getRang(): ?string
    {
        if ($this->getQualite() === null) {
            throw new RuntimeException("Pas de qualité associé au membre de jury [".$this->getDenomination()."].");
+6 −23
Changes for module/Soutenance/src/Soutenance/Entity/Qualite.php: 6 added lines, 23 removed lines.
Original line number Diff line number Diff line
@@ -12,12 +12,13 @@ class Qualite implements HistoriqueAwareInterface

    const ID_QUALITE_PAR_DEFAUT = 1;

    const RANG_LIBELLE_AUCUN = "Aucun";

    /** @var int */
    private $id;
    /** @var string */
    private $libelle;
    /** @var string */
    private $rang;
    private ?string $rang = null;
    /** @var string */
    private $hdr;
    /** @var string */
@@ -56,35 +57,17 @@ class Qualite implements HistoriqueAwareInterface
        return $this;
    }

    /**
     * @return string
     */
    public function getRang()
    public function getRang(): ?string
    {
        return $this->rang;
    }

    /**
     * @return bool
     */
    public function isRangA()
    {
        return $this->rang === 'A';
    }

    /**
     * @return bool
     */
    public function isRangB()
    public function isRangB(): bool
    {
        return $this->rang === 'B';
    }

    /**
     * @param string $rang
     * @return Qualite
     */
    public function setRang($rang)
    public function setRang(?string $rang): static
    {
        $this->rang = $rang;
        return $this;
+26 −3
Changes for module/Soutenance/src/Soutenance/Form/QualiteEdition/QualiteEditionForm.php: 26 added lines, 3 removed lines.
Original line number Diff line number Diff line
@@ -6,9 +6,11 @@ use Application\Utils\FormUtils;
use Laminas\Form\Element\Radio;
use Laminas\Form\Element\Text;
use Laminas\Form\Form;
use Laminas\InputFilter\InputProviderInterface;
use Soutenance\Entity\Qualite;

class QualiteEditionForm extends Form {

class QualiteEditionForm extends Form implements InputProviderInterface
{
    public function init()
    {
        $this->add(
@@ -19,7 +21,7 @@ class QualiteEditionForm extends Form {
        $this->add(
            (new Radio('rang'))
                ->setLabel("Rang :")
                ->setValueOptions(['A' => 'A', 'B' => 'B']))
                ->setValueOptions(['A' => 'A', 'B' => 'B', 'aucun' => Qualite::RANG_LIBELLE_AUCUN]))
        ;

        $this->add(
@@ -42,4 +44,25 @@ class QualiteEditionForm extends Form {

        FormUtils::addSaveButton($this);
    }

    public function getInputSpecification(): array
    {
        return [
            'libelle' => [
                'required' => true,
            ],
            'rang' => [
                'required' => true,
            ],
            'hdr' => [
                'required' => true,
            ],
            'emeritat' => [
                'required' => true,
            ],
            'justificatif' => [
                'required' => true,
            ],
        ];
    }
}
 No newline at end of file
+7 −5
Changes for module/Soutenance/src/Soutenance/Form/QualiteEdition/QualiteEditiontHydrator.php: 7 added lines, 5 removed lines.
Original line number Diff line number Diff line
@@ -2,8 +2,8 @@

namespace Soutenance\Form\QualiteEdition;

use Soutenance\Entity\Qualite;
use Laminas\Hydrator\HydratorInterface;
use Soutenance\Entity\Qualite;

class QualiteEditiontHydrator implements HydratorInterface
{
@@ -12,9 +12,11 @@ class QualiteEditiontHydrator implements HydratorInterface
     * @param Qualite $qualite
     * @return Qualite
     */
    public function hydrate(array $data, $qualite) {
    public function hydrate(array $data, $qualite): Qualite
    {
        $data['rang'] = $data['rang'] ?? null;

        $qualite->setRang($data['rang']);
        $qualite->setRang($data['rang'] === 'aucun' ? null : $data['rang']);
        $qualite->setLibelle($data['libelle']);
        $qualite->setHdr($data['hdr']);
        $qualite->setEmeritat($data['emeritat']);
@@ -27,8 +29,8 @@ class QualiteEditiontHydrator implements HydratorInterface
     * @param Qualite $qualite
     * @return array
     */
    public function extract($qualite): array {

    public function extract($qualite): array
    {
        $data = [];
        $data['libelle']         = $qualite->getLibelle();
        $data['rang']            = $qualite->getRang();
Loading