Commit 18efce77 authored by Stephane Bouvry's avatar Stephane Bouvry
Browse files

Fix : Selectionneur de date dans la fiche d'édition des organisations

parent 9f3b9e3a

module/Oscar/src/Oscar/Controller/OrganizationController.php

+5 −1
Original line number Diff line number Diff line
@@ -50,7 +50,7 @@ class OrganizationController extends AbstractOscarController implements UseOrgan 


    public function deleteAction(){



        $this->getOscarUserContext()->check(Privileges::ORGANIZATION_DELETE);

        $this->getOscarConfigurationService()->check(Privileges::ORGANIZATION_DELETE);



        $id = $this->params()->fromRoute('id');

        $organization = $this->getOrganizationService()->getOrganization($id);
@@ -776,7 +776,10 @@ class OrganizationController extends AbstractOscarController implements UseOrgan 
        $form->init();

        $form->bind($entity);







        if ($this->getRequest()->isPost()) {



            $form->setData($this->getRequest()->getPost());

            if( $form->isValid() ){

                $this->getEntityManager()->flush($entity);
@@ -799,6 +802,7 @@ class OrganizationController extends AbstractOscarController implements UseOrgan 
            $form->setData($datas);

        }





        $view = new ViewModel(array(

            'id' => $id,

            'organization' => $entity,

module/Oscar/src/Oscar/Form/OrganizationIdentificationForm.php

+24 −15
Original line number Diff line number Diff line
@@ -95,18 +95,6 @@ class OrganizationIdentificationForm extends \Zend\Form\Form implements InputFil 
            'type'=>'Text'

        ]);



        // DateStart

        $this->add([

            'name'   => 'dateEnd',

            'options' => [

                'label' => 'Date de fermeture'

            ],

            'attributes' => [

                'class' => 'input-date'

            ],

            'type'=>'Date'

        ]);



        ////////////////////////////////////////////////////////////////////////

        // Connectors (Ajout dynamique des champs pour les valeurs des connectors)

        foreach( $this->connectors as $connector ){
@@ -127,13 +115,34 @@ class OrganizationIdentificationForm extends \Zend\Form\Form implements InputFil 
        $this->add([

            'name'   => 'dateStart',

            'options' => [

                'label' => 'Date de début'

                'label' => 'Début du contrat',

                'format' => 'Y-m-d'

            ],

            'attributes' => [

                'class' => 'input-date'

                'class' => 'input-date form-control'

            ],

            'type'=>'Date'

            'type'=>'DateTime'

        ]);

        //$dateStart->setValue('FICK');

        //$this->get('dateStart')->setValue('FUCK');









//

        // DateEnd

        $this->add([

            'name'   => 'dateEnd',

            'options' => [

                'label' => 'Date de fermeture',

                'format' => 'Y-m-d'

            ],

            'attributes' => [

                'class' => 'input-date form-control'

            ],

            'type'=>'DateTime'

        ]);







        $eotp = new Element\Text('code');

module/Oscar/view/oscar/organization/form.phtml

+15 −6
Original line number Diff line number Diff line
@@ -35,12 +35,19 @@ 
    <?php endif; ?>

    <?= $this->formHidden($form->get('secure')) ?>



    <ul class="errors">

        <?php foreach ($form->getMessages() as $msg): ?>

<?php if( $form->getMessages() ): ?>

    <ul class="alert alert-danger">

        <?php foreach ($form->getMessages() as $champ=>$msgs): ?>

            <li><strong><?= $champ ?></strong>

                <ul>

                <?php foreach ($msgs as $msg): ?>

                    <li><?= $msg ?></li>

                    <?php endforeach; ?>

                </ul>



            </li>

        <?php endforeach; ?>

    </ul>

<?php endif; ?>

    <div id="completer">

        <div class="form-group">

            <div class="input-group input-group-lg">
@@ -82,22 +89,24 @@ 
        </div>

    </div>



    <?php /****/ ?>

    <div class="form-group">

        <div class="input-group input-group-sm">

            <span class="input-group-addon">Date de début (ouverture)</span>

            <?= $this->formInput($form->get('dateStart')) ?>

        </div>

            <?= $this->formElement($form->get('dateStart')) ?>

        <?= $this->formElementErrors($form->get('dateStart')); ?>

    </div>





    <div class="form-group">

        <div class="input-group input-group-sm">

            <span class="input-group-addon">Date de fin (fermeture)</span>

            <?= $this->formInput($form->get('dateEnd')) ?>

            <?= $this->formElement($form->get('dateEnd')) ?>

        </div>

        <?= $this->formElementErrors($form->get('dateEnd')); ?>

    </div>





    <h3>Adresse</h3>



    <div class="form-group">