fix(morelevel): ajout de niveau03 et niveau04
All checks were successful
Cadoles/nineskeletor/pipeline/head This commit looks good
All checks were successful
Cadoles/nineskeletor/pipeline/head This commit looks good
This commit is contained in:
@ -45,6 +45,8 @@ class UserController extends AbstractController
|
||||
$orderdir = $query['order'][0]['dir'];
|
||||
$niveau01 = null;
|
||||
$niveau02 = null;
|
||||
$niveau03 = null;
|
||||
$niveau04 = null;
|
||||
|
||||
// Nombre total d'enregistrement
|
||||
switch ($access) {
|
||||
@ -66,16 +68,26 @@ class UserController extends AbstractController
|
||||
default:
|
||||
$niveau01 = $this->getUser()->getNiveau01();
|
||||
$niveau02 = $this->getUser()->getNiveau02();
|
||||
$niveau03 = $this->getUser()->getNiveau03();
|
||||
$niveau04 = $this->getUser()->getNiveau04();
|
||||
|
||||
$qb = $em->getManager()->createQueryBuilder()->select('COUNT(entity)')->from($this->entity, 'entity')->where('entity.isvisible=true');
|
||||
switch ($request->getSession()->get('scopeannu')) {
|
||||
case 'SAME_NIVEAU01':
|
||||
case 1:
|
||||
$qb->andWhere('entity.niveau01 = :niveau01')->setParameter('niveau01', $niveau01);
|
||||
break;
|
||||
|
||||
case 'SAME_NIVEAU02':
|
||||
case 2:
|
||||
$qb->andWhere('entity.niveau02 = :niveau02')->setParameter('niveau02', $niveau02);
|
||||
break;
|
||||
|
||||
case 3:
|
||||
$qb->andWhere('entity.niveau03 = :niveau03')->setParameter('niveau03', $niveau03);
|
||||
break;
|
||||
|
||||
case 4:
|
||||
$qb->andWhere('entity.niveau04 = :niveau04')->setParameter('niveau04', $niveau04);
|
||||
break;
|
||||
}
|
||||
|
||||
$total = $qb->getQuery()->getSingleScalarResult();
|
||||
@ -126,13 +138,21 @@ class UserController extends AbstractController
|
||||
->setParameter('value', '%'.$search['value'].'%');
|
||||
|
||||
switch ($request->getSession()->get('scopeannu')) {
|
||||
case 'SAME_NIVEAU01':
|
||||
case 1:
|
||||
$qb->andWhere('entity.niveau01 = :niveau01')->setParameter('niveau01', $niveau01);
|
||||
break;
|
||||
|
||||
case 'SAME_NIVEAU02':
|
||||
case 2:
|
||||
$qb->andWhere('entity.niveau02 = :niveau02')->setParameter('niveau02', $niveau02);
|
||||
break;
|
||||
|
||||
case 3:
|
||||
$qb->andWhere('entity.niveau03 = :niveau03')->setParameter('niveau03', $niveau03);
|
||||
break;
|
||||
|
||||
case 4:
|
||||
$qb->andWhere('entity.niveau04 = :niveau04')->setParameter('niveau04', $niveau04);
|
||||
break;
|
||||
}
|
||||
|
||||
$totalf = $qb->getQuery()->getSingleScalarResult();
|
||||
@ -170,13 +190,21 @@ class UserController extends AbstractController
|
||||
$qb->andWhere('entity.isvisible=true');
|
||||
|
||||
switch ($request->getSession()->get('scopeannu')) {
|
||||
case 'SAME_NIVEAU01':
|
||||
case 1:
|
||||
$qb->andWhere('entity.niveau01 = :niveau01')->setParameter('niveau01', $niveau01);
|
||||
break;
|
||||
|
||||
case 'SAME_NIVEAU02':
|
||||
case 2:
|
||||
$qb->andWhere('entity.niveau02 = :niveau02')->setParameter('niveau02', $niveau02);
|
||||
break;
|
||||
|
||||
case 3:
|
||||
$qb->andWhere('entity.niveau03 = :niveau03')->setParameter('niveau03', $niveau03);
|
||||
break;
|
||||
|
||||
case 4:
|
||||
$qb->andWhere('entity.niveau04 = :niveau04')->setParameter('niveau04', $niveau04);
|
||||
break;
|
||||
}
|
||||
break;
|
||||
}
|
||||
@ -266,6 +294,8 @@ class UserController extends AbstractController
|
||||
array_push($tmp, $data->getTelephonenumber());
|
||||
array_push($tmp, $data->getNiveau01()->getLabel());
|
||||
array_push($tmp, $data->getNiveau02() ? $data->getNiveau02()->getLabel() : '');
|
||||
array_push($tmp, $data->getNiveau03() ? $data->getNiveau03()->getLabel() : '');
|
||||
array_push($tmp, $data->getNiveau04() ? $data->getNiveau04()->getLabel() : '');
|
||||
array_push($tmp, $data->getVisitedate() ? $data->getVisitedate()->format('d/m/Y H:i').'<br>nb = '.$data->getVisitecpt() : '');
|
||||
array_push($tmp, $roles);
|
||||
array_push($tmp, $groups);
|
||||
@ -323,7 +353,13 @@ class UserController extends AbstractController
|
||||
'userid' => $this->getUser()->getId(),
|
||||
'appMasteridentity' => $this->GetParameter('appMasteridentity'),
|
||||
'appNiveau01label' => $this->GetParameter('appNiveau01label'),
|
||||
'appNiveau02use' => $this->GetParameter('appNiveau02use'),
|
||||
'appNiveau02label' => $this->GetParameter('appNiveau02label'),
|
||||
'appNiveau03use' => $this->GetParameter('appNiveau03use'),
|
||||
'appNiveau03label' => $this->GetParameter('appNiveau03label'),
|
||||
'appNiveau04use' => $this->GetParameter('appNiveau04use'),
|
||||
'appNiveau04label' => $this->GetParameter('appNiveau04label'),
|
||||
'appNiveauupdatable' => $this->GetParameter('appNiveauupdatable'),
|
||||
]);
|
||||
|
||||
// Récupération des data du formulaire
|
||||
@ -436,7 +472,13 @@ class UserController extends AbstractController
|
||||
'userid' => $this->getUser()->getId(),
|
||||
'appMasteridentity' => $this->GetParameter('appMasteridentity'),
|
||||
'appNiveau01label' => $this->GetParameter('appNiveau01label'),
|
||||
'appNiveau02use' => $this->GetParameter('appNiveau02use'),
|
||||
'appNiveau02label' => $this->GetParameter('appNiveau02label'),
|
||||
'appNiveau03use' => $this->GetParameter('appNiveau03use'),
|
||||
'appNiveau03label' => $this->GetParameter('appNiveau03label'),
|
||||
'appNiveau04use' => $this->GetParameter('appNiveau04use'),
|
||||
'appNiveau04label' => $this->GetParameter('appNiveau04label'),
|
||||
'appNiveauupdatable' => $this->GetParameter('appNiveauupdatable'),
|
||||
]);
|
||||
|
||||
// Récupération des data du formulaire
|
||||
|
Reference in New Issue
Block a user