[Core] Assign quiz, question and category to teacher (author) #84

LaurentBouquet · Jul 28, 2021 · c1c02e0 · c1c02e0
1 parent fce238e
commit c1c02e0
Show file tree

Hide file tree

Showing 8 changed files with 55 additions and 12 deletions.
diff --git a/public/js/bootstrap.min.js b/public/js/bootstrap.min.js
diff --git a/public/js/jquery-3.3.1.slim.min.js b/public/js/jquery-3.3.1.slim.min.js
diff --git a/public/js/popper.min.js b/public/js/popper.min.js
diff --git a/src/Controller/QuizController.php b/src/Controller/QuizController.php
@@ -131,7 +131,7 @@ public function podium(Request $request, Quiz $quiz, EntityManagerInterface $em)
         $this->denyAccessUnlessGranted('ROLE_TEACHER', null, 'Access not allowed');
 
         if ($quiz->getActive()) {
-            // $quiz->setActive(false, $em); //TODO
+            // $quiz->setActiveInSession(false, $em); //TODO
             $em->persist($quiz);
             $em->flush();
         }
@@ -183,7 +183,7 @@ public function podium(Request $request, Quiz $quiz, EntityManagerInterface $em)
     public function activate(Request $request, Quiz $quiz, EntityManagerInterface $em): Response
     {
         $activate = ($request->query->get('active') == 1);
-        $quiz->setActive($activate, $em);
+        $quiz->setActiveInSession($activate, $em);
         $em->persist($quiz);
         $em->flush();
 
@@ -203,7 +203,7 @@ public function monitor(Request $request, Quiz $quiz, EntityManagerInterface $em
         $this->denyAccessUnlessGranted('ROLE_TEACHER', null, 'Access not allowed');
 
         if (!$quiz->getActive()) {
-            $quiz->setActive(true, $em);
+            $quiz->setActiveInSession(true, $em);
             $em->persist($quiz);
             $em->flush();
         }

diff --git a/src/Entity/Quiz.php b/src/Entity/Quiz.php
@@ -124,7 +124,8 @@ public function __construct()
         $this->setUpdatedAt(new \DateTime());
         $this->setShowResultQuestion(false);
         $this->setShowResultQuiz(false);
-        $this->setNumberOfQuestions(10);
+        $this->setNumberOfQuestions(5);
+        $this->setDefaultQuestionMaxDuration(180);
         $this->categories = new ArrayCollection();
         $this->workouts = new ArrayCollection();
         $this->setAllowAnonymousWorkout(false);
@@ -177,7 +178,25 @@ public function getActive(): ?bool
         return $this->active;
     }
 
-    public function setActive(bool $active, EntityManager $em): self
+    public function setActive(bool $active): self
+    {
+        $now = new DateTime();
+
+        if ($active) {
+            if (!$this->getActive()) {
+                $this->actived_at = $now;
+            }
+        } else {
+            $this->actived_at = null;
+            $session = $this->getLastSession();
+        }
+
+        $this->active = $active;
+
+        return $this;
+    }
+
+    public function setActiveInSession(bool $active, EntityManager $em): self
     {
         $now = new DateTime();
 

diff --git a/src/Form/QuestionType.php b/src/Form/QuestionType.php
@@ -16,16 +16,19 @@
 use Symfony\Component\Form\Extension\Core\Type\TextareaType;
 use Symfony\Component\Form\Extension\Core\Type\CollectionType;
 use Symfony\Component\DependencyInjection\ParameterBag\ParameterBagInterface;
+use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
 
 class QuestionType extends AbstractType
 {
     private $translator;
     private $param;
+    private $tokenStorage;
 
-    public function __construct(TranslatorInterface $translator, ParameterBagInterface $param)
+    public function __construct(TranslatorInterface $translator, ParameterBagInterface $param, TokenStorageInterface $tokenStorage)
     {
         $this->translator = $translator;
         $this->param = $param;
+        $this->tokenStorage = $tokenStorage;
     }
 
     public function buildForm(FormBuilderInterface $builder, array $options)
@@ -47,12 +50,13 @@ public function buildForm(FormBuilderInterface $builder, array $options)
             case 'teacher':
                 $builder->add('text');
                 $builder->add('max_duration', IntegerType::class, array(
+                    'required' => false,
                     'label' => 'Question max duration (seconds)',
                 ));
                 $builder->add('categories', EntityType::class, array(
                     'class' => Category::class,
-                    'query_builder' => function (CategoryRepository $er) {
-                        return $er->createQueryBuilder('c')->andWhere('c.language = :language')->setParameter('language', $this->param->get('locale'))->orderBy('c.shortname', 'ASC');
+                    'query_builder' => function (CategoryRepository $repository) {
+                        return $repository->createQueryBuilder('c')->andWhere('c.created_by = :created_by')->setParameter('created_by', $this->tokenStorage->getToken()->getUser())->andWhere('c.language = :language')->setParameter('language', $this->param->get('locale'))->orderBy('c.shortname', 'ASC');                        
                      },
                     'choice_label' => 'longname',
                     'multiple' => true

diff --git a/src/Form/QuizType.php b/src/Form/QuizType.php
@@ -12,16 +12,20 @@
 use Symfony\Component\Translation\TranslatorInterface;
 use Symfony\Component\Form\Extension\Core\Type\IntegerType;
 use Symfony\Component\DependencyInjection\ParameterBag\ParameterBagInterface;
+use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
 
 class QuizType extends AbstractType
 {
     private $translator;
     private $param;
+    private $tokenStorage;
 
-    public function __construct(TranslatorInterface $translator, ParameterBagInterface $param)
+    public function __construct(TranslatorInterface $translator, ParameterBagInterface $param, TokenStorageInterface $tokenStorage)
     {
         $this->translator = $translator;
         $this->param = $param;
+        $this->tokenStorage = $tokenStorage;
+
     }
 
     public function buildForm(FormBuilderInterface $builder, array $options)
@@ -32,7 +36,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
         $builder->add('categories', EntityType::class, array(
                 'class' => Category::class,
                 'query_builder' => function (CategoryRepository $er) {
-                    return $er->createQueryBuilder('c')->andWhere('c.language = :language')->setParameter('language', $this->param->get('locale'))->orderBy('c.shortname', 'ASC');
+                    return $er->createQueryBuilder('c')->andWhere('c.created_by = :created_by')->setParameter('created_by', $this->tokenStorage->getToken()->getUser())->andWhere('c.language = :language')->setParameter('language', $this->param->get('locale'))->orderBy('c.shortname', 'ASC');
                  },
                 'choice_label' => 'longname',
                 'multiple' => true

diff --git a/src/Repository/QuizRepository.php b/src/Repository/QuizRepository.php
@@ -57,8 +57,10 @@ public function find($id, $lockMode = null, $lockVersion = null, $isTeacher = fa
         $builder->andWhere('q.language = :language');
         $builder->setParameter('language', $this->language);
 
-        $builder->andWhere('q.created_by = :created_by');
-        $builder->setParameter('created_by', $this->tokenStorage->getToken()->getUser());
+        // if (!$isAdmin) {
+        //     $builder->andWhere('q.created_by = :created_by');
+        //     $builder->setParameter('created_by', $this->tokenStorage->getToken()->getUser());
+        // }
 
         $builder->orderBy('q.title', 'ASC');
         return $builder->getQuery()->getOneOrNullResult();