codeforlife-portal 8.2.0__py2.py3-none-any.whl → 8.2.2__py2.py3-none-any.whl

{codeforlife_portal-8.2.0.dist-info → codeforlife_portal-8.2.2.dist-info}/METADATA

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

{codeforlife_portal-8.2.0.dist-info → codeforlife_portal-8.2.2.dist-info}/RECORD

@@ -111,7 +111,7 @@ example_project/portal_test_settings.py,sha256=mTyObCGkZEI0IQSZkqCjb1WZ7ebjQLwui
 example_project/settings.py,sha256=pHQDI_A_yXV3u1efj689tc-vPI6nBFma4gMMPBzj0aI,5652
 example_project/urls.py,sha256=FUTzHPlUS1O5kqMHjL5V4L552N2ln7uTDXcw9wjKUto,422
 example_project/wsgi.py,sha256=U1W6WzZxZaIdYZ5tks7w9fqp5WS5qvn2iThsVcskrWw,829
-portal/__init__.py,sha256=Xb24P8T6pG5QQaEw-UTO0iybyDoxvRGJaUR_qFoVAJQ,22
+portal/__init__.py,sha256=qHoUgbIt6pjWzUYt9wXlO8qcrd9dEl09FyPsRTkJshI,22
 portal/admin.py,sha256=RKJizTF6dPJKmGPZw7nZUM0X8jkiTjgyKhLQxtvHJ0I,6148
 portal/app_settings.py,sha256=DhWLQOwM0zVOXE3O5TNKbMM9K6agfLuCsHOdr1J7xEI,651
 portal/backends.py,sha256=2Dss6_WoQwPuDzJUF1yEaTQTNG4eUrD12ujJQ5cp5Tc,812
@@ -129,7 +129,7 @@ portal/forms/invite_teacher.py,sha256=jkDNcCfkts4_lXRzhcI3xBam21Zn2yX9wMpMVhDtW1
 portal/forms/organisation.py,sha256=QcQyd7AiqBmvt4y8uQSQylguUbKOKqo2pjqWIkpWjDg,7433
 portal/forms/play.py,sha256=j_QYAKb4qyW0uy0VUUG49dmzDLINc3jR6ddK-djrbc4,11523
 portal/forms/registration.py,sha256=a-TuzikRc0Q-BAYs3rJ3Sz1wmQ1o_rTEtZmWdF7-xss,6008
-portal/forms/teach.py,sha256=wVwHP2odgMmEGGbbPQzak_1tqutcr1GWZcadvC1Bffg,21739
+portal/forms/teach.py,sha256=c0t9XLfQJFd8hDWbnMUGX15Nt_XDXFG2BfwAKizE-Uw,22381
 portal/helpers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 portal/helpers/captcha.py,sha256=Amwg3HZ9eIh1LGYVYWYruk1ccNj6P3nYP_evufOY8BY,254
 portal/helpers/decorators.py,sha256=Bs6AVCvcgxfHLdJVWzTmZpxlYbJZXJh5e9AGRXf7cwo,3617
@@ -454,7 +454,7 @@ portal/templates/portal/locked_out.html,sha256=JeiFHFyueFX03D54k82swjxvKY78cFG8V
 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=ETfPEVoWeWC8Jwwrr_2WaxYM_TyV4EHkq1l3RuKtrRM,5604
-portal/templates/portal/privacy_notice.html,sha256=USklp2FWK4yEpa_-UGYrOutC4lORBMIxqcQihvCLTSA,56338
+portal/templates/portal/privacy_notice.html,sha256=hZ41kpPeymv1leH1LAbVB98nVczf-m2-Fj79jH8DqFY,56482
 portal/templates/portal/register.html,sha256=4RqUxRiQOvd-oHAM5x6U01zdlYRfy-h8NUGl8UIiBC0,12531
 portal/templates/portal/reset_password.html,sha256=YzsREz5D2OwhicMLahVOVDXiNDxoHlPqU5iu96i36W0,1373
 portal/templates/portal/reset_password_confirm.html,sha256=jPHSDatezRXzCG4zH_5BQPWAxLblidqro0hzvsH54ho,3499
@@ -492,7 +492,7 @@ portal/templates/portal/tag_manager/tag_manager_body.html,sha256=M_c9T2cfmVm6_Gj
 portal/templates/portal/tag_manager/tag_manager_head.html,sha256=kWQ4ccJ062cWRJOcfTNaWYTxCmzDsB9JD5v_YdyO5Ic,1288
 portal/templates/portal/teach/base_registering.html,sha256=jpANyRQbsmWO404l9Mez91zolNP9ic1khWi27WW0FMQ,582
 portal/templates/portal/teach/class.html,sha256=zir7a7y4hbg9E6-zFIC0iv8kccIzF-qkni4DXlvkjgM,6726
-portal/templates/portal/teach/dashboard.html,sha256=SwNdLbTDPaz0O7wVlSVkU8KwIWPzBYsOo6ysOxkOwOc,32674
+portal/templates/portal/teach/dashboard.html,sha256=DcY6rcUjAT9h6VbSIA3mq4fyCIATIlWYDH2qMU1LySg,32697
 portal/templates/portal/teach/invited.html,sha256=lTsydONG5se1E099KaRgsxGuG12qVHxFUL2X0E3HBmQ,4188
 portal/templates/portal/teach/onboarding_classes.html,sha256=K212dunXG7eByyCg5lhv4ne-SniMz3kcKXrfianIY6g,2872
 portal/templates/portal/teach/onboarding_print.html,sha256=4vD2ZDNRxERNdCNj3ZNXJWYAFBQPn9C7Pzsz5TZjZHw,8862
@@ -537,7 +537,7 @@ portal/tests/test_2FA.py,sha256=0N4C9Ab3TvO9W__oQLCo-fLDH1Ho3CiGGsSg-2TiZUE,3597
 portal/tests/test_admin.py,sha256=AM2dgv8j9m4L-SDO-sMA9tQvQH9GwRBrlwRG9OgqtfI,1451
 portal/tests/test_api.py,sha256=Yo5s_nEGOoG35jA39yZ6nuDOUZvuCZ8o8o8XhZos61w,13819
 portal/tests/test_captcha_forms.py,sha256=Yn_VYO_6jbq6AeKeLcv-YFL1YwXZpU0C3y7SK8fRUm4,1033
-portal/tests/test_class.py,sha256=MfR8fRsi0XjqS5cbeV19y3Be2RVhOLUHsAy_mjm7P70,17644
+portal/tests/test_class.py,sha256=_P2CEtqH67MM9h6MMQB_PxXFyQj4tZZbN42NJQpIJ7o,18308
 portal/tests/test_emails.py,sha256=pLr06j3uMBxP1raoZQWzUTBVFvsEDFtUh85J8OnqCwE,9238
 portal/tests/test_global_forms.py,sha256=GIm_oSN4VsfaO--E2SMRu8CwVraan0UBj-_LE_tu8w0,833
 portal/tests/test_helper_methods.py,sha256=-SQCDZm2XUtyXGEp0CHIb_SSC9CPD-XOSnpnY8QclHk,890
@@ -613,7 +613,7 @@ portal/views/api.py,sha256=mdWmFkV5mxmR-mvj6ttIe8uwW9tbcx9-5ykk5dpX0LI,7047
 portal/views/dotmailer.py,sha256=OH06IXuqqjhQbEie8g8y2ZY1oZvsCtNHhkQRLa-julg,2467
 portal/views/email.py,sha256=V3wXRxIjeZ4OJBVqGCQrPn-GQWKZK1PCXbR1f2Zpa_4,2174
 portal/views/home.py,sha256=8leK4ADxRg-gK-bm7D08CR44bhV3I8lt5pCV59HXMkk,9619
-portal/views/legal.py,sha256=nUunsTHnhMcXBcDlg1GmUal86k9Vhinne4A2FWfq78M,342
+portal/views/legal.py,sha256=9m143zbEchH-U-2PCMuT25ErtZT4jQER5EgcFLb8gpk,348
 portal/views/organisation.py,sha256=sPDbiM7hdtpF8GKyh_4n4VPl2a-WnAgnF4q9aSvQCVI,3341
 portal/views/play_landing_page.py,sha256=FFmjUFub3ZdlbMqkB8yX3jAImCzqrUqgb8AZcpKywZ4,308
 portal/views/registration.py,sha256=9cDKFVXVyJcMJBVZLwHoucMI4UwsOhbUxMdcxIEOixs,10889
@@ -634,8 +634,8 @@ portal/views/two_factor/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG
 portal/views/two_factor/core.py,sha256=Lk32z2SN2Pg0rRkK-N-LXMvXC1kKKsH3l692kiSDQ4E,964
 portal/views/two_factor/form.py,sha256=lnHNKI-BMlpncTuW3zUzjPaJJNuEra2I_nOam0eOKFY,257
 portal/views/two_factor/profile.py,sha256=SHSg_xHccE5PtD-OfuOkYhREYz_er4bj5ro1RjJ88Yw,393
-codeforlife_portal-8.2.0.dist-info/LICENSE.md,sha256=9AbRlCDqD2D1tPibimysFv3zg3AIc49-eyv9aEsyq9w,115
-codeforlife_portal-8.2.0.dist-info/METADATA,sha256=ZSsWDJV-GTrgYnPCZ2sb5Q2_y3c2c_RaLoTN3QZudd4,3077
-codeforlife_portal-8.2.0.dist-info/WHEEL,sha256=Kh9pAotZVRFj97E15yTA4iADqXdQfIVTHcNaZTjxeGM,110
-codeforlife_portal-8.2.0.dist-info/top_level.txt,sha256=8e5pdsuIoTqEAMqpelHBjGjLbffcBtgOoggmd2q7nMw,41
-codeforlife_portal-8.2.0.dist-info/RECORD,,
+codeforlife_portal-8.2.2.dist-info/LICENSE.md,sha256=9AbRlCDqD2D1tPibimysFv3zg3AIc49-eyv9aEsyq9w,115
+codeforlife_portal-8.2.2.dist-info/METADATA,sha256=HyPeuAGr6YZvKArvEGwYJMPTTsd8WcZaHsxqpam71x0,3077
+codeforlife_portal-8.2.2.dist-info/WHEEL,sha256=Kh9pAotZVRFj97E15yTA4iADqXdQfIVTHcNaZTjxeGM,110
+codeforlife_portal-8.2.2.dist-info/top_level.txt,sha256=8e5pdsuIoTqEAMqpelHBjGjLbffcBtgOoggmd2q7nMw,41
+codeforlife_portal-8.2.2.dist-info/RECORD,,

portal/__init__.py

@@ -1 +1 @@
-__version__ = "8.2.0"
+__version__ = "8.2.2"

portal/forms/teach.py

@@ -234,6 +234,16 @@ class ClassCreationForm(forms.Form):
 
             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
@@ -288,6 +298,16 @@ 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):

portal/templates/portal/privacy_notice.html

@@ -83,10 +83,10 @@
             <li><p>Your messages and queries you may send us: when you use the “Contact Us” form or email.</p></li>
             <li><p>When your account was created and when you last logged into your account: this information is generated
                 at the time your account is created or you log in.</p></li>
-            <li><p>Technical information, such as the IP address and other information about the device you use to access
-                the Code for Life portal, and technical information about how you use these (for example, which pages on our
-                portal you visit, for how long you stay on each page, etc.): when you navigate the portal and allow the use
-                of non-essential cookies.</p></li>
+            <li><p>Technical information about the device you use to access the Code for Life portal (e.g. device type
+                and screen resolution), and technical information about how you use these (for example, which pages on
+                our portal you visit, for how long you stay on each page, etc.): when you navigate the portal and allow
+                the use of non-essential cookies.</p></li>
             <li><p>Data from Code for Life surveys you may take part in.</p></li>
         </ul>
 
@@ -100,10 +100,10 @@
             <li><p>Your messages and queries you may send us: when you use the “Contact Us” form or email.</p></li>
             <li><p>When you created an account and when you last logged in to your account: this information is generated at
                 the time you create your account or log in.</p></li>
-            <li><p>Technical information, such as the IP address and other information about the device you use to access
-                the Code for Life portal, and technical information about how you use these (for example, which pages on our
-                portal you visit, for how long you stay on each page, etc.): when you navigate the portal and allow the use
-                of non-essential cookies.</p></li>
+            <li><p>Technical information about the device you use to access the Code for Life portal (e.g. device type
+                and screen resolution), and technical information about how you use these (for example, which pages on
+                our portal you visit, for how long you stay on each page, etc.): when you navigate the portal and allow
+                the use of non-essential cookies.</p></li>
             <li><p>Data from Code for Life surveys you may take part in.</p></li>
             <li><p>Your marketing preferences, if you select to sign up to our newsletter.</p></li>
             <li><p>If you are under 13 years old, we will collect the data of your parent or guardian as you will need to
@@ -119,20 +119,20 @@
             <li><p>Your messages and queries you may send us: when you use the “Contact Us” form or email.</p></li>
             <li><p>When you created an account and when you last logged in to your account: this information is generated at
                 the time you create your account or log in.</p></li>
-            <li><p>Technical information, such as the IP address and other information about the device you use to access
-                the Code for Life portal, and technical information about how you use these (for example, which pages on our
-                portal you visit, for how long you stay on each page, etc.): when you navigate the portal and allow the use
-                of non-essential cookies.</p></li>
+            <li><p>Technical information about the device you use to access the Code for Life portal (e.g. device type
+                and screen resolution), and technical information about how you use these (for example, which pages on
+                our portal you visit, for how long you stay on each page, etc.): when you navigate the portal and allow
+                the use of non-essential cookies.</p></li>
             <li><p>Data from Code for Life surveys you may take part in.</p></li>
             <li><p>Your marketing preferences, if you select to sign up to our newsletter.</p></li>
         </ul>
 
         <p>If you are a <strong>Website visitor</strong>, we collect:</p>
         <ul>
-            <li><p>Technical information, such as the IP address and other information about the device you use to access
-                the Code for Life portal, and technical information about how you use these (for example, which pages on our
-                portal you visit, for how long you stay on each page, etc.): when you navigate the portal and allow the use
-                of non-essential cookies.</p></li>
+            <li><p>Technical information about the device you use to access the Code for Life portal (e.g. device type
+                and screen resolution), and technical information about how you use these (for example, which pages on
+                our portal you visit, for how long you stay on each page, etc.): when you navigate the portal and allow
+                the use of non-essential cookies.</p></li>
             <li><p>Your email address and marketing preferences, if you select to sign up to our newsletter.</p></li>
         </ul>
 
@@ -319,14 +319,16 @@
             and how it is used.</p>
         <p><strong>Google Analytics</strong>. Our portal uses Google Analytics, which is provided by Google, Inc.
             ("Google"). Google Analytics uses cookies to help us analyse how users use our portal. The information generated
-            by the cookie about your use of the website (including your IP address) will be transmitted to and stored by
-            Google on servers in the United States. Google will use this information for the purpose of evaluating your use
-            of the website, compiling reports on website activity for website operators and providing other services
-            relating to website activity and internet usage. Google may also transfer this information to third parties
-            where required to do so by law, or where such third parties process the information on Google's behalf. Google
-            will not associate your IP address with any other data held by Google. By accepting analytics / performance
-            cookies on our portal, you consent to the processing of data about you by Google in the manner and for the
-            purposes set out above.</p>
+            by the cookie about your use of the website will be transmitted to and stored by Google on servers in the
+            United States. Google will use this information for the purpose of evaluating your use of the website,
+            compiling reports on website activity for website operators and providing other services relating to website
+            activity and internet usage. Google may also transfer this information to third parties where required to do
+            so by law, or where such third parties process the information on Google's behalf. <strong>Please note: since the
+            release of Google Analytics 4, Google Analytics does not log or store IP addresses.</strong> You can read more about
+            user data collection by Google Analytics 4 <a href="https://support.google.com/analytics/answer/12017362?hl=en"
+                                                          target="_blank">here</a>.
+            By accepting analytics / performance cookies on our portal, you consent to the processing of data about you
+            by Google in the manner and for the purposes set out above.</p>
         <p><strong>Mouseflow</strong>. We also use Mouseflow on our portal; this provider offers a website analytics tool
             that helps us understand how our portal is used, and which areas are mostly used (e.g. by using heatmaps or by
             replaying your journey on our portal). Mouseflow uses cookies to record information such as when you click on or
@@ -525,8 +527,7 @@
             <li><p>The code you’ve created on our website,</p></li>
             <li><p>Any messages you send us when you use the “Contact Us” form or email,</p></li>
             <li><p>The date your Code for Life account was created and the date you last logged in,</p></li>
-            <li><p>The IP address (this is a unique number which identifies the device you’ve used to log on to the Code
-                for Life site) and other information about that device,</p></li>
+            <li><p>Information about the device you use to visit the Code for Life site,</p></li>
             <li><p>Information about how you use the site, such as which pages you’ve visited and how long you stayed on
                 each page. (We will only do this where you have allowed cookies – see the “Cookies and similar
                 technologies” section for more details),
@@ -660,11 +661,11 @@
             We explain in more detail below what information they collect and how it is used. We do not let other
             companies show ads on our portal.</p>
         <p><strong>Google Analytics</strong>. We use Google Analytics (which is run by Google) to help us understand how
-            you use our site. The information it collects about your use of the website (including your IP address) will
-            be stored by Google in the United States. Google may pass this information to other organisations who help
-            them to interpret this information. They may also pass the information to other organisations if the law
-            says they have to do so. If you choose to allow analytics / performance cookies on our site, you are
-            consenting to Google using your data for the reasons above.</p>
+            you use our site. The information it collects about your use of the website will be stored by Google in the
+            United States. Google Analytics does not collect IP addresses. Google may pass this information to other
+            organisations who help them to interpret this information. They may also pass the information to other
+            organisations if the law says they have to do so. If you choose to allow analytics / performance cookies on
+            our site, you are consenting to Google using your data for the reasons above.</p>
         <p><strong>Mouseflow</strong>. We also use Mouseflow to help us understand how our site is used and which areas
             are mostly used. It uses cookies to record information such as when you click on or move your mouse, when
             you scroll or press a key, what pages you visit on our website, how much time you spend on each page, and

portal/templates/portal/teach/dashboard.html

@@ -364,7 +364,7 @@
                     </p>
                 {% endif %}
 
-                <form autocomplete="off" method="post">
+                <form id="form-create-class" autocomplete="off" method="post">
 
                     {% csrf_token %}
 

portal/tests/test_class.py

@@ -15,6 +15,7 @@ from django.urls import reverse
 from game.models import Level
 
 from .base_test import BaseTest
+from .pageObjects.portal.home_page import HomePage
 from .pageObjects.portal.teach.class_page import TeachClassPage
 from .utils.classes import create_class
 from .utils.messages import is_class_created_message_showing
@@ -537,3 +538,23 @@ class TestClassFrontend(BaseTest):
         page, class_name_3 = create_class(page)
 
         assert is_class_created_message_showing(self.selenium, class_name_3)
+
+    def test_create_invalid_name(self):
+        email, password = signup_teacher_directly()
+        create_organisation_directly(email)
+
+        class_name = "Class!"
+
+        self.selenium.get(self.live_server_url)
+        page = (
+            HomePage(self.selenium)
+            .go_to_teacher_login_page()
+            .login_no_class(email, password)
+            .open_classes_tab()
+        )
+
+        page = page.create_class(class_name, False)
+
+        assert page.was_form_invalid(
+            "form-create-class", "Class name may only contain letters, numbers, dashes, underscores, and spaces."
+        )

portal/views/legal.py

@@ -5,7 +5,7 @@ def privacy_notice(request):
     return render(
         request,
         "portal/privacy_notice.html",
-        {"last_updated": "11th April 2024", "last_updated_children": "11th April 2024"},
+        {"last_updated": "17th February 2025", "last_updated_children": "17th February 2025"},
     )