diff --git a/hackathon/migrations/0008_hackprojectscorecategory_highest_score.py b/hackathon/migrations/0008_hackprojectscorecategory_highest_score.py new file mode 100644 index 00000000..a6b14d9e --- /dev/null +++ b/hackathon/migrations/0008_hackprojectscorecategory_highest_score.py @@ -0,0 +1,18 @@ +# Generated by Django 3.1.1 on 2020-10-18 11:43 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('hackathon', '0007_auto_20201017_1148'), + ] + + operations = [ + migrations.AddField( + model_name='hackprojectscorecategory', + name='highest_score', + field=models.IntegerField(default=10), + ), + ] diff --git a/hackathon/migrations/0009_auto_20201018_1829.py b/hackathon/migrations/0009_auto_20201018_1829.py new file mode 100644 index 00000000..c5a2ed8a --- /dev/null +++ b/hackathon/migrations/0009_auto_20201018_1829.py @@ -0,0 +1,23 @@ +# Generated by Django 3.1.1 on 2020-10-18 18:29 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('hackathon', '0008_hackprojectscorecategory_highest_score'), + ] + + operations = [ + migrations.RenameField( + model_name='hackprojectscorecategory', + old_name='highest_score', + new_name='max_score', + ), + migrations.AddField( + model_name='hackprojectscorecategory', + name='min_score', + field=models.IntegerField(default=1), + ), + ] diff --git a/hackathon/models.py b/hackathon/models.py index cc1f1b11..c0163c3a 100644 --- a/hackathon/models.py +++ b/hackathon/models.py @@ -166,6 +166,10 @@ class HackProjectScoreCategory(models.Model): on_delete=models.CASCADE, related_name="hackprojectscorecategories") category = models.CharField(default="", max_length=255) + # Score Categories can have different score range (e.g. 1-10, 1-15) + # these fields set the scale + min_score = models.IntegerField(default=1) + max_score = models.IntegerField(default=10) def __str__(self): return self.category diff --git a/hackathon/tests/test_models.py b/hackathon/tests/test_models.py index 338b9d9c..05ad16cb 100644 --- a/hackathon/tests/test_models.py +++ b/hackathon/tests/test_models.py @@ -45,7 +45,10 @@ def setUp(self): score_category = HackProjectScoreCategory.objects.create( created_by=user, - category="testcategory") + category="testcategory", + min_score=1, + max_score=15) + score_category.save() HackProjectScore.objects.create( created_by=user, @@ -80,3 +83,7 @@ def test_hackprojectscorecategory_str(self): """Tests the string method on the hackathon.""" self.assertEqual(str(HackProjectScoreCategory.objects.get(pk=1)), ('testcategory')) + self.assertEqual(HackProjectScoreCategory.objects.get(pk=1).min_score, + 1) + self.assertEqual(HackProjectScoreCategory.objects.get(pk=1).max_score, + 15)