Commit 8f81b68a authored by Antony Le Courtes's avatar Antony Le Courtes
Browse files

- Modification DDL pour la gestion PJ et durée de vie 

- Modification des traitements controller / vues
parent f66de148

data/ddl.php

+387 −341

File changed.

Preview size limit exceeded, changes collapsed.

docker-compose.yml

+2 −1
Original line number Diff line number Diff line
@@ -4,8 +4,9 @@ version: '3' 
# 172.21.0.10 ose-dev.localhost



services:

  ose-dev:

  ose-dev-test:

    container_name: ose-dev

    image: ose-dev:php7.4



    environment:

      XDEBUG_CONFIG: remote_host=172.17.0.1

module/Application/config/dossier-pieces.config.php

+3 −1
Original line number Diff line number Diff line
@@ -153,9 +153,11 @@ return [ 
                                        // lister les fichiers d'une PJ

                                        'type'    => 'Segment',

                                        'options' => [

                                            'route'       => '/lister/:typePieceJointe',

                                            'route'       => '/lister/:typePieceJointe/:pieceJointe',

                                            'constraints' => [

                                                'typePieceJointe' => '[0-9]*',

                                                'pieceJointe' => '[0-9]*',



                                            ],

                                            'defaults'    => [

                                                'action' => 'lister',

module/Application/src/Application/Controller/PieceJointeController.php

+4 −5
Original line number Diff line number Diff line
@@ -61,6 +61,8 @@ class PieceJointeController extends AbstractController 
    public function indexAction()

    {

        //$this->initFilters();

        //Todo : rendre impossible de supprimer un fichier fournis en ANNEE N-1 si le contexte est en ANNEE N

        //Todo : Si param PJ passé à la vue lister regarder le comportement si PJ est null (Call to a member function getId() on null /app/module/Application/view/application/piece-jointe/partial/piece-jointe.phtml                    :71)



        $role = $this->getServiceContext()->getSelectedIdentityRole();
@@ -75,6 +77,7 @@ class PieceJointeController extends AbstractController 
        $demandees       = $this->getServicePieceJointe()->getTypesPiecesDemandees($intervenant);

        $heuresPourSeuil = $this->getServicePieceJointe()->getHeuresPourSeuil($intervenant);

        $fournies        = $this->getServicePieceJointe()->getPiecesFournies($intervenant);

        //$archives        = $this->getServicePieceJointe()->getPiecesFourniesArchives($intervenant);



        $messages = $this->makeMessages($demandees, $fournies);
@@ -160,8 +163,6 @@ class PieceJointeController extends AbstractController 
        return compact('pj');

    }







    public function validerAction()

    {

        $this->initFilters();
@@ -201,10 +202,8 @@ class PieceJointeController extends AbstractController 
    public function listerAction()

    {

        $this->initFilters();



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

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

        $pj              = $this->getServicePieceJointe()->getByType($intervenant, $typePieceJointe);

        $pj = $this->getEvent()->getParam('pieceJointe');



        return compact('pj');

    }

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

+2 −0
Original line number Diff line number Diff line
@@ -50,6 +50,8 @@ 
        <option name="default">1</option>

      </options>

    </field>

    <field name="dateValidite" type="integer" column="DATE_VALIDITE" nullable="true" >

    </field>

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

    </field>

  </entity>