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

Ajout du lieu de l'instance de formation + fonction d'affichage pour les macros

parent a2ab92b7
Loading
Loading
Loading
Loading
+11 −0
Changes for module/Application/config/merged/formation.config.php: 11 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -127,6 +127,7 @@ return [
                    'action' => [
                        'afficher',
                        'generer-convocation',
                        'generer-attestation',
                    ],
                    'privileges' => [
                        FormationPrivileges::FORMATION_INSTANCE_AFFICHER,
@@ -250,6 +251,16 @@ return [
                            ],
                        ],
                    ],
                    'generer-attestation' => [
                        'type'  => Segment::class,
                        'options' => [
                            'route'    => '/generer-attestation/:inscrit',
                            'defaults' => [
                                'controller' => FormationInstanceController::class,
                                'action'     => 'generer-attestation',
                            ],
                        ],
                    ],
                    'historiser' => [
                        'type'  => Segment::class,
                        'options' => [
+17 −0
Changes for module/Application/src/Application/Controller/FormationInstanceController.php: 17 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -393,4 +393,21 @@ class FormationInstanceController extends AbstractActionController {
        exit;
    }

    /**
     * @throws MpdfException
     */
    public function genererAttestationAction()
    {
        $inscrit = $this->getFormationInstanceInscritService()->getRequestedFormationInstanceInscrit($this);

        $this->getExporterService()->setVars([
            'type' => 'FORMATION_ATTESTATION',
            'agent' => $inscrit->getAgent(),
            'formation' => $inscrit->getInstance()->getFormation(),
            'instance' => $inscrit->getInstance(),
        ]);
        $this->getExporterService()->export('export.pdf');
        exit;
    }

}
 No newline at end of file
+44 −0
Changes for module/Application/src/Application/Entity/Db/FormationInstance.php: 44 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@

namespace Application\Entity\Db;

use DateTime;
use Doctrine\Common\Collections\ArrayCollection;
use UnicaenUtilisateur\Entity\HistoriqueAwareInterface;
use UnicaenUtilisateur\Entity\HistoriqueAwareTrait;
@@ -20,6 +21,8 @@ class FormationInstance implements HistoriqueAwareInterface {
    private $nbPlacePrincipale;
    /** @var integer */
    private $nbPlaceComplementaire;
    /** @var string */
    private $lieu;

    /** @var ArrayCollection (FormationInstanceJournee) */
    private $journees;
@@ -108,6 +111,24 @@ class FormationInstance implements HistoriqueAwareInterface {
        return $this;
    }

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

    /**
     * @param string $lieu
     * @return FormationInstance
     */
    public function setLieu(string $lieu): FormationInstance
    {
        $this->lieu = $lieu;
        return $this;
    }

    /** JOURNEE *******************************************************************************************************/

    public function getJournees()
@@ -237,6 +258,11 @@ class FormationInstance implements HistoriqueAwareInterface {

    /** Fonctions pour les macros **********************************************************************************/

    public function getInstanceCode()
    {
        return $this->getFormation()->getId()."/".$this->getId();
    }

    public function getListeJournees()
    {
        /** @var FormationInstanceJournee[] $journees */
@@ -266,6 +292,24 @@ class FormationInstance implements HistoriqueAwareInterface {
        $text .= "</table>";

        return $text;
    }

    public function getDuree()
    {
        $sum = DateTime::createFromFormat('d/m/Y H:i','01/01/1970 00:00');
        /** @var FormationInstanceJournee[] $journees */
        $journees = array_filter($this->journees->toArray(), function (FormationInstanceJournee $a) { return $a->estNonHistorise(); });
        foreach ($journees as $journee) {
            $debut = DateTime::createFromFormat('d/m/Y H:i',$journee->getJour()." ".$journee->getDebut());
            $fin = DateTime::createFromFormat('d/m/Y H:i',$journee->getJour()." ".$journee->getFin());
            $duree = $fin->diff($debut);
            $sum->add($duree);
        }

        $result = $sum->diff(DateTime::createFromFormat('d/m/Y H:i','01/01/1970 00:00'));
        $heures = ($result->d * 24 + $result->h);
        $minutes = ($result->i);
        $text = $heures . " heures " . (($minutes !== 0)?($minutes." minutes"):"");
        return $text;
    }
}
 No newline at end of file
+1 −0
Changes for module/Application/src/Application/Entity/Db/Mapping/Application.Entity.Db.FormationInstance.dcm.xml: 1 added line, 0 removed lines.
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@

        <field name="nbPlacePrincipale"         type="integer"                  column="nb_place_principale"         nullable="false"/>
        <field name="nbPlaceComplementaire"     type="integer"                  column="nb_place_complementaire"     nullable="false"/>
        <field name="lieu"                      type="string" length="256"      column="lieu"                        nullable="false"/>
        <field name="complement"                type="string" length="4096"     column="complement"                  nullable="true"/>

        <one-to-many field="journees" target-entity="Application\Entity\Db\FormationInstanceJournee" mapped-by="instance"/>
+13 −0
Changes for module/Application/src/Application/Form/FormationInstance/FormationInstanceForm.php: 13 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ namespace Application\Form\FormationInstance;

use Zend\Form\Element\Button;
use Zend\Form\Element\Number;
use Zend\Form\Element\Text;
use Zend\Form\Element\Textarea;
use Zend\Form\Form;
use Zend\InputFilter\Factory;
@@ -49,6 +50,17 @@ class FormationInstanceForm extends Form {
                'id' => 'complementaire',
            ],
        ]);
        /** taille liste complementaire */
        $this->add([
            'type' => Text::class,
            'name' => 'lieu',
            'options' => [
                'label' => "Lieu de la formation * :",
            ],
            'attributes' => [
                'id' => 'lieu',
            ],
        ]);
        //button
        $this->add([
            'type' => Button::class,
@@ -69,6 +81,7 @@ class FormationInstanceForm extends Form {
            'description'               => [ 'required' => false, ],
            'principale'                => [ 'required' => true,  ],
            'complementaire'            => [ 'required' => true,  ],
            'lieu'                      => [ 'required' => true,  ],
        ]));
    }
}
 No newline at end of file
Loading