diff --git a/src/ninegate-1.0/src/Cadoles/CoreBundle/Controller/ConfigController.php b/src/ninegate-1.0/src/Cadoles/CoreBundle/Controller/ConfigController.php index c0ee499c..6326ccf9 100755 --- a/src/ninegate-1.0/src/Cadoles/CoreBundle/Controller/ConfigController.php +++ b/src/ninegate-1.0/src/Cadoles/CoreBundle/Controller/ConfigController.php @@ -185,7 +185,18 @@ class ConfigController extends Controller $response->headers->set('Content-Type', 'application/json'); return $response; } + + public function datauserdefaultAction(Request $request) + { + $em = $this->getDoctrine()->getManager(); + $config=$em->getRepository('CadolesCoreBundle:Config')->find("datauser"); + $config->setValue(""); + $em->persist($config); + $em->flush(); + return $this->redirectToRoute('cadoles_core_config_datauser'); + } + public function datauserAction(Request $request) { $em = $this->getDoctrine()->getManager(); @@ -282,6 +293,17 @@ class ConfigController extends Controller ]); } + public function datausersdefaultAction(Request $request) + { + $em = $this->getDoctrine()->getManager(); + $config=$em->getRepository('CadolesCoreBundle:Config')->find("datausers"); + $config->setValue(""); + $em->persist($config); + $em->flush(); + + return $this->redirectToRoute('cadoles_core_config_datausers'); + } + public function datausersAction(Request $request) { $em = $this->getDoctrine()->getManager(); @@ -315,6 +337,12 @@ class ConfigController extends Controller $fields["group"]["perm"]=1; $fields["group"]["label"]="Groupes"; + $fields["job"]["perm"]=1; + $fields["job"]["label"]="Métier"; + + $fields["position"]["perm"]=1; + $fields["position"]["label"]="Fonction"; + $fields["role"]["perm"]=1; $fields["role"]["label"]="Rôles"; diff --git a/src/ninegate-1.0/src/Cadoles/CoreBundle/Controller/UserController.php b/src/ninegate-1.0/src/Cadoles/CoreBundle/Controller/UserController.php index 42521c91..cf58984c 100644 --- a/src/ninegate-1.0/src/Cadoles/CoreBundle/Controller/UserController.php +++ b/src/ninegate-1.0/src/Cadoles/CoreBundle/Controller/UserController.php @@ -214,6 +214,14 @@ class UserController extends Controller break; case 10 : + $qb->orderBy('user.job',$order[0]["dir"]); + break; + + case 11 : + $qb->orderBy('user.position',$order[0]["dir"]); + break; + + case 12 : $qb->orderBy('user.role',$order[0]["dir"]); break; } @@ -245,6 +253,14 @@ class UserController extends Controller break; case 8 : + $qb->orderBy('user.job',$order[0]["dir"]); + break; + + case 9 : + $qb->orderBy('user.position',$order[0]["dir"]); + break; + + case 10 : $qb->orderBy('user.role',$order[0]["dir"]); break; } @@ -279,6 +295,8 @@ class UserController extends Controller array_push($tmp,$data->getNiveau01()->getLabel()); if($viewniveau02) array_push($tmp,($data->getNiveau02()!==null?$data->getNiveau02()->getLabel():"")); array_push($tmp,$groups); + array_push($tmp,$data->getJob()); + array_push($tmp,$data->getPosition()); array_push($tmp,$data->getRole()); array_push($output["data"],$tmp); diff --git a/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/config/routing.yml b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/config/routing.yml index 9333f7ee..904d8405 100644 --- a/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/config/routing.yml +++ b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/config/routing.yml @@ -165,10 +165,18 @@ cadoles_core_config_datauser: path: /config/commun/datauser defaults: { _controller: CadolesCoreBundle:Config:datauser } +cadoles_core_config_datauserdefault: + path: /config/commun/datauserdefault + defaults: { _controller: CadolesCoreBundle:Config:datauserdefault } + cadoles_core_config_datausers: path: /config/commun/datausers defaults: { _controller: CadolesCoreBundle:Config:datausers } +cadoles_core_config_datausersdefault: + path: /config/commun/datausersdefault + defaults: { _controller: CadolesCoreBundle:Config:datausersdefault } + #== Registration ========================================================================================================= #-- Access config diff --git a/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/views/Config/datauser.html.twig b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/views/Config/datauser.html.twig index 91c1f8de..d2bee48f 100755 --- a/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/views/Config/datauser.html.twig +++ b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/views/Config/datauser.html.twig @@ -11,6 +11,16 @@ {{ form_widget(form.submit) }} + {% if mode=="datauser" %} + Valeurs par défaut + {% else %} + Valeurs par défaut + {% endif %} +

{% if app.session.flashbag.has('error') %} diff --git a/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/views/User/list.html.twig b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/views/User/list.html.twig index 8e1498c9..b0d9dfcb 100644 --- a/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/views/User/list.html.twig +++ b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/views/User/list.html.twig @@ -1,5 +1,9 @@ {% extends '@CadolesCore/base.html.twig' %} +{% block localstyle %} +th { font-size: 10px; } +td { font-size: 10px; } +{% endblock %} {% block pagewrapper %} {% if access=="config" %}

Gestion des Utilisateurs

@@ -21,7 +25,7 @@
- +
{% if access=="config" %} @@ -31,13 +35,15 @@ - + {% if viewniveau02 %} {% endif %} + +
Login Nom PrénomEmailEmail Téléphone {{ labelniveau01 }}{{ labelniveau02 }}GroupesMétierFonction Rôle