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

Ajout de la méthode public function getObservationsWithTypeCode(string , bool ... 

Ajout de la méthode public function getObservationsWithTypeCode(string , bool  = false): array dans l'interface
parent 0008cfde

src/UnicaenObservation/Controller/ObservationInstanceController.php

+6 −6
Original line number Diff line number Diff line
@@ -57,7 +57,7 @@ class ObservationInstanceController extends AbstractActionController 
        }



        $vm = new ViewModel([

            'title' => "Ajout d'une observation",

            'title' => "Ajout d'observations",

            'form' => $form,

        ]);

        $vm->setTemplate('unicaen-observation/default/default-form');
@@ -82,7 +82,7 @@ class ObservationInstanceController extends AbstractActionController 
        }



        $vm = new ViewModel([

            'title' => "Modification d'une observation",

            'title' => "Modification des observations",

            'form' => $form,

        ]);

        $vm->setTemplate('unicaen-observation/default/default-form');
@@ -104,7 +104,7 @@ class ObservationInstanceController extends AbstractActionController 
        if ($observation !== null) {

            $vm->setTemplate('unicaen-observation/default/confirmation');

            $vm->setVariables([

                'title' => "Historisation du type d'observation",

                'title' => "Historisation d'observations",

                'text' => "L'historisation masquera votre observation que vous pourrez restaurer. Êtes-vous sûr·e de vouloir continuer ?",

                'action' => $this->url()->fromRoute('observation/instance/historiser', ["observation" => $observation->getId()], [], true),

            ]);
@@ -126,7 +126,7 @@ class ObservationInstanceController extends AbstractActionController 
        if ($observation !== null) {

            $vm->setTemplate('unicaen-observation/default/confirmation');

            $vm->setVariables([

                'title' => "Restauration du type d'observation",

                'title' => "Restauration d'observations",

                'text' => "La restauration va rétablir votre observation. Êtes-vous sûr·e de vouloir continuer ?",

                'action' => $this->url()->fromRoute('observation/instance/historiser', ["observation" => $observation->getId()], [], true),

            ]);
@@ -149,7 +149,7 @@ class ObservationInstanceController extends AbstractActionController 
        if ($observation !== null) {

            $vm->setTemplate('unicaen-observation/default/confirmation');

            $vm->setVariables([

                'title' => "Suppression du type d'observation",

                'title' => "Suppression d'observations",

                'text' => "La suppression est définitive êtes-vous sûr·e de vouloir continuer ?",

                'action' => $this->url()->fromRoute('observation/instance/supprimer', ["observation" => $observation->getId()], [], true),

            ]);
@@ -182,7 +182,7 @@ class ObservationInstanceController extends AbstractActionController 
        $vm = new ViewModel();

        $vm->setTemplate('unicaen-validation/validation-instance/validation-modal');

        $vm->setVariables([

            'title' => "Validation de l'obsevation",

            'title' => "Validation des obsevations",

            'text' => "La validation de l'observation figera celle-ci. Êtes-vous de vouloir valider cette validation ?",

            'action' => $this->url()->fromRoute('observation/instance/valider', ['observation-instance' => $observation->getId()], [], true),

            'refus' => false,

src/UnicaenObservation/Entity/Interface/HasObservationsInterface.php

+1 −0
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ interface HasObservationsInterface 
    public function hasObservationWithTypeCode(string $code, bool $histo = false): bool;



    public function getObservationWithTypeCode(string $code, bool $histo = false): ?ObservationInstance;

    public function getObservationsWithTypeCode(string $code, bool $histo = false): array;

    public function addObservation(ObservationInstance $observationInstance): void;

    public function removeObservation(ObservationInstance $observationInstance): void;

src/UnicaenObservation/Entity/Trait/HasObservationsTrait.php

+11 −0
Original line number Diff line number Diff line
@@ -46,6 +46,17 @@ trait HasObservationsTrait 
        return null;

    }



    /** @return ObservationInstance[] */

    public function getObservationsWithTypeCode(string $code, bool $histo = false): array

    {

        $array = [];

        /** @var ObservationInstance $observation */

        foreach ($this->getObservations() as $observation) {

            if ($observation->getType()->getCode() === $code AND (!$histo OR $observation->estNonHistorise())) $array[$observation->getId()] = $observation;

        }

        return $array;

    }



    public function addObservation(ObservationInstance $observationInstance): void

    {

        $this->observations->add($observationInstance);