mti
/
ptut-vhost
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[webpack.teacher.view] show all professors when (no filter|empty filter)

This commit is contained in:
xdrm-brackets 2018-03-06 14:49:48 +01:00
parent f0ea6cf494
commit 4352f02dc9
2 changed files with 19 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
build/api/module/professor/filterController.php
View File

@ -28,8 +28,8 @@ class filterController{
---------------------------------------------------------*/ ---------------------------------------------------------*/
public static function post($args){ public static function post($args){
$formations = null; $formations = [];
$ues = null; $ues = [];
extract($args); extract($args);
/** @var ue $ue_repo */ /** @var ue $ue_repo */
@ -38,18 +38,22 @@ class filterController{
/* (1) If no filter -> return error /* (1) If no filter -> return error
---------------------------------------------------------*/ ---------------------------------------------------------*/
/* (1) Exit if no filter */ /* (1) Pre-process conditions */
if( is_null($formations) && is_null($ues) ) $no_ue = !is_array($ues) || count($ues) < 1;
$no_formation = !is_array($formations) || count($formations) < 1;
/* (2) Exit if no filter */
if( $no_ue && $no_formation )
return ['error' => new Error(Err::MissingParam, 'You must give at least 1 parameter')]; return ['error' => new Error(Err::MissingParam, 'You must give at least 1 parameter')];
/* (2) Init. result array (only keys used for unicity) */ /* (3) Init. result array (only keys used for unicity) */
$matches_uniq = []; $matches_uniq = [];
/* (2) Filter by formation /* (2) Filter by formation
---------------------------------------------------------*/ ---------------------------------------------------------*/
if( !is_null($formations) ){ if( is_array($formations) ){
/** @var formation $form_repo */ /** @var formation $form_repo */
$form_repo = Repo::getRepo('formation'); $form_repo = Repo::getRepo('formation');
@ -58,15 +62,15 @@ class filterController{
foreach($formations as $form_id){ foreach($formations as $form_id){
// 1. Ignore if wrong format // 1. Ignore if wrong format
if( !is_numeric($form_id) || intval($form_id) !== $form_id ) if( !is_numeric($form_id) || !is_int($form_id) )
continue; continue;
// 2. Get from repo // 2. Get from repo
$fetched_ids = $form_repo->getProfessors($form_id); $fetched_ids = $form_repo->getProfessors( intval($form_id) );
// 3. Add in unique set // 3. Add in unique set
foreach($fetched_ids as $prof_id) foreach($fetched_ids as $prof_id)
$matches_uniq[ intval($prof_id["idProfesseur"]) ] = null; $matches_uniq[ intval($prof_id['idProfesseur']) ] = null;
} }
@ -77,7 +81,7 @@ class filterController{
/* (3) Filter by ue /* (3) Filter by ue
---------------------------------------------------------*/ ---------------------------------------------------------*/
if( !is_null($ues) ){ if( is_array($ues) ){
/** @var ue $ue_repo */ /** @var ue $ue_repo */
$ue_repo = Repo::getRepo('ue'); $ue_repo = Repo::getRepo('ue');
@ -94,7 +98,7 @@ class filterController{
// 3. Add in unique set // 3. Add in unique set
foreach($fetched_ids as $prof_id) foreach($fetched_ids as $prof_id)
$matches_uniq[ intval($prof_id["idProfesseur"]) ] = null; $matches_uniq[ intval($prof_id['idProfesseur']) ] = null;
} }

7
webpack/data/teacher.js
View File

@ -47,12 +47,13 @@ gstore.add('filter_handler', function(){
} }
/* (3) Get professor id for matching filter */ /* (3) Get professor id for matching filter */
api.call('POST professor/filter', request, function(rs){ api.call('POST professor/filter', request, function(rs){
// 1. Abort on error // 1. Display all on error
if( rs.error !== 0 ) return console.log('No filter result found, error: '+rs.error); if( rs.error !== 0 )
rs.matches = gstore.get.professors.map(function(prof,i){ return i; });
console.log(rs); console.log(rs);
// 2. Fetch professor elements // 2. Fetch professor elements