fix: Rename worksheet label to Challenge (#1427)

* fix: Rename worksheet label to Challenge

* Merge branch 'development' into rename_form_label

* Rename game class field to class

* Merge branch 'rename_form_label' of https://github.com/ocadotechnology/aimmo into rename_form_label

* Merge branch 'development' into rename_form_label

* Merge branch 'development' into rename_form_label

* Merge branch 'development' into rename_form_label

* Define worksheet widget to be consistent with game class

* Fix typo

aimmo/forms.py

@@ -1,17 +1,23 @@
+from common.models import Class
 from django.core.exceptions import ValidationError
 from django.db.models.query import QuerySet
 from django.forms import ModelChoiceField, ModelForm, Select
 
-from aimmo.models import Game
-from common.models import Class
+from aimmo.models import Game, Worksheet
 
 
 class AddGameForm(ModelForm):
     def __init__(self, classes: QuerySet, *args, **kwargs):
         super(AddGameForm, self).__init__(*args, **kwargs)
         self.fields["game_class"].queryset = classes
+        self.fields["worksheet"].queryset = Worksheet.objects.all()
 
-    game_class = ModelChoiceField(queryset=None, widget=Select, required=True)
+    game_class = ModelChoiceField(
+        queryset=None, widget=Select, label="Class", required=True
+    )
+    worksheet = ModelChoiceField(
+        queryset=None, widget=Select, label="Challenge", required=True
+    )
 
     class Meta:
         model = Game
@@ -46,8 +52,12 @@ def full_clean(self) -> None:
 
     def clean(self):
         game_class: Class = self.cleaned_data.get("game_class")
+        worksheet: Worksheet = self.cleaned_data.get("worksheet")
 
         if game_class and not Class.objects.filter(pk=game_class.id).exists():
             raise ValidationError("Sorry, an invalid class was entered")
 
+        if worksheet and not Worksheet.objects.filter(pk=worksheet.id).exists():
+            raise ValidationError("Sorry, an invalid challenge was entered")
+
         return self.cleaned_data