add players and teams to posts

moby18 · May 1, 2017 · db9268c · db9268c
1 parent f597e05
commit db9268c
Show file tree

Hide file tree

Showing 10 changed files with 115 additions and 8 deletions.
diff --git a/src/Volley/FaceBundle/Entity/Post.php b/src/Volley/FaceBundle/Entity/Post.php
@@ -252,7 +252,7 @@ class Post
      * @ORM\ManyToMany(targetEntity="Volley\StatBundle\Entity\Team", inversedBy="posts")
      * @ORM\JoinTable(name="posts_teams")
      **/
-    protected $teams;
+    private $teams;
 
 
     /**

diff --git a/src/Volley/FaceBundle/Form/PostType.php b/src/Volley/FaceBundle/Form/PostType.php
@@ -8,6 +8,7 @@
 use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\OptionsResolver\OptionsResolverInterface;
+use Tetranz\Select2EntityBundle\Form\Type\Select2EntityType;
 
 class PostType extends AbstractType
 {
@@ -96,9 +97,40 @@ public function buildForm(FormBuilderInterface $builder, array $options)
             ->add('imageSource', null, [
                 'label' => 'Post Image Source'
             ])
-            ->add('teams')
-            ->add('persons')
-        ;
+//            ->add('teams')
+//            ->add('persons');
+            ->add('teams',  Select2EntityType::class, [
+                'label' => false,
+                'multiple' => true,
+                'remote_route' => 'stat_team_json',
+                'class' => 'Volley\StatBundle\Entity\Team',
+                'primary_key' => 'id',
+                'minimum_input_length' => 2,
+                'page_limit' => 10,
+                'allow_clear' => true,
+                'delay' => 250,
+                'cache' => true,
+                'cache_timeout' => 60000, // if 'cache' is true
+                'language' => 'uk',
+                'placeholder' => "Введіть назву команди",
+                'attr' => ['width'=>'100%']
+            ])
+            ->add('persons',  Select2EntityType::class, [
+                'label' => false,
+                'multiple' => true,
+                'remote_route' => 'stat_person_json',
+                'class' => 'Volley\StatBundle\Entity\Person',
+                'primary_key' => 'id',
+                'minimum_input_length' => 2,
+                'page_limit' => 10,
+                'allow_clear' => true,
+                'delay' => 250,
+                'cache' => true,
+                'cache_timeout' => 60000, // if 'cache' is true
+                'language' => 'uk',
+                'placeholder' => "Введіть ім'я гравця, тренера або працівника команди",
+                'attr' => ['width'=>'100%']
+            ]);
     }
 
     /**

diff --git a/src/Volley/FaceBundle/Resources/public/js/custom/post.js b/src/Volley/FaceBundle/Resources/public/js/custom/post.js
@@ -1,6 +1,25 @@
+function resizeSelect () {
+  jQuery('select[id^=\'volley_bundle_facebundle_post_persons\']').select2entity({width: '100%'})
+  jQuery('select[id^=\'volley_bundle_facebundle_post_teams\']').select2entity({width: '100%'})
+  jQuery('li.select2-search').width('100%');
+  jQuery('input.select2-search__field').width('100%');
+}
+
 jQuery(document).ready(function() {
+    // datepicker
     jQuery('#volley_bundle_facebundle_post_published').datetimepicker({
         //defaultDate:new Date(),
         format:'Y-m-d H:i:s'
     });
+
+    // select2 resize init and resize
+    jQuery('a[href="#refs"]').on('click', function (event) {
+      resizeSelect()
+    })
+    jQuery('a[href="#refs"]').on('show.bs.tab', function (event) {
+      resizeSelect()
+    })
+    jQuery('a[href="#refs"]').on('shown.bs.tab', function (event) {
+      resizeSelect()
+    })
 });
diff --git a/src/Volley/FaceBundle/Resources/views/Post/edit.html.twig b/src/Volley/FaceBundle/Resources/views/Post/edit.html.twig
@@ -91,10 +91,13 @@
 {% block scripts %}
     {{ parent() }}
     <script type="text/javascript" src="{{ asset('bundles/volleyface/js/custom/jquery.datetimepicker.js') }}"></script>
+    <script type="text/javascript" src="{{ asset('bundles/volleyface/bower_components/select2/dist/js/select2.full.min.js') }}"></script>
+    <script src="{{ asset('bundles/tetranzselect2entity/js/select2entity.js') }}"></script>
     <script type="text/javascript" src="{{ asset('js/custom/post.js') }}"></script>
 {% endblock %}
 
 {% block styles %}
     {{ parent() }}
     <link rel="stylesheet" href="{{ asset('bundles/volleyface/css/jquery.datetimepicker.css') }}" type="text/css" />
+    <link rel="stylesheet" href="{{ asset('bundles/volleyface/bower_components/select2/dist/css/select2.min.css') }}" type="text/css"/>
 {% endblock %}
diff --git a/src/Volley/FaceBundle/Resources/views/Post/new.html.twig b/src/Volley/FaceBundle/Resources/views/Post/new.html.twig
@@ -72,10 +72,13 @@
 {% block scripts %}
     {{ parent() }}
     <script type="text/javascript" src="{{ asset('bundles/volleyface/js/custom/jquery.datetimepicker.js') }}"></script>
+    <script type="text/javascript" src="{{ asset('bundles/volleyface/bower_components/select2/dist/js/select2.full.min.js') }}"></script>
+    <script src="{{ asset('bundles/tetranzselect2entity/js/select2entity.js') }}"></script>
     <script type="text/javascript" src="{{ asset('js/custom/post.js') }}"></script>
 {% endblock %}
 
 {% block styles %}
     {{ parent() }}
     <link rel="stylesheet" href="{{ asset('bundles/volleyface/css/jquery.datetimepicker.css') }}" type="text/css" />
+    <link rel="stylesheet" href="{{ asset('bundles/volleyface/bower_components/select2/dist/css/select2.min.css') }}" type="text/css"/>
 {% endblock %}
diff --git a/src/Volley/StatBundle/Controller/TeamController.php b/src/Volley/StatBundle/Controller/TeamController.php
@@ -2,6 +2,7 @@
 
 namespace Volley\StatBundle\Controller;
 
+use Symfony\Component\HttpFoundation\JsonResponse;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Bundle\FrameworkBundle\Controller\Controller;
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\Method;
@@ -117,6 +118,24 @@ public function newAction()
         );
     }
 
+    /**
+     * Get Teams json
+     *
+     * @param Request $request
+
+     * @Route("/json", name="stat_team_json")
+     * @Method("GET")
+     *
+     * @return JsonResponse
+     */
+    public function getTeamsByNameAction(Request $request)
+    {
+        $q = $request->query->get('q',' ');
+        $em = $this->getDoctrine()->getManager();
+        $teams = $em->getRepository('VolleyStatBundle:Team')->findByName($q);
+        return JsonResponse::create($teams);
+    }
+
     /**
      * Finds and displays a Team entity.
      *

diff --git a/src/Volley/StatBundle/Entity/Person.php b/src/Volley/StatBundle/Entity/Person.php
@@ -662,7 +662,6 @@ public function getTeams()
      */
     public function addPost(Post $posts)
     {
-        $posts->addPerson($this);
         $this->posts[] = $posts;
 
         return $this;

diff --git a/src/Volley/StatBundle/Entity/Roster.php b/src/Volley/StatBundle/Entity/Roster.php
@@ -49,11 +49,17 @@ class Roster
      */
     protected $roster_persons;
 
+    /**
+     * @ORM\OneToMany(targetEntity="TeamSeason", mappedBy="roster", cascade={"persist"}, orphanRemoval=true)
+     */
+    protected $teams_seasons;
+
 
     function __construct()
     {
         $this->current = false;
         $this->roster_persons = new ArrayCollection();
+        $this->teams_seasons = new ArrayCollection();
     }
 
     /**

diff --git a/src/Volley/StatBundle/Entity/Team.php b/src/Volley/StatBundle/Entity/Team.php
@@ -12,10 +12,11 @@
  * Team
  *
  * @ORM\Table(name="stat_team")
+ * @ORM\Entity
  * @ORM\Entity(repositoryClass="Volley\StatBundle\Entity\TeamRepository")
  * @ORM\HasLifecycleCallbacks()
  */
-class Team
+class Team implements \JsonSerializable
 {
     /**
      * @var integer
@@ -339,7 +340,6 @@ public function removeRound(\Volley\StatBundle\Entity\Round $rounds)
      */
     public function addPost(Post $posts)
     {
-        $posts->addTeam($this);
         $this->posts[] = $posts;
 
         return $this;
@@ -780,5 +780,11 @@ function __toString()
         return $this->getName();
     }
 
-
+    public function jsonSerialize()
+    {
+        return [
+            'id' => $this->getId(),
+            'text' => $this->__toString()
+        ];
+    }
 }
diff --git a/src/Volley/StatBundle/Entity/TeamRepository.php b/src/Volley/StatBundle/Entity/TeamRepository.php
@@ -22,4 +22,24 @@ public function findByTournaments(array $tournaments) {
             ->orderBy('s.id','ASC')
             ->getQuery()->getResult();
     }
+
+    /**
+     * * Get team by query
+     *
+     * @param $q
+     * @return array
+     */
+    public function findByName($q)
+    {
+        $qb = $this->createQueryBuilder('t');
+        return $qb->select('t')
+            ->andWhere($qb->expr()->orX(
+                $qb->expr()->like('t.name', $qb->expr()->literal('%' . $q . '%'))
+            ))
+            ->orderBy('t.name', 'ASC')
+            ->setFirstResult(0)
+            ->setMaxResults(10)
+            ->getQuery()->getResult();
+
+    }
 }