codeforlife-portal 8.0.0__py2.py3-none-any.whl → 8.0.2__py2.py3-none-any.whl

portal/forms/teach.py

@@ -3,14 +3,14 @@ import re
 from builtins import map, range, str
 
 from common.helpers.emails import send_verification_email
-from common.models import Student, stripStudentName, UserSession, Teacher
+from common.models import Student, Teacher, UserSession, stripStudentName
 from django import forms
 from django.contrib.auth import authenticate
 from django.contrib.auth.forms import AuthenticationForm
 from django.contrib.auth.models import User
 from django_recaptcha.fields import ReCaptchaField
 from django_recaptcha.widgets import ReCaptchaV2Invisible
-from game.models import Episode
+from game.models import Episode, Worksheet
 
 from portal.forms.error_messages import INVALID_LOGIN_MESSAGE
 from portal.helpers.password import PasswordStrength, form_clean_password
@@ -18,46 +18,34 @@ from portal.helpers.ratelimit import clear_ratelimit_cache_for_user
 
 
 class InvitedTeacherForm(forms.Form):
-    prefix = 'teacher_signup'
+    prefix = "teacher_signup"
 
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
         for field_name, field in self.fields.items():
-            field.widget.attrs['id'] = f'id_teacher_signup-{field_name}'
+            field.widget.attrs["id"] = f"id_teacher_signup-{field_name}"
 
     teacher_password = forms.CharField(
         help_text="Enter a password",
-        widget=forms.PasswordInput(
-            attrs={"autocomplete": "off", "placeholder": "Password"}
-        ),
+        widget=forms.PasswordInput(attrs={"autocomplete": "off", "placeholder": "Password"}),
     )
     teacher_confirm_password = forms.CharField(
         help_text="Repeat password",
-        widget=forms.PasswordInput(
-            attrs={"autocomplete": "off", "placeholder": "Repeat password"}
-        ),
+        widget=forms.PasswordInput(attrs={"autocomplete": "off", "placeholder": "Repeat password"}),
     )
 
-    consent_ticked = forms.BooleanField(
-        widget=forms.CheckboxInput(), initial=False, required=True
-    )
-    newsletter_ticked = forms.BooleanField(
-        widget=forms.CheckboxInput(), initial=False, required=False
-    )
+    consent_ticked = forms.BooleanField(widget=forms.CheckboxInput(), initial=False, required=True)
+    newsletter_ticked = forms.BooleanField(widget=forms.CheckboxInput(), initial=False, required=False)
 
     def clean_teacher_password(self):
-        return form_clean_password(
-            self, "teacher_password", PasswordStrength.TEACHER
-        )
+        return form_clean_password(self, "teacher_password", PasswordStrength.TEACHER)
 
     def clean(self):
         if any(self.errors):
             return
 
         password = self.cleaned_data.get("teacher_password", None)
-        confirm_password = self.cleaned_data.get(
-            "teacher_confirm_password", None
-        )
+        confirm_password = self.cleaned_data.get("teacher_confirm_password", None)
 
         check_passwords(password, confirm_password)
 
@@ -68,22 +56,16 @@ class TeacherSignupForm(InvitedTeacherForm):
     teacher_first_name = forms.CharField(
         help_text="Enter your first name",
         max_length=100,
-        widget=forms.TextInput(
-            attrs={"autocomplete": "off", "placeholder": "First name"}
-        ),
+        widget=forms.TextInput(attrs={"autocomplete": "off", "placeholder": "First name"}),
     )
     teacher_last_name = forms.CharField(
         help_text="Enter your last name",
         max_length=100,
-        widget=forms.TextInput(
-            attrs={"autocomplete": "off", "placeholder": "Last name"}
-        ),
+        widget=forms.TextInput(attrs={"autocomplete": "off", "placeholder": "Last name"}),
     )
     teacher_email = forms.EmailField(
         help_text="Enter your email address",
-        widget=forms.EmailInput(
-            attrs={"autocomplete": "off", "placeholder": "Email address"}
-        ),
+        widget=forms.EmailInput(attrs={"autocomplete": "off", "placeholder": "Email address"}),
     )
 
     captcha = ReCaptchaField(widget=ReCaptchaV2Invisible)
@@ -92,37 +74,27 @@ class TeacherSignupForm(InvitedTeacherForm):
 class TeacherEditAccountForm(forms.Form):
     first_name = forms.CharField(
         max_length=100,
-        widget=forms.TextInput(
-            attrs={"placeholder": "First name", "class": "fName"}
-        ),
+        widget=forms.TextInput(attrs={"placeholder": "First name", "class": "fName"}),
         help_text="First name",
     )
     last_name = forms.CharField(
         max_length=100,
-        widget=forms.TextInput(
-            attrs={"placeholder": "Last name", "class": "lName"}
-        ),
+        widget=forms.TextInput(attrs={"placeholder": "Last name", "class": "lName"}),
         help_text="Last name",
     )
     email = forms.EmailField(
         required=False,
-        widget=forms.EmailInput(
-            attrs={"placeholder": "New email address (optional)"}
-        ),
+        widget=forms.EmailInput(attrs={"placeholder": "New email address (optional)"}),
         help_text="New email address (optional)",
     )
     password = forms.CharField(
         required=False,
-        widget=forms.PasswordInput(
-            attrs={"placeholder": "New password (optional)"}
-        ),
+        widget=forms.PasswordInput(attrs={"placeholder": "New password (optional)"}),
         help_text="New password (optional)",
     )
     confirm_password = forms.CharField(
         required=False,
-        widget=forms.PasswordInput(
-            attrs={"placeholder": "Confirm new password (optional)"}
-        ),
+        widget=forms.PasswordInput(attrs={"placeholder": "Confirm new password (optional)"}),
         help_text="Confirm new password (optional)",
     )
     current_password = forms.CharField(
@@ -149,9 +121,7 @@ class TeacherEditAccountForm(forms.Form):
 
         return self.cleaned_data
 
-    def check_password_errors(
-        self, password, confirm_password, current_password
-    ):
+    def check_password_errors(self, password, confirm_password, current_password):
         check_passwords(password, confirm_password)
 
         if not self.user.check_password(current_password):
@@ -160,15 +130,11 @@ class TeacherEditAccountForm(forms.Form):
 
 class TeacherLoginForm(AuthenticationForm):
     username = forms.EmailField(
-        widget=forms.EmailInput(
-            attrs={"autocomplete": "off", "placeholder": "Email address"}
-        ),
+        widget=forms.EmailInput(attrs={"autocomplete": "off", "placeholder": "Email address"}),
         help_text="Enter your email address",
     )
     password = forms.CharField(
-        widget=forms.PasswordInput(
-            attrs={"autocomplete": "off", "placeholder": "Password"}
-        ),
+        widget=forms.PasswordInput(attrs={"autocomplete": "off", "placeholder": "Password"}),
         help_text="Enter your password",
     )
 
@@ -202,9 +168,7 @@ class TeacherLoginForm(AuthenticationForm):
         users = User.objects.filter(email=email)
 
         for result in users:
-            if hasattr(result, "userprofile") and hasattr(
-                result.userprofile, "teacher"
-            ):
+            if hasattr(result, "userprofile") and hasattr(result.userprofile, "teacher"):
                 user = result
                 break
 
@@ -286,9 +250,7 @@ class ClassEditForm(forms.Form):
         [
             (
                 str(hours),
-                "Allow external requests to this class for the next "
-                + str(hours)
-                + " hours",
+                "Allow external requests to this class for the next " + str(hours) + " hours",
             )
             for hours in range(4, 28, 4)
         ]
@@ -297,9 +259,7 @@ class ClassEditForm(forms.Form):
         [
             (
                 str(days * 24),
-                "Allow external requests to this class for the next "
-                + str(days)
-                + " days",
+                "Allow external requests to this class for the next " + str(days) + " days",
             )
             for days in range(2, 5)
         ]
@@ -333,18 +293,22 @@ class ClassLevelControlForm(forms.Form):
     def __init__(self, *args, **kwargs):
         super(ClassLevelControlForm, self).__init__(*args, **kwargs)
 
-        episodes = Episode.objects.filter(pk__in=range(1, 22))
+        episodes = Episode.objects.filter(pk__in=range(1, 25))
 
         for episode in episodes:
-            levels = []
-
+            choices = []
             for level in episode.levels:
-                levels.append(level)
+                try:
+                    choices.append((f"worksheet:{level.after_worksheet.id}", episode.name))
+                except Worksheet.DoesNotExist:
+                    pass
+                choices.append((f"level:{level.id}", level.name))
 
-            levels_choices = [(level.id, level.name) for level in levels]
+            for worksheet in episode.worksheets.filter(before_level__isnull=True):
+                choices.append((f"worksheet:{worksheet.id}", episode.name))
 
             self.fields[episode.name] = forms.MultipleChoiceField(
-                choices=itertools.chain(levels_choices),
+                choices=itertools.chain(choices),
                 widget=forms.CheckboxSelectMultiple(),
                 required=False,
             )
@@ -364,9 +328,7 @@ class ClassMoveForm(forms.Form):
             teacher_choices.append(
                 (
                     teacher.id,
-                    teacher.new_user.first_name
-                    + " "
-                    + teacher.new_user.last_name,
+                    teacher.new_user.first_name + " " + teacher.new_user.last_name,
                 )
             )
         super(ClassMoveForm, self).__init__(*args, **kwargs)
@@ -389,24 +351,14 @@ class TeacherEditStudentForm(forms.Form):
         name = stripStudentName(self.cleaned_data.get("name", ""))
 
         if name == "":
-            raise forms.ValidationError(
-                "'"
-                + self.cleaned_data.get("name", "")
-                + "' is not a valid name"
-            )
+            raise forms.ValidationError("'" + self.cleaned_data.get("name", "") + "' is not a valid name")
 
         if re.match(re.compile("^[\w -]+$"), name) is None:
-            raise forms.ValidationError(
-                "Names may only contain letters, numbers, dashes, underscores, and spaces."
-            )
+            raise forms.ValidationError("Names may only contain letters, numbers, dashes, underscores, and spaces.")
 
-        students = Student.objects.filter(
-            class_field=self.klass, new_user__first_name__iexact=name
-        )
+        students = Student.objects.filter(class_field=self.klass, new_user__first_name__iexact=name)
         if students.exists() and students[0] != self.student:
-            raise forms.ValidationError(
-                "There is already a student called '" + name + "' in this class"
-            )
+            raise forms.ValidationError("There is already a student called '" + name + "' in this class")
 
         return name
 
@@ -415,16 +367,12 @@ class TeacherSetStudentPass(forms.Form):
     password = forms.CharField(
         label="New password",
         help_text="Enter new password",
-        widget=forms.PasswordInput(
-            attrs={"autocomplete": "off", "placeholder": "Enter new password"}
-        ),
+        widget=forms.PasswordInput(attrs={"autocomplete": "off", "placeholder": "Enter new password"}),
     )
     confirm_password = forms.CharField(
         label="Confirm new password",
         help_text="Confirm new password",
-        widget=forms.PasswordInput(
-            attrs={"autocomplete": "off", "placeholder": "Confirm new password"}
-        ),
+        widget=forms.PasswordInput(attrs={"autocomplete": "off", "placeholder": "Confirm new password"}),
     )
 
     def clean_password(self):
@@ -468,32 +416,19 @@ def validateStudentNames(klass, names):
 
 def find_clashes(names, students, clashes_found, validationErrors):
     for name in names:
-        if (
-            students.filter(new_user__first_name__iexact=name).exists()
-            and name not in clashes_found
-        ):
+        if students.filter(new_user__first_name__iexact=name).exists() and name not in clashes_found:
             validationErrors.append(
-                forms.ValidationError(
-                    "There is already a student called '"
-                    + name
-                    + "' in this class"
-                )
+                forms.ValidationError("There is already a student called '" + name + "' in this class")
             )
             clashes_found.append(name)
 
 
 def find_duplicates(names, lower_names, validationErrors):
     duplicates_found = []
-    for duplicate in [
-        name for name in names if lower_names.count(name.lower()) > 1
-    ]:
+    for duplicate in [name for name in names if lower_names.count(name.lower()) > 1]:
         if duplicate not in duplicates_found:
             validationErrors.append(
-                forms.ValidationError(
-                    "You cannot add more than one student called '"
-                    + duplicate
-                    + "'"
-                )
+                forms.ValidationError("You cannot add more than one student called '" + duplicate + "'")
             )
             duplicates_found.append(duplicate)
 
@@ -512,9 +447,7 @@ def find_illegal_characters(names, validationErrors):
 
 def check_passwords(password, confirm_password):
     if password is not None and password != confirm_password:
-        raise forms.ValidationError(
-            "The password and the confirmation password do not match"
-        )
+        raise forms.ValidationError("The password and the confirmation password do not match")
 
 
 class TeacherMoveStudentsDestinationForm(forms.Form):
@@ -539,9 +472,7 @@ class TeacherMoveStudentsDestinationForm(forms.Form):
                     + klass.teacher.new_user.last_name,
                 )
             )
-        super(TeacherMoveStudentsDestinationForm, self).__init__(
-            *args, **kwargs
-        )
+        super(TeacherMoveStudentsDestinationForm, self).__init__(*args, **kwargs)
         self.fields["new_class"].choices = class_choices
 
 
@@ -558,28 +489,20 @@ class TeacherMoveStudentDisambiguationForm(forms.Form):
     )
     name = forms.CharField(
         label="Name",
-        widget=forms.TextInput(
-            attrs={"placeholder": "Name", "style": "margin : 0px"}
-        ),
+        widget=forms.TextInput(attrs={"placeholder": "Name", "style": "margin : 0px"}),
     )
 
     def clean_name(self):
         name = stripStudentName(self.cleaned_data.get("name", ""))
         if name == "":
-            raise forms.ValidationError(
-                "'"
-                + self.cleaned_data.get("name", "")
-                + "' is not a valid name"
-            )
+            raise forms.ValidationError("'" + self.cleaned_data.get("name", "") + "' is not a valid name")
         return name
 
 
 class BaseTeacherMoveStudentsDisambiguationFormSet(forms.BaseFormSet):
     def __init__(self, destination, *args, **kwargs):
         self.destination = destination
-        super(BaseTeacherMoveStudentsDisambiguationFormSet, self).__init__(
-            *args, **kwargs
-        )
+        super(BaseTeacherMoveStudentsDisambiguationFormSet, self).__init__(*args, **kwargs)
 
     def clean(self):
         if any(self.errors):
@@ -608,34 +531,24 @@ class TeacherDismissStudentsForm(forms.Form):
     )
     name = forms.CharField(
         help_text="New student name",
-        widget=forms.TextInput(
-            attrs={"placeholder": "Enter new student name", "class": "m-0"}
-        ),
+        widget=forms.TextInput(attrs={"placeholder": "Enter new student name", "class": "m-0"}),
     )
     email = forms.EmailField(
         label="Email",
         help_text="New email address",
-        widget=forms.EmailInput(
-            attrs={"placeholder": "Enter email address", "class": "m-0"}
-        ),
+        widget=forms.EmailInput(attrs={"placeholder": "Enter email address", "class": "m-0"}),
     )
     confirm_email = forms.EmailField(
         label="Confirm Email",
         help_text="Confirm email address",
-        widget=forms.EmailInput(
-            attrs={"placeholder": "Confirm email address", "class": "m-0"}
-        ),
+        widget=forms.EmailInput(attrs={"placeholder": "Confirm email address", "class": "m-0"}),
     )
 
     def clean_name(self):
         name = stripStudentName(self.cleaned_data.get("name", ""))
 
         if name == "":
-            raise forms.ValidationError(
-                "'"
-                + self.cleaned_data.get("name", "")
-                + "' is not a valid name"
-            )
+            raise forms.ValidationError("'" + self.cleaned_data.get("name", "") + "' is not a valid name")
 
         return name
 
@@ -706,17 +619,9 @@ class TeacherAddExternalStudentForm(forms.Form):
         name = stripStudentName(self.cleaned_data.get("name", ""))
 
         if name == "":
-            raise forms.ValidationError(
-                "'"
-                + self.cleaned_data.get("name", "")
-                + "' is not a valid name"
-            )
+            raise forms.ValidationError("'" + self.cleaned_data.get("name", "") + "' is not a valid name")
 
-        if Student.objects.filter(
-            class_field=self.klass, new_user__first_name__iexact=name
-        ).exists():
-            raise forms.ValidationError(
-                "There is already a student called '" + name + "' in this class"
-            )
+        if Student.objects.filter(class_field=self.klass, new_user__first_name__iexact=name).exists():
+            raise forms.ValidationError("There is already a student called '" + name + "' in this class")
 
         return name

portal/templates/portal/teach/teacher_edit_class.html

@@ -147,20 +147,21 @@
                 </label>
             </div>
             {% for episode in python_episodes %}
-                {% if episode.levels %}
                 <div class="panel">
                     <div class="panel-header bg--{{ episode.difficulty }}" id="episode-{{episode.id}}">
                         <div class="d-flex align-items-center justify-content-end" data-toggle="collapse"
                              data-target="#collapse-{{episode.id}}" aria-expanded="false"
                              aria-controls="collapse-{{episode.id}}" data-parent="#episodes">
                             <p class="episode-title flex-grow-1">{{episode.name}}</p>
-                            {% if episode.first_level > 1009 %}
-                                <span>Levels {{episode.first_level|stringformat:"i"|slice:"2:4"}}-{{episode.last_level|stringformat:"i"|slice:"2:4"}}</span>
-                            {% else %}
-                                {% if episode.last_level > 1009 %}
-                                    <span>Levels {{episode.first_level|stringformat:"i"|slice:"3:4"}}-{{episode.last_level|stringformat:"i"|slice:"2:4"}}</span>
+                            {% if episode.levels %}
+                                {% if episode.first_level > 1009 %}
+                                    <span>Levels {{episode.first_level|stringformat:"i"|slice:"2:4"}}-{{episode.last_level|stringformat:"i"|slice:"2:4"}}</span>
                                 {% else %}
-                                    <span>Levels {{episode.first_level|stringformat:"i"|slice:"3:4"}}-{{episode.last_level|stringformat:"i"|slice:"3:4"}}</span>
+                                    {% if episode.last_level > 1009 %}
+                                        <span>Levels {{episode.first_level|stringformat:"i"|slice:"3:4"}}-{{episode.last_level|stringformat:"i"|slice:"2:4"}}</span>
+                                    {% else %}
+                                        <span>Levels {{episode.first_level|stringformat:"i"|slice:"3:4"}}-{{episode.last_level|stringformat:"i"|slice:"3:4"}}</span>
+                                    {% endif %}
                                 {% endif %}
                             {% endif %}
                             <div class="episode_range_text collapsed d-flex align-items-center justify-content-end"
@@ -177,12 +178,22 @@
                         <div class="panel-body d-flex justify-content-between">
                             <div class="d-flex flex-grow-1 flex-column justify-content-between">
                                 {% for level in episode.levels %}
+                                    {% for worksheet in episode.worksheets %}
+                                        {% if worksheet.before_level == level.id %}
+                                            <p>{{episode.name}}</p>
+                                        {% endif %}
+                                    {% endfor %}
                                     {% if level.name < 1010 %}
                                         <p>{{level.name|stringformat:"i"|slice:"3:4"}}: {{level.title.strip | safe}}</p>
                                     {% else %}
                                         <p>{{level.name|stringformat:"i"|slice:"2:4"}}: {{level.title.strip | safe}}</p>
                                     {% endif %}
                                 {% endfor %}
+                                {% for worksheet in episode.worksheets %}
+                                    {% if not worksheet.before_level %}
+                                        <p>{{episode.name}}{% if episode.worksheets|length > 1 %} pt. {{ forloop.counter }}{% endif %}</p>
+                                    {% endif %}
+                                {% endfor %}
                             </div>
                             <div class="form__checkbox flex-column justify-content-between p-0">
                                 {% for input in level_control_form|get_dict_item:episode.name %}
@@ -194,7 +205,6 @@
                         </div>
                     </div>
                 </div>
-                {% endif %}
             {% endfor %}
         </div>