Evolution #163: Evenements: Prise en comptes des autres facteurs

app/Resources/translations/users.fr.yml

@@ -21,6 +21,10 @@ events:
     no:                         Pas de nouveaux partages mis en favoris
     one:                        %count% de vos partage a été mis en favoris
     yes:                        %count% de vos partages ont été mis en favoris
+  new_follows:
+    no:                         Pas de nouveaux utilisateurs qui vous suivent
+    one:                        %count% nouvel utilisateur vous suis
+    yes:                        %count% nouveaux utilisateurs vous suivent
     
 reputation:
   bar:

src/Muzich/CoreBundle/Controller/CoreController.php

@@ -139,7 +139,7 @@ class CoreController extends Controller
         $Follow->setFollowed($followed); 
         
         $event = new EventUser($this->container);
-        $event->addToFollow($followed);
+        $event->addToFollow($followed, $this->getUser());
         $em->persist($followed);
       }
       else { $Follow->setGroup($followed); }

src/Muzich/CoreBundle/Entity/Event.php

@@ -20,6 +20,7 @@ class Event
   
   const TYPE_COMMENT_ADDED_ELEMENT = "com.adde.ele";
   const TYPE_FAV_ADDED_ELEMENT     = "fav.adde.ele";
+  const TYPE_USER_FOLLOW           = "user.follow";
   
   /**
    * @ORM\Id

src/Muzich/CoreBundle/Entity/User.php

@@ -134,6 +134,13 @@ class User extends BaseUser
   protected $events;
   
   /**
+   * Contient des données pratique pour par exemple influencer l'affichange dans twig.
+   * 
+   * @var array 
+   */
+  protected $live_datas = array();
+  
+  /**
    * 
    */
   public function __construct()
@@ -616,4 +623,29 @@ class User extends BaseUser
     return $this->email_requested_datetime;
   }
   
+  public function addLiveData($id, $data)
+  {
+    $this->live_datas[$id] = $data;
+  }
+  
+  public function removeLiveData($id)
+  {
+    if (array_key_exists($id, $this->live_datas))
+    {
+      unset($this->live_datas[$id]);
+    }
+  }
+  
+  public function hasLiveData($id, $data = null)
+  {
+    if (array_key_exists($id, $this->live_datas))
+    {
+      if ($this->live_datas[$id] == $data)
+      {
+        return true;
+      }
+    }
+    return false;
+  }
+  
 }

src/Muzich/CoreBundle/Extension/MyTwigExtension.php

@@ -3,6 +3,7 @@
 namespace Muzich\CoreBundle\Extension;
 
 use Symfony\Bundle\FrameworkBundle\Translation\Translator;
+use Muzich\CoreBundle\Entity\Event;
 
 class MyTwigExtension extends \Twig_Extension {
 
@@ -122,10 +123,13 @@ class MyTwigExtension extends \Twig_Extension {
     switch ($const_name)
     {
       case 'TYPE_COMMENT_ADDED_ELEMENT':
-        return \Muzich\CoreBundle\Entity\Event::TYPE_COMMENT_ADDED_ELEMENT;
+        return Event::TYPE_COMMENT_ADDED_ELEMENT;
       break;
       case 'TYPE_FAV_ADDED_ELEMENT':
-        return \Muzich\CoreBundle\Entity\Event::TYPE_FAV_ADDED_ELEMENT;
+        return Event::TYPE_FAV_ADDED_ELEMENT;
+      break;
+      case 'TYPE_USER_FOLLOW':
+        return Event::TYPE_USER_FOLLOW;
       break;
       default:
         throw new \Exception('Constante non géré dans MyTwigExtension::event_const');

src/Muzich/CoreBundle/Propagator/EventUser.php

@@ -21,12 +21,18 @@ class EventUser extends EventPropagator
    * 
    * @param User $user Utilisateur suivis
    */
-  public function addToFollow(User $user)
+  public function addToFollow(User $user, User $follower)
   {
+    // Points de réputation
     $ur = new UserReputation($user);
     $ur->addPoints(
       $this->container->getParameter('reputation_element_follow_value')
     );
+    
+    // Event de suivis
+    $uea = new UserEventAction($user, $this->container);
+    $event = $uea->proceed(Event::TYPE_USER_FOLLOW, $follower->getId());
+    $this->container->get('doctrine')->getEntityManager()->persist($event);
   }
   
   /**

src/Muzich/MynetworkBundle/Controller/MynetworkController.php

@@ -15,7 +15,7 @@ class MynetworkController extends Controller
    *
    * @Template()
    */
-  public function indexAction()
+  public function indexAction($event_id)
   {    
     $user = $this->getUser(true, array('join' => array(
       'followeds_users', 'followers_users', 'followeds_groups'
@@ -25,6 +25,21 @@ class MynetworkController extends Controller
     $followeds_groups = $user->getFollowedGroups();
     $followers_users = $user->getFollowersUsers();
     
+    if ($event_id)
+    {
+      if (!($event = $this->getDoctrine()->getRepository('MuzichCoreBundle:Event')
+      ->findOneById($event_id)))
+      {
+        return $this->redirect($this->generateUrl('mynetwork_index'));
+      }
+
+      if ($event->getUser()->getId() != $this->getUserId())
+      {
+        throw $this->createNotFoundException('NotAllowed');
+      }
+      $followers_users = $this->proceedForEvent($event, $followers_users, $event_id);
+    }
+    
     return array(
       'followeds_users' => $followeds_users,
       'followeds_groups' => $followeds_groups,
@@ -32,8 +47,28 @@ class MynetworkController extends Controller
     );
   }
   
+  private function proceedForEvent($event, $followers_users, $event_id)
+  {
+    $ids = $event->getIds();
+    
+    $this->getDoctrine()->getEntityManager()->remove($event);
+    $this->getDoctrine()->getEntityManager()->flush();
+    
+    $followers_users_new = array();
+    foreach ($followers_users as $user)
+    {
+      if (in_array($user->getId(), $ids))
+      {
+        $user->addLiveData('new', true);
+      }
+      $followers_users_new[] = $user;
+    }
+    
+    return $followers_users_new;
+  }
+  
   /**
-   * Action qui affiche la page de recherche, et efectue la recherche
+   * Action qui affiche la page de recherche, et effectue la recherche
    * d'utilisateurs et de groupes.
    * 
    * @Template()

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

@@ -1,7 +1,7 @@
 
 mynetwork_index:
-  pattern:  /my-network
-  defaults: { _controller: MuzichMynetworkBundle:Mynetwork:index }
+  pattern:  /my-network/{event_id}
+  defaults: { _controller: MuzichMynetworkBundle:Mynetwork:index, event_id: null }
   
 mynetwork_search:
   pattern:  /my-network/search

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

@@ -34,7 +34,7 @@
     <b>{{ 'followed_by'|trans({}, 'network') }}</b>
     <ul id="followers_users" class="inline">
     {% for user in followers_users %} 
-      <li>
+      <li {% if user.hasLiveData('new', true) %}class="new"{% endif %}>
         <a href="{{ path('show_user', { 'slug': user.slug }) }}">{{ user.username }}</a>
       </li>
     {% endfor %}

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

@@ -37,4 +37,3 @@ update_address:
 event_view_elements:
   pattern: /event/view/elements/{event_id}
   defaults: { _controller: MuzichUserBundle:Event:viewElements }
-  

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

@@ -41,5 +41,24 @@
         {% endif %}
           
     </div>
+    
+    <div class="follows">
+      
+        {% if events[event_const('TYPE_USER_FOLLOW')] is defined %}
+          <a 
+            href="{{ path('mynetwork_index', {'event_id':events[event_const('TYPE_USER_FOLLOW')].id}) }}" 
+            title="{%if events[event_const('TYPE_USER_FOLLOW')].count == 1 %}{{ 'events.new_follows.one'|trans({'%count%':1}, 'users') }}{% else %}{{ 'events.new_follows.yes'|trans({'%count%':events[event_const('TYPE_USER_FOLLOW')].count}, 'users') }}{% endif %}"
+            class="view_elements_event"
+          >
+            <img src="{{ asset('bundles/muzichcore/img/1333474994_people.png') }}" alt="favoriteds" />
+            <span class="new_comments">{{ events[event_const('TYPE_USER_FOLLOW')].count }}</span>
+          </a>
+        {% else %}
+          <img title="{{ 'events.new_follows.no'|trans({}, 'users') }}" src="{{ asset('bundles/muzichcore/img/1333474994_people.png') }}" alt="favoriteds" />
+          <span class="new_comments">0</span>
+        {% endif %}
+          
+    </div>
+  
   
   </div>

web/bundles/muzichcore/css/main.css

@@ -1154,4 +1154,24 @@ div#events div.favorites span
 {
   font-weight: bold;
   margin-left: 5px;
+}
+
+div#events div.follows img
+{
+  margin-left: 3px;
+  margin-bottom: -2px;
+}
+
+div#events div.follows span
+{
+  font-weight: bold;
+  margin-left: 5px;
+}
+
+/*
+* css mynetwork
+*/
+ul#followers_users li.new
+{
+  font-weight: bold;
 }