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

presence aux actions de formation

parent 50677cc7
Loading
Loading
Loading
Loading
+36 −2
Changes for module/Application/config/merged/formation.config.php: 36 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -40,9 +40,10 @@ use Application\Service\FormationInstance\FormationInstanceInscritService;
use Application\Service\FormationInstance\FormationInstanceInscritServiceFactory;
use Application\Service\FormationInstance\FormationInstanceJourneeService;
use Application\Service\FormationInstance\FormationInstanceJourneeServiceFactory;
use Application\Service\FormationInstance\FormationInstancePresenceService;
use Application\Service\FormationInstance\FormationInstancePresenceServiceFactory;
use Application\Service\FormationInstance\FormationInstanceService;
use Application\Service\FormationInstance\FormationInstanceServiceFactory;
use Application\View\Helper\FormationGroupeViewHelper;
use UnicaenPrivilege\Guard\PrivilegeController;
use Zend\Router\Http\Literal;
use Zend\Router\Http\Segment;
@@ -146,6 +147,9 @@ return [
                    'controller' => FormationInstanceController::class,
                    'action' => [
                        'modifier-informations',
                        'renseigner-presences',
                        'toggle-presence',
                        'toggle-presences',

                        'ajouter-journee',
                        'modifier-journee',
@@ -301,6 +305,36 @@ return [
                            ],
                        ],
                    ],
                    'renseigner-presences' => [
                        'type'  => Segment::class,
                        'options' => [
                            'route'    => '/renseigner-presences/:formation-instance',
                            'defaults' => [
                                'controller' => FormationInstanceController::class,
                                'action'     => 'renseigner-presences',
                            ],
                        ],
                    ],
                    'toggle-presence' => [
                        'type'  => Segment::class,
                        'options' => [
                            'route'    => '/toggle-presence/:journee/:inscrit',
                            'defaults' => [
                                'controller' => FormationInstanceController::class,
                                'action'     => 'toggle-presence',
                            ],
                        ],
                    ],
                    'toggle-presences' => [
                        'type'  => Segment::class,
                        'options' => [
                            'route'    => '/toggle-presences/:mode/:inscrit',
                            'defaults' => [
                                'controller' => FormationInstanceController::class,
                                'action'     => 'toggle-presences',
                            ],
                        ],
                    ],
                    'ajouter-journee' => [
                        'type'  => Segment::class,
                        'options' => [
@@ -679,6 +713,7 @@ return [
            FormationInstanceService::class => FormationInstanceServiceFactory::class,
            FormationInstanceInscritService::class => FormationInstanceInscritServiceFactory::class,
            FormationInstanceJourneeService::class => FormationInstanceJourneeServiceFactory::class,
            FormationInstancePresenceService::class => FormationInstancePresenceServiceFactory::class,
            FormationGroupeService::class => FormationGroupeServiceFactory::class,
            FormationThemeService::class => FormationThemeServiceFactory::class,
        ],
@@ -702,7 +737,6 @@ return [
    'hydrators' => [
        'invokables' => [
            SelectionFormationHydrator::class => SelectionFormationHydrator::class,
//            FormationGroupeHydrator::class => FormationGroupeHydrator::class,
        ],
        'factories' => [
            AjouterFormationHydrator::class => AjouterFormationHydratorFactory::class,
+83 −1
Changes for module/Application/src/Application/Controller/FormationInstanceController.php: 83 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ namespace Application\Controller;
use Application\Entity\Db\FormationInstance;
use Application\Entity\Db\FormationInstanceInscrit;
use Application\Entity\Db\FormationInstanceJournee;
use Application\Entity\Db\FormationInstancePresence;
use Application\Form\FormationInstance\FormationInstanceFormAwareTrait;
use Application\Form\FormationJournee\FormationJourneeFormAwareTrait;
use Application\Form\SelectionAgent\SelectionAgentFormAwareTrait;
@@ -12,10 +13,10 @@ use Application\Service\Export\Formation\Emargement\EmargementPdfExporter;
use Application\Service\Formation\FormationServiceAwareTrait;
use Application\Service\FormationInstance\FormationInstanceInscritServiceAwareTrait;
use Application\Service\FormationInstance\FormationInstanceJourneeServiceAwareTrait;
use Application\Service\FormationInstance\FormationInstancePresenceAwareTrait;
use Application\Service\FormationInstance\FormationInstanceServiceAwareTrait;
use Mpdf\MpdfException;
use UnicaenApp\Exception\RuntimeException;
use UnicaenDocument\Service\Contenu\ContenuServiceAwareTrait;
use UnicaenDocument\Service\Exporter\ExporterServiceAwareTrait;
use Zend\Http\Request;
use Zend\Mvc\Controller\AbstractActionController;
@@ -29,6 +30,7 @@ class FormationInstanceController extends AbstractActionController {
    use FormationInstanceServiceAwareTrait;
    use FormationInstanceInscritServiceAwareTrait;
    use FormationInstanceJourneeServiceAwareTrait;
    use FormationInstancePresenceAwareTrait;
    use FormationInstanceFormAwareTrait;
    use FormationJourneeFormAwareTrait;
    use SelectionAgentFormAwareTrait;
@@ -410,4 +412,84 @@ class FormationInstanceController extends AbstractActionController {
        exit;
    }

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

    public function renseignerPresencesAction()
    {
        $instance = $this->getFormationInstanceService()->getRequestedFormationInstance($this);
        $presences = $this->getFormationInstancePresenceService()->getFormationInstancePresenceByInstance($instance);

        $dictionnaire = [];
        foreach ($presences as $presence) {
            $dictionnaire[$presence->getJournee()->getId()][$presence->getInscrit()->getId()] = $presence;
        }

        return new ViewModel([
            'instance' => $instance,
            'presences' => $dictionnaire,
        ]);
    }

    public function togglePresenceAction()
    {
        $journeeId = $this->params()->fromRoute('journee');
        $journee = $this->getFormationInstanceJourneeService()->getFormationInstanceJournee($journeeId);
        $inscritId = $this->params()->fromRoute('inscrit');
        $inscrit = $this->getFormationInstanceInscritService()->getFormationInstanceInscrit($inscritId);

        /** @var  FormationInstancePresence $presence */
        $presence = $this->getFormationInstancePresenceService()->getFormationInstancePresenceByJourneeAndInscrit($journee, $inscrit);
        if ($presence === null) {
            $presence = new FormationInstancePresence();
            $presence->setJournee($journee);
            $presence->setInscrit($inscrit);
            $presence->setPresent(true);
            $presence->setPresenceType("???");
            $this->getFormationInstancePresenceService()->create($presence);
        } else {
            $presence->setPresent(! $presence->isPresent());
            $this->getFormationInstancePresenceService()->update($presence);
        }

        $vm = new ViewModel();
        $vm->setTemplate('application/default/reponse');
        $vm->setVariables([
            'reponse' => $presence->isPresent(),
        ]);
        return $vm;
    }

    public function togglePresencesAction()
    {
        $mode = $this->params()->fromRoute('mode');
        $inscritId = $this->params()->fromRoute('inscrit');
        $inscrit = $this->getFormationInstanceInscritService()->getFormationInstanceInscrit($inscritId);

        $instance = $inscrit->getInstance();
        $journees = $instance->getJournees();

        /** @var  FormationInstancePresence $presence */
        foreach ($journees as $journee) {
            $presence = $this->getFormationInstancePresenceService()->getFormationInstancePresenceByJourneeAndInscrit($journee, $inscrit);
            if ($presence === null) {
                $presence = new FormationInstancePresence();
                $presence->setJournee($journee);
                $presence->setInscrit($inscrit);
                $presence->setPresent($mode === 'on');
                $presence->setPresenceType("???");
                $this->getFormationInstancePresenceService()->create($presence);
            } else {
                $presence->setPresent($mode === 'on');
                $this->getFormationInstancePresenceService()->update($presence);
            }
        }

        $vm = new ViewModel();
        $vm->setTemplate('application/default/reponse');
        $vm->setVariables([
            'reponse' => ($mode === 'on'),
        ]);
        return $vm;
    }

}
 No newline at end of file
+4 −0
Changes for module/Application/src/Application/Controller/FormationInstanceControllerFactory.php: 4 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ use Application\Form\SelectionAgent\SelectionAgentForm;
use Application\Service\Formation\FormationService;
use Application\Service\FormationInstance\FormationInstanceInscritService;
use Application\Service\FormationInstance\FormationInstanceJourneeService;
use Application\Service\FormationInstance\FormationInstancePresenceService;
use Application\Service\FormationInstance\FormationInstanceService;
use Interop\Container\ContainerInterface;
use UnicaenDocument\Service\Exporter\ExporterService;
@@ -26,12 +27,14 @@ class FormationInstanceControllerFactory {
         * @var FormationInstanceService $formationInstanceService
         * @var FormationInstanceInscritService $formationInstanceInscritService
         * @var FormationInstanceJourneeService $formationInstanceJourneeService
         * @var FormationInstancePresenceService $formationInstancePresenceService
         * @var ExporterService $exporterService
         */
        $formationService = $container->get(FormationService::class);
        $formationInstanceService = $container->get(FormationInstanceService::class);
        $formationInstanceInscritService = $container->get(FormationInstanceInscritService::class);
        $formationInstanceJourneeService = $container->get(FormationInstanceJourneeService::class);
        $formationInstancePresenceService = $container->get(FormationInstancePresenceService::class);
        $exporterService = $container->get(ExporterService::class);

        /**
@@ -53,6 +56,7 @@ class FormationInstanceControllerFactory {
        $controller->setFormationInstanceService($formationInstanceService);
        $controller->setFormationInstanceInscritService($formationInstanceInscritService);
        $controller->setFormationInstanceJourneeService($formationInstanceJourneeService);
        $controller->setFormationInstancePresenceService($formationInstancePresenceService);
        $controller->setExporterService($exporterService);
        $controller->setFormationInstanceForm($formationInstanceForm);
        $controller->setFormationJourneeForm($formationJourneeForm);
+122 −0
Changes for module/Application/src/Application/Entity/Db/FormationInstancePresence.php: 122 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 FormationInstancePresence implements HistoriqueAwareInterface {
    use HistoriqueAwareTrait;

    /** @var integer */
    private $id;
    /** @var FormationInstanceJournee */
    private $journee;
    /** @var FormationInstanceInscrit */
    private $inscrit;
    /** @var string */
    private $presenceType;
    /** @var bool */
    private $presenceTemoin;
    /** @var string */
    private $commentaire;

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

    /**
     * @return FormationInstanceJournee
     */
    public function getJournee(): FormationInstanceJournee
    {
        return $this->journee;
    }

    /**
     * @param FormationInstanceJournee $journee
     * @return FormationInstancePresence
     */
    public function setJournee(FormationInstanceJournee $journee): FormationInstancePresence
    {
        $this->journee = $journee;
        return $this;
    }

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

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

    /**
     * @return string
     */
    public function getPresenceType(): string
    {
        return $this->presenceType;
    }

    /**
     * @param string $presenceType
     * @return FormationInstancePresence
     */
    public function setPresenceType(string $presenceType): FormationInstancePresence
    {
        $this->presenceType = $presenceType;
        return $this;
    }

    /**
     * @return bool
     */
    public function isPresent(): bool
    {
        return $this->presenceTemoin;
    }

    /**
     * @param bool $presenceTemoin
     * @return FormationInstancePresence
     */
    public function setPresent(bool $presenceTemoin): FormationInstancePresence
    {
        $this->presenceTemoin = $presenceTemoin;
        return $this;
    }

    /**
     * @return string
     */
    public function getCommentaire(): string
    {
        return $this->commentaire;
    }

    /**
     * @param string $commentaire
     * @return FormationInstancePresence
     */
    public function setCommentaire(string $commentaire): FormationInstancePresence
    {
        $this->commentaire = $commentaire;
        return $this;
    }

}
 No newline at end of file
+34 −0
Changes for module/Application/src/Application/Entity/Db/Mapping/Application.Entity.Db.FormationInstancePresence.dcm.xml: 34 added lines, 0 removed lines.
Original line number Diff line number Diff line
<?xml version="1.0" encoding="utf-8"?>
<doctrine-mapping xmlns="http://doctrine-project.org/schemas/orm/doctrine-mapping" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping http://doctrine-project.org/schemas/orm/doctrine-mapping.xsd">
    <entity name="Application\Entity\Db\FormationInstancePresence" table="formation_instance_presence">

        <id name="id" type="integer" column="id">
            <generator strategy="IDENTITY"/>
        </id>

        <many-to-one target-entity="Application\Entity\Db\FormationInstanceJournee"  field="journee">
            <join-column name="journee_id" referenced-column-name="id"/>
        </many-to-one>
        <many-to-one target-entity="Application\Entity\Db\FormationInstanceInscrit"  field="inscrit">
            <join-column name="inscrit_id" referenced-column-name="id"/>
        </many-to-one>

        <field name="presenceType"      column="presence_type"   type="string"  length="256"    nullable="false"/>
        <field name="presenceTemoin"    column="presence_temoin" type="boolean"                 nullable="false"/>
        <field name="commentaire"       column="commentaire"     type="string"  length="4096"   nullable="true"/>

        <field name="histoCreation"     type="datetime"                 column="histo_creation"     nullable="false"/>
        <field name="histoModification" type="datetime"                 column="histo_modification" nullable="false"/>
        <field name="histoDestruction"  type="datetime"                 column="histo_destruction"  nullable="true"/>
        <many-to-one target-entity="UnicaenUtilisateur\Entity\Db\User"  field="histoCreateur">
            <join-column name="histo_createur_id" referenced-column-name="id"/>
        </many-to-one>
        <many-to-one target-entity="UnicaenUtilisateur\Entity\Db\User"  field="histoModificateur">
            <join-column name="histo_modificateur_id" referenced-column-name="id"/>
        </many-to-one>
        <many-to-one target-entity="UnicaenUtilisateur\Entity\Db\User"  field="histoDestructeur">
            <join-column name="histo_destructeur_id" referenced-column-name="id"/>
        </many-to-one>

    </entity>
</doctrine-mapping>
Loading