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

app/Resources/translations/elements.fr.yml

@@ -55,6 +55,11 @@ element:
       label:            M'avertir en cas de nouveaux commentaires
   vote:
     good:               Ce partage mérite un point supplémentaire (cliquez a nouveau pour enlever)
+  tag_proposition:
+    form:
+      submit:           Proposer ces tags
+      cancel:           Annuler
+      description:      Proposez ci-dessous les tags que vous trouvez les plus appropriés pour ce partage
   
 comment:
   edit:

app/Resources/translations/userui.fr.yml

@@ -119,4 +119,6 @@ element:
     confirm: 
       sentence:          Signaler ce contenu comme inapproprié ?
       yes:               Oui
-      no:                Non
+      no:                Non
+  proposition_tags:
+    link_title:        Proposer des tags

src/Muzich/CoreBundle/Controller/ElementController.php

@@ -5,6 +5,7 @@ namespace Muzich\CoreBundle\Controller;
 use Muzich\CoreBundle\lib\Controller;
 use Muzich\CoreBundle\ElementFactory\ElementManager;
 use Muzich\CoreBundle\Propagator\EventElement;
+use Muzich\CoreBundle\Entity\ElementTagsProposition;
 
 class ElementController extends Controller
 {
@@ -489,5 +490,122 @@ class ElementController extends Controller
       )
     ));
   }
+    
+  /**
+   * Retourne un json avec le form permettant a l'utilisateur de proposer des
+   * tags sur un élément.
+   * 
+   * @param int $element_id
+   * @return Response 
+   */
+  public function proposeTagsOpenAction($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')
+      ));
+    }
+    
+    $search_tags = array();
+    foreach ($element->getTags() as $tag)
+    {
+      $search_tags[$tag->getId()] = $tag->getName();
+    }
+    
+    $element->setTags($element->getTagsIdsJson());
+    $form = $this->getAddForm($element, 'element_tag_proposition_'.$element->getId());
+    $response = $this->render('MuzichCoreBundle:Element:tag.proposition.html.twig', array(
+      'form'        => $form->createView(),
+      'form_name'   => 'element_tag_proposition_'.$element->getId(),
+      'element_id'  => $element->getId(),
+      '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()
+      ));
+    }
+  }
+  
+  public function proposeTagsProceedAction($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')
+      ));
+    }
+    
+    $values   = $this->getRequest()->request->get('element_tag_proposition_'.$element->getId());
+    $tags_ids = json_decode($values['tags'], true);
+    
+    // On récupère les tags en base
+    $tags = $this->getDoctrine()->getEntityManager()->getRepository('MuzichCoreBundle:Tag')
+      ->getTagsWithIds($tags_ids)
+    ;
+    
+    if (!count($tags))
+    {
+      return $this->jsonResponse(array(
+        'status' => 'error',
+        'errors' => array('NotFound')
+      ));
+    }
+    
+    $proposition = new ElementTagsProposition();
+    $proposition->setElement($element);
+    $proposition->setUser($this->getUser());
+    
+    foreach ($tags as $tag)
+    {
+      // Si le tag est a modérer, il faut que le propriétaire de l'élément
+      // puisse voir ce tag, afin d'accepter en toute connaisance la proposition.
+      if ($tag->getTomoderate())
+      {
+        if (!$tag->hasIdInPrivateIds($element->getOwner()->getId()))
+        {
+          // Si son id n'y est pas on la rajoute afin que le proprio puisse voir 
+          // ces nouveau tags
+          $private_ids = json_decode($tag->getPrivateids(), true);
+          $private_ids[] = $element->getOwner()->getId();
+          $tag->setPrivateids(json_encode($private_ids));
+          $this->getDoctrine()->getEntityManager()->persist($tag);
+        }
+      }
+          
+      $proposition->addTag($tag);
+    }
+    
+    $element->setHasTagProposition(true);
+    
+    $this->getDoctrine()->getEntityManager()->persist($element);
+    $this->getDoctrine()->getEntityManager()->persist($proposition);
+    $this->getDoctrine()->getEntityManager()->flush();
+    
+    return $this->jsonResponse(array(
+      'status' => 'success',
+      'dom_id' => 'element_'.$element->getId()
+    ));
+  }
   
 }

src/Muzich/CoreBundle/Entity/Element.php

@@ -82,6 +82,15 @@ class Element
   protected $tags_propositions;
   
   /**
+   * Permet de savoir sans faire de gros calculs en base si il y a des 
+   * propositions de tags en cours sur cet élément.
+   * 
+   * @ORM\Column(type="boolean", nullable = true)
+   * @var type string
+   */
+  protected $has_tags_proposition = false;
+  
+  /**
    * L'url est l'url du media. 
    * 
    * @ORM\Column(type="string", length=1024)
@@ -485,6 +494,21 @@ class Element
     $this->comments = json_encode($comments);
   }
   
+  public function setHasTagProposition($has_prop)
+  {
+    $this->has_tags_proposition = $has_prop;
+  }
+  
+  public function hasTagProposition()
+  {
+    if ($this->has_tags_proposition === null)
+    {
+      return false;
+    }
+    
+    return $this->has_tags_proposition;
+  }
+  
   /**
    * Etablie des relation vers des tags.
    * (Supprime les anciens tags, au niveau de l'objet seulement)

src/Muzich/CoreBundle/Entity/ElementTagsProposition.php

@@ -12,6 +12,7 @@ use Muzich\CoreBundle\Validator as MuzichAssert;
  * ne leurs appartenant pas.
  * 
  * @ORM\Entity
+ * @ORM\Table(name="element_tags_proposition")
  * @ORM\Entity(repositoryClass="Muzich\CoreBundle\Repository\ElementTagsProposition")
  * 
  */
@@ -51,21 +52,21 @@ class ElementTagsProposition
    */
   protected $tags;
   
-  /**
-   * @var datetime $created
-   *
-   * @Gedmo\Timestampable(on="create")
-   * @ORM\Column(type="datetime")
-   */
-  private $created;
-
-  /**
-   * @var datetime $updated
-   *
-   * @ORM\Column(type="datetime")
-   * @Gedmo\Timestampable(on="update")
-   */
-  private $updated;
+//  /**
+//   * @var datetime $created
+//   *
+//   * @Gedmo\Timestampable(on="create")
+//   * @ORM\Column(type="datetime")
+//   */
+//  private $created;
+//
+//  /**
+//   * @var datetime $updated
+//   *
+//   * @ORM\Column(type="datetime")
+//   * @Gedmo\Timestampable(on="update")
+//   */
+//  private $updated;
   
     
   /**
@@ -78,45 +79,45 @@ class ElementTagsProposition
     return $this->id;
   }
 
-  /**
-   * Set created
-   *
-   * @param datetime $created
-   */
-  public function setCreated($created)
-  {
-    $this->created = $created;
-  }
-
-  /**
-   * Get created
-   *
-   * @return datetime 
-   */
-  public function getCreated()
-  {
-    return $this->created;
-  }
-
-  /**
-   * Set updated
-   *
-   * @param datetime $updated
-   */
-  public function setUpdated($updated)
-  {
-    $this->updated = $updated;
-  }
-
-  /**
-   * Get updated
-   *
-   * @return datetime 
-   */
-  public function getUpdated()
-  {
-    return $this->updated;
-  }
+//  /**
+//   * Set created
+//   *
+//   * @param datetime $created
+//   */
+//  public function setCreated($created)
+//  {
+//    $this->created = $created;
+//  }
+//
+//  /**
+//   * Get created
+//   *
+//   * @return datetime 
+//   */
+//  public function getCreated()
+//  {
+//    return $this->created;
+//  }
+//
+//  /**
+//   * Set updated
+//   *
+//   * @param datetime $updated
+//   */
+//  public function setUpdated($updated)
+//  {
+//    $this->updated = $updated;
+//  }
+//
+//  /**
+//   * Get updated
+//   *
+//   * @return datetime 
+//   */
+//  public function getUpdated()
+//  {
+//    return $this->updated;
+//  }
 
   /**
    * Set user

src/Muzich/CoreBundle/Entity/Tag.php

@@ -238,6 +238,18 @@ class Tag
     return $this->privateids;
   }
   
+  public function hasIdInPrivateIds($id)
+  {
+    foreach (json_decode($this->privateids) as $pid)
+    {
+      if ($pid == $id)
+      {
+        return true;
+      }
+    }
+    return false;
+  }
+  
   public function getArguments()
   {
     return $this->arguments;

src/Muzich/CoreBundle/Form/Element/ElementAddForm.php

@@ -7,6 +7,8 @@ use Symfony\Component\Form\FormBuilder;
 
 class ElementAddForm extends AbstractType
 {
+  private $name = null;
+  
   public function buildForm(FormBuilder $builder, array $options)
   {    
     $builder->add('name', 'text', array(
@@ -21,9 +23,18 @@ class ElementAddForm extends AbstractType
         
     $builder->add('tags', 'hidden');    
   }
+  
+  public function setName($name)
+  {
+    $this->name = $name;
+  }
 
   public function getName()
   {
+    if ($this->name)
+    {
+      return $this->name;
+    }
     return 'element_add';
   }
   

src/Muzich/CoreBundle/Repository/TagRepository.php

@@ -41,6 +41,11 @@ class TagRepository extends EntityRepository
     ")->setParameter('tids', $ids);
   }
   
+  public function getTagsWithIds($ids)
+  {
+    return $this->findByIds($ids)->getResult();
+  }
+  
   public function getTagsForElementSearch($ids)
   {
     $tags = array();

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

@@ -112,4 +112,12 @@ ajax_set_element_group:
   
 ajax_report_element:
   pattern: /ajax/element/report/{element_id}/{token}
-  defaults: { _controller: MuzichCoreBundle:Core:reportElement }
+  defaults: { _controller: MuzichCoreBundle:Core:reportElement }
+  
+ajax_element_propose_tags_open:
+  pattern: /ajax/element/propose/tags/{element_id}
+  defaults: { _controller: MuzichCoreBundle:Element:proposeTagsOpen }
+  
+ajax_element_propose_tags_proceed:
+  pattern: /ajax/element/propose/tags/{element_id}/proceed/{token}
+  defaults: { _controller: MuzichCoreBundle:Element:proposeTagsProceed }

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

@@ -0,0 +1,20 @@
+
+<div class="tag_proposition">
+  <form id="element_tag_proposition_{{ element_id }}" 
+    action="{{ path('ajax_element_propose_tags_proceed', {'element_id':element_id , 'token':app.user.getPersonalHash}) }}" name="element_tag_proposition_{{ element_id }}" method="post">
+
+    <p>
+      {{ 'element.tag_proposition.form.description'|trans({}, 'elements') }}
+    </p>
+
+  {% include "MuzichCoreBundle:Tag:tagsPrompt.html.twig" with { 
+    'form_name'     : form_name
+  } %}
+
+  {{ form_widget(form.tags, { 'attr': {'class': 'tagBox_tags_ids'} }) }}
+
+    <input type="submit" value="{{ 'element.tag_proposition.form.submit'|trans({}, 'elements') }}" class="button" />
+    <input type="button" value="{{ 'element.tag_proposition.form.cancel'|trans({}, 'elements') }}" class="button cancel" />
+
+  </form>
+</div>

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

@@ -51,11 +51,21 @@
         <img src="{{ asset('bundles/muzichcore/img/1324917097_link.png') }}" alt="link" />
       </a>
       
-      <a title="{{ 'element.report.link_title'|trans({}, 'userui') }}" 
-        class="element_report" 
-        href="{{ path('ajax_report_element', {'element_id':element.id, 'token':app.user.getPersonalHash}) }}">
-        <img src="{{ asset('bundles/muzichcore/img/1331832708_comment_alert.png') }}" alt="report" />
-      </a>
+      {% if app.user.id != element.owner.id %}
+      
+        <a title="{{ 'element.proposition_tags.link_title'|trans({}, 'userui') }}" 
+          class="element_propose_tags" 
+          href="{{ path('ajax_element_propose_tags_open', {'element_id' : element.id}) }}">
+          <img src="{{ asset('bundles/muzichcore/img/1333484018_rss-tag.png') }}" alt="tags_proposition" />
+        </a>
+      
+        <a title="{{ 'element.report.link_title'|trans({}, 'userui') }}" 
+          class="element_report" 
+          href="{{ path('ajax_report_element', {'element_id':element.id, 'token':app.user.getPersonalHash}) }}">
+          <img src="{{ asset('bundles/muzichcore/img/1331832708_comment_alert.png') }}" alt="report" />
+        </a>
+      
+      {% endif %}
       
       {% if app.user.id == element.owner.id %}
         <a title="{{ 'element.edit.link'|trans({}, 'elements') }}" class="element_edit_link" 

src/Muzich/CoreBundle/lib/Controller.php

@@ -294,10 +294,12 @@ class Controller extends BaseController
    * @param \Muzich\CoreBundle\Searcher\Searcher $search_object
    * @return \Symfony\Component\Form\Form
    */
-  protected function getAddForm($element = array())
+  protected function getAddForm($element = array(), $name = null)
   {
+    $form = new ElementAddForm();
+    $form->setName($name);
     return $this->createForm(
-      new ElementAddForm(),
+      $form,
       $element,
       array()
     );

web/bundles/muzichcore/js/muzich.js

@@ -1709,5 +1709,84 @@ $(document).ready(function(){
     
     return false;
   });
+  
+  /*
+   * 
+   * Proposition de tags sur un élément
+   * 
+   */
+  
+ // Ouverture du formulaire de modification
+  $('a.element_propose_tags').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')
+      {
+        
+        // On prépare le tagBox
+        table = li.find('table:first');
+        li.find('div.tag_proposition').remove();
+        table.after(response.html);
+
+        // Pour le click sur l'input de saisie de tag
+        li.find('ul.tagbox li.input input[type="text"]').formDefaults();
+
+        var options = new Array();
+        options.form_name  = response.form_name;
+        options.tag_init   = response.tags;
+
+        ajax_query_timestamp = null;
+
+        $("#tags_prompt_list_"+response.form_name).tagBox(options);
+      
+      // On rend ce formulaire ajaxFormable
+      $('form[name="'+response.form_name+'"] input[type="submit"]').live('click', function(){
+        li = $(this).parent('form').parent('div').parent('li');
+        li.find('img.element_loader').show();
+      });
+      $('form[name="'+response.form_name+'"]').ajaxForm(function(response){
+        
+        if (response.status == 'mustbeconnected')
+        {
+          $(location).attr('href', url_index);
+        }
+                
+        if (response.status == 'success')
+        {
+          li = $('li#'+response.dom_id);
+          li.find('img.element_loader').hide();
+          li.find('form')
+          li.find('div.tag_proposition').remove();
+        }
+      });
+      
+      }
+    });
+    return false;
+  });
+  
+  // Annulation d'un formulaire de modification d'élément
+  $('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')]);
+  });
+  
+  /*
+   * Proposition de tag sur un élément FIN
+   */
 
 });