Commit 7732edbb authored by Stéphane Bouvry's avatar Stéphane Bouvry
Browse files

Fix: La recherche d'activité refonctionne dans la fiche projet

parent 5ac9c5d7
Loading
Loading
Loading
Loading

doc/numerotation.md

0 → 100644
+0 −0

Empty file added.

+19 −185
Changes for module/Oscar/src/Oscar/Controller/ProjectGrantController.php: 19 added lines, 185 removed lines.
Original line number Diff line number Diff line
@@ -1285,6 +1285,8 @@ class ProjectGrantController extends AbstractOscarController
            } else {
                if ($search) {

                    $oscarNumSeparator = $this->getConfiguration("oscar.oscar_num_separator");

                    // La saisie est un PFI
                    if (preg_match($this->getServiceLocator()->get("Config")['oscar']['validation']['pfi'], $search)) {
                        $parameters['search'] = $search;
@@ -1299,8 +1301,9 @@ class ProjectGrantController extends AbstractOscarController
                        if (preg_match("/^[0-9]{4}SAIC.*/mi", $search)) {
                            $parameters['search'] = $search . '%';
                            $qb->andWhere('c.centaureNumConvention LIKE :search');
                        } // La saisie est un numéro OSCAR©
                        elseif (preg_match("/^[0-9]{4}DRI.*/mi", $search)) {
                        }
                        // La saisie est un numéro OSCAR©
                        elseif (preg_match("/^[0-9]{4}".$oscarNumSeparator.".*/mi", $search)) {
                            $parameters['search'] = $search . '%';
                            $qb->andWhere('c.oscarNum LIKE :search');
                        } // Saisie 'libre'
@@ -1602,12 +1605,21 @@ class ProjectGrantController extends AbstractOscarController
                        $qb->andWhere('c.' . $sort . ' IS NOT NULL');
                    }
                }



                $activities = new UnicaenDoctrinePaginator($qb, $page);
            }

            if ($this->getRequest()->isXmlHttpRequest()) {
                $json = [
                    'datas' => []
                ];
                /** @var Activity $activity */
                foreach ($activities as $activity) {
                    $json['datas'][] = $activity->toJson();
                }

                return $this->ajaxResponse($json);
            }

            $view = new ViewModel([
                'projectview' => $projectview,
                'exportIds' => implode(',', $ids),
@@ -1693,186 +1705,8 @@ class ProjectGrantController extends AbstractOscarController
     */
    public function indexAction()
    {
        $page = $this->params()->fromQuery('page', 1);
        $search = $this->params()->fromQuery('q', '');
        $filterStatus = $this->params()->fromQuery('filter_status', []);
        $filterType = $this->params()->fromQuery('filter_type', []);
        $filterYears = $this->params()->fromQuery('filter_year', []);
        $filterPersons = $this->params()->fromQuery('persons', []);

        $datefilter_type = $this->params()->fromQuery('datefilter_type', '');
        $datefilter_from = $this->params()->fromQuery('datefilter_from', '');
        $datefilter_to = $this->params()->fromQuery('datefilter_to', '');


        $sortCriteria = [
            'dateCreated' => 'Date de création',
            'dateStart' => 'Date début',
            'dateEnd' => 'Date fin',
            'dateUpdated' => 'Date de mise à jour',
            'dateSigned' => 'Date de signature',
            'dateOpened' => "Date d'ouverture",
        ];

        $sortDirections = [
            'desc' => 'Décroissant',
            'asc' => 'Croissant'
        ];

        $sort = $this->params()->fromQuery('sort', 'dateUpdated');
        $sortDirection = $this->params()->fromQuery('sortDirection', 'desc');

        if (!key_exists($sort, $sortCriteria)) {
            $sort = 'dateCreated';
        }
        if (!key_exists($datefilter_type, $sortCriteria)) {
            $datefilter_type = '';
        }

        if (!key_exists($sortDirection, $sortDirections)) {
            $sortDirection = 'desc';
        }

        $qb = $this->getEntityManager()->createQueryBuilder()
            ->select('c')
            ->from(Activity::class, 'c')
            ->orderBy('c.' . $sort, $sortDirection);

        $displayFilters = false;

        if ($search) {
            $displayFilters = true;
            if (preg_match(EOTP::REGEX_EOTP, $search)) {
                $qb->where('c.codeEOTP = :search')
                    ->setParameter('search', $search);
            } else {
                if (preg_match("/^[0-9]{4}SAIC.*/mi", $search)) {
                    $qb->where('c.centaureNumConvention LIKE :search')
                        ->setParameter('search', $search . '%');
                } elseif (preg_match("/^[0-9]{4}DRI.*/mi", $search)) {
                    $qb->where('c.oscarNum LIKE :search')
                        ->setParameter('search', $search . '%');
                } else {

                    $qb->where('c.id IN(:ids)')
                        ->setParameter('ids',
                            $this->getActivityService()->search($search));
                }
            }
        }

        // Filtre sur le status de l'activités
        if (count($filterStatus)) {
            $displayFilters = true;
            $qb->andWhere('c.status IN(:status)')
                ->setParameter('status', $filterStatus);
        }

        // Filtre sur les types d'activités
        if (count($filterType)) {
            $displayFilters = true;
            $selectedTypes = $this->getActivityTypeService()->getActivityTypesById($filterType);
            $qb->innerJoin('c.activityType', 't');
            /** @var ActivityType $selectedType */
            foreach ($selectedTypes as $selectedType) {
                $qb->andWhere('t.lft >= :lft AND t.rgt <= :rgt')
                    ->setParameter('lft', $selectedType->getLft())
                    ->setParameter('rgt', $selectedType->getRgt());

            }
        }

        // Filtre sur les types d'activités
        if (count($filterYears)) {
            $displayFilters = true;
            $clause = [];
            $values = [];

            foreach ($filterYears as $year) {
                $values['start_' . $year] = $year . '-01-01';
                $values['end_' . $year] = $year . '-12-31';
                $clause[] = "(c.dateStart <= '$year-12-31' AND c.dateEnd >= '$year-01-01')";
            }

            $qb->andWhere(implode(' OR ', $clause));
        }

        // Persons
        $persons = [];
        if (count($filterPersons)) {
            $displayFilters = true;
            foreach ($this->getEntityManager()->getRepository(Person::class)->createQueryBuilder('p')->where('p.id IN (:persons)')->setParameter('persons',
                $filterPersons)->getQuery()->getResult() as $p) {
                $persons[] = $p;
            }
            $qb->innerJoin('c.persons', 'm')
                ->leftJoin('m.person', 'p')
                ->leftJoin('c.project', 'pr')
                ->leftJoin('pr.members', 'pm')
                ->leftJoin('pm.person', 'p2')
                ->andWhere('p.id in (:personIds) OR p2.id IN (:personIds)')
                ->setParameter('personIds', $filterPersons);
        }

        if ($datefilter_type != '' && ($datefilter_from != '' || $datefilter_to != '')) {
            $displayFilters = true;
            if ($datefilter_from != '') {
                $qb->andWhere('c.' . $datefilter_type . ' >= :from')
                    ->setParameter('from', $datefilter_from);
            }
            if ($datefilter_to != '') {
                $qb->andWhere('c.' . $datefilter_type . ' <= :to')
                    ->setParameter('to', $datefilter_to);
            }
        }
        try {
            // IDS
            $qbIds = $qb->select('c.id');
            $ids = [];
            foreach ($qbIds->getQuery()->getResult() as $row) {
                $ids[] = $row['id'];
            }
            $qb->select('c');

            $paginator = new UnicaenDoctrinePaginator($qb, $page, 20);

        } catch (\Exception $e) {
            die(sprintf("<h1>%s</h1><pre>%s</pre>", $e->getMessage(),
                $e->getTraceAsString()));
        }

        if ($this->getRequest()->isXmlHttpRequest()) {
            $json = [
                'datas' => []
            ];
            /** @var Activity $activity */
            foreach ($paginator as $activity) {
                $json['datas'][] = $activity->toJson();
            }

            return $this->ajaxResponse($json);
            // die('Recherche');
        }


        return [
            'exportIds' => implode(',', $ids),
            'contracts' => $paginator,
            'search' => $search,
            'filterStatus' => $filterStatus,
            'filterType' => $filterType,
            'filterYear' => $filterYears,
            'sorts' => $sortCriteria,
            'directions' => $sortDirections,
            'sort' => $sort,
            'sortDirection' => $sortDirection,
            'filterPersons' => $persons,
            'displayFilters' => $displayFilters,
            'datefilter_type' => $datefilter_type,
            'datefilter_from' => $datefilter_from,
            'datefilter_to' => $datefilter_to,
            'types' => $this->getActivityTypeService()->getActivityTypes(true),
        ];
        die("DEPRECATED");
        return $this->getResponseDeprecated();
    }


+1 −1
Changes for module/Oscar/view/oscar/project/show.phtml: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -128,7 +128,7 @@ h2.tv-serie-label { border-bottom: none; }
                Ajouter des activités existantes dans ce projet :
                <div class="row">
                    <div class="col-md-10">
                        <select name="activities_ids[]" id="activities-choose" data-url="<?= $this->url('contract') ?>" multiple></select>
                        <select name="activities_ids[]" id="activities-choose" data-url="<?= $this->url('contract/advancedsearch') ?>" multiple></select>
                    </div>
                    <div class="col-md-2">
                        <button type="submit" class="btn btn-primary" style="display: block">