Evolution #42: Pagination des éléments

app/Resources/translations/userui.fr.yml

@@ -8,4 +8,6 @@ my_account:
   change_email:     Changer mon adresse email
   
 connexion:
-  password_lost:    Mot de passe perdu ?
+  password_lost:    Mot de passe perdu ?
+  
+more:    plus

app/config/routing.yml

@@ -27,24 +27,30 @@ MuzichCoreBundle:
 
 MuzichHomeBundle:
   resource: "@MuzichHomeBundle/Resources/config/routing.yml"
-  prefix: /
+  prefix: /{_locale}/
+  defaults:
+    _locale: en|fr
 
 MuzichUserBundle:
   resource: "@MuzichUserBundle/Resources/config/routing.yml"
   prefix: /{_locale}/
-  defaults: { _locale: fr }
+  defaults:
+    _locale: en|fr
 
 MuzichMynetworkBundle:
   resource: "@MuzichMynetworkBundle/Resources/config/routing.yml"
   prefix:   /{_locale}/
-  defaults: { _locale: fr }
+  defaults:
+    _locale: en|fr
   
 MuzichGroupBundle:
   resource: "@MuzichGroupBundle/Resources/config/routing.yml"
   prefix:   /{_locale}/
-  defaults: { _locale: fr }
+  defaults:
+    _locale: en|fr
   
 MuzichFavoriteBundle:
   resource: "@MuzichFavoriteBundle/Resources/config/routing.yml"
   prefix:   /{_locale}/
-  defaults: { _locale: fr }
+  defaults:
+    _locale: en|fr

src/Muzich/CoreBundle/Repository/ElementRepository.php

@@ -132,6 +132,7 @@ class ElementRepository extends EntityRepository
       $where_user
       $where_group
       $where_favorite
+      GROUP BY e, et, t2, eu, g, fav
       ORDER BY e.created DESC, e.name DESC"
     ;
     $params['uid'] = $user_id;

src/Muzich/CoreBundle/Resources/views/SearchElement/default.html.twig

@@ -2,7 +2,7 @@
 {% if elements|length %}
   <ul>
     {% for element in elements %} 
-      <li>
+      <li id="element_{{ element.id }}">
         {% if element.group %}
           <b>({{ element.group.name }})</b>
         {% endif %}
@@ -36,6 +36,15 @@
       </li>
     {% endfor %} 
   </ul>
+
+   {% if more_count is defined %} 
+     <span class="elements_more">
+       <a href="{{ path('home_more', {'count': more_count}) }}" >
+         {{ 'more'|trans({}, 'userui') }}
+       </a>
+     </span>
+   {% endif %}
+
 {% else %}
 
   <p class="no-elements">{{ 'noelements.sentence'|trans({}, 'elements') }}</p>

src/Muzich/CoreBundle/Searcher/ElementSearcher.php

@@ -57,6 +57,14 @@ class ElementSearcher extends Searcher implements SearcherInterface
   protected $favorite = false;
   
   /**
+   * Si id_limit est renseigné c'est que l'on veut trouver les elements
+   * plus vieux (ont utilise l'id comme référence) que l'id_limi passé.
+   * 
+   * @var type int
+   */
+  protected $id_limit = null;
+  
+  /**
    * @see SearcherInterface
    * @param array $params 
    */
@@ -69,7 +77,7 @@ class ElementSearcher extends Searcher implements SearcherInterface
     
     // Mise a jour des attributs
     $this->setAttributes(array(
-      'network', 'tags', 'count', 'user_id', 'group_id', 'favorite'
+      'network', 'tags', 'count', 'user_id', 'group_id', 'favorite', 'id_limit'
     ), $params);
     
   }
@@ -82,7 +90,7 @@ class ElementSearcher extends Searcher implements SearcherInterface
   {
     // Mise a jour des attributs
     $this->setAttributes(array(
-      'network', 'tags', 'count', 'user_id', 'group_id', 'favorite'
+      'network', 'tags', 'count', 'user_id', 'group_id', 'favorite', 'id_limit'
     ), $params);
   }
   

src/Muzich/CoreBundle/lib/Controller.php

@@ -40,7 +40,7 @@ class Controller extends BaseController
    * 
    * @return  ElementSearcher
    */
-  protected function getElementSearcher()
+  protected function getElementSearcher($count = null)
   {
     $session = $this->get("session");
     // Si l'objet n'existe pas encore, a t-on déjà des paramètres de recherche
@@ -55,7 +55,7 @@ class Controller extends BaseController
             $this->getUserId(),
             $this->container->getParameter('search_default_favorites_tags_count')
           ),
-        'count' => $this->container->getParameter('search_default_count')
+        'count' => ($count)?$count:$this->container->getParameter('search_default_count')
       ));
 
       // Et on met en session les paramètres
@@ -67,6 +67,10 @@ class Controller extends BaseController
       $this->ElementSearcher = new ElementSearcher();
       // et on l'initatialise avec ces paramétres connus
       $this->ElementSearcher->init($session->get('user.element_search.params'));
+      if ($count)
+      {
+        $this->ElementSearcher->update(array('count' => $count));
+      }
     }
     
     // on le retourne

src/Muzich/HomeBundle/Controller/HomeController.php

@@ -18,9 +18,9 @@ class HomeController extends Controller
    * 
    * @Template()
    */
-  public function indexAction()
+  public function indexAction($count = null)
   {
-    $search_object = $this->getElementSearcher();
+    $search_object = $this->getElementSearcher($count);
     $user = $this->getUser(true, array('join' => array(
       'groups_owned'
     )), true);
@@ -41,12 +41,13 @@ class HomeController extends Controller
         //'groups' => $user->getGroupsOwnedArray(),
       )
     );
-        
+    
     return array(
       'user'        => $this->getUser(),
       'add_form'    => $add_form->createView(),
       'search_form' => $search_form->createView(),
-      'elements'    => $search_object->getElements($this->getDoctrine(), $this->getUserId())
+      'elements'    => $search_object->getElements($this->getDoctrine(), $this->getUserId()),
+      'more_count'  => ($count)?$count+$this->container->getParameter('search_default_count'):$this->container->getParameter('search_default_count')*2
     );
   }
 }

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

@@ -1,15 +1,17 @@
 ## Routing du Bundle
 
 home:
-  pattern:  /{_locale}
-  defaults: { _controller: MuzichHomeBundle:Home:index, _locale: fr }
-  requirements:
-    _locale: en|fr
+  pattern:  /
+  defaults: { _controller: MuzichHomeBundle:Home:index }
+  
+home_more:
+  pattern:  /{count}
+  defaults: { _controller: MuzichHomeBundle:Home:index, count: null }
   
 show_user:
-  pattern: /{_locale}/user/{slug}
-  defaults: { _controller: MuzichHomeBundle:Show:showUser, _locale: fr }
+  pattern: /user/{slug}
+  defaults: { _controller: MuzichHomeBundle:Show:showUser }
   
 show_group:
-  pattern: /{_locale}/group/{slug}
-  defaults: { _controller: MuzichHomeBundle:Show:showGroup, _locale: fr }
+  pattern: /group/{slug}
+  defaults: { _controller: MuzichHomeBundle:Show:showGroup }