codeforlife-portal 7.4.1__tar.gz → 7.4.3__tar.gz

{codeforlife-portal-7.4.1/codeforlife_portal.egg-info → codeforlife-portal-7.4.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: codeforlife-portal
-Version: 7.4.1
+Version: 7.4.3
 Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Framework :: Django

{codeforlife-portal-7.4.1 → codeforlife-portal-7.4.3/codeforlife_portal.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: codeforlife-portal
-Version: 7.4.1
+Version: 7.4.3
 Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Framework :: Django

{codeforlife-portal-7.4.1 → codeforlife-portal-7.4.3}/codeforlife_portal.egg-info/SOURCES.txt

@@ -454,7 +454,6 @@ portal/tests/test_admin.py
 portal/tests/test_api.py
 portal/tests/test_captcha_forms.py
 portal/tests/test_class.py
-portal/tests/test_daily_activities.py
 portal/tests/test_emails.py
 portal/tests/test_global_forms.py
 portal/tests/test_helper_methods.py

{codeforlife-portal-7.4.1 → codeforlife-portal-7.4.3}/codeforlife_portal.egg-info/requires.txt

@@ -13,7 +13,7 @@ django-classy-tags==2.0.0
 libsass==0.23.0
 phonenumbers==8.12.12
 more-itertools==8.7.0
-cfl-common==7.4.1
+cfl-common==7.4.3
 django-ratelimit==3.0.1
 django-preventconcurrentlogins==0.8.2
 django-csp==3.7

codeforlife-portal-7.4.3/portal/__init__.py

@@ -0,0 +1 @@
+__version__ = "7.4.3"

{codeforlife-portal-7.4.1 → codeforlife-portal-7.4.3}/portal/forms/teach.py

@@ -18,6 +18,13 @@ from portal.helpers.ratelimit import clear_ratelimit_cache_for_user
 
 
 class InvitedTeacherForm(forms.Form):
+    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}'
+
     teacher_password = forms.CharField(
         help_text="Enter a password",
         widget=forms.PasswordInput(

{codeforlife-portal-7.4.1 → codeforlife-portal-7.4.3}/portal/templates/portal/coding_club.html

@@ -86,12 +86,22 @@
                     </p>
                 </div>
                 <div>
-                    <form method="post", action="{% url 'download_student_pack' 4 %}" class="non-styled--form">
-                        {% csrf_token %}
-                        <button id="python_pack" download type="submit" class="button button--primary button--icon">
-                            Download the Python coding club pack<span class="iconify" data-icon="mdi:tray-arrow-down"></span>
-                        </button>
-                    </form>
+                    <!-- TODO: improve responsiveness -->
+                    <div style="margin-bottom: 10px;">
+                        <a id="grass_snakes_pack" download class="button button--primary button--icon" href="https://3289537671-files.gitbook.io/~/files/v0/b/gitbook-x-prod.appspot.com/o/spaces%2FS5kw31UTGL8CPHU9skBS%2Fuploads%2FKsC7tdyT6htj5JX1ig28%2FGrass%20Snakes%20Club.zip?alt=media&token=1f6e6f0e-1a10-4bef-a8f8-a20b0a59e4c0">
+                            Lvl 1: Grass Snakes<span class="iconify" data-icon="mdi:tray-arrow-down"></span>
+                        </a>
+                    </div>
+                    <div style="margin-bottom: 10px;">
+                        <a id="tiger_snakes_pack" download type="submit" class="button button--primary button--icon" href="https://3289537671-files.gitbook.io/~/files/v0/b/gitbook-x-prod.appspot.com/o/spaces%2FS5kw31UTGL8CPHU9skBS%2Fuploads%2FSIeSsvz348nXjNMcVPxx%2FTiger%20Snakes%20Club.zip?alt=media&token=872b383f-a209-4864-a0e0-26d7ba3a8d74">
+                            Lvl 2: Tiger Snakes<span class="iconify" data-icon="mdi:tray-arrow-down"></span>
+                        </a>
+                    </div>
+                    <div>
+                        <a id="cobra_snakes_pack" download type="submit" class="button button--primary button--icon" href="https://3289537671-files.gitbook.io/~/files/v0/b/gitbook-x-prod.appspot.com/o/spaces%2FS5kw31UTGL8CPHU9skBS%2Fuploads%2FITTbTC8DVwr8LdCkN82d%2FCobra%20Club.zip?alt=media&token=bfd94842-cba9-45c7-892b-331bc82c33e9">
+                            Lvl 3: Cobra Snakes<span class="iconify" data-icon="mdi:tray-arrow-down"></span>
+                        </a>
+                    </div>
                 </div>
             </div>
         </div>

{codeforlife-portal-7.4.1 → codeforlife-portal-7.4.3}/portal/templates/portal/teach/invited.html

@@ -20,7 +20,7 @@
                 </p>
             </div>
 
-            <form class="d-flex flex-column" method="post" id="form-invited-teacher" autocomplete="off">
+            <form class="d-flex flex-column" method="post" id="teacher-register-form" autocomplete="off">
 
                 {% csrf_token %}
 
@@ -29,7 +29,9 @@
                 <div class="row form--row">
                     <label for="{{ invited_teacher_form.teacher_password.auto_id }}"></label>
                     <div class="input--icon">
-                        {{ invited_teacher_form.teacher_password }}<span class="iconify" data-icon="mdi:security"></span>
+                        {{ invited_teacher_form.teacher_password }}
+                        <span id="teacher-password-field-icon" class="iconify"
+                            data-icon="material-symbols:visibility-off" ></span>
                     </div>
                     <small>{{ invited_teacher_form.teacher_password.help_text }}</small>
                     {{ invited_teacher_form.teacher_password.errors }}
@@ -37,7 +39,9 @@
                 <div class="row form--row">
                     <label for="{{ invited_teacher_form.teacher_confirm_password.auto_id }}"></label>
                     <div class="input--icon">
-                        {{ invited_teacher_form.teacher_confirm_password }}<span class="iconify" data-icon="mdi:security"></span>
+                        {{ invited_teacher_form.teacher_confirm_password }}
+                        <span id="teacher-confirm-password-field-icon" class="iconify"
+                            data-icon="material-symbols:visibility-off" ></span>
                     </div>
                     <small>{{ invited_teacher_form.teacher_confirm_password.help_text }}</small>
                     {{ invited_teacher_form.teacher_confirm_password.errors }}
@@ -73,10 +77,14 @@
     </div>
 </div>
 
-<script type="text/javascript" src="{% static 'portal/js/passwordStrength.js' %}"></script>
+{% include "portal/partials/service_unavailable_popup.html" %}
+
 <script>
-    var TEACHER_PASSWORD_FIELD_ID = '{{ invited_teacher_form.teacher_password.auto_id }}';
-    var INDEP_STUDENT_PASSWORD_FIELD_ID = '{{ invited_teacher_form.teacher_password.auto_id }}';
+    const password_id = '{{ invited_teacher_form.teacher_password.auto_id }}';
+    var TEACHER_PASSWORD_FIELD_ID = password_id;
+    var INDEP_STUDENT_PASSWORD_FIELD_ID = password_id;
 </script>
 
-{% endblock content %}
+<script type="text/javascript" src="{% static 'portal/js/passwordStrength.js' %}"></script>
+
+{% endblock content %}

{codeforlife-portal-7.4.1 → codeforlife-portal-7.4.3}/portal/tests/test_invite_teacher.py

@@ -63,9 +63,9 @@ class TestInviteTeacher(TestCase):
         response = client.post(
             invitation_url,
             {
-                "teacher_password": invited_teacher_password,
-                "teacher_confirm_password": invited_teacher_password,
-                "consent_ticked": "on",
+                "teacher_signup-teacher_password": invited_teacher_password,
+                "teacher_signup-teacher_confirm_password": invited_teacher_password,
+                "teacher_signup-consent_ticked": "on",
             },
         )
 

{codeforlife-portal-7.4.1 → codeforlife-portal-7.4.3}/portal/views/home.py

@@ -33,15 +33,9 @@ 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.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__)
 
@@ -71,15 +65,11 @@ 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)
@@ -133,15 +123,11 @@ 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"],
@@ -152,9 +138,7 @@ 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,
@@ -182,15 +166,11 @@ 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}"
-            )
+            LOGGER.warning(f"Ratelimit independent {RATELIMIT_USER_ALREADY_REGISTERED_EMAIL_GROUP}: {email}")
         return render(
             request,
             "portal/email_verification_needed.html",
@@ -208,9 +188,7 @@ 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,
@@ -221,10 +199,7 @@ def process_independent_student_signup_form(request, data):
 
 
 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):
@@ -254,14 +229,10 @@ def home(request):
     # 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
 
@@ -279,19 +250,13 @@ 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):
     if request.method == "POST":
         count_student_pack_downloads_click(int(student_pack_type))
-        link = (
-            cloud_storage("club_packs/PythonCodingClub.zip")
-            if DownloadType(int(student_pack_type)) == DownloadType.PYTHON_PACK
-            else cloud_storage("club_packs/PrimaryCodingClub.zip")
-        )
+        link = cloud_storage("club_packs/PrimaryCodingClub.zip")
         return redirect(link)
 
 
@@ -304,9 +269,7 @@ def home_learning(request):
 
 
 def ten_year_map_page(request):
-    messages.info(
-        request, "This page is currently under construction.", extra_tags="safe"
-    )
+    messages.info(request, "This page is currently under construction.", extra_tags="safe")
     return render(
         request,
         "portal/ten_year_map.html",