Evolution #164: Proposition de tag sur un élément

app/Resources/translations/elements.fr.yml

@@ -60,6 +60,13 @@ element:
       submit:           Proposer ces tags
       cancel:           Annuler
       description:      Proposez ci-dessous les tags que vous trouvez les plus appropriés pour ce partage
+  view_propositions:
+    link:               Voir les propositions de tags
+    description_one:    Un utilisateur vous propose cette configuration de tags
+    description_x:      Des utilisateurs vous propose ces configurations de tags
+    link_accept:        Accepter cette proposition
+    link_refuse_one:    Refuser les propositions
+    link_refuse_x:      Refuser les propositions
   
 comment:
   edit:

src/Muzich/CoreBundle/Controller/ElementController.php

@@ -529,15 +529,12 @@ class ElementController extends Controller
       'search_tags' => $search_tags
     ));
     
-    if ($this->getRequest()->isXmlHttpRequest())
-    {
-      return $this->jsonResponse(array(
-        'status'    => 'success',
-        'form_name' => 'element_tag_proposition_'.$element->getId(),
-        'tags'      => $search_tags,
-        'html'      => $response->getContent()
-      ));
-    }
+    return $this->jsonResponse(array(
+      'status'    => 'success',
+      'form_name' => 'element_tag_proposition_'.$element->getId(),
+      'tags'      => $search_tags,
+      'html'      => $response->getContent()
+    ));
   }
   
   public function proposeTagsProceedAction($element_id, $token)
@@ -608,4 +605,135 @@ class ElementController extends Controller
     ));
   }
   
+  public function proposedTagsViewAction($element_id)
+  {
+    if (($response = $this->mustBeConnected(true)))
+    {
+      return $response;
+    }
+    
+    if (!($element = $this->getDoctrine()->getRepository('MuzichCoreBundle:Element')
+      ->findOneById($element_id)))
+    {
+      return $this->jsonResponse(array(
+        'status' => 'error',
+        'errors' => array('NotFound')
+      ));
+    }
+    
+    if ($element->getOwner()->getId() != $this->getUserId())
+    {
+      return $this->jsonResponse(array(
+        'status' => 'error',
+        'errors' => array('NotAllowed')
+      ));
+    }
+    
+    // On récupére toute les propsotions pour cet élément
+    $propositions = $this->getDoctrine()->getEntityManager()->getRepository('MuzichCoreBundle:ElementTagsProposition')
+      ->findByElement($element->getId())
+    ;
+    
+    $response = $this->render('MuzichCoreBundle:Element:tag.propositions.html.twig', array(
+      'propositions' => $propositions,
+      'element_id'   => $element->getId()
+    ));
+    
+    return $this->jsonResponse(array(
+      'status'    => 'success',
+      'html'      => $response->getContent()
+    ));
+    
+  }
+  
+  public function proposedTagsAcceptAction($proposition_id, $token)
+  {
+    if (($response = $this->mustBeConnected(true)))
+    {
+      return $response;
+    }
+    
+    if (!($proposition = $this->getDoctrine()->getRepository('MuzichCoreBundle:ElementTagsProposition')
+      ->findOneById($proposition_id)) || $token != $this->getUser()->getPersonalHash())
+    {
+      return $this->jsonResponse(array(
+        'status' => 'error',
+        'errors' => array('NotFound')
+      ));
+    }
+    
+    // On commence par appliquer les nouveaux tags a l'élément
+    $element = $proposition->getElement();
+    $element->setTags(null);
+    foreach ($proposition->getTags() as $tag)
+    {
+      $element->addTag($tag);
+    }
+    $element->setHasTagProposition(false);
+    $this->getDoctrine()->getEntityManager()->persist($element);
+    
+    $propositions = $this->getDoctrine()->getEntityManager()->getRepository('MuzichCoreBundle:ElementTagsProposition')
+      ->findByElement($element->getId())
+    ;
+    
+    /*
+     * TODO: ARCHIVAGE (c avant ou aprés event déjà ?) (cf doc), notifs (event)
+     */
+    
+    // On supprime les proposition liés a cet élement
+    foreach ($propositions as $proposition)
+    {
+      $this->getDoctrine()->getEntityManager()->remove($proposition);
+    }
+    
+    $this->getDoctrine()->getEntityManager()->flush();
+    $element = $this->getDoctrine()->getRepository('MuzichCoreBundle:Element')
+      ->findOneById($element->getId())
+    ;
+    
+    // On récupère l'html de l'élément
+    $html = $this->render('MuzichCoreBundle:SearchElement:element.html.twig', array(
+      'element'     => $element
+    ))->getContent();
+    
+    return $this->jsonResponse(array(
+      'status' => 'success',
+      'html'   => $html
+    ));
+  }
+  
+  public function proposedTagsRefuseAction($element_id, $token)
+  {
+    if (($response = $this->mustBeConnected(true)))
+    {
+      return $response;
+    }
+    
+    if (!($element = $this->getDoctrine()->getRepository('MuzichCoreBundle:Element')
+      ->findOneById($element_id)) || $token != $this->getUser()->getPersonalHash())
+    {
+      return $this->jsonResponse(array(
+        'status' => 'error',
+        'errors' => array('NotFound')
+      ));
+    }
+    
+    // On supprime les proposition liés a cet élement
+    $propositions = $this->getDoctrine()->getEntityManager()->getRepository('MuzichCoreBundle:ElementTagsProposition')
+      ->findByElement($element->getId())
+    ;
+    foreach ($propositions as $proposition)
+    {
+      $this->getDoctrine()->getEntityManager()->remove($proposition);
+    }
+    // On spécifie qu'il n'y as plus de proposition
+    $element->setHasTagProposition(false);
+    $this->getDoctrine()->getEntityManager()->persist($element);
+    $this->getDoctrine()->getEntityManager()->flush();
+    
+    return $this->jsonResponse(array(
+      'status' => 'success'
+    ));
+  }
+  
 }

src/Muzich/CoreBundle/Entity/ElementTagsProposition.php

@@ -13,7 +13,7 @@ use Muzich\CoreBundle\Validator as MuzichAssert;
  * 
  * @ORM\Entity
  * @ORM\Table(name="element_tags_proposition")
- * @ORM\Entity(repositoryClass="Muzich\CoreBundle\Repository\ElementTagsProposition")
+ * @ORM\Entity(repositoryClass="Muzich\CoreBundle\Repository\ElementTagsPropositionRepository")
  * 
  */
 class ElementTagsProposition

src/Muzich/CoreBundle/Repository/ElementTagsPropositionRepository.php

@@ -6,5 +6,29 @@ use Doctrine\ORM\EntityRepository;
 
 class ElementTagsPropositionRepository extends EntityRepository
 {
-    
+  
+  public function findByElement($element_id)
+  {
+    return $this->getEntityManager()
+      ->createQuery('SELECT p FROM MuzichCoreBundle:ElementTagsProposition p 
+        JOIN p.user u
+        JOIN p.tags t
+        WHERE p.element = :eid')
+      ->setParameter('eid', $element_id)
+      ->getResult()
+    ;
+  }
+  
+  public function findOneById($id)
+  {
+    return $this->getEntityManager()
+      ->createQuery('SELECT p FROM MuzichCoreBundle:ElementTagsProposition p 
+        JOIN p.element e
+        JOIN p.tags t
+        WHERE p.id = :id')
+      ->setParameter('id', $id)
+      ->getSingleResult()
+    ;
+  }
+  
 }

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

@@ -120,4 +120,16 @@ ajax_element_propose_tags_open:
   
 ajax_element_propose_tags_proceed:
   pattern: /ajax/element/propose/tags/{element_id}/proceed/{token}
-  defaults: { _controller: MuzichCoreBundle:Element:proposeTagsProceed }
+  defaults: { _controller: MuzichCoreBundle:Element:proposeTagsProceed }
+  
+ajax_element_proposed_tags_view:
+  pattern: /ajax/element/proposed/tags/{element_id}/view
+  defaults: { _controller: MuzichCoreBundle:Element:proposedTagsView }
+  
+ajax_element_proposed_tags_accept:
+  pattern: /ajax/element/proposed/tags/accept/{proposition_id}/{token}
+  defaults: { _controller: MuzichCoreBundle:Element:proposedTagsAccept }
+  
+ajax_element_proposed_tags_refuse:
+  pattern: /ajax/element/proposed/tags/refuses/{element_id}/{token}
+  defaults: { _controller: MuzichCoreBundle:Element:proposedTagsRefuse }

src/Muzich/CoreBundle/Resources/views/Element/tag.propositions.html.twig

@@ -0,0 +1,40 @@
+<div class="tags_proposition_view">
+
+  <p>
+    {% if propositions|length > 1 %}
+      {{ 'element.view_propositions.description_x'|trans({}, 'elements') }}
+    {% else %}
+      {{ 'element.view_propositions.description_one'|trans({}, 'elements') }}
+    {% endif %}
+  </p>
+  
+  <ul class="tag_propositions">
+    {% for proposition in propositions %} 
+      <li class="tag_proposition">
+        <a href="{{ path('show_user', {'slug': proposition.user.slug}) }}" >
+          {{ proposition.user.name }}
+        </a>:
+        
+        {% for tag in proposition.tags %} 
+          <span class="button">{{ tag.name }}</span>
+        {% endfor %}
+          
+          <a class="accept_tag_propotision button button_green" href="{{ path('ajax_element_proposed_tags_accept', {'proposition_id':proposition.id,'token':app.user.getPersonalHash}) }}">
+            {{ 'element.view_propositions.link_accept'|trans({}, 'elements') }}
+          </a>
+          
+      </li>
+    {% endfor %}
+  </ul>
+  
+  {% if propositions|length > 1 %}
+    <a class="refuse_tag_propositions button" href="{{ path('ajax_element_proposed_tags_refuse', {'element_id':element_id,'token':app.user.getPersonalHash}) }}" >
+      {{ 'element.view_propositions.link_refuse_x'|trans({}, 'elements') }}
+    </a>
+  {% else %}
+    <a class="refuse_tag_propositions button" href="{{ path('ajax_element_proposed_tags_refuse', {'element_id':element_id,'token':app.user.getPersonalHash}) }}" >
+      {{ 'element.view_propositions.link_refuse_one'|trans({}, 'elements') }}
+    </a>
+  {% endif %}
+  
+</div>

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

@@ -68,6 +68,15 @@
       {% endif %}
       
       {% if app.user.id == element.owner.id %}
+      
+        {% if element.hasTagProposition %}
+          <a title="{{ 'element.view_propositions.link'|trans({}, 'elements') }}" class="element_view_propositions_link" 
+             href="{{ path('ajax_element_proposed_tags_view', {'element_id' : element.id})  }}"
+          >
+            <img src="{{ asset('bundles/muzichcore/img/1333493527_tag_add.png') }}" alt="tags proposition" />
+          </a>
+        {% endif %}
+      
         <a title="{{ 'element.edit.link'|trans({}, 'elements') }}" class="element_edit_link" 
            href="{{ path('element_edit', {'element_id' : element.id})  }}" style="display: none;"
         >

web/bundles/muzichcore/css/main.css

@@ -1174,4 +1174,27 @@ div#events div.follows span
 ul#followers_users li.new
 {
   font-weight: bold;
+}
+
+/*
+*  Proposition de tags
+*/ 
+
+li.tag_proposition span.button
+{
+  font-size: 95%;
+  padding: 2px 4px;
+}
+
+li.tag_proposition:hover
+{
+  background-color: #c0f2ff;
+}
+
+
+/* */
+
+.button_green
+{
+  background-color: #5ae959;
 }

web/bundles/muzichcore/js/muzich.js

@@ -1779,11 +1779,95 @@ $(document).ready(function(){
   });
   
   // Annulation d'un formulaire de modification d'élément
+  //
+  //  TODO TODO TODO
+  //    ca en dessous la: TODO neuu
+  //
   $('form.edit_element input.cancel_edit').live('click', function(){
     var li = $(this).parent('form').parent('li');
     li.html(elements_edited[li.attr('id')]);
     delete(elements_edited[li.attr('id')]);
   });
+  ///////
+  
+  $('a.element_view_propositions_link').live('click', function(){
+    
+    link = $(this);
+    li = link.parent('td').parent('tr').parent().parent().parent('li.element');
+    
+    li.find('img.element_loader').show();
+    
+    $.getJSON($(this).attr('href'), function(response) {
+      
+      if (response.status == 'mustbeconnected')
+      {
+        $(location).attr('href', url_index);
+      }
+      
+      li.find('img.element_loader').hide();
+      
+      if (response.status == 'success')
+      {
+        table = li.find('table:first');
+        li.find('div.tags_proposition_view').remove();
+        table.after(response.html);
+      }
+    });
+    
+    return false;
+  });
+  
+  $('a.accept_tag_propotision').live('click', function(){
+    
+    link = $(this);
+    li = link.parent('li.tag_proposition').parent('ul.tag_propositions')
+      .parent('div.tags_proposition_view').parent('li.element');
+    
+    li.find('img.element_loader').show();
+    
+    $.getJSON($(this).attr('href'), function(response) {
+      
+      if (response.status == 'mustbeconnected')
+      {
+        $(location).attr('href', url_index);
+      }
+      
+      li.find('img.element_loader').hide();
+      
+      if (response.status == 'success')
+      {
+        li.html(response.html);
+      }
+    });
+    
+    return false;
+  });
+  
+  //
+  $('a.refuse_tag_propositions').live('click', function(){
+    
+    link = $(this);
+    li = link.parent('div.tags_proposition_view').parent('li.element');
+    
+    li.find('img.element_loader').show();
+    
+    $.getJSON($(this).attr('href'), function(response) {
+      
+      if (response.status == 'mustbeconnected')
+      {
+        $(location).attr('href', url_index);
+      }
+      
+      li.find('img.element_loader').hide();
+      
+      if (response.status == 'success')
+      {
+        li.find('div.tags_proposition_view').remove();
+      }
+    });
+    
+    return false;
+  });
   
   /*
    * Proposition de tag sur un élément FIN