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

derniere modif

parent ff8ff757

module/Application/src/Application/Entity/Db/EntretienProfessionnel.php

+56 −0
Changes for module/Application/src/Application/Entity/Db/EntretienProfessionnel.php: 56 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ namespace Application\Entity\Db; 


use Autoform\Entity\Db\FormulaireInstance;

use DateTime;

use Doctrine\Common\Collections\ArrayCollection;

use UnicaenUtilisateur\Entity\Db\User;

use UnicaenUtilisateur\Entity\HistoriqueAwareInterface;

use UnicaenUtilisateur\Entity\HistoriqueAwareTrait;
@@ -25,6 +26,9 @@ class EntretienProfessionnel implements HistoriqueAwareInterface { 
    /** @var FormulaireInstance */

    private $formulaireInstance;



    /** @var ArrayCollection (Observation) */

    private $observations;



    /** @var ValidationInstance */

    private $validationAgent;

    /** @var ValidationInstance */
@@ -140,6 +144,58 @@ class EntretienProfessionnel implements HistoriqueAwareInterface { 
        return $this;

    }



    /** OBSERVATIONS **************************************************************************************************/



    /**

     * @return EntretienProfessionnelObservation[]

     */

    public function getObservations()

    {

        return $this->observations->toArray();

    }



    /**

     * @param EntretienProfessionnelObservation $observation

     * @return boolean

     */

    public function hasObservation($observation)

    {

        return $this->observations->contains($observation);

    }



    /**

     * @param EntretienProfessionnelObservation $observation

     * @return EntretienProfessionnel

     */

    public function addObservation(EntretienProfessionnelObservation $observation)

    {

        if ($this->hasObservation($observation)) $this->observations->add($observation);

        return $this;

    }



    /**

     * @param EntretienProfessionnelObservation $observation

     * @return EntretienProfessionnel

     */

    public function removeObservation(EntretienProfessionnelObservation $observation)

    {

        $this->observations->removeElement($observation);

        return $this;

    }



    /**

     * @param EntretienProfessionnelObservation[] $observations

     * @return EntretienProfessionnel

     */

    public function setObservations($observations)

    {

        $this->observations->clear();

        foreach ($observations as $observation) $this->addObservation($observation);

        return $this;

    }



    /** VALIDATION ****************************************************************************************************/



    /**

     * @return ValidationInstance

     */

module/Application/src/Application/Entity/Db/EntretienProfessionnelObservation.php

0 → 100644
+81 −0
Changes for module/Application/src/Application/Entity/Db/EntretienProfessionnelObservation.php: 81 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 EntretienProfessionnelObservation implements HistoriqueAwareInterface {

    use HistoriqueAwareTrait;



    /** @var integer */

    private $id;

    /** @var EntretienProfessionnel */

    private $entretien;

    /** @var string */

    private $observationAgentEntretien;

    /** @var string */

    private $observationAgentPerspective;



    /**

     * @return int

     */

    public function getId()

    {

        return $this->id;

    }



    /**

     * @return EntretienProfessionnel

     */

    public function getEntretien()

    {

        return $this->entretien;

    }



    /**

     * @param EntretienProfessionnel $entretien

     * @return EntretienProfessionnelObservation

     */

    public function setEntretien($entretien)

    {

        $this->entretien = $entretien;

        return $this;

    }



    /**

     * @return string

     */

    public function getObservationAgentEntretien()

    {

        return $this->observationAgentEntretien;

    }



    /**

     * @param string $observationAgentEntretien

     * @return EntretienProfessionnelObservation

     */

    public function setObservationAgentEntretien($observationAgentEntretien)

    {

        $this->observationAgentEntretien = $observationAgentEntretien;

        return $this;

    }



    /**

     * @return string

     */

    public function getObservationAgentPerspective()

    {

        return $this->observationAgentPerspective;

    }



    /**

     * @param string $observationAgentPerspective

     * @return EntretienProfessionnelObservation

     */

    public function setObservationAgentPerspective($observationAgentPerspective)

    {

        $this->observationAgentPerspective = $observationAgentPerspective;

        return $this;

    }

}
 
 No newline at end of file

module/Application/src/Application/Entity/Db/Mapping/Application.Entity.Db.EntretienProfessionnel.dcm.xml

+2 −0
Changes for module/Application/src/Application/Entity/Db/Mapping/Application.Entity.Db.EntretienProfessionnel.dcm.xml: 2 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -34,6 +34,8 @@ 
            <join-column name="validation_drh_id" referenced-column-name="id" />

        </one-to-one>



        <one-to-many target-entity="Application\Entity\Db\EntretienProfessionnelObservation"   mapped-by="entretien" field="observations"/>



        <!-- HISTORISATION ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -->

        <field name="histoCreation"     type="datetime"                 column="histo_creation"     nullable="false"/>

        <field name="histoModification" type="datetime"                 column="histo_modification" nullable="false"/>

module/Application/src/Application/Entity/Db/Mapping/Application.Entity.Db.EntretienProfessionnelObservation.dcm.xml

0 → 100644
+30 −0
Changes for module/Application/src/Application/Entity/Db/Mapping/Application.Entity.Db.EntretienProfessionnelObservation.dcm.xml: 30 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\EntretienProfessionnelObservation" table="entretienprofessionnel_observation">



        <id name="id" type="integer" column="id">

            <generator strategy="IDENTITY"/>

        </id>



        <many-to-one target-entity="Application\Entity\Db\EntretienProfessionnel"  field="entretien">

            <join-column name="entretien_id" referenced-column-name="id"/>

        </many-to-one>

        <field name="observationAgentEntretien"   column="observation_agent_entretien"   type="string"  length="4096" nullable="true"/>

        <field name="observationAgentPerspective" column="observation_agent_perspective" type="string"  length="4096" nullable="true"/>



        <!-- HISTORISATION ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -->

        <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>

module/Application/src/Application/View/Helper/partial/parcours-de-formation.phtml

+0 −2
Changes for module/Application/src/Application/View/Helper/partial/parcours-de-formation.phtml: 0 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -18,8 +18,6 @@ $asArray=true; 


$canModifier = isset($options['modification'])?$options['modification']:false;







$nogroup = "ZZZZ";

$formationArray = [];

foreach ($parcours->getFormations() as $formation) {