Commit 4d435a44 authored by Antony Le Courtes's avatar Antony Le Courtes
Browse files

Merge remote-tracking branch 'origin/master'

parents 5e8c6ee6 4201c4cf

data/ddl/index/TI_STATUT_STATUT_UN.php

+1 −0
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ return [ 
    'columns' => [

        'TYPE_INTERVENTION_ID',

        'STATUT_ID',

        'HISTO_DESTRUCTION',

    ],

];

data/ddl/table/TYPE_INTERVENTION_STATUT.php

+3 −3
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ return [ 
            'length'      => 0,

            'scale'       => '0',

            'precision'   => NULL,

            'nullable'    => TRUE,

            'nullable'    => FALSE,

            'default'     => NULL,

            'position'    => 8,

            'commentaire' => NULL,
@@ -40,7 +40,7 @@ return [ 
            'length'      => 0,

            'scale'       => NULL,

            'precision'   => NULL,

            'nullable'    => TRUE,

            'nullable'    => FALSE,

            'default'     => NULL,

            'position'    => 7,

            'commentaire' => NULL,
@@ -88,7 +88,7 @@ return [ 
            'length'      => 0,

            'scale'       => NULL,

            'precision'   => NULL,

            'nullable'    => TRUE,

            'nullable'    => FALSE,

            'default'     => NULL,

            'position'    => 9,

            'commentaire' => NULL,

data/ddl/unique-constraint/TI_STATUT_STATUT_UN.php

+1 −0
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ return [ 
    'columns' => [

        'TYPE_INTERVENTION_ID',

        'STATUT_ID',

        'HISTO_DESTRUCTION',

    ],

];

module/Application/src/Controller/TypeInterventionController.php

+5 −0
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ class TypeInterventionController extends AbstractController 
        $this->em()->getFilters()->enable('historique')->init([

            TypeIntervention::class,

            TypeInterventionStructure::class,

            TypeInterventionStatut::class,

        ]);



        $annee  = $this->getServiceContext()->getAnnee();
@@ -50,6 +51,10 @@ class TypeInterventionController extends AbstractController 


    public function statutAction()

    {

        $this->em()->getFilters()->enable('historique')->init([

            TypeInterventionStatut::class,

        ]);



        /** @var TypeIntervention $typeIntervention */

        $typeIntervention        = $typeIntervention = $this->getEvent()->getParam('typeIntervention');

        $typeInterventionStatuts = $typeIntervention->getTypeInterventionStatut($this->getServiceContext()->getAnnee());

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

+13 −0
Original line number Diff line number Diff line
@@ -21,5 +21,18 @@ 
        <many-to-one field="statut" target-entity="Intervenant\Entity\Db\Statut">

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

        </many-to-one>



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

        <many-to-one field="histoCreateur" target-entity="Application\Entity\Db\Utilisateur">

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

        </many-to-one>

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

        <many-to-one field="histoModificateur" target-entity="Application\Entity\Db\Utilisateur">

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

        </many-to-one>

        <field name="histoDestruction" type="datetime" column="HISTO_DESTRUCTION" nullable="true"/>

        <many-to-one field="histoDestructeur" target-entity="Application\Entity\Db\Utilisateur">

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

        </many-to-one>

    </entity>

</doctrine-mapping>