Merge branch 'master' of https://github.com/netgen/LiveVotingBundle

ezpublishlegacy · Jul 30, 2015 · 88ced11 · 88ced11
2 parents 236ce20 + 57b0414
commit 88ced11
Show file tree

Hide file tree

Showing 6 changed files with 32 additions and 15 deletions.
diff --git a/Controller/DashboardController.php b/Controller/DashboardController.php
@@ -85,7 +85,7 @@ public function getPresentationsAction(){
       if($numOfUsers === 0)
         $presentation['average'] = 0;
       else
-        $presentation['average'] = $sum/$numOfUsers;
+        $presentation['average'] = round($sum/$numOfUsers, 2);
     }
 
     // Limit LiveResults to three presentations

diff --git a/Controller/IndexController.php b/Controller/IndexController.php
@@ -10,6 +10,7 @@
 namespace Netgen\LiveVotingBundle\Controller;
 
 use Netgen\LiveVotingBundle\Entity\Event;
+use Netgen\LiveVotingBundle\Entity\Presentation;
 use Symfony\Bundle\FrameworkBundle\Controller\Controller;
 use Symfony\Component\HttpFoundation\JsonResponse;
 use Symfony\Component\HttpFoundation\Request;
@@ -23,6 +24,7 @@
  */
 class IndexController extends Controller
 {
+    private $has_voting = false;
     /**
      * Lists all Events on /user/ landing page
      * @return mixed
@@ -31,14 +33,29 @@ public function landingAction()
     {
         $events = $this->getDoctrine()->getManager()
             ->createQueryBuilder("e")
-            ->select("e")
+            ->select("e, p")
             ->from("LiveVotingBundle:event", "e")
             ->where('e.begin < :datetime')
-            ->andWhere('e.end > :datetime')
             ->orderBy('e.event', 'ASC')
+            ->leftjoin('e.presentations', "p")
             ->setParameter('datetime', new \DateTime())
             ->getQuery()->getResult();
         $events = $this->sortEvents($events);
+        foreach($events as $key => $event) {
+            /**
+             * @var $event Event
+             */
+            $this->has_voting = false;
+            foreach($event->getPresentations() as $presentationKey => $presentation) {
+                /**
+                 * @var $presentation Presentation
+                 */
+                if($presentation->getVotingEnabled()) {
+                    $this->has_voting = true;
+                }
+            }
+            $events[$key]->hasVoting = $this->has_voting;
+        }
         return $this->render('LiveVotingBundle:Index:landing.html.twig',
             array(
               'events'=>$events

diff --git a/Features/Result/Result.php b/Features/Result/Result.php
@@ -56,7 +56,7 @@ public function getResults($event_id){
                 $tmp = $presentationResult[$vote->getPresentation()->getId()];
                 $tmp['numOfUsers']++;
                 $tmp['score'] += $vote->getRate();
-                $tmp['average'] = round($tmp['score']/$tmp['numOfUsers'], 5);
+                $tmp['average'] = round($tmp['score']/$tmp['numOfUsers'], 2);
                 $tmp1[$vote->getPresentation()->getId()]  = $tmp;
                 $presentationResult[$vote->getPresentation()->getId()] = $tmp;
             }
@@ -96,7 +96,7 @@ public function getLiveResults($event_id){
                 $data['numOfUsers']++;
             }
             if($data['numOfUsers']){
-                $data['average'] = round($data['score']/$data['numOfUsers'], 5);
+                $data['average'] = round($data['score']/$data['numOfUsers'], 2);
                 $result['presentations'][] = array(
                 'presentation'=>array('name'=>$presentation->getPresentationName(), 'entity'=>$presentation),
                 'score'=>$data);
@@ -128,7 +128,7 @@ public function getLiveResultsQuestion($event_id){
                     $data['numOfUsers']++;
                 }
                 if($data['numOfUsers']){
-                    $data['average'] = round($data['score'] / $data['numOfUsers'], 5);
+                    $data['average'] = round($data['score'] / $data['numOfUsers'], 2);
                     $result['questions'][] = array(
                             'question' => array(
                                 'name' => $question->getQuestion(), 

diff --git a/Form/PresentationType.php b/Form/PresentationType.php
@@ -23,6 +23,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                 'data_class' => null,
                 'required' => false
             ))
+            ->add('globalBrake', 'checkbox', array('attr' => array('class' => 'form-control'), "label" => "Global break (lunch, pause, etc.)"))
             ->add('hall', 'text' ,array('attr' => array('class' => 'form-control')))
             ->add('user', 'entity' ,array('attr' => array('class' => 'form-control'), 'class' => 'LiveVotingBundle:User', 'property' => 'email'))
             ->add('begin')

diff --git a/Resources/views/Dashboard/index.html.twig b/Resources/views/Dashboard/index.html.twig
@@ -239,6 +239,13 @@
                         $(this).removeClass('active');
                     }
                 });
+                this.element.find('.vote-option').each(function () {
+                    if (this.value == vote_number) {
+                        $(this).addClass('active');
+                    } else {
+                        $(this).removeClass('active');
+                    }
+                });
             };
 
 
@@ -392,9 +399,6 @@
         }
 
         function pequals(p, presentation) {
-            console.log("Comparing");
-            console.log(p);
-            console.log(presentation);
             if(p.id != presentation.id) return false;
             if(p.globalBrake != presentation.globalBrake) return false;
             if(p.begin != presentation.begin) return false;
@@ -411,7 +415,6 @@
                     dataType: "json",
                     success: function (data) {
                         if('presentations' in data) {
-                            console.log("Number of displayed presentations "+displayedPresentations.length);
                             if(displayedPresentations.length == 0) {
                                 var result = $.grep(data.presentations, function(e){
                                     return e.globalBrake;
@@ -436,17 +439,13 @@
                                     //removing expired presentations
                                     displayedPresentations.forEach(function(displayed_presentation, index, array) {
                                        if(!presentationInArray(displayed_presentation, data.presentations)) {
-                                           console.log("Removing");
-                                           console.log(displayed_presentation);
                                            $('#presentation-'+displayed_presentation.id).remove();
                                            array.splice(index, 1);
                                        }
                                     });
                                     //adding presentations scheduled next
                                     data.presentations.forEach(function(presentation) {
                                         if(!presentationInArray(presentation, displayedPresentations)) {
-                                            console.log("Adding");
-                                            console.log(presentation);
                                             $(presentation_template(presentation)).hide().appendTo(srcDiv).fadeIn(1500);
                                             displayedPresentations.push(presentation);
                                         }

diff --git a/Resources/views/Index/landing.html.twig b/Resources/views/Index/landing.html.twig
@@ -25,7 +25,7 @@
 			<div class="clearfix visible-xs"></div>
 			<div class="col-xs-12 col-sm-5 col-lg-4">				
 				<div class="text-right actions">
-					<a href="{{path('event', {'event_id':event.getId})}}" class="text-center"><i class="fa fa-thumbs-o-up"></i><span>Vote</span></a><!--
+					{% if event.hasVoting %}<a href="{{path('event', {'event_id':event.getId})}}" class="text-center"><i class="fa fa-thumbs-o-up"></i><span>Vote</span></a>{% endif %}<!--
 					{% if event.getAllowViewingResults %}
 					--><a href="{{path('result', {'event_id':event.getId})}}" class="text-center"><i class="fa fa-bar-chart"></i><span>Results</span></a><!--
 					{% endif %}