Commit 9d7dd429 authored by Thomas Hamel's avatar Thomas Hamel
Browse files

update sql

parent 207c9f51

module/Admission/Sql/admission.sql

+2 −2
Changes for module/Admission/Sql/admission.sql: 2 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -1096,14 +1096,13 @@ from data 
                                           'RESP_UR',

                                           'RESP_ED',

                                           'D', -- Directeur

                                           'K', -- Co-directeur

                                           'BDD' -- Maison du Doctorat

                                           'K' -- Co-directeur

    )

         join CATEGORIE_PRIVILEGE cp on cp.CODE = data.categ

         join PRIVILEGE p on p.CATEGORIE_ID = cp.id and p.code = data.priv

where not exists (select * from PROFIL_PRIVILEGE where PRIVILEGE_ID = p.id and PROFIL_ID = profil.id);



-- ajout des privilèges au profil BDD (Maison du Doctorat)

INSERT INTO PROFIL_PRIVILEGE (PRIVILEGE_ID, PROFIL_ID)

with data(categ, priv) as (select 'admission', 'admission-afficher-son-dossier-admission'

                           union

module/Admission/config/module.config.php

+1 −0
Changes for module/Admission/config/module.config.php: 1 added line, 0 removed lines.
Original line number Diff line number Diff line
@@ -315,6 +315,7 @@ return array( 
                            'route'       => '/rechercher-individu',

                            'defaults'    => [

                                'action' => 'rechercher-individu',

                                'controller' => AdmissionController::class,

                                /* @see AdmissionController::rechercherIndividuAction() */

                            ],

                        ],

module/Admission/src/Admission/Service/Admission/AdmissionRechercheService.php

+4 −4
Changes for module/Admission/src/Admission/Service/Admission/AdmissionRechercheService.php: 4 added lines, 4 removed lines.
Original line number Diff line number Diff line
@@ -118,7 +118,7 @@ class AdmissionRechercheService extends SearchService 
            ->setDataProvider(function() {

                return $this->fetchEtablissements();

            })

            ->setQueryBuilderApplier(function(SearchFilter $filter, QueryBuilder $qb, string $alias = 'these') {

            ->setQueryBuilderApplier(function(SearchFilter $filter, QueryBuilder $qb, string $alias = 'admission') {

                $qb

                    ->andWhere($qb->expr()->orX('etab.sourceCode = :sourceCodeEtab', 'etab_substituant.sourceCode = :sourceCodeEtab'))

                    ->setParameter('sourceCodeEtab', $filter->getValue());
@@ -127,7 +127,7 @@ class AdmissionRechercheService extends SearchService 
            ->setDataProvider(function() {

                return $this->fetchEcolesDoctorales();

            })

            ->setQueryBuilderApplier(function(SearchFilter $filter, QueryBuilder $qb, string $alias = 'these') {

            ->setQueryBuilderApplier(function(SearchFilter $filter, QueryBuilder $qb, string $alias = 'admission') {

                $qb

                    ->andWhere($qb->expr()->orX('ed.sourceCode = :sourceCodeED', 'ed_substituant.sourceCode = :sourceCodeED'))

                    ->setParameter('sourceCodeED', $filter->getValue());
@@ -136,7 +136,7 @@ class AdmissionRechercheService extends SearchService 
            ->setDataProvider(function() {

                return $this->fetchUnitesRecherches();

            })

            ->setQueryBuilderApplier(function(SearchFilter $filter, QueryBuilder $qb, string $alias = 'these') {

            ->setQueryBuilderApplier(function(SearchFilter $filter, QueryBuilder $qb, string $alias = 'admission') {

                $qb

                    ->andWhere($qb->expr()->orX('ur.sourceCode = :sourceCodeUR', 'ur_substituant.sourceCode = :sourceCodeUR'))

                    ->setParameter('sourceCodeUR', $filter->getValue());
@@ -212,7 +212,7 @@ class AdmissionRechercheService extends SearchService 


            case self::SORTER_NAME_titre:

                // trim et suppression des guillemets

                $orderBy = "TRIM(REPLACE(these.$name, CHR(34), ''))"; // CHR(34) <=> "

                $orderBy = "TRIM(REPLACE(admission.$name, CHR(34), ''))"; // CHR(34) <=> "

                $qb->addOrderBy($orderBy, $direction);

                break;