Use preferred grading model instead of having it as part of the grade…

…s page dnna#22
dspinellis · Feb 26, 2016 · 6412bc1 · 6412bc1
1 parent bbbb6c2
commit 6412bc1
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/src/Pixelbonus/SiteBundle/Controller/QRController.php b/src/Pixelbonus/SiteBundle/Controller/QRController.php
@@ -45,6 +45,7 @@ public function course(Course $course) {
      * @Secure(roles="ROLE_USER")
      */
     public function courseGrades(Course $course) {
+        $user = $this->container->get('security.context')->getToken()->getUser();
         // Get all tags
         $tags = $this->container->get('doctrine')->getManager()->createQuery('SELECT t FROM Pixelbonus\SiteBundle\Entity\Tag t JOIN t.qrsets qrs WHERE qrs.course = :course')->setParameter('course', $course)->getResult();
         $selectedTag = $this->getRequest()->get('tag');
@@ -58,7 +59,7 @@ public function courseGrades(Course $course) {
             $maxRedemptions = 1;
         }
         // Add the grade based on our model
-        $selectedGradingModel = $this->getRequest()->get('model', 'reduction');
+        $selectedGradingModel = $this->getRequest()->get('model', $user->getPreferredGradingModel());
         if($selectedGradingModel == 'reduction') {
             $redemptions = array_map(function($e) use ($maxRedemptions) {
                 $e['grade'] = min($e['rcount']/$maxRedemptions*10, 10);

diff --git a/src/Pixelbonus/SiteBundle/Resources/views/QR/course_grades.html.twig b/src/Pixelbonus/SiteBundle/Resources/views/QR/course_grades.html.twig
@@ -24,13 +24,13 @@
                 </ul>
             </div>
         </div>
-        <hr />
+        {#<hr />
         <div class="row text-center">
             <div class="col-lg-2">
             {{'qr.grading_model'|trans}}:
             </div>
             <div class="col-lg-2"><a href="{{path('course_grades', app.request.get('_route_params')|merge(app.request.query.all())|merge({'course': course.id, 'model': 'reduction'}))}}" {% if selectedGradingModel == 'reduction' %}style="text-decoration: underline;"{% endif %}>{{'qr.reduction'|trans}}</a></div>
-        </div>
+        </div>#}
         <hr />
         <div class="row text-center">
             <div class="col-lg-12">