Commit 9e907f27 authored by Laurent Lecluse's avatar Laurent Lecluse
Browse files

Merge branch 'missions' of https://git.unicaen.fr/open-source/OSE into missions

parents eae11839 5adb0c5f
Loading
Loading
Loading
Loading
+72
Changes for data/ddl/table/MISSION_TAUX_REMU.php: 72 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -21,6 +21,78 @@ return [
            'position'    => 2,
            'commentaire' => NULL,
        ],
        'HISTO_CREATEUR_ID'     => [
            'name'        => 'HISTO_CREATEUR_ID',
            'type'        => 'int',
            'bdd-type'    => 'NUMBER',
            'length'      => 0,
            'scale'       => '0',
            'precision'   => NULL,
            'nullable'    => TRUE,
            'default'     => NULL,
            'position'    => 5,
            'commentaire' => NULL,
        ],
        'HISTO_CREATION'        => [
            'name'        => 'HISTO_CREATION',
            'type'        => 'date',
            'bdd-type'    => 'DATE',
            'length'      => 0,
            'scale'       => NULL,
            'precision'   => NULL,
            'nullable'    => FALSE,
            'default'     => 'SYSDATE',
            'position'    => 4,
            'commentaire' => NULL,
        ],
        'HISTO_DESTRUCTEUR_ID'  => [
            'name'        => 'HISTO_DESTRUCTEUR_ID',
            'type'        => 'int',
            'bdd-type'    => 'NUMBER',
            'length'      => 0,
            'scale'       => '0',
            'precision'   => NULL,
            'nullable'    => TRUE,
            'default'     => NULL,
            'position'    => 9,
            'commentaire' => NULL,
        ],
        'HISTO_DESTRUCTION'     => [
            'name'        => 'HISTO_DESTRUCTION',
            'type'        => 'date',
            'bdd-type'    => 'DATE',
            'length'      => 0,
            'scale'       => NULL,
            'precision'   => NULL,
            'nullable'    => TRUE,
            'default'     => NULL,
            'position'    => 8,
            'commentaire' => NULL,
        ],
        'HISTO_MODIFICATEUR_ID' => [
            'name'        => 'HISTO_MODIFICATEUR_ID',
            'type'        => 'int',
            'bdd-type'    => 'NUMBER',
            'length'      => 0,
            'scale'       => '0',
            'precision'   => NULL,
            'nullable'    => TRUE,
            'default'     => NULL,
            'position'    => 7,
            'commentaire' => NULL,
        ],
        'HISTO_MODIFICATION'    => [
            'name'        => 'HISTO_MODIFICATION',
            'type'        => 'date',
            'bdd-type'    => 'DATE',
            'length'      => 0,
            'scale'       => NULL,
            'precision'   => NULL,
            'nullable'    => FALSE,
            'default'     => 'SYSDATE',
            'position'    => 6,
            'commentaire' => NULL,
        ],
        'ID'                    => [
            'name'        => 'ID',
            'type'        => 'int',
+6 −3
Changes for module/Mission/config/module.config.php: 6 added lines, 3 removed lines.
Original line number Diff line number Diff line
@@ -4,12 +4,13 @@ namespace Mission;

use Application\Entity\Db\WfEtape;
use Application\Provider\Privilege\Privileges;
use Laminas\ServiceManager\Factory\InvokableFactory;
use Mission\Controller\MissionController;
use Mission\Controller\MissionTauxController;
use Mission\Service\MissionTauxService;
use Mission\Service\MissionTauxServiceFactory;
use UnicaenAuth\Assertion\AssertionFactory;
use Mission\Service\MissionTauxValeurService;
use Mission\Service\MissionTauxValeurServiceFactory;
use UnicaenAuth\Guard\PrivilegeController;


@@ -75,7 +76,7 @@ return [
                    'action'     => 'supprimer',
                ],
                'saisir-valeur'    => [
                    'route'      => '/saisir-valeur[/:tauxRemuValeur]',
                    'route'      => '/saisir-valeur[/:tauxRemu][/:tauxRemuValeur]',
                    'controller' => MissionTauxController::class,
                    'action'     => 'saisirValeur',
                ],
@@ -182,12 +183,14 @@ return [

    'services' => [
        MissionTauxService::class         => MissionTauxServiceFactory::class,
        Assertion\MissionAssertion::class => \UnicaenAuth\Assertion\AssertionFactory::class,
        MissionTauxValeurService::class   => MissionTauxValeurServiceFactory::class,
        Assertion\MissionAssertion::class => AssertionFactory::class,
        Service\MissionService::class     => Service\MissionServiceFactory::class,
    ],

    'forms' => [
        Form\MissionForm::class     => Form\MissionFormFactory::class,
        Form\MissionTauxForm::class => Form\MissionTauxFormFactory::class,
    ],

    'view_helpers' => [
+53 −10
Changes for module/Mission/src/Controller/MissionTauxController.php: 53 added lines, 10 removed lines.
Original line number Diff line number Diff line
@@ -3,8 +3,10 @@
namespace Mission\Controller;

use Application\Controller\AbstractController;
use Mission\Entity\Db\MissionTauxRemu;
use Mission\Form\MissionTauxFormAwareTrait;
use Mission\Form\MissionTauxValeurFormAwareTrait;
use Mission\Service\MissionTauxServiceAwareTrait;
use Mission\Service\MissionTauxValeurServiceAwareTrait;
use Application\Service\Traits\ContextServiceAwareTrait;
use UnicaenApp\View\Model\MessengerViewModel;

@@ -16,8 +18,10 @@ use UnicaenApp\View\Model\MessengerViewModel;
class MissionTauxController extends AbstractController
{
    use MissionTauxServiceAwareTrait;
    use MissionTauxValeurServiceAwareTrait;
    use ContextServiceAwareTrait;

    use MissionTauxFormAwareTrait;
    use MissionTauxValeurFormAwareTrait;

    public function indexAction()
    {
@@ -30,13 +34,27 @@ class MissionTauxController extends AbstractController



    public function saisirAction(): array
    public function saisirAction()
    {

        $tauxMissions = $this->getServiceMissionTaux()->getTauxRemus();
        $annee        = $this->getServiceContext()->getAnnee();
        $tauxRemuId = $this->params()->fromRoute('tauxRemu');
        $tauxRemu = $this->getServiceMissionTaux()->get($tauxRemuId);
        $form = $this->getFormMissionTaux();
        if (empty($tauxRemu)) {
            $title               = "Création d'un nouveau taux";
            $tauxRemu = $this->getServiceMissionTaux()->newEntity();
        } else {
            $title = "Édition d'un taux";
        }
        $form->bindRequestSave($tauxRemu, $this->getRequest(), function () use ($tauxRemu, $form) {

        return compact('tauxMissions', 'annee');
            $this->getServiceMissionTaux()->save($tauxRemu);
            $this->flashMessenger()->addSuccessMessage(
                "Ajout réussi"
            );
        });

        return compact('form','title');
    }


@@ -44,17 +62,42 @@ class MissionTauxController extends AbstractController
    public function saisirValeurAction(): array
    {

        $tauxMissions = $this->getServiceMissionTaux()->getTauxRemus();
        $annee        = $this->getServiceContext()->getAnnee();
        $tauxRemuValeurId = $this->params()->fromRoute('tauxRemuValeur');
        $tauxRemuValeur = $this->getServiceMissionTauxValeur()->get($tauxRemuValeurId);
        $form = $this->getFormMissionTauxValeur();
        if (empty($tauxRemuValeur)) {
            $title               = "Création d'une nouvelle valeur";
            /* @var \Mission\Entity\Db\MissionTauxRemuValeur $tauxRemuValeur */
            $tauxRemuValeur = $this->getServiceMissionTauxValeur()->newEntity();

        return compact('tauxMissions', 'annee');

        } else {
            $title = "Édition d'une nouvelle valeur";
        }
        if($tauxRemuValeur->getMissionTauxRemu() == null){
            $tauxRemuId = $this->params()->fromRoute('tauxRemu');
            $tauxRemu = $this->getServiceMissionTaux()->get($tauxRemuId);
            $tauxRemuValeur = $tauxRemuValeur->setMissionTauxRemu($tauxRemu);
        }


        $form->bindRequestSave($tauxRemuValeur, $this->getRequest(), function () use ($tauxRemuValeur, $form) {

            $this->getServiceMissionTauxValeur()->save($tauxRemuValeur);
            $this->flashMessenger()->addSuccessMessage(
                "Ajout réussi"
            );
        });

        return compact('form','title');
    }



    public function supprimerAction(): MessengerViewModel
    {
        echo "test";
        $tauxRemu = $this->getEvent()->getParam('tauxRemu');
        $this->getServiceMissionTaux()->delete($tauxRemu, true);

        return new MessengerViewModel();
    }
+3
Changes for module/Mission/src/Controller/MissionTauxControllerFactory.php: 3 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -3,7 +3,9 @@
namespace Mission\Controller;

use Application\Service\ContextService;
use Mission\Form\MissionTauxForm;
use Mission\Service\MissionTauxService;
use Mission\Service\MissionTauxValeurService;
use Psr\Container\ContainerInterface;

/**
@@ -24,6 +26,7 @@ class MissionTauxControllerFactory
    {
        $controller = new MissionTauxController;
        $controller->setServiceMissionTaux($container->get(MissionTauxService::class));
        $controller->setServiceMissionTauxValeur($container->get(MissionTauxValeurService::class));
        $controller->setServiceContext($container->get(ContextService::class));
        return $controller;
    }
+15
Changes for module/Mission/src/Entity/Db/Mapping/Mission.Entity.Db.MissionTauxRemu.dcm.xml: 15 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -13,5 +13,20 @@
                <order-by-field name="dateEffet" direction="DESC" />
            </order-by>
        </one-to-many>

        <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-columns>
                <join-column name="HISTO_DESTRUCTEUR_ID" referenced-column-name="ID"/>
            </join-columns>
        </many-to-one>
    </entity>
</doctrine-mapping>
 No newline at end of file
Loading