Commit bc5941da authored by Florian Joriot's avatar Florian Joriot
Browse files

Modularisation terminé, test manquant

parent 490c98b3
Loading
Loading
Loading
Loading
+0 −4
Changes for module/Application/src/Entity/Db/Mapping/Application.Entity.Db.Structure.dcm.xml: 0 added lines, 4 removed lines.
Original line number Diff line number Diff line
@@ -44,10 +44,6 @@
    <many-to-one field="histoDestructeur" target-entity="Application\Entity\Db\Utilisateur">
      <join-column name="HISTO_DESTRUCTEUR_ID" referenced-column-name="ID"/>
    </many-to-one>
    <many-to-one field="tauxRemu" target-entity="Paiement\Entity\Db\TauxRemu">
      <join-column name="TAUX_REMU_ID" referenced-column-name="ID"/>
    </many-to-one>

    <many-to-many field="centreCout" target-entity="Application\Entity\Db\CentreCout" mapped-by="structure" />
    <one-to-many field="elementPedagogique" target-entity="OffreFormation\Entity\Db\ElementPedagogique" mapped-by="structure" />
    <one-to-many field="miseEnPaiementIntervenantStructure" target-entity="Application\Entity\Db\MiseEnPaiementIntervenantStructure" mapped-by="structure" />
+0 −27
Changes for module/Application/src/Entity/Db/Structure.php: 0 added lines, 27 removed lines.
Original line number Diff line number Diff line
@@ -6,7 +6,6 @@ use Application\Entity\Traits\AdresseTrait;
use Doctrine\Common\Collections\ArrayCollection;
use Doctrine\Common\Collections\Collection;
use Laminas\Permissions\Acl\Resource\ResourceInterface;
use Paiement\Entity\Db\TauxRemu;
use UnicaenApp\Entity\HistoriqueAwareInterface;
use UnicaenApp\Entity\HistoriqueAwareTrait;
use UnicaenImport\Entity\Db\Interfaces\ImportAwareInterface;
@@ -39,8 +38,6 @@ class Structure implements HistoriqueAwareInterface, ResourceInterface, ImportAw

    protected            $affAdresseContrat = true;

    protected            $tauxRemu          = null;



    function __construct()
@@ -187,30 +184,6 @@ class Structure implements HistoriqueAwareInterface, ResourceInterface, ImportAw



    /**
     * Set un taux de rémunération
     *
     * @param TauxRemu|null $tauxRemu
     */
    public function setTauxRemu(?TauxRemu $tauxRemu)
    {
        $this->tauxRemu = $tauxRemu;
    }



    /**
     * Get centreCout
     *
     * @return TauxRemu|null
     */
    public function getTauxRemu(): ?TauxRemu
    {
        return $this->tauxRemu;
    }



    /**
     * Get miseEnPaiementIntervenantStructure
     *
+0 −131
Changes for module/OffreFormation/config/discipline.config.php: 0 added lines, 131 removed lines.
Original line number Diff line number Diff line
<?php

namespace OffreFormation;

use Application\Provider\Privilege\Privileges;
use UnicaenAuth\Guard\PrivilegeController;

return [
    'router'          => [
        'routes' => [
            'discipline' => [
                'type'          => 'Literal',
                'options'       => [
                    'route'    => '/discipline',
                    'defaults' => [
                        'controller' => 'Application\Controller\Discipline',
                        'action'     => 'index',
                    ],
                ],
                'may_terminate' => true,
                'child_routes'  => [
                    'voir'      => [
                        'type'          => 'Segment',
                        'options'       => [
                            'route'       => '/voir/:discipline',
                            'constraints' => [
                                'discipline' => '[0-9]*',
                            ],
                            'defaults'    => [
                                'action' => 'voir',
                            ],
                        ],
                        'may_terminate' => true,
                    ],
                    'saisir'    => [
                        'type'          => 'Segment',
                        'options'       => [
                            'route'       => '/saisir[/:discipline]',
                            'constraints' => [
                                'discipline' => '[0-9]*',
                            ],
                            'defaults'    => [
                                'action' => 'saisir',
                            ],
                        ],
                        'may_terminate' => true,
                    ],
                    'supprimer' => [
                        'type'          => 'Segment',
                        'options'       => [
                            'route'       => '/supprimer/:discipline',
                            'constraints' => [
                                'discipline' => '[0-9]*',
                            ],
                            'defaults'    => [
                                'action' => 'supprimer',
                            ],
                        ],
                        'may_terminate' => true,
                    ],
                ],
            ],
        ],
    ],
    'navigation'      => [
        'default' => [
            'home' => [
                'pages' => [
                    'administration' => [
                        'pages' => [
                            'odf' => [
                                'pages' => [
                                    'discipline' => [
                                        'color' => '#9F491F',
                                        'label'        => "Types de disciplines",
                                        'title'        => "Gestion des disciplines",
                                        'route'        => 'discipline',
                                        'resource'     => PrivilegeController::getResourceId('Application\Controller\Discipline', 'index'),
                                        'order'        => 50,
                                    ],
                                ],
                            ],
                        ],
                    ],
                ],
            ],
        ],
    ],
    'bjyauthorize'    => [
        'guards' => [
            PrivilegeController::class => [
                [
                    'controller' => 'Application\Controller\Discipline',
                    'action'     => ['index'],
                    'privileges' => [
                        Privileges::DISCIPLINE_GESTION,
                    ],
                ],
                [
                    'controller' => 'Application\Controller\Discipline',
                    'action'     => ['voir'],
                    'privileges' => [
                        Privileges::DISCIPLINE_VISUALISATION,
                    ],
                ],
                [
                    'controller' => 'Application\Controller\Discipline',
                    'action'     => ['saisir', 'supprimer'],
                    'privileges' => [
                        Privileges::DISCIPLINE_EDITION,
                    ],
                ],
            ],
        ],
    ],
    'controllers'     => [
        'invokables' => [
            'Application\Controller\Discipline' => Controller\DisciplineController::class,
        ],
    ],
    'service_manager' => [
        'invokables' => [
            Service\DisciplineService::class => Service\DisciplineService::class,
        ],
    ],
    'form_elements'   => [
        'invokables' => [
            Form\DisciplineForm::class => Form\DisciplineForm::class,
        ],
    ],
];
 No newline at end of file
+333 −2

File changed.

Preview size limit exceeded, changes collapsed.

+0 −146
Changes for module/OffreFormation/config/type-formation.config.php: 0 added lines, 146 removed lines.
Original line number Diff line number Diff line
<?php
/*
* @author JORIOT Florian <florian.joriot at unicaen.fr>
*/

namespace OffreFormation;


use Application\Provider\Privilege\Privileges;
use OffreFormation\Controller\TypeFormationController;
use UnicaenAuth\Guard\PrivilegeController;

return [
    'router' => [
        'routes' => [
            'type-formation' => [
                'type'          => 'Literal',
                'options'       => [
                    'route'    => '/type-formation',
                    'defaults' => [
                        'controller' => TypeFormationController::class,
                        'action'     => 'index',
                    ],
                ],
                'may_terminate' => true,
                'child_routes'  => [
                    'saisie'           => [
                        'type'          => 'Segment',
                        'options'       => [
                            'route'       => '/saisie[/:typeFormation][/:groupeTypeFormation]',
                            'constraints' => [
                                'typeFormation' => '[0-9]*',
                            ],
                            'defaults'    => [
                                'action' => 'saisie',
                            ],
                        ],
                        'may_terminate' => true,
                    ],
                    'supprimer'        => [
                        'type'          => 'Segment',
                        'options'       => [
                            'route'       => '/supprimer/:typeFormation',
                            'constraints' => [
                                'typeFormation' => '[0-9]*',
                            ],
                            'defaults'    => [
                                'action' => 'supprimer',
                            ],
                        ],
                        'may_terminate' => true,
                    ],
                    'saisie-groupe'    => [
                        'type'          => 'Segment',
                        'options'       => [
                            'route'       => '/saisie-groupe[/:groupeTypeFormation]',
                            'constraints' => [
                                'groupeTypeFormation' => '[0-9]*',
                            ],
                            'defaults'    => [
                                'action' => 'saisieGroupe',
                            ],
                        ],
                        'may_terminate' => true,
                    ],
                    'supprimer-groupe' => [
                        'type'          => 'Segment',
                        'options'       => [
                            'route'       => '/supprimer-groupe/:groupeTypeFormation',
                            'constraints' => [
                                'groupeTypeFormation' => '[0-9]*',
                            ],
                            'defaults'    => [
                                'action' => 'supprimerGroupe',
                            ],
                        ],
                        'may_terminate' => true,
                    ],
                    'trier'            => [
                        'type'          => 'Segment',
                        'options'       => [
                            'route'       => '/trier/',
                            'constraints' => [
                            ],
                            'defaults'    => [
                                'action' => 'trier',
                            ],
                        ],
                        'may_terminate' => true,
                    ],
                ],
            ],
        ],
    ],

    'navigation' => [
        'default' => [
            'home' => [
                'pages' => [
                    'administration' => [
                        'pages' => [
                            'odf' => [
                                'pages' => [
                                    'gestion-type-formation' => [
                                        'label'          => 'Types de formations',
                                        'route'          => 'type-formation',
                                        'resource'       => PrivilegeController::getResourceId(TypeFormationController::class, 'index'),
                                        'order'          => 60,
                                        'border - color' => '#111',
                                    ],
                                ],
                            ],
                        ],
                    ],
                ],
            ],
        ],
    ],

    'bjyauthorize'  => [
        'guards' => [
            PrivilegeController::class => [
                [
                    'controller' => TypeFormationController::class,
                    'action'     => ['index'],
                    'privileges' => [Privileges::ODF_TYPE_FORMATION_VISUALISATION],
                ],
                [
                    'controller' => TypeFormationController::class,
                    'action'     => ['saisie', 'supprimer', 'saisieGroupe', 'supprimerGroupe', "trier"],
                    'privileges' => [Privileges::ODF_TYPE_FORMATION_EDITION],
                ],
            ],
        ],
    ],
    'controllers'   => [
        'factories' => [
            TypeFormationController::class       => Controller\Factory\TypeFormationControllerFactory::class,
        ],
    ],
    'form_elements' => [
        'factories' => [
            Form\TypeFormation\TypeFormationSaisieForm::class => Form\TypeFormation\TypeFormationSaisieFormFactory::class,
        ],
    ],
];
Loading