Browse Source

Ajout des notes

François 6 years ago
parent
commit
27d902d76d

+ 4 - 0
assets/js/app.js

@@ -8,6 +8,10 @@ import 'jquery-ui/themes/base/all.css';
 import 'jquery-ui/ui/widgets/autocomplete';
 import 'bootstrap-notify/bootstrap-notify';
 import 'animate.css/animate.css';
+import 'bootstrap-star-rating';
+import 'bootstrap-star-rating/css/star-rating.css';
+import 'bootstrap-star-rating/themes/krajee-fa/theme';
+import 'bootstrap-star-rating/themes/krajee-fa/theme.css';
 
 $(document).ready(function() {
     $(function() {

+ 33 - 33
composer.lock

@@ -414,16 +414,16 @@
         },
         {
             "name": "doctrine/doctrine-bundle",
-            "version": "1.9.1",
+            "version": "1.10.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/doctrine/DoctrineBundle.git",
-                "reference": "703fad32e4c8cbe609caf45a71a1d4266c830f0f"
+                "reference": "82d2c63cd09acbde2332f55d9aa7b28aefe4983d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/DoctrineBundle/zipball/703fad32e4c8cbe609caf45a71a1d4266c830f0f",
-                "reference": "703fad32e4c8cbe609caf45a71a1d4266c830f0f",
+                "url": "https://api.github.com/repos/doctrine/DoctrineBundle/zipball/82d2c63cd09acbde2332f55d9aa7b28aefe4983d",
+                "reference": "82d2c63cd09acbde2332f55d9aa7b28aefe4983d",
                 "shasum": ""
             },
             "require": {
@@ -441,8 +441,8 @@
             },
             "require-dev": {
                 "doctrine/orm": "~2.4",
+                "php-coveralls/php-coveralls": "^2.1",
                 "phpunit/phpunit": "^4.8.36|^5.7|^6.4",
-                "satooshi/php-coveralls": "^1.0",
                 "symfony/phpunit-bridge": "~2.7|~3.0|~4.0",
                 "symfony/property-info": "~2.8|~3.0|~4.0",
                 "symfony/validator": "~2.7|~3.0|~4.0",
@@ -457,7 +457,7 @@
             "type": "symfony-bundle",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.8.x-dev"
+                    "dev-master": "1.9.x-dev"
                 }
             },
             "autoload": {
@@ -495,7 +495,7 @@
                 "orm",
                 "persistence"
             ],
-            "time": "2018-04-19 14:07:39"
+            "time": "2018-11-30 13:53:17"
         },
         {
             "name": "doctrine/doctrine-cache-bundle",
@@ -1263,16 +1263,16 @@
         },
         {
             "name": "psr/log",
-            "version": "1.0.2",
+            "version": "1.1.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/php-fig/log.git",
-                "reference": "4ebe3a8bf773a19edfe0a84b6585ba3d401b724d"
+                "reference": "6c001f1daafa3a3ac1d8ff69ee4db8e799a654dd"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/php-fig/log/zipball/4ebe3a8bf773a19edfe0a84b6585ba3d401b724d",
-                "reference": "4ebe3a8bf773a19edfe0a84b6585ba3d401b724d",
+                "url": "https://api.github.com/repos/php-fig/log/zipball/6c001f1daafa3a3ac1d8ff69ee4db8e799a654dd",
+                "reference": "6c001f1daafa3a3ac1d8ff69ee4db8e799a654dd",
                 "shasum": ""
             },
             "require": {
@@ -1306,7 +1306,7 @@
                 "psr",
                 "psr-3"
             ],
-            "time": "2016-10-10 12:19:37"
+            "time": "2018-11-20 15:27:04"
         },
         {
             "name": "psr/simple-cache",
@@ -1410,16 +1410,16 @@
         },
         {
             "name": "sensio/framework-extra-bundle",
-            "version": "v5.2.2",
+            "version": "v5.2.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sensiolabs/SensioFrameworkExtraBundle.git",
-                "reference": "9ef408febe2f12e70118ef61c6515035a06c5830"
+                "reference": "1032c7077fd1a6f24f98b5a8377938000859f35d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sensiolabs/SensioFrameworkExtraBundle/zipball/9ef408febe2f12e70118ef61c6515035a06c5830",
-                "reference": "9ef408febe2f12e70118ef61c6515035a06c5830",
+                "url": "https://api.github.com/repos/sensiolabs/SensioFrameworkExtraBundle/zipball/1032c7077fd1a6f24f98b5a8377938000859f35d",
+                "reference": "1032c7077fd1a6f24f98b5a8377938000859f35d",
                 "shasum": ""
             },
             "require": {
@@ -1438,7 +1438,7 @@
                 "symfony/finder": "^3.3|^4.0",
                 "symfony/monolog-bridge": "^3.0|^4.0",
                 "symfony/monolog-bundle": "^3.2",
-                "symfony/phpunit-bridge": "^3.3|^4.0",
+                "symfony/phpunit-bridge": "^3.4.19|^4.1.8",
                 "symfony/psr-http-message-bridge": "^0.3",
                 "symfony/security-bundle": "^3.3|^4.0",
                 "symfony/twig-bundle": "^3.3|^4.0",
@@ -1477,20 +1477,20 @@
                 "annotations",
                 "controllers"
             ],
-            "time": "2018-10-26 14:09:02"
+            "time": "2018-11-30 18:25:56"
         },
         {
             "name": "sensiolabs/security-checker",
-            "version": "v5.0.1",
+            "version": "v5.0.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sensiolabs/security-checker.git",
-                "reference": "9ea927417c949039a9cfb0d92af76fd1c538d9e9"
+                "reference": "728f9fb0fe815003b3bcfd331d33106c0d8a6b1e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sensiolabs/security-checker/zipball/9ea927417c949039a9cfb0d92af76fd1c538d9e9",
-                "reference": "9ea927417c949039a9cfb0d92af76fd1c538d9e9",
+                "url": "https://api.github.com/repos/sensiolabs/security-checker/zipball/728f9fb0fe815003b3bcfd331d33106c0d8a6b1e",
+                "reference": "728f9fb0fe815003b3bcfd331d33106c0d8a6b1e",
                 "shasum": ""
             },
             "require": {
@@ -1523,7 +1523,7 @@
                 }
             ],
             "description": "A security checker for your composer.lock",
-            "time": "2018-10-16 10:30:44"
+            "time": "2018-12-10 06:08:43"
         },
         {
             "name": "swiftmailer/swiftmailer",
@@ -2101,16 +2101,16 @@
         },
         {
             "name": "symfony/symfony",
-            "version": "v3.4.18",
+            "version": "v3.4.20",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/symfony.git",
-                "reference": "ee054aa62e535b7905c5b8e90cb49a1ad65dbfd8"
+                "reference": "f6b8ddc362b1cf3fb06548693c3adbb736092412"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/symfony/zipball/ee054aa62e535b7905c5b8e90cb49a1ad65dbfd8",
-                "reference": "ee054aa62e535b7905c5b8e90cb49a1ad65dbfd8",
+                "url": "https://api.github.com/repos/symfony/symfony/zipball/f6b8ddc362b1cf3fb06548693c3adbb736092412",
+                "reference": "f6b8ddc362b1cf3fb06548693c3adbb736092412",
                 "shasum": ""
             },
             "require": {
@@ -2252,7 +2252,7 @@
             "keywords": [
                 "framework"
             ],
-            "time": "2018-11-03 10:03:29"
+            "time": "2018-12-06 15:24:36"
         },
         {
             "name": "twbs/bootstrap",
@@ -2430,16 +2430,16 @@
         },
         {
             "name": "symfony/phpunit-bridge",
-            "version": "v3.4.18",
+            "version": "v3.4.20",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/phpunit-bridge.git",
-                "reference": "76e013a98031356604e5a730c9eb22713dc4dda4"
+                "reference": "2155067dfc73e0e77dbc26f236af17e4df552de5"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/phpunit-bridge/zipball/76e013a98031356604e5a730c9eb22713dc4dda4",
-                "reference": "76e013a98031356604e5a730c9eb22713dc4dda4",
+                "url": "https://api.github.com/repos/symfony/phpunit-bridge/zipball/2155067dfc73e0e77dbc26f236af17e4df552de5",
+                "reference": "2155067dfc73e0e77dbc26f236af17e4df552de5",
                 "shasum": ""
             },
             "require": {
@@ -2492,7 +2492,7 @@
             ],
             "description": "Symfony PHPUnit Bridge",
             "homepage": "https://symfony.com",
-            "time": "2018-10-02 12:28:39"
+            "time": "2018-11-20 16:47:12"
         }
     ],
     "aliases": [],

+ 7 - 2
src/AppBundle/Controller/VideothequeController.php

@@ -158,8 +158,13 @@ class VideothequeController extends Controller
         $form->handleRequest($request);
         if ($form->isSubmitted() && $form->isValid())
         {
-            $commentaireUser = $form->getData();
-            $em->persist($commentaireUser);
+            if ($commentaireUser->getContenu() =="" && $commentaireUser->getNote() == 0) {
+                if (null !== $commentaireUser->getId()) {
+                    $em->remove($commentaireUser);
+                }
+            } else {
+                $em->persist($commentaireUser);
+            }
             $em->flush();
             $this->addFlash('success', 'Le commentaire a été posté');
 

+ 25 - 1
src/AppBundle/Entity/Commentaire.php

@@ -24,10 +24,18 @@ class Commentaire
     /**
      * @var string
      *
-     * @ORM\Column(name="contenu", type="text")
+     * @ORM\Column(name="contenu", type="text", nullable=true)
      */
     private $contenu;
 
+    /**
+     * @var int
+     *
+     * @ORM\Column(name="note", type="integer")
+     *
+     */
+    private $note;
+
     /**
      * @ORM\ManyToOne(targetEntity="AppBundle\Entity\Film")
      * @ORM\JoinColumn(nullable=false)
@@ -74,6 +82,22 @@ class Commentaire
         return $this->contenu;
     }
 
+    /**
+     * @return int
+     */
+    public function getNote()
+    {
+        return $this->note;
+    }
+
+    /**
+     * @param int $note
+     */
+    public function setNote($note)
+    {
+        $this->note = $note;
+    }
+
     /**
      * Set film
      *

+ 15 - 7
src/AppBundle/Form/CommentaireType.php

@@ -7,6 +7,7 @@ use AppBundle\Repository\RealisateurRepository;
 use Symfony\Bridge\Doctrine\Form\Type\EntityType;
 use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
 use Symfony\Component\Form\Extension\Core\Type\CollectionType;
+use Symfony\Component\Form\Extension\Core\Type\NumberType;
 use Symfony\Component\Form\Extension\Core\Type\RangeType;
 use Symfony\Component\Form\Extension\Core\Type\TextType;
 use Symfony\Component\Form\AbstractType;
@@ -26,17 +27,24 @@ class CommentaireType extends AbstractType
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
 	    $builder
-            ->add('contenu', TextareaType::class, array(
-                'label' => false
-            ))
-
-            /*->add('note', RangeType::class, array (
+            ->add('note', NumberType::class, array (
                 'required'  => false,
+                'label'       => false,
                 'attr'      => array (
                     'min'   => 0,
-                    'max'   => 5
+                    'max'   => 5,
+                    'class' => "rating",
+                    'data-step' => 1,
+                    'data-show-clear'   => "true",
+                    'data-show-caption' => "false",
+                    'data-size'         => "sm",
+                    'data-theme'          => "krajee-fa"
                 )
-            ))*/
+            ))
+            ->add('contenu', TextareaType::class, array(
+                'required' => false,
+                'label' => false
+            ))
 		    ->add('save', SubmitType::class, array(
 		        'label' => 'Enregistrer le commentaire',
                 'attr'=>array(

+ 15 - 1
src/AppBundle/Resources/views/videotheque/voirfilm.html.twig

@@ -104,7 +104,21 @@
                                     <a type="button" data-toggle="modal" data-target="#supprcommentaire" class="float-lg-right" id="supp_commentaire" href="#"><i class="fa fa-trash" style="color: Tomato"></i></a>
                                 {% endif %}#}
                                 <p class="mb-1"><strong>Posté par {{ commentaire.user.username }}</strong></p>
-                                <p class="mb-1">{{ commentaire.contenu }}</p>
+                                {% if commentaire.note > 0 %}
+                                    <input class="rating"
+                                           data-disabled="true"
+                                           data-show-clear="false"
+                                           data-show-caption="false"
+                                           data-theme="krajee-fa"
+                                           min=0
+                                           max=5
+                                           data-step=1
+                                           data-size="xs"
+                                           value="{{ commentaire.note }}">
+                                {% endif %}
+                                {% if commentaire.contenu != "" %}
+                                    <p class="mb-1">{{ commentaire.contenu }}</p>
+                                {%  endif %}
                             </div>
                         {% endfor %}
                     </div>