codeforlife-portal 7.2.1__py2.py3-none-any.whl → 7.3.1__py2.py3-none-any.whl

{codeforlife_portal-7.2.1.dist-info → codeforlife_portal-7.3.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: codeforlife-portal
-Version: 7.2.1
+Version: 7.3.1
 Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Framework :: Django
@@ -21,7 +21,7 @@ Requires-Dist: django-classy-tags==2.0.0
 Requires-Dist: libsass==0.23.0
 Requires-Dist: phonenumbers==8.12.12
 Requires-Dist: more-itertools==8.7.0
-Requires-Dist: cfl-common==7.2.1
+Requires-Dist: cfl-common==7.3.1
 Requires-Dist: django-ratelimit==3.0.1
 Requires-Dist: django-preventconcurrentlogins==0.8.2
 Requires-Dist: django-csp==3.7

{codeforlife_portal-7.2.1.dist-info → codeforlife_portal-7.3.1.dist-info}/RECORD

@@ -104,10 +104,10 @@ deploy/templates/deploy/csrf_failure.html,sha256=-pBRPn4Y7nUdYHGpTHCokT9Boi-isuw
 example_project/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 example_project/manage.py,sha256=EUgybZlZ7xk2Zf2KCwBbK_z7gf7Ifqs0_bl4Kijhdgo,242
 example_project/portal_test_settings.py,sha256=NfLY72mt1LR2c0_kxF-Yg5pCm2vQ52eceBMn573wW0Y,7247
-example_project/settings.py,sha256=vOGZyxsWfV_G28X3XnSGSE65BUSU7mIGKOd0Z4mSkaE,5600
+example_project/settings.py,sha256=Smpr5FHAaQQhXPgh6-Zsy-jnH5_ZV9htPTWJWlGqptI,5575
 example_project/urls.py,sha256=3SsP5jvPAXV5xmduka4zbSZB5PbXggjsalu1ojY5KIo,434
 example_project/wsgi.py,sha256=U1W6WzZxZaIdYZ5tks7w9fqp5WS5qvn2iThsVcskrWw,829
-portal/__init__.py,sha256=5HkC96OIlIn2QaEoaF1aGy7IrAcyzQSiHxoFr7pNa8s,22
+portal/__init__.py,sha256=EwNAYkUpUieq_F_-i4iAHHUWZC-cpSOWZYMwaEyUOT0,22
 portal/admin.py,sha256=on1-zNRnZvf2cwBN6GVRVYRhkaksrCgfzX8XPWtkvz8,6062
 portal/app_settings.py,sha256=DhWLQOwM0zVOXE3O5TNKbMM9K6agfLuCsHOdr1J7xEI,651
 portal/backends.py,sha256=2Dss6_WoQwPuDzJUF1yEaTQTNG4eUrD12ujJQ5cp5Tc,812
@@ -125,7 +125,7 @@ portal/forms/invite_teacher.py,sha256=jkDNcCfkts4_lXRzhcI3xBam21Zn2yX9wMpMVhDtW1
 portal/forms/organisation.py,sha256=QcQyd7AiqBmvt4y8uQSQylguUbKOKqo2pjqWIkpWjDg,7433
 portal/forms/play.py,sha256=z9P5LzyS3jjYcnfco84d2x8ptgLxRmh94Dnj05plmbY,11505
 portal/forms/registration.py,sha256=gWcY7rllhWO3c9as6QHUDWZx1Jme7DqtGHYaKcvxe-U,5990
-portal/forms/teach.py,sha256=4vBlBO2q8hexreZc1te_iBe9GilpxkM_zyXbfkMSd3Q,20462
+portal/forms/teach.py,sha256=lFGM9gk1gC_N_qJhzV2VdAVArCiAYfhOmrxvPkYC-co,22446
 portal/helpers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 portal/helpers/captcha.py,sha256=Amwg3HZ9eIh1LGYVYWYruk1ccNj6P3nYP_evufOY8BY,254
 portal/helpers/decorators.py,sha256=AnHbcRg42cUYkpMnJMImEMueSKHZRBZ0o67B7_Wp_Zs,3695
@@ -449,7 +449,7 @@ portal/templates/portal/home_learning.html,sha256=AdKDe0dlbWUrL1BOCjJpdQcOsC6SR-
 portal/templates/portal/locked_out.html,sha256=JeiFHFyueFX03D54k82swjxvKY78cFG8Vre-bKKv_7Y,894
 portal/templates/portal/locked_out_school_student.html,sha256=bcpLtu4mkHR-zILLuArtHH2OfUSjHiqntcdbTMlx5Kg,684
 portal/templates/portal/mouseflow.html,sha256=ji9SWR86nqC59xdmivfdPNG5OzFk8gJEUeOUUh52alk,361
-portal/templates/portal/play.html,sha256=qiXUo44yXv4XDWjIU1xSC9pTXFKmx_YF4BKb4K6xOKY,5606
+portal/templates/portal/play.html,sha256=ETfPEVoWeWC8Jwwrr_2WaxYM_TyV4EHkq1l3RuKtrRM,5604
 portal/templates/portal/privacy_notice.html,sha256=USklp2FWK4yEpa_-UGYrOutC4lORBMIxqcQihvCLTSA,56338
 portal/templates/portal/register.html,sha256=4RqUxRiQOvd-oHAM5x6U01zdlYRfy-h8NUGl8UIiBC0,12531
 portal/templates/portal/reset_password.html,sha256=YzsREz5D2OwhicMLahVOVDXiNDxoHlPqU5iu96i36W0,1373
@@ -497,7 +497,7 @@ portal/templates/portal/teach/onboarding_students.html,sha256=09q658n7U7Vuzy_M_0
 portal/templates/portal/teach/teacher_add_external_student.html,sha256=Lrrh4W3EwxxXKe45kcqzf2BcPxYo_mLahGIQMNJjX9E,2453
 portal/templates/portal/teach/teacher_added_external_student.html,sha256=f18RhP5PCE13yjBTrQTCwPLZnkcZb0bDUZ_Z2Oh3D3I,1189
 portal/templates/portal/teach/teacher_dismiss_students.html,sha256=_5FvvtNjdYpZaM9lDzXrhhTjAD3NK_92kDYzh7xqowI,4283
-portal/templates/portal/teach/teacher_edit_class.html,sha256=ulpUfsLc7WROMNjzqIMhRzWHhl5p2KSaHCggaLANKk8,8496
+portal/templates/portal/teach/teacher_edit_class.html,sha256=TcACMixI-kd0OyUThS5EJ81O_E8j8SOTciccjfpIx5I,12254
 portal/templates/portal/teach/teacher_edit_student.html,sha256=JNF8JyoZh0J-oKH4dz7SGSxR0t7J1lbTGLvjhNbk2Rw,3237
 portal/templates/portal/teach/teacher_move_all_classes.html,sha256=u9PNJHrKaIXd67vuwhgMmVXumgSnkKH4QKx1bd3O2VY,1780
 portal/templates/portal/teach/teacher_move_students.html,sha256=toBtjtpiCwvxo2FTJX5oZDzJ9batXdi7ty5AiCHnq4s,1591
@@ -626,13 +626,13 @@ portal/views/student/edit_account_details.py,sha256=Ba-3D_zzKbX5N01NG5qqBS0ud10B
 portal/views/student/play.py,sha256=GMxk65bxWOe1Ds2kb6rvuOd1GoAtt5v_9AihLNXoUL0,8768
 portal/views/teacher/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 portal/views/teacher/dashboard.py,sha256=8WglspwuHF__2LtoX5_XvoW1ulICSupjKv--MtjrvJk,25714
-portal/views/teacher/teach.py,sha256=qNP3j4m1ecMJHdaob3HAL_dnSvaWXysajS7CuV3wlH0,34320
+portal/views/teacher/teach.py,sha256=DFQSiC3RokLMArR_jTinFOqdymMa9phUOmwK0xBoDdk,37039
 portal/views/two_factor/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 portal/views/two_factor/core.py,sha256=O_wcBeFqdPYSGNGv-pT_vbs5-Dj1Z-Jfkd6f9-E5yZI,760
 portal/views/two_factor/form.py,sha256=lnHNKI-BMlpncTuW3zUzjPaJJNuEra2I_nOam0eOKFY,257
 portal/views/two_factor/profile.py,sha256=tkl_ludo8arMtd5LKNmohM66vpC_YQiP-0nspTSJiJ4,383
-codeforlife_portal-7.2.1.dist-info/LICENSE.md,sha256=9AbRlCDqD2D1tPibimysFv3zg3AIc49-eyv9aEsyq9w,115
-codeforlife_portal-7.2.1.dist-info/METADATA,sha256=XS4XFqynBl5LSfI8NPsyl63vRE4fo80iVR-Fg2j7AQc,3317
-codeforlife_portal-7.2.1.dist-info/WHEEL,sha256=fS9sRbCBHs7VFcwJLnLXN1MZRR0_TVTxvXKzOnaSFs8,110
-codeforlife_portal-7.2.1.dist-info/top_level.txt,sha256=8e5pdsuIoTqEAMqpelHBjGjLbffcBtgOoggmd2q7nMw,41
-codeforlife_portal-7.2.1.dist-info/RECORD,,
+codeforlife_portal-7.3.1.dist-info/LICENSE.md,sha256=9AbRlCDqD2D1tPibimysFv3zg3AIc49-eyv9aEsyq9w,115
+codeforlife_portal-7.3.1.dist-info/METADATA,sha256=86OkP1HAPvcVixUEN2CN5nWJLKPR_E8KMAqfM_Pd6T8,3317
+codeforlife_portal-7.3.1.dist-info/WHEEL,sha256=fS9sRbCBHs7VFcwJLnLXN1MZRR0_TVTxvXKzOnaSFs8,110
+codeforlife_portal-7.3.1.dist-info/top_level.txt,sha256=8e5pdsuIoTqEAMqpelHBjGjLbffcBtgOoggmd2q7nMw,41
+codeforlife_portal-7.3.1.dist-info/RECORD,,

example_project/settings.py

@@ -54,7 +54,6 @@ INSTALLED_APPS = [
     "django.contrib.staticfiles",
     "rest_framework",
     "import_export",
-    "django_js_reverse",
     "django_otp",
     "django_otp.plugins.otp_static",
     "django_otp.plugins.otp_totp",

portal/__init__.py

@@ -1 +1 @@
-__version__ = "7.2.1"
+__version__ = "7.3.1"

portal/forms/teach.py

@@ -20,25 +20,37 @@ from portal.helpers.ratelimit import clear_ratelimit_cache_for_user
 class InvitedTeacherForm(forms.Form):
     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)
 
@@ -49,16 +61,22 @@ 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)
@@ -67,31 +85,42 @@ 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(
-        widget=forms.PasswordInput(attrs={"placeholder": "Current password"}), help_text="Enter your current password"
+        widget=forms.PasswordInput(attrs={"placeholder": "Current password"}),
+        help_text="Enter your current password",
     )
 
     def __init__(self, user, *args, **kwargs):
@@ -113,7 +142,9 @@ 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):
@@ -122,11 +153,15 @@ 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",
     )
 
@@ -160,7 +195,9 @@ 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
 
@@ -186,7 +223,8 @@ class TeacherLoginForm(AuthenticationForm):
 
 class ClassCreationForm(forms.Form):
     class_name = forms.CharField(
-        widget=forms.TextInput(attrs={"placeholder": "Class name"}), help_text="Enter a class name"
+        widget=forms.TextInput(attrs={"placeholder": "Class name"}),
+        help_text="Enter a class name",
     )
     teacher = forms.ChoiceField(help_text="Select teacher", required=False)
     classmate_progress = forms.BooleanField(
@@ -201,7 +239,12 @@ class ClassCreationForm(forms.Form):
 
         if teacher is not None:
             # Place current teacher at the top
-            teacher_choices = [(teacher.id, f"{teacher.new_user.first_name} {teacher.new_user.last_name}")]
+            teacher_choices = [
+                (
+                    teacher.id,
+                    f"{teacher.new_user.first_name} {teacher.new_user.last_name}",
+                )
+            ]
 
             # Get coworkers and add them to the choices if the teacher is an admin
             if teacher.is_admin:
@@ -212,7 +255,10 @@ class ClassCreationForm(forms.Form):
                 )
                 for coworker in coworkers:
                     teacher_choices.append(
-                        (coworker.id, f"{coworker.new_user.first_name} {coworker.new_user.last_name}")
+                        (
+                            coworker.id,
+                            f"{coworker.new_user.first_name} {coworker.new_user.last_name}",
+                        )
                     )
 
             self.fields["teacher"].choices = teacher_choices
@@ -231,19 +277,35 @@ class ClassEditForm(forms.Form):
     ]
     join_choices.extend(
         [
-            (str(hours), "Allow external requests to this class for the next " + str(hours) + " hours")
+            (
+                str(hours),
+                "Allow external requests to this class for the next "
+                + str(hours)
+                + " hours",
+            )
             for hours in range(4, 28, 4)
         ]
     )
     join_choices.extend(
         [
-            (str(days * 24), "Allow external requests to this class for the next " + str(days) + " days")
+            (
+                str(days * 24),
+                "Allow external requests to this class for the next "
+                + str(days)
+                + " days",
+            )
             for days in range(2, 5)
         ]
     )
-    join_choices.append(("1000", "Always allow external requests to this class (not recommended)"))
+    join_choices.append(
+        (
+            "1000",
+            "Always allow external requests to this class (not recommended)",
+        )
+    )
     name = forms.CharField(
-        widget=forms.TextInput(attrs={"placeholder": "Enter class name"}), help_text="Enter class name"
+        widget=forms.TextInput(attrs={"placeholder": "Enter class name"}),
+        help_text="Enter class name",
     )
     classmate_progress = forms.BooleanField(
         label="Allow students to see their classmates' progress?",
@@ -264,7 +326,7 @@ class ClassLevelControlForm(forms.Form):
     def __init__(self, *args, **kwargs):
         super(ClassLevelControlForm, self).__init__(*args, **kwargs)
 
-        episodes = Episode.objects.filter(pk__in=range(1, 10))
+        episodes = Episode.objects.filter(pk__in=range(1, 22))
 
         for episode in episodes:
             levels = []
@@ -275,27 +337,40 @@ class ClassLevelControlForm(forms.Form):
             levels_choices = [(level.id, level.name) for level in levels]
 
             self.fields[episode.name] = forms.MultipleChoiceField(
-                choices=itertools.chain(levels_choices), widget=forms.CheckboxSelectMultiple(), required=False
+                choices=itertools.chain(levels_choices),
+                widget=forms.CheckboxSelectMultiple(),
+                required=False,
             )
 
 
 class ClassMoveForm(forms.Form):
     new_teacher = forms.ChoiceField(
-        label="New teacher to take over class", help_text="Select teacher", widget=forms.Select()
+        label="New teacher to take over class",
+        help_text="Select teacher",
+        widget=forms.Select(),
     )
 
     def __init__(self, teachers, *args, **kwargs):
         self.teachers = teachers
         teacher_choices = []
         for teacher in teachers:
-            teacher_choices.append((teacher.id, teacher.new_user.first_name + " " + teacher.new_user.last_name))
+            teacher_choices.append(
+                (
+                    teacher.id,
+                    teacher.new_user.first_name
+                    + " "
+                    + teacher.new_user.last_name,
+                )
+            )
         super(ClassMoveForm, self).__init__(*args, **kwargs)
         self.fields["new_teacher"].choices = teacher_choices
 
 
 class TeacherEditStudentForm(forms.Form):
     name = forms.CharField(
-        label="Name", widget=forms.TextInput(attrs={"placeholder": "Name"}), help_text="Choose a name"
+        label="Name",
+        widget=forms.TextInput(attrs={"placeholder": "Name"}),
+        help_text="Choose a name",
     )
 
     def __init__(self, student, *args, **kwargs):
@@ -307,14 +382,24 @@ 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
 
@@ -323,12 +408,16 @@ 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):
@@ -372,19 +461,32 @@ 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)
 
@@ -403,7 +505,9 @@ 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):
@@ -428,28 +532,47 @@ 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
 
 
 class TeacherMoveStudentDisambiguationForm(forms.Form):
     orig_name = forms.CharField(
         label="Original Name",
-        widget=forms.TextInput(attrs={"readonly": "readonly", "placeholder": "Original Name", "type": "hidden"}),
+        widget=forms.TextInput(
+            attrs={
+                "readonly": "readonly",
+                "placeholder": "Original Name",
+                "type": "hidden",
+            }
+        ),
+    )
+    name = forms.CharField(
+        label="Name",
+        widget=forms.TextInput(
+            attrs={"placeholder": "Name", "style": "margin : 0px"}
+        ),
     )
-    name = forms.CharField(label="Name", 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):
@@ -468,28 +591,44 @@ class BaseTeacherMoveStudentsDisambiguationFormSet(forms.BaseFormSet):
 class TeacherDismissStudentsForm(forms.Form):
     orig_name = forms.CharField(
         help_text="Original student name",
-        widget=forms.TextInput(attrs={"readonly": "readonly", "placeholder": "Original Name", "class": "m-0"}),
+        widget=forms.TextInput(
+            attrs={
+                "readonly": "readonly",
+                "placeholder": "Original Name",
+                "class": "m-0",
+            }
+        ),
     )
     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
 
@@ -547,7 +686,10 @@ class StudentCreationForm(forms.Form):
 
 
 class TeacherAddExternalStudentForm(forms.Form):
-    name = forms.CharField(label="Student name", widget=forms.TextInput(attrs={"placeholder": "Name"}))
+    name = forms.CharField(
+        label="Student name",
+        widget=forms.TextInput(attrs={"placeholder": "Name"}),
+    )
 
     def __init__(self, klass, *args, **kwargs):
         self.klass = klass
@@ -557,9 +699,17 @@ 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/play.html

@@ -29,7 +29,7 @@
             </div>
             <div class="row my-4">
                 <div class="col-sm-12">
-                    <a href="https://docs.codeforlife.education/rapid-router/blockly-guide"
+                    <a href="https://code-for-life.gitbook.io/rapid-router/blockly-guide"
                        class="button button--primary button--icon col-sm-8"
                        target="_blank">
                         Learn more about Blockly<span class="iconify" data-icon="mdi:open-in-new"></span></a>