Evolution #166: La recherche

src/Muzich/CoreBundle/Controller/CoreController.php

@@ -669,7 +669,7 @@ class CoreController extends Controller
    * supprime cette configuration de façon a ce que le chercheur fonctionne 
    * normalement.
    * 
-   * @return type 
+   * @return \Symfony\Component\HttpFoundation\Response 
    */
   public function filterRemoveIdsAction()
   {

src/Muzich/CoreBundle/Controller/SearchController.php

@@ -10,6 +10,9 @@ use Muzich\CoreBundle\Form\Search\ElementSearchForm;
 use Symfony\Component\HttpFoundation\Response;
 use Muzich\CoreBundle\Util\TagLike;
 
+use Symfony\Component\HttpFoundation\Request;
+use Muzich\CoreBundle\Searcher\GlobalSearcher;
+
 class SearchController extends Controller
 {
   
@@ -269,4 +272,44 @@ class SearchController extends Controller
     throw $this->createNotFoundException('Cette ressource n\'est pas accessible');
   }
   
+  /**
+   * Retourne une réponse contenant le dom du formulaire de recherche global
+   * 
+   * @return \Symfony\Component\HttpFoundation\Response 
+   */
+  public function renderGlobalSearchFormAction()
+  {
+    return $this->render(
+      'MuzichCoreBundle:GlobalSearch:form.html.twig', 
+      array('form' => $this->getGlobalSearchForm()->createView())
+    );
+  }
+  
+  /**
+   * Page d'affichage des résultats pour une recherche globale.
+   * * Users
+   * * Groups
+   * * Partages
+   * 
+   * @return \Symfony\Component\HttpFoundation\Response
+   * @Template("MuzichCoreBundle:GlobalSearch:results.html.twig")
+   */
+  public function globalAction(Request $request)
+  {
+    $form = $this->getGlobalSearchForm($searcher = new GlobalSearcher());
+    $form->bindRequest($request);
+    $results = array(
+      'users'  => null,
+      'groups' => null
+    );
+    if ($form->isValid())
+    {
+      $results = $searcher->getResults($this->getDoctrine());
+    }
+    return array(
+      'form' => $form->createView(),
+      'results'     => $results
+    );
+  }
+  
 }

src/Muzich/CoreBundle/Resources/config/routing.yml

@@ -130,8 +130,17 @@ ajax_element_proposed_tags_refuse:
   pattern: /ajax/element/proposed/tags/refuses/{element_id}/{token}
   defaults: { _controller: MuzichCoreBundle:Element:proposedTagsRefuse }
   
+## search
+  
+global_search:
+  pattern:  /search
+  defaults: { _controller: MuzichCoreBundle:Search:global }
+  
+  
 ## lol
 
 teapot:
   pattern: /what/are/you
-  defaults: { _controller: MuzichCoreBundle:Info:teapot }
+  defaults: { _controller: MuzichCoreBundle:Info:teapot }
+  
+  

src/Muzich/CoreBundle/Resources/views/GlobalSearch/form.html.twig

@@ -0,0 +1,12 @@
+<form action="{{ path('global_search') }}" method="post" {{ form_enctype(form) }}>
+    
+  {% form_theme form 'MuzichCoreBundle:Form:errors.html.twig' %}
+  {{ form_errors(form) }}
+
+  {{ form_errors(form.string) }}
+  {{ form_widget(form.string) }}
+  <input type="submit" class="button" value="{{ 'search.form.submit_value'|trans({}, 'network') }}" />
+  
+  {{ form_rest(form) }}
+
+</form>

src/Muzich/CoreBundle/Resources/views/GlobalSearch/results.html.twig

@@ -0,0 +1,43 @@
+{% extends "MuzichCoreBundle::layout.html.twig" %}
+
+{% block title %}Recherche{% endblock %}
+
+{% block main_content %}
+
+  {% include "MuzichCoreBundle:Menu:containerMenu.html.twig" with {'active': null} %}
+  
+  {% include "MuzichCoreBundle:GlobalSearch:form.html.twig" with {'form': form } %}
+  
+  {% if results.users|length or results.groups|length %}
+  
+    {% if results.users %}
+
+      <b>{{ 'search.users'|trans({}, 'network') }}</b>
+      
+      <ul id="search_users" class="inline">
+      {% for user in results.users %} 
+        <li>
+          <a href="{{ path('show_user', { 'slug': user.slug }) }}">{{ user.username }}</a>
+        </li>
+      {% endfor %}
+      </ul>
+
+    {% endif %}
+  
+    {% if results.groups %}
+
+      <b>{{ 'search.groups'|trans({}, 'network') }}</b>
+      
+      <ul id="search_groups" class="inline">
+      {% for group in results.groups %} 
+        <li>
+          <a href="{{ path('show_group', { 'slug': group.slug }) }}">{{ group.name }}</a>
+        </li>
+      {% endfor %}
+      </ul>
+
+    {% endif %}
+  
+  {% endif %}
+
+{% endblock %}

src/Muzich/CoreBundle/Searcher/GlobalSearcher.php

@@ -0,0 +1,114 @@
+<?php
+
+namespace Muzich\CoreBundle\Searcher;
+
+use Symfony\Component\Validator\Constraints as Assert;
+use Symfony\Bundle\DoctrineBundle\Registry;
+
+/**
+ * 
+ */
+class GlobalSearcher extends Searcher implements SearcherInterface
+{
+  
+  /**
+   * Chaine de caractère représentant la recherche.
+   * 
+   * @var string
+   * @Assert\NotBlank()
+   * @Assert\Type("string")
+   * @Assert\MinLength(3)
+   */
+  protected $string;
+  
+  /**
+   * @see SearcherInterface
+   * @param array $params 
+   */
+  public function init($params)
+  {
+    // Control des parametres transmis.
+    $this->checkParams($params, array(
+      'string' => "Muzich\CoreBundle\Searcher\GlobalSearch::init():"
+        ." \$params: Un string est nécéssaire"
+    ));
+    
+    // Mise a jour des attributs
+    $this->setAttributes(array('string', 'min_lenght'), $params);
+  }
+  
+  /**
+   * @see SearcherInterface
+   * @param array $params 
+   */
+  public function update($params)
+  {
+    // Mise a jour des attributs
+    $this->setAttributes(array(
+      'string', 'min_length'
+    ), $params);
+  }
+  
+  /**
+   * @see SearcherInterface
+   * 
+   * @return array 
+   */
+  public function getParams()
+  {
+    return array(
+      'string' => $this->string,
+      'min_length' => $this->min_length
+    );
+  }
+  
+  public function getString()
+  {
+    return $this->string;
+  }
+  
+  public function setString($string)
+  {
+    $this->string = $string;
+  }
+  
+  /**
+   * Retourne les user et groupes correspondant a la recherche
+   *
+   * @param Registry $doctrine
+   * @return array
+   */
+  public function getResults(Registry $doctrine)
+  {
+    
+    // instancier objet SearchUser and groups;
+    // puis faire recherche sur elements
+    
+    // On remplace le caratcère '%' au cas ou un malin l'insére.
+    $string = str_replace('%', '#', $this->string);
+    
+    $users = $doctrine
+      ->getRepository('MuzichCoreBundle:User')
+      ->findByString($string)
+      ->execute()
+    ;
+    
+    $groups = $doctrine
+      ->getRepository('MuzichCoreBundle:Group')
+      ->findByString($string)
+      ->execute()
+    ;
+    
+    return array(
+      'users'  => $users,
+      'groups' => $groups
+    );
+  }
+  
+  
+  
+  
+  
+  
+  
+}

src/Muzich/CoreBundle/lib/Controller.php

@@ -8,6 +8,7 @@ use Symfony\Component\Security\Core\Authentication\Token\UsernamePasswordToken;
 use Muzich\CoreBundle\Form\Search\ElementSearchForm;
 use Muzich\CoreBundle\Form\Element\ElementAddForm;
 use Symfony\Component\HttpFoundation\Response;
+use Muzich\CoreBundle\Searcher\GlobalSearcher;
 
 class Controller extends BaseController
 {
@@ -289,6 +290,23 @@ class Controller extends BaseController
   }
   
   /**
+   * Retourne l'objet Form du formulaire de recherche global.
+   * 
+   * @return \Symfony\Component\Form\Form 
+   */
+  protected function getGlobalSearchForm($searcher = null)
+  {
+    if ($searcher === null)
+    {
+      $searcher = new GlobalSearcher();
+    }
+    
+    return $this->createFormBuilder($searcher)
+      ->add('string', 'text')
+    ->getForm();
+  }
+  
+  /**
    * Retourne le formulaire d'ajout d'élément
    * 
    * @param \Muzich\CoreBundle\Searcher\Searcher $search_object

src/Muzich/MynetworkBundle/Controller/MynetworkController.php

@@ -67,44 +67,4 @@ class MynetworkController extends Controller
     return $followers_users_new;
   }
   
-  /**
-   * Action qui affiche la page de recherche, et effectue la recherche
-   * d'utilisateurs et de groupes.
-   * 
-   * @Template()
-   */
-  public function searchAction()
-  {
-    $request = $this->getRequest();
-    $search = new UserAndGroupSearcher();
-    $results = array('users' => null, 'groups' => null);
-    
-    $search_form = $this->createFormBuilder($search)
-      ->add('string', 'text')
-    ->getForm();
-    
-    // Si l'utilisateur effectue la recherche
-    if ($request->getMethod() == 'POST')
-    {
-      $search_form->bindRequest($request);
-      if ($search_form->isValid())
-      {
-        $results = $search->getResults($this->getDoctrine());
-      }
-    }
-    
-    if ($this->getRequest()->isXmlHttpRequest())
-    {
-      
-    }
-    else
-    {
-      return array(
-        'search_form' => $search_form->createView(),
-        'results'     => $results,
-        'search_done' => $search->getString() ? true : false
-      );
-    }
-  }
-  
 }

src/Muzich/MynetworkBundle/Resources/config/routing.yml

@@ -1,15 +1,6 @@
-
 mynetwork_index:
   pattern:  /my-network/{event_id}
   defaults: { _controller: MuzichMynetworkBundle:Mynetwork:index, event_id: null }
   requirements:
     event_id:  \d+
-  
-mynetwork_search:
-  pattern:  /my-network/search
-  defaults: { _controller: MuzichMynetworkBundle:Mynetwork:search }
-  
-#mynetwork_search:
-#  pattern:  /my-network/search/do
-#  defaults: { _controller: MuzichMynetworkBundle:Mynetwork:search }
   

src/Muzich/MynetworkBundle/Resources/views/Mynetwork/index.html.twig

@@ -3,10 +3,6 @@
 {% block title %}Mon réseau{% endblock %}
 
 {% block content %}
-
-  <a class="link_navigation" href="{{ path('mynetwork_search') }}" >
-    {{ 'search.search'|trans({}, 'network') }}
-  </a>
   
   {% if followeds_users %}
     <b>{{ 'users'|trans({}, 'network') }}</b>

src/Muzich/MynetworkBundle/Resources/views/Mynetwork/search.html.twig

@@ -1,64 +0,0 @@
-{% extends "MuzichMynetworkBundle::layout.html.twig" %}
-
-{% block title %}Mon réseau{% endblock %}
-
-{% block content %}
-
-  <a class="link_navigation" href="{{ path('mynetwork_index') }}" >
-    {{ 'search.return'|trans({}, 'network') }}
-  </a>
-  
-  <b>{{ 'search.search_u_n_g'|trans({}, 'network') }}</b>
-  
-  <form action="{{ path('mynetwork_search') }}" method="post" {{ form_enctype(search_form) }}>
-    
-    {% form_theme search_form 'MuzichCoreBundle:Form:errors.html.twig' %}
-    {{ form_errors(search_form) }}
-
-    <div class="field">
-      {{ form_errors(search_form.string) }}
-      {{ form_widget(search_form.string) }}
-      <input type="submit" class="button" value="{{ 'search.form.submit_value'|trans({}, 'network') }}" />
-    </div>
-
-    {{ form_rest(search_form) }}
-
-  </form>
-  
-  {% if results.users|length or results.groups|length %}
-  
-    {% if results.users %}
-
-      <b>{{ 'search.users'|trans({}, 'network') }}</b>
-      
-      <ul id="search_users" class="inline">
-      {% for user in results.users %} 
-        <li>
-          <a href="{{ path('show_user', { 'slug': user.slug }) }}">{{ user.username }}</a>
-        </li>
-      {% endfor %}
-      </ul>
-
-    {% endif %}
-  
-    {% if results.groups %}
-
-      <b>{{ 'search.groups'|trans({}, 'network') }}</b>
-      
-      <ul id="search_groups" class="inline">
-      {% for group in results.groups %} 
-        <li>
-          <a href="{{ path('show_group', { 'slug': group.slug }) }}">{{ group.name }}</a>
-        </li>
-      {% endfor %}
-      </ul>
-
-    {% endif %}
-  
-  {% elseif search_done %}
-      
-      <p>{{ 'search.no_result'|trans({}, 'network') }}</p>
-      
-  {% endif %}
-
-{% endblock %}

src/Muzich/UserBundle/Resources/views/Account/topBar.html.twig

@@ -1,5 +1,10 @@
 
 {% if is_granted("IS_AUTHENTICATED_REMEMBERED") %}
+
+  <div id="top_search">
+    {% render "MuzichCoreBundle:Search:renderGlobalSearchForm" %}
+  </div>
+
   <div id="top_bar">
 
     <a href="{{ path('my_account') }}" >
@@ -11,4 +16,5 @@
     </a>
 
   </div>
+
 {% endif %}

web/bundles/muzichcore/css/main.css

@@ -217,6 +217,39 @@ div#noscript_warning
 	text-align: center;
 }
 
+#top_search
+{
+  float: left;
+  width: 207px;
+  background-color: white;
+  padding: 0px;
+  
+  margin-left: auto;
+  margin-right: auto;
+  
+  border-radius: 0px 0px 4px 4px;
+  -moz-border-radius: 0px 0px 4px 4px;
+  -webkit-border-radius: 0px 0px 4px 4px;
+  
+	text-align: center;
+}
+
+#top_search input[type="text"]
+{
+  font-size: 12px;
+  height: 12px;
+  width: 120px;
+}
+
+#top_search  input[type="submit"]
+{
+  font-size: 12px;
+  height: 16px;
+  padding: 0 2px 1px;
+}
+
+
+
 #top_bar a 
 {
   text-decoration: none;