Charles-Edouard
/
Easy_solution
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix tabulator name field

This commit is contained in:
Charles 2026-03-03 14:12:45 +01:00
parent a93b94ba7b
commit 0c758a9370
5 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
assets/controllers/user_controller.js
View File

@ -162,8 +162,8 @@ export default class extends base_controller {
return wrapper; return wrapper;
}, },
}, },
{title: "<b>Nom</b>", field: "name", headerFilter: "input", widthGrow: 2, vertAlign: "middle"}, {title: "<b>Nom</b>", field: "surname", headerFilter: "input", widthGrow: 2, vertAlign: "middle"},
{title: "<b>Prénom</b>", field: "prenom", headerFilter: "input", widthGrow: 2, vertAlign: "middle"}, {title: "<b>Prénom</b>", field: "name", headerFilter: "input", widthGrow: 2, vertAlign: "middle"},
{title: "<b>Email</b>", field: "email", headerFilter: "input", widthGrow: 3, vertAlign: "middle"}, {title: "<b>Email</b>", field: "email", headerFilter: "input", widthGrow: 3, vertAlign: "middle"},
{ {
title: "<b>Statut</b>", field: "statut", vertAlign: "middle", title: "<b>Statut</b>", field: "statut", vertAlign: "middle",
@ -302,6 +302,7 @@ export default class extends base_controller {
// Add filters // Add filters
if (params.filter) { if (params.filter) {
params.filter.forEach(filter => { params.filter.forEach(filter => {
console.log("Adding filter to query:", filter.field, filter.value);
queryParams.append(`filter[${filter.field}]`, filter.value); queryParams.append(`filter[${filter.field}]`, filter.value);
}); });
} }
@ -640,8 +641,8 @@ export default class extends base_controller {
return wrapper; return wrapper;
}, },
}, },
{title: "<b>Nom</b>", field: "name", headerFilter: "input", widthGrow: 2, vertAlign: "middle"}, {title: "<b>Nom</b>", field: "surname", headerFilter: "input", widthGrow: 2, vertAlign: "middle"},
{title: "<b>Prénom</b>", field: "prenom", headerFilter: "input", widthGrow: 2, vertAlign: "middle"}, {title: "<b>Prénom</b>", field: "name", headerFilter: "input", widthGrow: 2, vertAlign: "middle"},
{title: "<b>Email</b>", field: "email", headerFilter: "input", widthGrow: 3, vertAlign: "middle"}, {title: "<b>Email</b>", field: "email", headerFilter: "input", widthGrow: 3, vertAlign: "middle"},
{ {
title: "<b>Statut</b>", field: "statut", vertAlign: "middle", title: "<b>Statut</b>", field: "statut", vertAlign: "middle",

4
src/Controller/UserController.php
View File

@ -531,8 +531,8 @@ class UserController extends AbstractController
return [ return [
'id' => $user->getId(), 'id' => $user->getId(),
'pictureUrl' => $user->getPictureUrl(), 'pictureUrl' => $user->getPictureUrl(),
'name' => $user->getSurname(), 'surname' => $user->getSurname(),
'prenom' => $user->getName(), 'name' => $user->getName(),
'email' => $user->getEmail(), 'email' => $user->getEmail(),
'isConnected' => $this->userService->isUserConnected($user->getUserIdentifier()), 'isConnected' => $this->userService->isUserConnected($user->getUserIdentifier()),
'showUrl' => $this->generateUrl('user_show', ['id' => $user->getId()]), 'showUrl' => $this->generateUrl('user_show', ['id' => $user->getId()]),

13
src/Repository/UserRepository.php
View File

@ -45,14 +45,13 @@ class UserRepository extends ServiceEntityRepository implements PasswordUpgrader
$qb = $this->createQueryBuilder('u') $qb = $this->createQueryBuilder('u')
->where('u.isDeleted = :del') ->where('u.isDeleted = :del')
->setParameter('del', false); ->setParameter('del', false);
if (!empty($filters['surname'])) {
if (!empty($filters['name'])) { $qb->andWhere('u.surname LIKE :surname')
$qb->andWhere('u.surname LIKE :name') ->setParameter('surname', '%' . strtoupper($filters['surname']) . '%');
->setParameter('name', '%' . strtolower($filters['name']) . '%');
} }
if (!empty($filters['prenom'])) { if (!empty($filters['name'])) {
$qb->andWhere('u.name LIKE :prenom') $qb->andWhere('u.name LIKE :name')
->setParameter('prenom', '%' . strtolower($filters['prenom']) . '%'); ->setParameter('name', '%' . ucFirst($filters['name']) . '%');
} }
if (!empty($filters['email'])) { if (!empty($filters['email'])) {
$qb->andWhere('u.email LIKE :email') $qb->andWhere('u.email LIKE :email')

12
src/Repository/UsersOrganizationsRepository.php
View File

@ -58,13 +58,13 @@ class UsersOrganizationsRepository extends ServiceEntityRepository
->setParameter('org', $org); ->setParameter('org', $org);
// Apply filters // Apply filters
if (!empty($filters['name'])) { if (!empty($filters['surname'])) {
$qb->andWhere('u.surname LIKE :name') $qb->andWhere('u.surname LIKE :surname')
->setParameter('name', '%' . strtolower($filters['name']) . '%'); ->setParameter('surname', '%' . strtoupper($filters['surname']) . '%');
} }
if (!empty($filters['prenom'])) { if (!empty($filters['name'])) {
$qb->andWhere('u.name LIKE :prenom') $qb->andWhere('u.name LIKE :name')
->setParameter('prenom', '%' . strtolower($filters['prenom']) . '%'); ->setParameter('name', '%' . ucFirst($filters['name']) . '%');
} }
if (!empty($filters['email'])) { if (!empty($filters['email'])) {
$qb->andWhere('u.email LIKE :email') $qb->andWhere('u.email LIKE :email')

4
src/Service/UserService.php
View File

@ -418,8 +418,8 @@ class UserService
} }
return [ return [
'pictureUrl' => $user->getPictureUrl(), 'pictureUrl' => $user->getPictureUrl(),
'name' => $user->getSurname(), 'surname' => $user->getSurname(),
'prenom' => $user->getName(), 'name' => $user->getName(),
'email' => $user->getEmail(), 'email' => $user->getEmail(),
'isConnected' => $this->isUserConnected($user->getUserIdentifier()), 'isConnected' => $this->isUserConnected($user->getUserIdentifier()),
'statut' => $statut, 'statut' => $statut,