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

Ajout des frais de formation

parent b90dae3c
Loading
Loading
Loading
Loading
+20 −0
Changes for module/Application/config/merged/formation.config.php: 20 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -22,6 +22,10 @@ use Application\Form\FormationInstance\FormationInstanceForm;
use Application\Form\FormationInstance\FormationInstanceFormFactory;
use Application\Form\FormationInstance\FormationInstanceHydrator;
use Application\Form\FormationInstance\FormationInstanceHydratorFactory;
use Application\Form\FormationInstanceFrais\FormationInstanceFraisForm;
use Application\Form\FormationInstanceFrais\FormationInstanceFraisFormFactory;
use Application\Form\FormationInstanceFrais\FormationInstanceFraisHydrator;
use Application\Form\FormationInstanceFrais\FormationInstanceFraisHydratorFactory;
use Application\Form\FormationJournee\FormationJourneeForm;
use Application\Form\FormationJournee\FormationJourneeFormFactory;
use Application\Form\FormationJournee\FormationJourneeHydrator;
@@ -36,6 +40,8 @@ use Application\Service\Formation\FormationService;
use Application\Service\Formation\FormationServiceFactory;
use Application\Service\Formation\FormationThemeService;
use Application\Service\Formation\FormationThemeServiceFactory;
use Application\Service\FormationInstance\FormationInstanceFraisService;
use Application\Service\FormationInstance\FormationInstanceFraisServiceFactory;
use Application\Service\FormationInstance\FormationInstanceInscritService;
use Application\Service\FormationInstance\FormationInstanceInscritServiceFactory;
use Application\Service\FormationInstance\FormationInstanceJourneeService;
@@ -146,6 +152,7 @@ return [
                    'action' => [
                        'modifier-informations',
                        'renseigner-presences',
                        'renseigner-frais',
                        'toggle-presence',
                        'toggle-presences',

@@ -263,6 +270,16 @@ return [
                            ],
                        ],
                    ],
                    'renseigner-frais' => [
                        'type'  => Segment::class,
                        'options' => [
                            'route'    => '/renseigner-frais/:inscrit',
                            'defaults' => [
                                'controller' => FormationInstanceController::class,
                                'action'     => 'renseigner-frais',
                            ],
                        ],
                    ],
                    'historiser' => [
                        'type'  => Segment::class,
                        'options' => [
@@ -702,6 +719,7 @@ return [
            FormationInstanceInscritService::class => FormationInstanceInscritServiceFactory::class,
            FormationInstanceJourneeService::class => FormationInstanceJourneeServiceFactory::class,
            FormationInstancePresenceService::class => FormationInstancePresenceServiceFactory::class,
            FormationInstanceFraisService::class => FormationInstanceFraisServiceFactory::class,
            FormationGroupeService::class => FormationGroupeServiceFactory::class,
            FormationThemeService::class => FormationThemeServiceFactory::class,
        ],
@@ -718,6 +736,7 @@ return [
            FormationForm::class => FormationFormFactory::class,
            FormationGroupeForm::class => FormationGroupeFormFactory::class,
            FormationInstanceForm::class => FormationInstanceFormFactory::class,
            FormationInstanceFraisForm::class => FormationInstanceFraisFormFactory::class,
            FormationJourneeForm::class => FormationJourneeFormFactory::class,
            SelectionFormationForm::class => SelectionFormationFormFactory::class,
        ],
@@ -731,6 +750,7 @@ return [
            FormationHydrator::class => FormationHydratorFactory::class,
            FormationGroupeHydrator::class => FormationGroupeHydratorFactory::class,
            FormationInstanceHydrator::class => FormationInstanceHydratorFactory::class,
            FormationInstanceFraisHydrator::class => FormationInstanceFraisHydratorFactory::class,
            FormationJourneeHydrator::class => FormationJourneeHydratorFactory::class,
        ],
    ],
+39 −0
Changes for module/Application/src/Application/Controller/FormationInstanceController.php: 39 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -3,14 +3,17 @@
namespace Application\Controller;

use Application\Entity\Db\FormationInstance;
use Application\Entity\Db\FormationInstanceFrais;
use Application\Entity\Db\FormationInstanceInscrit;
use Application\Entity\Db\FormationInstanceJournee;
use Application\Entity\Db\FormationInstancePresence;
use Application\Form\FormationInstance\FormationInstanceFormAwareTrait;
use Application\Form\FormationInstanceFrais\FormationInstanceFraisFormAwareTrait;
use Application\Form\FormationJournee\FormationJourneeFormAwareTrait;
use Application\Form\SelectionAgent\SelectionAgentFormAwareTrait;
use Application\Service\Export\Formation\Emargement\EmargementPdfExporter;
use Application\Service\Formation\FormationServiceAwareTrait;
use Application\Service\FormationInstance\FormationInstanceFraisServiceAwareTrait;
use Application\Service\FormationInstance\FormationInstanceInscritServiceAwareTrait;
use Application\Service\FormationInstance\FormationInstanceJourneeServiceAwareTrait;
use Application\Service\FormationInstance\FormationInstancePresenceAwareTrait;
@@ -30,9 +33,11 @@ class FormationInstanceController extends AbstractActionController {
    use FormationInstanceServiceAwareTrait;
    use FormationInstanceInscritServiceAwareTrait;
    use FormationInstanceJourneeServiceAwareTrait;
    use FormationInstanceFraisServiceAwareTrait;
    use FormationInstancePresenceAwareTrait;
    use FormationInstanceFormAwareTrait;
    use FormationJourneeFormAwareTrait;
    use FormationInstanceFraisFormAwareTrait;
    use SelectionAgentFormAwareTrait;
    use ExporterServiceAwareTrait;

@@ -412,6 +417,40 @@ class FormationInstanceController extends AbstractActionController {
        exit;
    }

    /** FRIAS DE FORMATION ********************************************************************************************/

    public function renseignerFraisAction()
    {
        $inscrit = $this->getFormationInstanceInscritService()->getRequestedFormationInstanceInscrit($this);
        if ($inscrit->getFrais() === null) {
            $frais = new FormationInstanceFrais();
            $frais->setInscrit($inscrit);
            $this->getFormationInstanceFraisService()->create($frais);
        }
        $frais = $inscrit->getFrais();

        $form = $this->getFormationInstanceFraisForm();
        $form->setAttribute('action', $this->url()->fromRoute('formation-instance/renseigner-frais', ['inscrit' => $inscrit->getId()], [], true));
        $form->bind($frais);

        $request = $this->getRequest();
        if ($request->isPost()) {
            $data = $request->getPost();
            $form->setData($data);
            if ($form->isValid()) {
                $this->getFormationInstanceFraisService()->update($frais);
            }
        }

        $vm = new ViewModel();
        $vm->setTemplate('application/default/default-form');
        $vm->setVariables([
            'title' => "Saisie des frais de ".$inscrit->getAgent()->getDenomination(),
            'form' => $form,
        ]);
        return $vm;
    }

    /** PRESENCE AU FORMATION *****************************************************************************************/

    public function renseignerPresencesAction()
+8 −0
Changes for module/Application/src/Application/Controller/FormationInstanceControllerFactory.php: 8 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -3,9 +3,11 @@
namespace Application\Controller;

use Application\Form\FormationInstance\FormationInstanceForm;
use Application\Form\FormationInstanceFrais\FormationInstanceFraisForm;
use Application\Form\FormationJournee\FormationJourneeForm;
use Application\Form\SelectionAgent\SelectionAgentForm;
use Application\Service\Formation\FormationService;
use Application\Service\FormationInstance\FormationInstanceFraisService;
use Application\Service\FormationInstance\FormationInstanceInscritService;
use Application\Service\FormationInstance\FormationInstanceJourneeService;
use Application\Service\FormationInstance\FormationInstancePresenceService;
@@ -28,6 +30,7 @@ class FormationInstanceControllerFactory {
         * @var FormationInstanceInscritService $formationInstanceInscritService
         * @var FormationInstanceJourneeService $formationInstanceJourneeService
         * @var FormationInstancePresenceService $formationInstancePresenceService
         * @var FormationInstanceFraisService $formationInstanceFraisService
         * @var ExporterService $exporterService
         */
        $formationService = $container->get(FormationService::class);
@@ -35,15 +38,18 @@ class FormationInstanceControllerFactory {
        $formationInstanceInscritService = $container->get(FormationInstanceInscritService::class);
        $formationInstanceJourneeService = $container->get(FormationInstanceJourneeService::class);
        $formationInstancePresenceService = $container->get(FormationInstancePresenceService::class);
        $formationInstanceFraisService = $container->get(FormationInstanceFraisService::class);
        $exporterService = $container->get(ExporterService::class);

        /**
         * @var FormationInstanceForm $formationInstanceForm
         * @var FormationJourneeForm $formationJourneeForm
         * @var FormationInstanceFraisForm $formationFraisForm
         * @var SelectionAgentForm $selectionAgentForm
         */
        $formationInstanceForm = $container->get('FormElementManager')->get(FormationInstanceForm::class);
        $formationJourneeForm = $container->get('FormElementManager')->get(FormationJourneeForm::class);
        $formationFraisForm = $container->get('FormElementManager')->get(FormationInstanceFraisForm::class);
        $selectionAgentForm = $container->get('FormElementManager')->get(SelectionAgentForm::class);

        /* @var PhpRenderer $renderer  */
@@ -57,9 +63,11 @@ class FormationInstanceControllerFactory {
        $controller->setFormationInstanceInscritService($formationInstanceInscritService);
        $controller->setFormationInstanceJourneeService($formationInstanceJourneeService);
        $controller->setFormationInstancePresenceService($formationInstancePresenceService);
        $controller->setFormationInstanceFraisService($formationInstanceFraisService);
        $controller->setExporterService($exporterService);
        $controller->setFormationInstanceForm($formationInstanceForm);
        $controller->setFormationJourneeForm($formationJourneeForm);
        $controller->setFormationInstanceFraisForm($formationFraisForm);
        $controller->setSelectionAgentForm($selectionAgentForm);
        return $controller;
    }
+113 −0
Changes for module/Application/src/Application/Entity/Db/FormationInstanceFrais.php: 113 added lines, 0 removed lines.
Original line number Diff line number Diff line
<?php

namespace Application\Entity\Db;

use UnicaenUtilisateur\Entity\HistoriqueAwareInterface;
use UnicaenUtilisateur\Entity\HistoriqueAwareTrait;

class FormationInstanceFrais implements HistoriqueAwareInterface {
    use HistoriqueAwareTrait;

    /** @var integer */
    private $id;
    /** @var FormationInstanceInscrit */
    private $inscrit;
    /** @var float */
    private $fraisRepas;
    /** @var float */
    private $fraisHebergement;
    /** @var float */
    private $fraisTransport;

    /**
     * @return int
     */
    public function getId(): int
    {
        return $this->id;
    }

    /**
     * @return FormationInstanceInscrit
     */
    public function getInscrit(): FormationInstanceInscrit
    {
        return $this->inscrit;
    }

    /**
     * @param FormationInstanceInscrit $inscrit
     * @return FormationInstanceFrais
     */
    public function setInscrit(FormationInstanceInscrit $inscrit): FormationInstanceFrais
    {
        $this->inscrit = $inscrit;
        return $this;
    }

    /**
     * @return float|null
     */
    public function getFraisRepas(): ?float
    {
        return $this->fraisRepas;
    }

    /**
     * @param float $fraisRepas
     * @return FormationInstanceFrais
     */
    public function setFraisRepas(float $fraisRepas): FormationInstanceFrais
    {
        $this->fraisRepas = $fraisRepas;
        return $this;
    }

    /**
     * @return float|null
     */
    public function getFraisHebergement(): ?float
    {
        return $this->fraisHebergement;
    }

    /**
     * @param float $fraisHebergement
     * @return FormationInstanceFrais
     */
    public function setFraisHebergement(float $fraisHebergement): FormationInstanceFrais
    {
        $this->fraisHebergement = $fraisHebergement;
        return $this;
    }

    /**
     * @return float|null
     */
    public function getFraisTransport(): ?float
    {
        return $this->fraisTransport;
    }

    /**
     * @param float $fraisTransport
     * @return FormationInstanceFrais
     */
    public function setFraisTransport(float $fraisTransport): FormationInstanceFrais
    {
        $this->fraisTransport = $fraisTransport;
        return $this;
    }

    /**
     * @return string
     */
    public function afficheFrais()
    {
        $text  = "<strong> Repas </strong> : " . (($this->getFraisRepas())?:"0.00")." € <br/>";
        $text .= "<strong> Hébergement </strong> : " . (($this->getFraisHebergement())?:"0.00")." € <br/>";
        $text .= "<strong> Transport </strong> : " . (($this->getFraisTransport())?:"0.00")." € ";
        return $text;
    }

}
 No newline at end of file
+22 −0
Changes for module/Application/src/Application/Entity/Db/FormationInstanceInscrit.php: 22 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -20,6 +20,8 @@ class FormationInstanceInscrit implements HistoriqueAwareInterface, HasAgentInte
    private $agent;
    /** @var string */
    private $liste;
    /** @var FormationInstanceFrais */
    private $frais;

    /**
     * @return int
@@ -83,4 +85,24 @@ class FormationInstanceInscrit implements HistoriqueAwareInterface, HasAgentInte
        return $this;
    }


    /**
     * @return FormationInstanceFrais|null
     */
    public function getFrais(): ?FormationInstanceFrais
    {
        return $this->frais;
    }

    /**
     * @param FormationInstanceFrais|null $frais
     * @return FormationInstanceInscrit
     */
    public function setFrais(?FormationInstanceFrais $frais): FormationInstanceInscrit
    {
        $this->frais = $frais;
        return $this;
    }


}
 No newline at end of file
Loading