Commit c7dee755 authored by Antony Le Courtes's avatar Antony Le Courtes
Browse files

Dévelopement en cours sur durée de vie agrement

parent 4954864a

data/ddl.php

+497 −378

File changed.

Preview size limit exceeded, changes collapsed.

module/Application/src/Application/Controller/AgrementController.php

+4 −2
Original line number Diff line number Diff line
@@ -96,8 +96,9 @@ class AgrementController extends AbstractController 
        }



        $qb = $this->getServiceTblAgrement()->finderByTypeAgrement($typeAgrement);

        $this->getServiceTblAgrement()->finderByIntervenant($intervenant, $qb);



        $this->getServiceTblAgrement()->finderByCodeIntervenant($intervenant->getCode(), $qb);

        $annee = $this->getServiceContext()->getAnnee();

        $this->getServiceTblAgrement()->finderByAnnee($annee, $qb);

        $this->getServiceTblAgrement()->leftJoin(AgrementService::class, $qb, 'agrement', true);



        $tas = $this->getServiceTblAgrement()->getList($qb);
@@ -152,6 +153,7 @@ class AgrementController extends AbstractController 
            $agrement->setType($this->getEvent()->getParam('typeAgrement'));

            $agrement->setIntervenant($this->getEvent()->getParam('intervenant'));

            $agrement->setStructure($this->getEvent()->getParam('structure'));

            $agrement->setCodeIntervenant($this->getEvent()->getParam('intervenant')->getCode());

        }



        $form = $this->getFormAgrementSaisie();

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

+27 −4
Original line number Diff line number Diff line
@@ -24,6 +24,12 @@ class Agrement implements HistoriqueAwareInterface, ResourceInterface 
     */

    private $dateDecision;



    /**

     * @var integer

     */

    private $codeIntervenant;





    /**

     * @var integer

     */
@@ -73,7 +79,6 @@ class Agrement implements HistoriqueAwareInterface, ResourceInterface 
    }







    /**

     * Set dateDecision

     *
@@ -88,8 +93,6 @@ class Agrement implements HistoriqueAwareInterface, ResourceInterface 
        return $this;

    }







    /**

     * Get dateDecision

     *
@@ -101,7 +104,6 @@ class Agrement implements HistoriqueAwareInterface, ResourceInterface 
    }







    /**

     * Get id

     *
@@ -169,6 +171,27 @@ class Agrement implements HistoriqueAwareInterface, ResourceInterface 
    }





    /**

     * @return string

     */

    public function getCodeIntervenant(): string

    {

        return $this->codeIntervenant;

    }







    /**

     * @param int $codeIntervenant

     */

    public function setCodeIntervenant(string $codeIntervenant)

    {

        $this->codeIntervenant = $codeIntervenant;



        return $this;

    }







    /**

     * Set structure

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

+1 −0
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ 
    <field name="histoDestruction" type="datetime" column="HISTO_DESTRUCTION" nullable="true"/>

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

    <field name="dateDecision" type="datetime" column="DATE_DECISION" nullable="false"/>

    <field name="codeIntervenant" type="string" column="CODE_INTERVENANT" nullable="true" />

    <many-to-one field="type" target-entity="Application\Entity\Db\TypeAgrement">

      <join-columns>

        <join-column name="TYPE_AGREMENT_ID" referenced-column-name="ID"/>

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

+7 −0
Original line number Diff line number Diff line
@@ -30,5 +30,12 @@ 
                <join-column name="AGREMENT_ID" referenced-column-name="ID"/>

            </join-columns>

        </many-to-one>

        <field name="dureeVie" type="integer" column="DUREE_VIE" nullable="true" >

            <options>

                <option name="default">1</option>

            </options>

        </field>

        <field name="codeIntervenant" type="string" column="CODE_INTERVENANT" nullable="true" >

        </field>

    </entity>

</doctrine-mapping>