Commit c8659565 authored by Jean-Philippe Metivier's avatar Jean-Philippe Metivier
Browse files

Valeur => Refus (Boolean)

parent 4afadb76

documentation/001_table.sql

+1 −1
Changes for documentation/001_table.sql: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ create table unicaen_validation_instance 
        constraint unicaen_validation_instance_unicaen_validation_type_id_fk

            references unicaen_validation_type

                on delete cascade,

    valeur                text,

    refus                boolean not null default false,

    justification                text,

    histo_creation        timestamp not null,

    histo_createur_id     integer   not null

src/UnicaenValidation/Entity/Db/ValidationInstance.php

+7 −31
Changes for src/UnicaenValidation/Entity/Db/ValidationInstance.php: 7 added lines, 31 removed lines.
Original line number Diff line number Diff line
@@ -10,64 +10,40 @@ class ValidationInstance implements HistoriqueAwareInterface { 


    private int $id;

    private ?ValidationType $type = null;

    private ?string $valeur = null;

    private bool $refus = false;

    private ?string $justification = null;

    

    /**

     * @return int

     */

    public function getId() : int

    {

        return $this->id;

    }



    /**

     * @return ValidationType|null

     */

    public function getType() : ?ValidationType

    {

        return $this->type;

    }



    /**

     * @param ValidationType $type

     * @return ValidationInstance

     */

    public function setType(ValidationType $type) : ValidationInstance

    {

        $this->type = $type;

        return $this;

    }



    /**

     * @return string|null

     */

    public function getValeur() : ?string

    public function isRefus(): bool

    {

        return $this->valeur;

        return $this->refus;

    }



    /**

     * @param string|null $valeur

     * @return ValidationInstance

     */

    public function setValeur(?string $valeur) : ValidationInstance

    public function setRefus(bool $refus): void

    {

        $this->valeur = $valeur;

        return $this;

        $this->refus = $refus;

    }



    /**

     * @return string|null

     */

    public function getJustification(): ?string

    {

        return $this->justification;

    }



    /**

     * @param string|null $justification

     */

    public function setJustification(?string $justification): void

    {

        $this->justification = $justification;
@@ -96,8 +72,8 @@ class ValidationInstance implements HistoriqueAwareInterface { 


    public function toStringValeur() : string

    {

        if ($this->getValeur() === null) return "Aucune valeur associée à la validation";

        return $this->getValeur();

        if ($this->getJustification() === null) return "Aucune valeur associée à la validation";

        return $this->getJustification();

    }



    public function toStringValidateur() : string

src/UnicaenValidation/Form/ValidationInstance/ValidationInstanceHydrator.php

+3 −2
Changes for src/UnicaenValidation/Form/ValidationInstance/ValidationInstanceHydrator.php: 3 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ class ValidationInstanceHydrator implements HydratorInterface { 
    {

        $data = [

            'type'          => ($object AND $object->getType())?$object->getType()->getId():null,

            'valeur'        => $object?$object->getValeur():null,

            'valeur'        => $object?$object->getJustification():null,

        ];

        return $data;

    }
@@ -31,7 +31,8 @@ class ValidationInstanceHydrator implements HydratorInterface { 
    {

        $type = $this->getValidationTypeService()->getValidationType($data['type']);

        $object->setType($type);

        $object->setValeur($data['valeur'] ?? null);

        $object->setJustification($data['valeur'] ?? null);

        $object->setRefus($data['valeur'] === null || $data['valeur'] === "");

        return $object;

    }

}
 
 No newline at end of file

src/UnicaenValidation/Service/ValidationInstance/ValidationInstanceService.php

+4 −4
Changes for src/UnicaenValidation/Service/ValidationInstance/ValidationInstanceService.php: 4 added lines, 4 removed lines.
Original line number Diff line number Diff line
@@ -213,20 +213,20 @@ class ValidationInstanceService { 
     * @param string|null $justification

     * @return ValidationInstance

     */

    public function createWithCode(string $code, ?string $valeur = null, ?string $justification = null) : ValidationInstance

    public function createWithCode(string $code, bool $refus = false, ?string $justification = null) : ValidationInstance

    {

        $type = $this->getValidationTypeService()->getValidationTypeByCode($code);



        $instance = new ValidationInstance();

        $instance->setType($type);

        $instance->setValeur($valeur);

        $instance->setRefus($refus);

        $instance->setJustification($justification);

        $this->create($instance);



        return $instance;

    }



    public function setValidationActive(HasValidationsInterface $element, string $code, ?string $value = null) : HasValidationsInterface

    public function setValidationActive(HasValidationsInterface $element, string $code, ?string $justification = null) : HasValidationsInterface

    {

        //historisation de l'état actif actuel (s'il existe)

        $validationActive = $element->getValidationActiveByTypeCode($code);
@@ -235,7 +235,7 @@ class ValidationInstanceService { 
        }



        //creation de la nouvelle instance

        $validation = $this->createWithCode($code, $value);

        $validation = $this->createWithCode($code, $justification !== null,  $justification);



        //ajout à l'element et persist

        $element->addValidation($validation);

src/UnicaenValidation/View/Helper/partial/validation-afficher.phtml

+2 −2
Changes for src/UnicaenValidation/View/Helper/partial/validation-afficher.phtml: 2 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -11,8 +11,8 @@ $type = $instance->getType(); 


?>



<div class="validation validation-affichage <?php echo ($instance->getValeur() === null)?"validation-valider":"validation-refuser" ?>">

        <?php if ($instance->getValeur() !== null) : ?>

<div class="validation validation-affichage <?php echo ($instance->isRefus())?"validation-refuser":"validation-valider" ?>">

        <?php if ($instance->isRefus()) : ?>

            Refusé

        <?php else : ?>

            Validé