Commit 7383bfc7 authored by Stephane Bouvry's avatar Stephane Bouvry
Browse files

- Up : Les projets vides sont retirés des résultats car ils apparaisent... 

- Up : Les projets vides sont retirés des résultats car ils apparaisent indépendament des filtres (Pour le moment, utiliser l'écran 'Projets vides')
parent d04ac113

module/Oscar/src/Oscar/Entity/ActivityRepository.php

+5 −14
Original line number Diff line number Diff line
@@ -948,15 +948,6 @@ class ActivityRepository extends EntityRepository 
        if ($ids) {

            $qb = $this->getEntityManager()->createQueryBuilder()

                ->select(



                    /*'DISTINCT p.id,

                    COALESCE(MIN(a.dateCreated),p.dateCreated) as dateCreated,

                    MIN(a.dateStart) as dateStart,

                    MAX(a.dateEnd) as dateEnd,

                    COALESCE(MAX(a.dateUpdated),p.dateUpdated) as dateUpdated,

                    MAX(a.dateSigned) as dateSigned,

                    MAX(a.dateOpened) as dateOpened

                    '*/

                    'DISTINCT p.id as projectId,

                    MIN(a.dateCreated) as dateCreated, 

                    MIN(a.dateStart) as dateStart,
@@ -971,11 +962,11 @@ class ActivityRepository extends EntityRepository 
                ->where('a.id IN(:ids)')

                ->groupBy('p.id');





            if($search){

                $qb->orWhere('(LOWER(p.acronym) LIKE LOWER(:search) OR LOWER(p.label) LIKE LOWER(:search) OR LOWER(p.description) LIKE LOWER(:search))')

                    ->setParameter('search', '%' . $search . '%');

            }

// TODO TROUVER UNE AUTRE SOLUTION, sinon, des projets vides remontent sans tenir compte des filtres

//            if($search){

//                $qb->orWhere('(LOWER(p.acronym) LIKE LOWER(:search) OR LOWER(p.label) LIKE LOWER(:search) OR LOWER(p.description) LIKE LOWER(:search))')

//                    ->setParameter('search', '%' . $search . '%');

//            }



            $qb->setParameter('ids', $ids);

module/Oscar/src/Oscar/Service/ProjectGrantSearchService.php

+7 −2
Original line number Diff line number Diff line
@@ -884,6 +884,11 @@ class ProjectGrantSearchService implements UseEntityManager, UsePersonService, U 


                        break;



                    ///////////////////////////////// PROJETS VIDES

                    case 'pv' :



                        break;



                    ///////////////////////////////// ACTIVITY / COMPTE STRICT

                    /// (Note : Accessible depuis l'interface d'administration uniquement)

                    case 'cb2':
@@ -970,7 +975,7 @@ class ProjectGrantSearchService implements UseEntityManager, UsePersonService, U 
        // Vue projet

        if ($projectView) {

            if ($search) {

                // TODO Ajouter les projets vides aux résultats



                $idsProject = $this->getProjectGrantService()->getActivityRepository()

                    ->getIdsProjectsForActivityAndEmpty(

                        $search,
@@ -979,7 +984,7 @@ class ProjectGrantSearchService implements UseEntityManager, UsePersonService, U 
                        $params['sortDirection'],

                        $params['sortIgnoreNull'] == 'on'

                    );

                $this->getLoggerService()->debug("Projet(s) : " . (count($idsProject)) . " projet(s)");



            } else {

                $idsProject = $this->getProjectGrantService()->getActivityRepository()

                    ->getIdsProjectsForActivity(