codeforlife-portal 5.32.2__py2.py3-none-any.whl → 8.9.9__py2.py3-none-any.whl

portal/forms/teach.py

@@ -1,62 +1,41 @@
+import itertools
 import re
 from builtins import map, range, str
 
-from captcha.fields import ReCaptchaField
-from captcha.widgets import ReCaptchaV2Invisible
 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, Worksheet
 
 from portal.forms.error_messages import INVALID_LOGIN_MESSAGE
 from portal.helpers.password import PasswordStrength, form_clean_password
 from portal.helpers.ratelimit import clear_ratelimit_cache_for_user
-from portal.templatetags.app_tags import is_verified
 
 
-class TeacherSignupForm(forms.Form):
+class InvitedTeacherForm(forms.Form):
+    prefix = "teacher_signup"
 
-    teacher_first_name = forms.CharField(
-        help_text="Enter your first name",
-        max_length=100,
-        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"}
-        ),
-    )
-    teacher_email = forms.EmailField(
-        help_text="Enter your email address",
-        widget=forms.EmailInput(
-            attrs={"autocomplete": "off", "placeholder": "Email address"}
-        ),
-    )
-
-    newsletter_ticked = forms.BooleanField(
-        widget=forms.CheckboxInput(), initial=False, required=False
-    )
+    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}"
 
     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"}),
     )
 
-    captcha = ReCaptchaField(widget=ReCaptchaV2Invisible)
+    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)
@@ -73,8 +52,26 @@ class TeacherSignupForm(forms.Form):
         return self.cleaned_data
 
 
-class TeacherEditAccountForm(forms.Form):
+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"}),
+    )
+    teacher_last_name = forms.CharField(
+        help_text="Enter your last name",
+        max_length=100,
+        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"}),
+    )
 
+    captcha = ReCaptchaField(widget=ReCaptchaV2Invisible)
+
+
+class TeacherEditAccountForm(forms.Form):
     first_name = forms.CharField(
         max_length=100,
         widget=forms.TextInput(attrs={"placeholder": "First name", "class": "fName"}),
@@ -97,9 +94,7 @@ class TeacherEditAccountForm(forms.Form):
     )
     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(
@@ -135,13 +130,12 @@ class TeacherEditAccountForm(forms.Form):
 
 class TeacherLoginForm(AuthenticationForm):
     username = forms.EmailField(
-        label="Email address",
-        widget=forms.EmailInput(
-            attrs={"autocomplete": "off", "placeholder": "my.email@address.com"}
-        ),
+        widget=forms.EmailInput(attrs={"autocomplete": "off", "placeholder": "Email address"}),
+        help_text="Enter your email address",
     )
     password = forms.CharField(
-        label="Password", widget=forms.PasswordInput(attrs={"autocomplete": "off"})
+        widget=forms.PasswordInput(attrs={"autocomplete": "off", "placeholder": "Password"}),
+        help_text="Enter your password",
     )
 
     def clean(self):
@@ -149,7 +143,6 @@ class TeacherLoginForm(AuthenticationForm):
         password = self.cleaned_data.get("password", None)
 
         if email and password:
-
             # Check it's a teacher and not a student using the same email address
             user = None
 
@@ -175,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
 
@@ -190,8 +181,8 @@ class TeacherLoginForm(AuthenticationForm):
         if user is None:
             self.show_invalid_login_message()
 
-        if not is_verified(user):
-            send_verification_email(self.request, user)
+        if not user.userprofile.is_verified:
+            send_verification_email(self.request, user, self.data)
             self.show_invalid_login_message()
 
         if not user.is_active:
@@ -206,6 +197,7 @@ class ClassCreationForm(forms.Form):
         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(
         label="Allow students to see their classmates' progress?",
         widget=forms.CheckboxInput(),
@@ -213,6 +205,45 @@ class ClassCreationForm(forms.Form):
         required=False,
     )
 
+    def __init__(self, *args, teacher=None, **kwargs):
+        super().__init__(*args, **kwargs)
+
+        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}",
+                )
+            ]
+
+            # Get coworkers and add them to the choices if the teacher is an admin
+            if teacher.is_admin:
+                coworkers = (
+                    Teacher.objects.filter(school=teacher.school)
+                    .exclude(id=teacher.id)
+                    .order_by("new_user__last_name", "new_user__first_name")
+                )
+                for coworker in coworkers:
+                    teacher_choices.append(
+                        (
+                            coworker.id,
+                            f"{coworker.new_user.first_name} {coworker.new_user.last_name}",
+                        )
+                    )
+
+            self.fields["teacher"].choices = teacher_choices
+
+    def clean(self):
+        name = self.cleaned_data.get("class_name", "")
+
+        if re.match(re.compile("^[\w -]+$"), name) is None:
+            raise forms.ValidationError(
+                "Class name may only contain letters, numbers, dashes, underscores, and spaces."
+            )
+
+        return self.cleaned_data
+
 
 class ClassEditForm(forms.Form):
     # select dropdown choices for potentially limiting time in which external students may join
@@ -229,9 +260,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)
         ]
@@ -240,15 +269,16 @@ 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)
         ]
     )
     join_choices.append(
-        ("1000", "Always allow external requests to this class (not recommended)")
+        (
+            "1000",
+            "Always allow external requests to this class (not recommended)",
+        )
     )
     name = forms.CharField(
         widget=forms.TextInput(attrs={"placeholder": "Enter class name"}),
@@ -268,6 +298,41 @@ class ClassEditForm(forms.Form):
         widget=forms.Select(),
     )
 
+    def clean(self):
+        name = self.cleaned_data.get("name", "")
+
+        if re.match(re.compile("^[\w -]+$"), name) is None:
+            raise forms.ValidationError(
+                "Class name may only contain letters, numbers, dashes, underscores, and spaces."
+            )
+
+        return self.cleaned_data
+
+
+class ClassLevelControlForm(forms.Form):
+    def __init__(self, *args, **kwargs):
+        super(ClassLevelControlForm, self).__init__(*args, **kwargs)
+
+        episodes = Episode.objects.filter(pk__in=range(1, 25))
+
+        for episode in episodes:
+            choices = []
+            for level in episode.levels:
+                try:
+                    choices.append((f"worksheet:{level.after_worksheet.id}", episode.name))
+                except Worksheet.DoesNotExist:
+                    pass
+                choices.append((f"level:{level.id}", level.name))
+
+            for worksheet in episode.worksheets.filter(before_level__isnull=True):
+                choices.append((f"worksheet:{worksheet.id}", episode.name))
+
+            self.fields[f"episode{episode.id}"] = forms.MultipleChoiceField(
+                choices=itertools.chain(choices),
+                widget=forms.CheckboxSelectMultiple(),
+                required=False,
+            )
+
 
 class ClassMoveForm(forms.Form):
     new_teacher = forms.ChoiceField(
@@ -306,22 +371,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
 
@@ -330,12 +387,12 @@ class TeacherSetStudentPass(forms.Form):
     password = forms.CharField(
         label="New password",
         help_text="Enter new password",
-        widget=forms.PasswordInput(attrs={"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={"placeholder": "Confirm new password"}),
+        widget=forms.PasswordInput(attrs={"autocomplete": "off", "placeholder": "Confirm new password"}),
     )
 
     def clean_password(self):
@@ -379,14 +436,9 @@ 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)
 
@@ -396,9 +448,7 @@ def find_duplicates(names, lower_names, validationErrors):
     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)
 
@@ -417,9 +467,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):
@@ -467,18 +515,14 @@ class TeacherMoveStudentDisambiguationForm(forms.Form):
     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):
@@ -496,48 +540,35 @@ class BaseTeacherMoveStudentsDisambiguationFormSet(forms.BaseFormSet):
 
 class TeacherDismissStudentsForm(forms.Form):
     orig_name = forms.CharField(
-        label="Original Name",
         help_text="Original student name",
         widget=forms.TextInput(
             attrs={
                 "readonly": "readonly",
                 "placeholder": "Original Name",
-                "style": "margin: 0",
+                "class": "m-0",
             }
         ),
     )
     name = forms.CharField(
-        label="New Name",
         help_text="New student name",
-        widget=forms.TextInput(
-            attrs={"placeholder": "Enter new student name", "style": "margin : 0px"}
-        ),
+        widget=forms.TextInput(attrs={"placeholder": "Enter new student name", "class": "m-0"}),
     )
     email = forms.EmailField(
         label="Email",
-        help_text="Current email address",
-        widget=forms.EmailInput(
-            attrs={"placeholder": "Enter email address", "style": "margin : 0px"}
-        ),
+        help_text="New email address",
+        widget=forms.EmailInput(attrs={"placeholder": "Enter email address", "class": "m-0"}),
     )
     confirm_email = forms.EmailField(
         label="Confirm Email",
-        help_text="New email address",
-        widget=forms.EmailInput(
-            attrs={"placeholder": "Confirm email address", "style": "margin : 0px"}
-        ),
+        help_text="Confirm email address",
+        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"
-            )
-
-        if User.objects.filter(username=name).exists():
-            raise forms.ValidationError("That username is already in use")
+            raise forms.ValidationError("'" + self.cleaned_data.get("name", "") + "' is not a valid name")
 
         return name
 
@@ -596,7 +627,8 @@ class StudentCreationForm(forms.Form):
 
 class TeacherAddExternalStudentForm(forms.Form):
     name = forms.CharField(
-        label="Student name", widget=forms.TextInput(attrs={"placeholder": "Name"})
+        label="Student name",
+        widget=forms.TextInput(attrs={"placeholder": "Name"}),
     )
 
     def __init__(self, klass, *args, **kwargs):
@@ -607,15 +639,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/handlers.py

@@ -1,10 +1,9 @@
+from common.utils import two_factor_cache_key
 from django.core.cache import cache
 from django.db.models.signals import post_save, pre_delete
 from django.dispatch import receiver
 from django_otp.models import Device
 
-from common.utils import two_factor_cache_key
-
 
 @receiver([post_save, pre_delete])
 def clear_two_factor_cache(sender, **kwargs):

portal/helpers/decorators.py

@@ -1,15 +1,16 @@
 from __future__ import absolute_import
 
 import datetime
-import pytz
 from functools import wraps
 
+import pytz
 from common.models import Teacher, Student
 from django.contrib.auth import logout
 from django.shortcuts import render
 from ratelimit import ALL, UNSAFE
 
 from portal.helpers.ratelimit import is_ratelimited
+from portal.helpers.request_handlers import get_access_code_from_request
 from portal.templatetags.app_tags import is_logged_in
 
 __all__ = ["ratelimit"]
@@ -39,14 +40,15 @@ def ratelimit(
                 increment=True,
             )
             request.limited = ratelimited or old_limited
-
             if ratelimited and block:
                 if is_teacher:
                     model = Teacher
                 else:
                     model = Student
 
-                user = None
+                user_to_lockout = None
+
+                lockout_template = "portal/locked_out.html"
 
                 if request.user.is_anonymous:
                     data = request.POST
@@ -55,21 +57,39 @@ def ratelimit(
                     else:
                         username = data.get("username")
 
-                    if model.objects.filter(new_user__username=username).exists():
-                        user = model.objects.get(new_user__username=username)
+                    access_code = get_access_code_from_request(request)
+                    model_finder = model.objects.get
+                    # look for school student if access code not found
+                    # (AttributeError) if student not found (IndexError) move
+                    # on to another try block similar logic followed afterwards
+                    if access_code:
+                        user_to_lockout = model_finder(
+                            new_user__first_name=username,
+                            class_field__access_code=access_code,  # extract the found text from regex
+                        )
+                        lockout_template = (
+                            "portal/locked_out_school_student.html"
+                        )
+                    # look for indy student or teacher
+                    else:
+                        user_to_lockout = model_finder(
+                            new_user__username=username
+                        )
                 else:
-                    user = model.objects.get(new_user=request.user)
+                    user_to_lockout = model.objects.get(new_user=request.user)
 
-                if user:
-                    user.blocked_time = datetime.datetime.now(tz=pytz.utc)
-                    user.save()
+                if user_to_lockout:
+                    user_to_lockout.blocked_time = datetime.datetime.now(
+                        tz=pytz.utc
+                    )
+                    user_to_lockout.save()
 
                     if is_logged_in(request.user):
                         logout(request)
 
                     return render(
                         request,
-                        "portal/locked_out.html",
+                        lockout_template,
                         {"is_teacher": is_teacher},
                     )