Commit 6dd4cc48 authored by Alexandre Zvenigorosky's avatar Alexandre Zvenigorosky
Browse files

Merge branches 'Centres-cout' and 'master' of git.unicaen.fr:open-source/OSE into Centres-cout 

# Conflicts:
#	composer.json
#	composer.lock
parent b184eb4f

module/Application/src/Application/Form/CentreCout/CentreCoutSaisieForm.php

+3 −13
Original line number Diff line number Diff line
@@ -44,24 +44,17 @@ class CentreCoutSaisieForm extends AbstractForm 
            ],

            'type'    => 'Text',

        ]);

        $this->add([

            'name'    => 'source-code',

            'options' => [

                'label' => "Source Code",

            ],

            'type'    => 'Text',

        ]);

        $this->add([

            'name'    => 'unite-budgetaire',

            'options' => [

                'label' => "Unite Budgetaire",

                'label' => "Unité Budgétaire",

            ],

            'type'    => 'Text',

        ]);

        $this->add([

            'name'       => 'activite',

            'options'    => [

                'label' => 'Activite',

                'label' => 'Activité',

            ],

            'attributes' => [

                'class'            => 'selectpicker',
@@ -139,9 +132,6 @@ class CentreCoutSaisieForm extends AbstractForm 
                'required' => true,

            ],



            'source-code' => [

                'required' => true,

            ],

            'parent'      => [

                'required' => false,

            ],
@@ -175,7 +165,7 @@ class CentreCoutHydrator implements HydratorInterface 
    {

        $object->setCode($data['code']);

        $object->setLibelle($data['libelle']);

        $object->setSourceCode($data['source-code']);

        $object->setSourceCode($data['code']);

        $object->setUniteBudgetaire($data['unite-budgetaire']);

        if (array_key_exists('activite', $data)) {

            $object->setActivite($this->getServiceccActivite()->get($data['activite']));

module/Application/view/application/centre-cout/saisie.phtml

+33 −3
Original line number Diff line number Diff line 
<?php

/**

 * @var $this  \Application\View\Renderer\PhpRenderer

 * @var $form  \Application\Form\CentreCout\CentreCoutSaisieForm

 * @var $form  \Application\Form\FonctionReferentiel\TypeInterventionSaisieForm

 */



echo $this->messenger()->addCurrentMessagesFromFlashMessenger();

echo $this->form($form);
 


echo $this->form()->openTag($form); ?>



<div class="row">

    <div class="col-md-6">

        <?= $this->formControlGroup($form->get('parent')); ?>

    </div>

    <div class="col-md-6">

        <?= $this->formControlGroup($form->get('unite-budgetaire')); ?>

    </div>

</div>



<div class="row">

    <div class="col-md-6">

        <?= $this->formControlGroup($form->get('libelle')); ?>

    </div>

    <div class="col-md-6">

        <?= $this->formControlGroup($form->get('code')); ?>

    </div>

</div>



<div class="row">

    <div class="col-md-6">

        <?= $this->formControlGroup($form->get('activite')); ?>

    </div>

    <div class="col-md-6">

        <?= $this->formControlGroup($form->get('type-ressource')); ?>

    </div>

</div>

<?= $this->formControlGroup($form->get('security')); ?>

<?= $this->formSubmit($form->get('submit')); ?>

<?= $this->form()->closeTag(); ?>