Commit b184eb4f 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 55bfa17a

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

+1 −13
Original line number Diff line number Diff line
@@ -97,7 +97,7 @@ class CentreCoutSaisieForm extends AbstractForm 
        ]);

        $this->get('parent')

            ->setEmptyOption("(Aucun)")

            ->setValueOptions(\UnicaenApp\Util::collectionAsOptions($this->getParent()));

            ->setValueOptions(\UnicaenApp\Util::collectionAsOptions($this->getServiceCentreCout()->getListeParent()));



        $this->add(new Csrf('security'));

        $this->add([
@@ -114,18 +114,6 @@ class CentreCoutSaisieForm extends AbstractForm 






    public function getParent()

    {

        $serviceCentreCout = $this->getServiceCentreCout();

        $qb                = $serviceCentreCout->finderByHistorique();

        $qb->andWhere('parent' == Null);

        $centreCouts = $serviceCentreCout->getList($qb);



        return $centreCouts;

    }







    /**

     * Should return an array specification compatible with

     * {@link Zend\InputFilter\Factory::createInputFilter()}.

module/Application/src/Application/Service/CentreCoutService.php

+39 −7
Original line number Diff line number Diff line
@@ -17,6 +17,8 @@ class CentreCoutService extends AbstractEntityService 
{

    use TypeHeuresServiceAwareTrait;







    /**

     * retourne la classe des entités

     *
@@ -27,6 +29,8 @@ class CentreCoutService extends AbstractEntityService 
        return CentreCout::class;

    }







    /**

     * Retourne l'alias d'entité courante

     *
@@ -37,6 +41,8 @@ class CentreCoutService extends AbstractEntityService 
        return 'cc';

    }







    /**

     * Retourne la liste des services selon l'étape donnée

     *
@@ -57,6 +63,8 @@ class CentreCoutService extends AbstractEntityService 
        return $qb;

    }







    /**

     * Formatte une liste d'entités CentreCout (centres de coûts et éventuels EOTP fils)

     * en tableau attendu par l'aide de vue FormSelect.
@@ -95,4 +103,28 @@ class CentreCoutService extends AbstractEntityService 
        return $result;

    }







    /**

     * Retourne la liste des centres de coûts sans parent

     *

     * @return CentreCout[]

     */

    public function getListeParent(QueryBuilder $qb = null, $alias = null)

    {

        list($qb, $alias) = $this->initQuery($qb, $alias);

        $qb->where("$alias.parent is Null");

        $qb->andWhere("$alias.histoDestruction is Null");

        $this->orderBy($qb);

        $entities    = $qb->getQuery()->execute();

        $result      = [];

        $entityClass = $this->getEntityClass();

        foreach ($entities as $entity) {

            if ($entity instanceof $entityClass) {

                $result[$entity->getId()] = $entity;

            }

        }



        return $result;

    }

}
 
 No newline at end of file