Evolution #151: Evenements

app/Resources/translations/userui.fr.yml

@@ -65,6 +65,7 @@ filter:
   mytags:  Tous mes tags
   network_all:   Réseau global
   network_my:    Mon réseau
+  new_comments:   Nvx commentaires
   
 element_add:
   url:

src/Muzich/CoreBundle/Controller/CoreController.php

@@ -538,4 +538,27 @@ class CoreController extends Controller
     
   }
   
+  public function filterRemoveIdsAction()
+  {
+    if (($response = $this->mustBeConnected(true)))
+    {
+      return $response;
+    }
+    
+    $es = $this->getElementSearcher();
+    $es->setIds(null);
+    $this->setElementSearcherParams($es->getParams());
+    
+    $html = $this->render('MuzichCoreBundle:SearchElement:default.html.twig', array(
+      'user'        => $this->getUser(),
+      'elements'    => $es->getElements($this->getDoctrine(), $this->getUserId()),
+      'invertcolor' => false
+    ))->getContent();
+
+    return $this->jsonResponse(array(
+      'status'  => 'success',
+      'html'    => $html
+    ));
+  }
+  
 }

src/Muzich/CoreBundle/Repository/ElementRepository.php

@@ -38,6 +38,27 @@ class ElementRepository extends EntityRepository
     $params_select['uid'] = $user_id;
     $order_by = "ORDER BY e_.created DESC, e_.id DESC";
     
+    // Première chose, si on impose les element_ids on a pas besoin de faire 
+    // le filtrage
+    if ($searcher->hasIds())
+    {
+      // Dans ce cas ou les ids sont déjà donné, on ne peut pas avoir de nouveaux
+      // éléments
+      if ($searcher->isSearchingNew())
+      {
+        return $query = $this->getEntityManager()
+          ->createQuery("SELECT e FROM MuzichCoreBundle:Element e WHERE 1 = 2")
+        ;
+      }
+      
+      if (($id_limit = $searcher->getIdLimit()))
+      {
+        return $this->getSelectElementForSearchQuery($params_select, $user_id, $searcher->getIds(), $id_limit, $searcher->getCount());
+      }
+      return $this->getSelectElementForSearchQuery($params_select, $user_id, $searcher->getIds());
+    }
+    
+    
     // Booléen nous permettant de savoir si un where a déjà été écrit
     $is_where = false;
     
@@ -202,26 +223,7 @@ class ElementRepository extends EntityRepository
         $ids[] = $r_id['id'];
       }
 
-      // C'est la requête qui récupérera les données element avec ses jointures.
-      $query_select = "SELECT e, t, o, g, fav
-        FROM MuzichCoreBundle:Element e 
-        LEFT JOIN e.group g 
-        LEFT JOIN e.tags t WITH (t.tomoderate = 'FALSE' OR t.tomoderate IS NULL
-          OR t.privateids LIKE :uidt)
-        LEFT JOIN e.elements_favorites fav WITH fav.user = :uid
-        JOIN e.owner o
-        WHERE e.id IN (:ids)
-        ORDER BY e.created DESC, e.id DESC"
-      ;
-
-      $params_select['ids'] = $ids;
-      $params_select['uidt'] = '%"'.$user_id.'"%';
-      $query = $this->getEntityManager()
-        ->createQuery($query_select)
-        ->setParameters($params_select)
-      ;
-
-      return $query;
+      return $this->getSelectElementForSearchQuery($params_select, $user_id, $ids);
     }
     
     // Il faut retourner une Query
@@ -230,6 +232,42 @@ class ElementRepository extends EntityRepository
     ;
   }
   
+  protected function getSelectElementForSearchQuery($params_select, $user_id, $ids, $id_limit = null, $count_limit = null)
+  {    
+    $where = "";
+    if ($id_limit)
+    {
+      $where = "AND e.id < :id_limit";
+      $params_select['id_limit'] = $id_limit;
+    }
+      
+    // C'est la requête qui récupérera les données element avec ses jointures.
+    $query_select = "SELECT e, t, o, g, fav
+      FROM MuzichCoreBundle:Element e 
+      LEFT JOIN e.group g 
+      LEFT JOIN e.tags t WITH (t.tomoderate = 'FALSE' OR t.tomoderate IS NULL
+        OR t.privateids LIKE :uidt)
+      LEFT JOIN e.elements_favorites fav WITH fav.user = :uid
+      JOIN e.owner o
+      WHERE e.id IN (:ids) $where
+      ORDER BY e.created DESC, e.id DESC"
+    ;
+
+    $params_select['ids'] = $ids;
+    $params_select['uidt'] = '%"'.$user_id.'"%';
+    $query = $this->getEntityManager()
+      ->createQuery($query_select)
+      ->setParameters($params_select)
+    ;
+    
+    if ($count_limit)
+    {
+      $query->setMaxResults($count_limit);
+    }
+
+    return $query;
+  }
+  
   /**
    * Retourne une requete selectionnant les Elements en fonction du
    * propriétaire.

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

@@ -60,6 +60,10 @@ ajax_element_remove_vote_good:
   pattern: /ajax/element/vote/remove/good/{element_id}/{token}
   defaults: { _controller: MuzichCoreBundle:Element:removeVoteGood }
 
+ajax_filter_remove_ids:
+  pattern: /ajax/filter/remove/ids
+  defaults: { _controller: MuzichCoreBundle:Core:filterRemoveIds }
+
 ####
 
 info_about:

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

@@ -77,7 +77,8 @@ security:
         - { path: ^/(?:fr|en)/show/group/, role: IS_AUTHENTICATED_ANONYMOUSLY }
         - { path: ^/(?:fr|en)/favoritesajax, role: IS_AUTHENTICATED_ANONYMOUSLY }
         - { path: ^/(?:fr|en)/ajax, role: IS_AUTHENTICATED_ANONYMOUSLY }
-                                
+        - { path: ^/(?:fr|en)/event/view/elements, role: IS_AUTHENTICATED_ANONYMOUSLY }
+                                        
         - { path: ^/, roles: ROLE_USER }
         
 #        # Liste des pages accessibles à tous les utilisateurs (ne pas toucher)

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

@@ -7,12 +7,20 @@
       {{ form_widget(search_form.network, { 'attr': {'style': 'display: none;'} }) }}
     </div>
     
-    <a href="#" class="button all_network {% if network_public %}active{% endif %}">
+    <a href="#" class="button all_network {% if network_public and not display_comments %}active{% endif %}">
       {{ 'filter.network_all'|trans({}, 'userui') }}
     </a>
-    <a href="#" class="button my_network {% if not network_public %}active{% endif %}">
+    <a href="#" class="button my_network {% if not network_public and not display_comments %}active{% endif %}">
       {{ 'filter.network_my'|trans({}, 'userui') }}
     </a>
+      
+  </div>
+
+  <div class="more_filters">
+    <a href="{{ path('ajax_filter_remove_ids') }}" class="button active new_comments" style="{% if not display_comments %}display: none;{% endif %}">
+      {{ 'filter.new_comments'|trans({}, 'userui') }}
+      <img src="{{ asset('bundles/muzichcore/img/1328276855_list-remove.png') }}" alt="remove" />
+    </a>
   </div>
   
   {% include "MuzichCoreBundle:Tag:tagsPrompt.html.twig" with { 

src/Muzich/CoreBundle/Resources/views/layout.html.twig

@@ -79,7 +79,7 @@
   <div id="container">
     
     {% if is_granted("IS_AUTHENTICATED_REMEMBERED") %}
-      {% render "MuzichUserBundle:User:infoBar" %}
+      {% render "MuzichUserBundle:Event:infoBar" %}
     {% endif %}
     
     {% block main_content %}{% endblock %}

src/Muzich/CoreBundle/Searcher/ElementSearcher.php

@@ -74,6 +74,15 @@ class ElementSearcher extends Searcher implements SearcherInterface
   protected $searchnew = false;
   
   /**
+   * Ce tableaux peut conteni des ids. Si ces ids sont renseignés tout les 
+   * autres paramétres ne sont plus pris en compte.
+   * Ces ids servent a filtrer directement la liste d'élément a afficher.
+   * 
+   * @var array
+   */
+  protected $ids;
+  
+  /**
    * @see SearcherInterface
    * @param array $params 
    */
@@ -86,7 +95,7 @@ class ElementSearcher extends Searcher implements SearcherInterface
     
     // Mise a jour des attributs
     $this->setAttributes(array(
-      'network', 'tags', 'count', 'user_id', 'group_id', 'favorite', 'id_limit', 'searchnew'
+      'network', 'tags', 'count', 'user_id', 'group_id', 'favorite', 'id_limit', 'searchnew', 'ids'
     ), $params);
     
   }
@@ -99,7 +108,7 @@ class ElementSearcher extends Searcher implements SearcherInterface
   {
     // Mise a jour des attributs
     $this->setAttributes(array(
-      'network', 'tags', 'count', 'user_id', 'group_id', 'favorite', 'id_limit', 'searchnew'
+      'network', 'tags', 'count', 'user_id', 'group_id', 'favorite', 'id_limit', 'searchnew', 'ids'
     ), $params);
   }
   
@@ -116,7 +125,8 @@ class ElementSearcher extends Searcher implements SearcherInterface
       'count'    => $this->getCount(),
       'user_id'  => $this->getUserId(),
       'group_id' => $this->getGroupId(),
-      'favorite' => $this->isFavorite()
+      'favorite' => $this->isFavorite(),
+      'ids'      => $this->getIds()
     );
   }
   
@@ -182,6 +192,25 @@ class ElementSearcher extends Searcher implements SearcherInterface
   {
     return $this->favorite;
   }
+  
+  public function setIds($ids)
+  {
+    $this->ids = $ids;
+  }
+  
+  public function getIds()
+  {
+    return $this->ids;
+  }
+  
+  public function hasIds()
+  {
+    if (count($this->ids))
+    {
+      return true;
+    }
+    return false;
+  }
 
   /**
    * Construction de l'objet Query

src/Muzich/HomeBundle/Controller/HomeController.php

@@ -30,6 +30,7 @@ class HomeController extends Controller
     
     return array(
       'search_tags_id'   => $search_object->getTags(),
+      'display_comments' => $search_object->hasIds(),
       'user'             => $this->getUser(),
       'add_form'         => $add_form->createView(),
       'add_form_name'    => 'add',

src/Muzich/UserBundle/Controller/EventController.php

@@ -0,0 +1,82 @@
+<?php
+
+namespace Muzich\UserBundle\Controller;
+
+use Muzich\CoreBundle\lib\Controller;
+
+class EventController extends Controller
+{
+    
+  public function infoBarAction()
+  {
+    $events = $this->getDoctrine()->getRepository('MuzichCoreBundle:Event')
+      ->getNotViewEvents($this->getUserId())
+    ;
+    
+    return $this->render('MuzichUserBundle:Info:bar.html.twig', array(
+      'events' => $events
+    ));
+  }
+  
+  public function viewElementsAction($event_id)
+  {
+    if (($response = $this->mustBeConnected()))
+    {
+      return $response;
+    }
+    
+    if (!($event = $this->getDoctrine()->getRepository('MuzichCoreBundle:Event')
+      ->findOneById($event_id)))
+    {
+      if ($this->getRequest()->isXmlHttpRequest())
+      {
+        return $this->jsonResponse(array(
+          'status' => 'error',
+          'errors' => array('NotFound')
+        ));
+      }
+      throw $this->createNotFoundException('Ressource ajax uniquement.');
+    }
+    
+    if ($event->getUser()->getId() != $this->getUserId())
+    {
+      if ($this->getRequest()->isXmlHttpRequest())
+      {
+        return $this->jsonResponse(array(
+          'status' => 'error',
+          'errors' => array('NotAllowed')
+        ));
+      }
+      throw $this->createNotFoundException('Ressource ajax uniquement.');
+    }
+    
+    // A partir d'ici on a ce qu'il faut.
+    // On modifie l'Element Searcher en lui donnat les ids correspondant a l'event
+    
+    $es = $this->getElementSearcher();
+    $es->setIds($event->getIds());
+    $this->setElementSearcherParams($es->getParams());
+    $event->setView(true);
+    $this->getDoctrine()->getEntityManager()->persist($event);
+    $this->getDoctrine()->getEntityManager()->flush();
+    
+    // Si ajax
+    if ($this->getRequest()->isXmlHttpRequest())
+    {
+      $html = $this->render('MuzichCoreBundle:SearchElement:default.html.twig', array(
+        'user'        => $this->getUser(),
+        'elements'    => $es->getElements($this->getDoctrine(), $this->getUserId()),
+        'invertcolor' => false
+      ))->getContent();
+      
+      return $this->jsonResponse(array(
+        'status'  => 'success',
+        'html'    => $html
+      ));
+    }
+    
+    // Sinon on redirige vers home
+    return $this->redirect($this->generateUrl('home'));
+  }
+    
+}

src/Muzich/UserBundle/Controller/UserController.php

@@ -566,16 +566,5 @@ class UserController extends Controller
       'status' => 'success'
     ));
   }
-  
-  public function infoBarAction()
-  {
-    $events = $this->getDoctrine()->getRepository('MuzichCoreBundle:Event')
-      ->getNotViewEvents($this->getUserId())
-    ;
-    
-    return $this->render('MuzichUserBundle:Info:bar.html.twig', array(
-      'events' => $events
-    ));
-  }
     
 }

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

@@ -32,4 +32,9 @@ change_email_confirm:
   
 update_address:
   pattern: /ajax/update-address/{token}
-  defaults: { _controller: MuzichUserBundle:User:updateAddress }
+  defaults: { _controller: MuzichUserBundle:User:updateAddress }
+  
+event_view_elements:
+  pattern: /event/view/elements/{event_id}
+  defaults: { _controller: MuzichUserBundle:Event:viewElements }
+  

src/Muzich/UserBundle/Resources/views/Info/bar.html.twig

@@ -1,17 +1,25 @@
 <div id="events">
     
     <div class="score">
-      <img src="{{ asset('bundles/muzichcore/img/1332286466_stock_scores.png') }}" alt="" />
+      <img src="{{ asset('bundles/muzichcore/img/1332286466_stock_scores.png') }}" alt="score" />
       <span>{{ app.user.reputation }}</span>
     </div>
     
     <div class="comments">
-      <img src="{{ asset('bundles/muzichcore/img/1332286007_comments_reply.png') }}" alt="" />
-      {% if events[event_const('TYPE_COMMENT_ADDED_ELEMENT')] is defined %}
-        <span>{{ events[event_const('TYPE_COMMENT_ADDED_ELEMENT')].count }}</span>
-      {% else %}
-        <span>0</span>
-      {% endif %}
+      
+        {% if events[event_const('TYPE_COMMENT_ADDED_ELEMENT')] is defined %}
+          <a 
+            href="{{ path('event_view_elements', {'event_id':events[event_const('TYPE_COMMENT_ADDED_ELEMENT')].id}) }}" 
+            title="BLLLLLLLLL"
+            class="view_elements_event"
+          >
+            <img src="{{ asset('bundles/muzichcore/img/1332286007_comments_reply.png') }}" alt="comments" />
+            <span>{{ events[event_const('TYPE_COMMENT_ADDED_ELEMENT')].count }}</span>
+          </a>
+        {% else %}
+          <img src="{{ asset('bundles/muzichcore/img/1332286007_comments_reply.png') }}" alt="comments" />
+          <span>0</span>
+        {% endif %}
     </div>
   
   </div>

web/bundles/muzichcore/css/main.css

@@ -4,7 +4,7 @@
   position: relative;
   min-height: 100%;
   padding-bottom: 30px;
-  
+  min-height: 120px;
   
   width: 640px;
   margin-top: 45px;

web/bundles/muzichcore/js/muzich.js

@@ -1683,5 +1683,30 @@ $(document).ready(function(){
     return false;
   });
   
+  
+  // Enlever les ids du ElementSearch
+  $('div.more_filters a.new_comments').live('click', function(){
+    
+    $('img.elements_more_loader').show();
+    $('ul.elements').html('');
+    link = $(this);
+    
+    $.getJSON(link.attr('href'), function(response){
+        
+      if (response.status == 'mustbeconnected')
+      {
+        $(location).attr('href', url_index);
+      }
+      
+      if (response.status == 'success')
+      {
+        $('form[name="search"]').submit();
+        $('div.more_filters a.new_comments').hide();
+      }
+      
+    });
+    
+    return false;
+  });
 
 });

web/bundles/muzichhome/css/home.css

@@ -76,6 +76,20 @@ div.select_network a.my_network
   background-position: 2px 3px;
 }
 
+div.more_filters a.new_comments
+{
+  margin-top: 5px;
+  padding-left: 20px;
+  background-image: url(/bundles/muzichcore/img/1332286007_comments_reply.png);
+  background-repeat: no-repeat;
+  background-position: 2px 3px;
+}
+
+div.more_filters a.new_comments img
+{
+  margin-bottom: -3px;
+}
+
 div.select_network a.active
 {
   background-color: #39c9cc