Commit a9e36feb authored by Laurent Lecluse's avatar Laurent Lecluse
Browse files

Gestion des autovalidations

parent 5d0b4b99
Loading
Loading
Loading
Loading
+10 −1
Changes for module/Mission/src/Controller/MissionController.php: 10 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ namespace Mission\Controller;
use Application\Constants;
use Application\Controller\AbstractController;
use Application\Entity\Db\Intervenant;
use Application\Provider\Privilege\Privileges;
use Application\Service\Traits\ContextServiceAwareTrait;
use Application\Service\Traits\TypeValidationServiceAwareTrait;
use Application\Service\Traits\ValidationServiceAwareTrait;
@@ -93,6 +94,10 @@ class MissionController extends AbstractController
        $mission->setDateDebut(new \DateTime());
        $mission->setDateFin(new \DateTime());

        $canAutoValidate = $this->isAllowed($mission, Privileges::MISSION_AUTOVALIDATION);

        if ($canAutoValidate) $mission->setAutoValidation(true);

        return $this->saisieAction($mission);
    }

@@ -147,10 +152,13 @@ class MissionController extends AbstractController
        /** @var Mission $mission */
        $mission = $this->getEvent()->getParam('mission');

        if ($mission->isValide()) {
            $this->flashMessenger()->addInfoMessage('La mission est déjà validée');
        } else {
            $this->getServiceValidation()->validerMission($mission);
            $this->getServiceMission()->save($mission);

            $this->flashMessenger()->addSuccessMessage('Mission validée');
        }

        return $this->getAction();
    }
@@ -164,6 +172,7 @@ class MissionController extends AbstractController

        $validation = $mission->getValidation();
        if ($validation) {
            $mission->setAutoValidation(false);
            $mission->removeValidation($validation);
            $this->getServiceValidation()->delete($validation);
            $this->flashMessenger()->addSuccessMessage("Validation de la mission <strong>retirée</strong> avec succès.");
+9 −1
Changes for module/Mission/src/Entity/Db/Mission.php: 9 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -8,10 +8,11 @@ use Application\Entity\Db\Traits\StructureAwareTrait;
use Application\Entity\Db\Validation;
use Doctrine\Common\Collections\ArrayCollection;
use Doctrine\Common\Collections\Collection;
use Laminas\Permissions\Acl\Resource\ResourceInterface;
use UnicaenApp\Entity\HistoriqueAwareInterface;
use UnicaenApp\Entity\HistoriqueAwareTrait;

class Mission implements HistoriqueAwareInterface
class Mission implements HistoriqueAwareInterface, ResourceInterface
{
    use HistoriqueAwareTrait;
    use IntervenantAwareTrait;
@@ -48,6 +49,13 @@ class Mission implements HistoriqueAwareInterface



    public function getResourceId()
    {
        return 'Mission';
    }



    public function getId(): ?int
    {
        return $this->id;
+1 −2
Changes for module/Mission/src/Form/MissionForm.php: 1 added line, 2 removed lines.
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ class MissionForm extends AbstractForm

    public function init()
    {
        $this->spec(Mission::class, ['intervenant']);
        $this->spec(Mission::class, ['intervenant', 'autoValidation']);

        $this->spec(['description' => ['type' => 'Textarea']]);

@@ -44,7 +44,6 @@ class MissionForm extends AbstractForm
            'dateDebut'       => 'Date de début',
            'dateFin'         => 'Date de fin',
            'description'     => 'Descriptif de la mission',
            'autoValidation'  => 'La mission n\'a pas besoin d\'être validée',
        ]);

        $this->addSubmit();
+0 −1
Changes for module/Mission/view/mission/mission/saisie.phtml: 0 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -34,7 +34,6 @@ echo '</div>';
echo '</div>';

echo $this->formControlGroup($form->get('description'));
echo $this->formControlGroup($form->get('autoValidation'));

echo $this->formSubmit($form->get('submit'));