codeforlife-portal 6.45.6__py2.py3-none-any.whl → 6.46.0__py2.py3-none-any.whl

portal/views/home.py

@@ -33,30 +33,19 @@ from portal.helpers.ratelimit import (
 )
 from portal.strings.coding_club import CODING_CLUB_BANNER
 from portal.strings.home_learning import HOME_LEARNING_BANNER
+from portal.strings.ten_year_map import (
+    TEN_YEAR_MAP_BANNER,
+    TEN_YEAR_MAP_HEADLINE,
+)
 from portal.templatetags.app_tags import cloud_storage
-from portal.views.teacher.teach import DownloadType, count_student_pack_downloads_click
+from portal.views.teacher.teach import (
+    DownloadType,
+    count_student_pack_downloads_click,
+)
 
 LOGGER = logging.getLogger(__name__)
 
 
-def teach_email_labeller(request):
-    if request.method == "POST" and "teacher_login" in request.POST:
-        return request.POST["login-teacher_email"]
-
-    return ""
-
-
-def play_name_labeller(request):
-    if request.method == "POST":
-        if "school_login" in request.POST:
-            return request.POST["login-name"] + ":" + request.POST["login-access_code"]
-
-        if "independent_student_login" in request.POST:
-            return request.POST["independent_student-username"]
-
-    return ""
-
-
 def register_view(request):
     if request.user.is_authenticated:
         return redirect_user_to_dashboard(request)
@@ -82,11 +71,15 @@ def render_signup_form(request):
     invalid_form = False
 
     teacher_signup_form = TeacherSignupForm(prefix="teacher_signup")
-    independent_student_signup_form = IndependentStudentSignupForm(prefix="independent_student_signup")
+    independent_student_signup_form = IndependentStudentSignupForm(
+        prefix="independent_student_signup"
+    )
 
     if request.method == "POST":
         if "teacher_signup-teacher_email" in request.POST:
-            teacher_signup_form = TeacherSignupForm(request.POST, prefix="teacher_signup")
+            teacher_signup_form = TeacherSignupForm(
+                request.POST, prefix="teacher_signup"
+            )
 
             if not captcha.CAPTCHA_ENABLED:
                 remove_captcha_from_forms(teacher_signup_form)
@@ -140,11 +133,15 @@ def process_signup_form(request, data):
                 [email],
                 personalization_values={
                     "EMAIL": email,
-                    "LOGIN_URL": request.build_absolute_uri(reverse("teacher_login")),
+                    "LOGIN_URL": request.build_absolute_uri(
+                        reverse("teacher_login")
+                    ),
                 },
             )
         else:
-            LOGGER.warn(f"Ratelimit teacher {RATELIMIT_USER_ALREADY_REGISTERED_EMAIL_GROUP}: {email}")
+            LOGGER.warn(
+                f"Ratelimit teacher {RATELIMIT_USER_ALREADY_REGISTERED_EMAIL_GROUP}: {email}"
+            )
     else:
         teacher = Teacher.objects.factory(
             first_name=data["teacher_first_name"],
@@ -155,9 +152,16 @@ def process_signup_form(request, data):
 
         send_verification_email(request, teacher.user.user, data)
 
-        TotalActivity.objects.update(teacher_registrations=F("teacher_registrations") + 1)
+        TotalActivity.objects.update(
+            teacher_registrations=F("teacher_registrations") + 1
+        )
 
-    return render(request, "portal/email_verification_needed.html", {"usertype": "TEACHER"}, status=302)
+    return render(
+        request,
+        "portal/email_verification_needed.html",
+        {"usertype": "TEACHER"},
+        status=302,
+    )
 
 
 def process_independent_student_signup_form(request, data):
@@ -178,12 +182,21 @@ def process_independent_student_signup_form(request, data):
                 [email],
                 personalization_values={
                     "EMAIL": email,
-                    "LOGIN_URL": request.build_absolute_uri(reverse("independent_student_login")),
+                    "LOGIN_URL": request.build_absolute_uri(
+                        reverse("independent_student_login")
+                    ),
                 },
             )
         else:
-            LOGGER.warning(f"Ratelimit independent {RATELIMIT_USER_ALREADY_REGISTERED_EMAIL_GROUP}: {email}")
-        return render(request, "portal/email_verification_needed.html", {"usertype": "INDEP_STUDENT"}, status=302)
+            LOGGER.warning(
+                f"Ratelimit independent {RATELIMIT_USER_ALREADY_REGISTERED_EMAIL_GROUP}: {email}"
+            )
+        return render(
+            request,
+            "portal/email_verification_needed.html",
+            {"usertype": "INDEP_STUDENT"},
+            status=302,
+        )
 
     student = Student.objects.independentStudentFactory(
         name=data["name"], email=data["email"], password=data["password"]
@@ -195,13 +208,23 @@ def process_independent_student_signup_form(request, data):
 
     send_verification_email(request, student.new_user, data, age=age)
 
-    TotalActivity.objects.update(independent_registrations=F("independent_registrations") + 1)
+    TotalActivity.objects.update(
+        independent_registrations=F("independent_registrations") + 1
+    )
 
-    return render(request, "portal/email_verification_needed.html", {"usertype": "INDEP_STUDENT"}, status=302)
+    return render(
+        request,
+        "portal/email_verification_needed.html",
+        {"usertype": "INDEP_STUDENT"},
+        status=302,
+    )
 
 
 def is_developer(request):
-    return hasattr(request.user, "userprofile") and request.user.userprofile.developer
+    return (
+        hasattr(request.user, "userprofile")
+        and request.user.userprofile.developer
+    )
 
 
 def redirect_teacher_to_correct_page(request, teacher):
@@ -227,13 +250,18 @@ def redirect_teacher_to_correct_page(request, teacher):
 
 @cache_control(private=True)
 def home(request):
-    # Putting this in a try catch because it causes some weird issue in the tests where the first Selenium test passes,
-    # but any following test fails because it cannot find the Maintenance banner instance.
+    # Putting this in a try catch because it causes some weird issue in the
+    # tests where the first Selenium test passes, but any following test
+    # fails because it cannot find the Maintenance banner instance.
     try:
-        maintenance_banner = DynamicElement.objects.get(name="Maintenance banner")
+        maintenance_banner = DynamicElement.objects.get(
+            name="Maintenance banner"
+        )
 
         if maintenance_banner.active:
-            messages.info(request, format_html(maintenance_banner.text), extra_tags="safe")
+            messages.info(
+                request, format_html(maintenance_banner.text), extra_tags="safe"
+            )
     except ObjectDoesNotExist:
         pass
 
@@ -251,7 +279,9 @@ def home(request):
 
 
 def coding_club(request):
-    return render(request, "portal/coding_club.html", {"BANNER": CODING_CLUB_BANNER})
+    return render(
+        request, "portal/coding_club.html", {"BANNER": CODING_CLUB_BANNER}
+    )
 
 
 def download_student_pack(request, student_pack_type):
@@ -266,7 +296,22 @@ def download_student_pack(request, student_pack_type):
 
 
 def home_learning(request):
-    return render(request, "portal/home_learning.html", {"HOME_LEARNING_BANNER": HOME_LEARNING_BANNER})
+    return render(
+        request,
+        "portal/home_learning.html",
+        {"HOME_LEARNING_BANNER": HOME_LEARNING_BANNER},
+    )
+
+
+def ten_year_map_page(request):
+    messages.info(
+        request, "This page is currently under construction.", extra_tags="safe"
+    )
+    return render(
+        request,
+        "portal/ten_year_map.html",
+        {"BANNER": TEN_YEAR_MAP_BANNER, "HEADLINE": TEN_YEAR_MAP_HEADLINE},
+    )
 
 
 def reset_screentime_warning(request):