add new votes for secondary criteria judgin hackupc 2019

applications/migrations/0026_merge_20191013_0204.py

@@ -0,0 +1,16 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.23 on 2019-10-13 00:04
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('applications', '0025_auto_20191010_1815'),
+        ('applications', '0025_auto_20191010_0029'),
+    ]
+
+    operations = [
+    ]

judging/admin.py

@@ -22,7 +22,7 @@ class RoomAdmin(admin.ModelAdmin):
 
 class PresentationAdmin(admin.ModelAdmin):
     list_display = ('project', 'room', 'done', 'score', 'tech_score',
-                    'learning_score')
+                    'learning_score', 'design_score', 'ux_score', 'smoke_score')
     list_filter = ('room__challenge', 'room', 'done')
 
     def score(self, presentation):
@@ -33,6 +33,15 @@ def score(self, presentation):
     def tech_score(self, presentation):
         return presentation.tech_avg
 
+    def design_score(self, presentation):
+        return presentation.design_avg
+
+    def ux_score(self, presentation):
+        return presentation.ux_avg
+
+    def smoke_score(self, presentation):
+        return presentation.smoke_avg
+
     tech_score.admin_order_field = 'tech_score'
 
     def design_score(self, presentation):

judging/models.py

@@ -2,8 +2,7 @@
 from django.db.models import Count, Q, Avg, F
 
 from app import settings
-from user.models import User
-
+from user.models import User 
 
 class Challenge(models.Model):
     name = models.CharField(max_length=25)
@@ -122,6 +121,11 @@ def annotate_score(cls, qs):
     (5, '5')
 )
 
+SECONDARY_CRITERIA = (
+        (0, '0'),
+        (1, '1')
+)
+
 
 class PresentationEvaluation(models.Model):
     presentation = models.ForeignKey(Presentation, on_delete=models.CASCADE)
@@ -131,9 +135,9 @@ class PresentationEvaluation(models.Model):
     learning = models.IntegerField(choices=VOTES)
     idea = models.IntegerField(choices=VOTES)
     # Auxiliar criteria
-    design = models.IntegerField(choices=VOTES)
-    ux = models.IntegerField(choices=VOTES)
-    smoke = models.IntegerField(choices=VOTES)
+    design = models.IntegerField(choices=SECONDARY_CRITERIA)
+    ux = models.IntegerField(choices=SECONDARY_CRITERIA)
+    smoke = models.IntegerField(choices=SECONDARY_CRITERIA)
 
     class Meta:
         unique_together = (('presentation', 'judge_alias'))

judging/templates/include/number2.html

@@ -0,0 +1,6 @@
+<div class="">
+    <select name="{{ name }}" class="barrating " required>
+        <option value="0" selected>1</option>
+        <option value="1">2</option>
+    </select>
+</div>

judging/templates/room_judging.html

@@ -67,9 +67,9 @@ <h4 class="text-center">Secondary Score</h4>
           <dl class="dl-horizontal">
             <div class="row">
               <div class="col-md-2"><dt>Judge {{ judge }}</dt><dd></dd></div>
-              <div class="col-md-2 col-md-offset-2">{% include 'include/number5.html' with name="design_score_"|add:judge %}</div>
-              <div class="col-md-2">{% include 'include/number5.html' with name="ux_score_"|add:judge %}</div>
-              <div class="col-md-2">{% include 'include/number5.html' with name="smoke_score_"|add:judge %}</div>
+              <div class="col-md-2 col-md-offset-2">{% include 'include/number2.html' with name="design_score_"|add:judge %}</div>
+              <div class="col-md-2">{% include 'include/number2.html' with name="ux_score_"|add:judge %}</div>
+              <div class="col-md-2">{% include 'include/number2.html' with name="smoke_score_"|add:judge %}</div>
             </div>
           </dl>
           {% endfor %}