diff --git a/src/schedule-2.0/src/Controller/EventController.php b/src/schedule-2.0/src/Controller/EventController.php index 5737243..e255281 100755 --- a/src/schedule-2.0/src/Controller/EventController.php +++ b/src/schedule-2.0/src/Controller/EventController.php @@ -48,17 +48,8 @@ class EventController extends AbstractController if($iduser=="all") $events=$em->getRepository("App:Event")->findAll(); else { - $selectedusers = $this->get("session")->get("selectedusers"); - if (isset($selectedusers) && sizeof($selectedusers)>1){ - $users= []; - foreach($selectedusers as $user) { - array_push($users,$em->getRepository("App:User")->find($user)); - } - $events=$em->getRepository("App:Event")->findBy(["user"=>$users]); - }else{ - $user=$em->getRepository("App:User")->find($iduser); - $events=$em->getRepository("App:Event")->findBy(["user"=>$user]); - } + $user=$em->getRepository("App:User")->find($iduser); + $events=$em->getRepository("App:Event")->findBy(["user"=>$user]); } foreach($events as $event) { $idproject=$event->getTask()->getProject()->getId(); diff --git a/src/schedule-2.0/src/Controller/HomeController.php b/src/schedule-2.0/src/Controller/HomeController.php index 69b72af..01cfb4a 100755 --- a/src/schedule-2.0/src/Controller/HomeController.php +++ b/src/schedule-2.0/src/Controller/HomeController.php @@ -36,9 +36,7 @@ class HomeController extends AbstractController public function selectuser(Request $request) { $iduser = $request->request->get('iduser'); - $selectedusers = $request->request->get('selectedusers'); $this->get('session')->set('iduser',$iduser); - $this->get('session')->set('selectedusers',$selectedusers); $output=["return"=>"OK"]; return new Response(json_encode($output)); } diff --git a/src/schedule-2.0/src/Service/sessionListener.php b/src/schedule-2.0/src/Service/sessionListener.php index a872503..e99f79d 100644 --- a/src/schedule-2.0/src/Service/sessionListener.php +++ b/src/schedule-2.0/src/Service/sessionListener.php @@ -122,8 +122,6 @@ class sessionListener { } $session->set('services',$tbservices); - $selectedusers=[]; - $session->set('selectedusers',$selectedusers); } } } diff --git a/src/schedule-2.0/templates/base.html.twig b/src/schedule-2.0/templates/base.html.twig index 10a6199..301d36b 100644 --- a/src/schedule-2.0/templates/base.html.twig +++ b/src/schedule-2.0/templates/base.html.twig @@ -284,20 +284,13 @@
- + + {% for user in app.session.get('users') %} {% set selected="" %} - {% if app.session.get('selectedusers')|length > 1 %} - {% for suser in app.session.get('selectedusers') %} - {%if user.id == suser %} - {% set selected="selected" %} - {% endif %} - {% endfor %} - {% else %} - {%if user.id==app.session.get('iduser') %} - {% set selected="selected" %} - {% endif %} + {%if user.id==app.session.get('iduser') %} + {% set selected="selected" %} {% endif %} {% endfor %} @@ -520,13 +513,10 @@ $('#sideuser').on('select2:select', function (e) { var data = e.params.data; - var selectedusers = $('#sideuser').val(); - console.log(selectedusers) $.ajax({ type: "POST", data: { iduser: data.id, - selectedusers: selectedusers, }, url: "{{ path('app_home_selectuser') }}", success: function (response) {