Loading install/demo/affectations.json 0 → 100644 +34 −0 Changes for install/demo/affectations.json: 34 added lines, 0 removed lines. Original line number Diff line number Diff line [ { "uid": "alberteinstein", "roles": { "14": ["Responsable scientifique"] } }, { "uid": "normanosborn", "roles": { "OSCORP": ["Directeur de laboratoire"] } }, { "uid": "mauricesolovine", "roles": { "14": ["Responsable scientifique", "Doctorant"] } }, { "uid": "maxplank", "roles": { "14": ["Turlututu"], "ED209": ["Code Absent de oscar => Ignoré"], "UNIV2": "Gestionnaire" } }, { "uid": "direction", "roles": { "LABO1": ["Directeur de composante"] } } ] No newline at end of file install/demo/referents.json 0 → 100644 +6 −0 Changes for install/demo/referents.json: 6 added lines, 0 removed lines. Original line number Diff line number Diff line [ { "uid": "marcelgrossmann", "referents": ["maxplank", "alberteinstein"] } ] No newline at end of file module/Oscar/src/Oscar/Controller/PersonController.php +10 −11 Changes for module/Oscar/src/Oscar/Controller/PersonController.php: 10 added lines, 11 removed lines. Original line number Diff line number Diff line Loading @@ -64,18 +64,14 @@ class PersonController extends AbstractOscarController throw new BadRequest400Exception("Cette fonctionnalité n'est pas activé"); } if( $this->isAjax() || $this->params()->fromQuery('format') == 'json' ){ $q = $this->params()->fromQuery('q'); $q = $this->params()->fromQuery('q', ""); $page = $this->params()->fromQuery('p', 1); $params = [ 'filter_roles' => [], 'order_by' => 'lastname', 'leader' => null ]; $idCoWorkers = []; $idSubordinates = $this->getPersonService()->getSubordinateIds($this->getCurrentPerson()->getId()); Loading @@ -88,15 +84,20 @@ class PersonController extends AbstractOscarController if( !$this->getOscarUserContext()->hasPrivileges(Privileges::PERSON_INDEX) ){ $params['ids'] = array_merge($idCoWorkers, $idSubordinates); // var_dump($params); // die(); } $extended = $this->params()->fromQuery('extended', 0); if( $extended ){ $datas = $this->getPersonService()->searchPersonnel($q, $page, $params); } else { $datas = $this->getPersonService()->getPersonsSearchPaged($q, $page, $params); } $output = [ 'total'=> count($datas), 'search' => $q, 'persons' => [], 'extended' => $extended, 'page' => $page, 'resultbypage' => 50, 'coworkers' => [], Loading Loading @@ -124,13 +125,11 @@ class PersonController extends AbstractOscarController $output['subordinates'] = $idSubordinates; $output['coworkers'] = $idCoWorkers; if( $this->isAjax() || $this->params()->fromQuery('format') == 'json' ){ return $this->ajaxResponse($output); } $datas = []; return $datas; return ['result' => $output ]; } public function grantAction() Loading module/Oscar/src/Oscar/Entity/PersonRepository.php +22 −0 Changes for module/Oscar/src/Oscar/Entity/PersonRepository.php: 22 added lines, 0 removed lines. Original line number Diff line number Diff line Loading @@ -22,6 +22,28 @@ class PersonRepository extends EntityRepository implements IConnectedRepository { private $_cacheSelectebleRolesOrganisation; public function getPersonsIdsForActivitiesids( $activitiesIds ){ $queryActivity = $this->createQueryBuilder('p') ->select('DISTINCT p.id') ->innerJoin('p.activities', 'ap') ->innerJoin('ap.activity', 'a') ->where('a.id IN (:ids)') ->setParameter('ids', $activitiesIds); $queryProject = $this->createQueryBuilder('p') ->select('DISTINCT p.id') ->innerJoin('p.projectAffectations', 'pra') ->innerJoin('pra.project', 'pr') ->innerJoin('pr.grants', 'a') ->where('a.id IN (:ids)') ->setParameter('ids', $activitiesIds); $fromActivities = array_map('current', $queryActivity->getQuery()->getResult()); $fromProject = array_map('current', $queryProject->getQuery()->getResult()); return array_unique(array_merge($fromActivities, $fromProject)); } /** * Retourne la liste des IDS des personnes identifiées directement comme membre dans la/les organisations. * Loading module/Oscar/src/Oscar/Service/PersonService.php +39 −0 Changes for module/Oscar/src/Oscar/Service/PersonService.php: 39 added lines, 0 removed lines. Original line number Diff line number Diff line Loading @@ -537,6 +537,45 @@ die($privilege); $resultByPage); } /** * @return PersonRepository */ protected function getPersonRepository(){ return $this->getEntityManager()->getRepository(Person::class); } public function searchPersonnel( $search = null, $currentPage = 1, $filters = [], $resultByPage = 50 ) { $query = $this->getBaseQuery(); if( $search ){ /** @var ProjectGrantService $activityService */ $activityService = $this->getServiceLocator()->get("ActivityService"); $ids = $activityService->search($search); $idsPersons = $this->getPersonRepository()->getPersonsIdsForActivitiesids($ids); $query->leftJoin('p.organizations', 'o') ->leftJoin('p.activities', 'a') ->where('p.id IN(:ids)') ->setParameter('ids', $idsPersons); } if( array_key_exists('ids', $filters) ){ $query->andWhere('p.id IN(:filterIds)') ->setParameter('filterIds', $filters['ids']); } return new UnicaenDoctrinePaginator($query, $currentPage, $resultByPage); } /** * @param string|null $search * @param int $currentPage Loading Loading
install/demo/affectations.json 0 → 100644 +34 −0 Changes for install/demo/affectations.json: 34 added lines, 0 removed lines. Original line number Diff line number Diff line [ { "uid": "alberteinstein", "roles": { "14": ["Responsable scientifique"] } }, { "uid": "normanosborn", "roles": { "OSCORP": ["Directeur de laboratoire"] } }, { "uid": "mauricesolovine", "roles": { "14": ["Responsable scientifique", "Doctorant"] } }, { "uid": "maxplank", "roles": { "14": ["Turlututu"], "ED209": ["Code Absent de oscar => Ignoré"], "UNIV2": "Gestionnaire" } }, { "uid": "direction", "roles": { "LABO1": ["Directeur de composante"] } } ] No newline at end of file
install/demo/referents.json 0 → 100644 +6 −0 Changes for install/demo/referents.json: 6 added lines, 0 removed lines. Original line number Diff line number Diff line [ { "uid": "marcelgrossmann", "referents": ["maxplank", "alberteinstein"] } ] No newline at end of file
module/Oscar/src/Oscar/Controller/PersonController.php +10 −11 Changes for module/Oscar/src/Oscar/Controller/PersonController.php: 10 added lines, 11 removed lines. Original line number Diff line number Diff line Loading @@ -64,18 +64,14 @@ class PersonController extends AbstractOscarController throw new BadRequest400Exception("Cette fonctionnalité n'est pas activé"); } if( $this->isAjax() || $this->params()->fromQuery('format') == 'json' ){ $q = $this->params()->fromQuery('q'); $q = $this->params()->fromQuery('q', ""); $page = $this->params()->fromQuery('p', 1); $params = [ 'filter_roles' => [], 'order_by' => 'lastname', 'leader' => null ]; $idCoWorkers = []; $idSubordinates = $this->getPersonService()->getSubordinateIds($this->getCurrentPerson()->getId()); Loading @@ -88,15 +84,20 @@ class PersonController extends AbstractOscarController if( !$this->getOscarUserContext()->hasPrivileges(Privileges::PERSON_INDEX) ){ $params['ids'] = array_merge($idCoWorkers, $idSubordinates); // var_dump($params); // die(); } $extended = $this->params()->fromQuery('extended', 0); if( $extended ){ $datas = $this->getPersonService()->searchPersonnel($q, $page, $params); } else { $datas = $this->getPersonService()->getPersonsSearchPaged($q, $page, $params); } $output = [ 'total'=> count($datas), 'search' => $q, 'persons' => [], 'extended' => $extended, 'page' => $page, 'resultbypage' => 50, 'coworkers' => [], Loading Loading @@ -124,13 +125,11 @@ class PersonController extends AbstractOscarController $output['subordinates'] = $idSubordinates; $output['coworkers'] = $idCoWorkers; if( $this->isAjax() || $this->params()->fromQuery('format') == 'json' ){ return $this->ajaxResponse($output); } $datas = []; return $datas; return ['result' => $output ]; } public function grantAction() Loading
module/Oscar/src/Oscar/Entity/PersonRepository.php +22 −0 Changes for module/Oscar/src/Oscar/Entity/PersonRepository.php: 22 added lines, 0 removed lines. Original line number Diff line number Diff line Loading @@ -22,6 +22,28 @@ class PersonRepository extends EntityRepository implements IConnectedRepository { private $_cacheSelectebleRolesOrganisation; public function getPersonsIdsForActivitiesids( $activitiesIds ){ $queryActivity = $this->createQueryBuilder('p') ->select('DISTINCT p.id') ->innerJoin('p.activities', 'ap') ->innerJoin('ap.activity', 'a') ->where('a.id IN (:ids)') ->setParameter('ids', $activitiesIds); $queryProject = $this->createQueryBuilder('p') ->select('DISTINCT p.id') ->innerJoin('p.projectAffectations', 'pra') ->innerJoin('pra.project', 'pr') ->innerJoin('pr.grants', 'a') ->where('a.id IN (:ids)') ->setParameter('ids', $activitiesIds); $fromActivities = array_map('current', $queryActivity->getQuery()->getResult()); $fromProject = array_map('current', $queryProject->getQuery()->getResult()); return array_unique(array_merge($fromActivities, $fromProject)); } /** * Retourne la liste des IDS des personnes identifiées directement comme membre dans la/les organisations. * Loading
module/Oscar/src/Oscar/Service/PersonService.php +39 −0 Changes for module/Oscar/src/Oscar/Service/PersonService.php: 39 added lines, 0 removed lines. Original line number Diff line number Diff line Loading @@ -537,6 +537,45 @@ die($privilege); $resultByPage); } /** * @return PersonRepository */ protected function getPersonRepository(){ return $this->getEntityManager()->getRepository(Person::class); } public function searchPersonnel( $search = null, $currentPage = 1, $filters = [], $resultByPage = 50 ) { $query = $this->getBaseQuery(); if( $search ){ /** @var ProjectGrantService $activityService */ $activityService = $this->getServiceLocator()->get("ActivityService"); $ids = $activityService->search($search); $idsPersons = $this->getPersonRepository()->getPersonsIdsForActivitiesids($ids); $query->leftJoin('p.organizations', 'o') ->leftJoin('p.activities', 'a') ->where('p.id IN(:ids)') ->setParameter('ids', $idsPersons); } if( array_key_exists('ids', $filters) ){ $query->andWhere('p.id IN(:filterIds)') ->setParameter('filterIds', $filters['ids']); } return new UnicaenDoctrinePaginator($query, $currentPage, $resultByPage); } /** * @param string|null $search * @param int $currentPage Loading