codeforlife-portal 7.4.0__py2.py3-none-any.whl → 7.4.2__py2.py3-none-any.whl

{codeforlife_portal-7.4.0.dist-info → codeforlife_portal-7.4.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: codeforlife-portal
-Version: 7.4.0
+Version: 7.4.2
 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.4.0
+Requires-Dist: cfl-common==7.4.2
 Requires-Dist: django-ratelimit==3.0.1
 Requires-Dist: django-preventconcurrentlogins==0.8.2
 Requires-Dist: django-csp==3.7

{codeforlife_portal-7.4.0.dist-info → codeforlife_portal-7.4.2.dist-info}/RECORD

@@ -108,7 +108,7 @@ example_project/portal_test_settings.py,sha256=_gI7-HMoPJ-cDGO6n5UlEIHKHuTR5SC_X
 example_project/settings.py,sha256=HgGSG0n6Xggd0NieFVoJgn8vKGqyRbCddoB3CRuoT-Y,5640
 example_project/urls.py,sha256=3SsP5jvPAXV5xmduka4zbSZB5PbXggjsalu1ojY5KIo,434
 example_project/wsgi.py,sha256=U1W6WzZxZaIdYZ5tks7w9fqp5WS5qvn2iThsVcskrWw,829
-portal/__init__.py,sha256=Dbq9JbNzDz-GmfE0eozgGmdee4W8D3uVIIQv1bzHZPk,22
+portal/__init__.py,sha256=sM2nJxMmGij5RSBxjI6nK_EBgrH8US-_qbfODFsue-A,22
 portal/admin.py,sha256=on1-zNRnZvf2cwBN6GVRVYRhkaksrCgfzX8XPWtkvz8,6062
 portal/app_settings.py,sha256=DhWLQOwM0zVOXE3O5TNKbMM9K6agfLuCsHOdr1J7xEI,651
 portal/backends.py,sha256=2Dss6_WoQwPuDzJUF1yEaTQTNG4eUrD12ujJQ5cp5Tc,812
@@ -259,7 +259,6 @@ portal/static/portal/img/thumbnail_python_den.png,sha256=0if8hLRK9tR-oII6IEuRRq2
 portal/static/portal/img/twitter.png,sha256=QD2ckrIWgV6WpuV0R7p717_T9a-DibzIxXsqHbvDR48,15969
 portal/static/portal/img/universities.png,sha256=y015DeiJzJyIAEC-qIGY5HgsXJDr_DhUXOx8_2xbxf0,145961
 portal/static/portal/img/wes.png,sha256=z2Z-vqqzIPkHY0PN7pgb7Im8CU0w9p2bc9VNRXGxtd0,54619
-portal/static/portal/img/x_close_video.png,sha256=R6YR7j0axvkIdfB2u17hvbgTWA1sCk_0GREBRfFu3aY,1051
 portal/static/portal/img/colorboxImages/border.png,sha256=Eb2D9kRqG0Gw2I3bLicfzJkSshDXf0DjTl4x4amvF0o,112
 portal/static/portal/img/colorboxImages/controls.png,sha256=zQowXWoW0otiA3-wj5sGLdGgpqO5cNj5Xs69VvdAZ-k,2893
 portal/static/portal/img/colorboxImages/loading.gif,sha256=NO9VJC_CTJTweQkCwJYB0ijpB0v3ofiMTeajm0DOOPo,9427
@@ -293,7 +292,7 @@ portal/static/portal/js/lib/jquery.min.js,sha256=2Pmvv0kuTBOenSvLm6bvfBSSHrUJ-3A
 portal/static/portal/js/lib/modernizr-build.js,sha256=pGqgo-dxjy43hd1yL75ivaH9xWF9qfVKLlD4EYlTzJ4,36698
 portal/static/portal/js/lib/papaparse.min.js,sha256=tDf9H6Pr0oXtuyG0hGdMQ5OU5EuM5IK8WMK2iTbdvd0,18829
 portal/static/portal/sass/bootstrap.scss,sha256=q_gMkiqFVJBrMKNr0kXaP7y4caychGNGkyEyEUUFN3k,2144
-portal/static/portal/sass/colorbox.scss,sha256=ZSilgJLSC_ZIMp2Wb5zJvwR-cyRbmcDPy93Kt78VbIM,3790
+portal/static/portal/sass/colorbox.scss,sha256=DqEMSAPBfBwNGY1acoh9fCW9PPY-SchjKW7sNMxd9UM,3637
 portal/static/portal/sass/styles.scss,sha256=gTv8yjfzrN1acywPBkS9b49648LUGN4xvkwqAK-gAvc,780
 portal/static/portal/sass/bootstrap/_alerts.scss,sha256=C5kv4Wt7RFE3ESibknOeFzbE79it0qfwV59y_yaeImE,1546
 portal/static/portal/sass/bootstrap/_badges.scss,sha256=lHaAb3wWe4sh5kwNTsni1f0PCkNXBTfcVbakJTzoAYY,1228
@@ -436,7 +435,7 @@ portal/templates/captcha/includes/js_v2_invisible.html,sha256=FUyDf1RDyS7whzW2B_
 portal/templates/portal/about.html,sha256=_iD0GCP6q3-XuZ2LC-9O0KYY-mKL6c9qk3O-NRRqsRM,10321
 portal/templates/portal/base.html,sha256=4xLACNgKmRQTdEsdNNGYhLzMozzYzWIIzk31HrLGBf0,12109
 portal/templates/portal/base_no_userprofile.html,sha256=PlRufyYmUUGWBZ6CvbYhJWOMTqKqdcee4xnO5--AogA,447
-portal/templates/portal/coding_club.html,sha256=aaLx9UQ8p_7Vvy3Vlh1rOufeNN0KhJ6fj4oqI6QqJcM,4518
+portal/templates/portal/coding_club.html,sha256=A9_hiD-ChBRnictFvAaQiSgSANfrnQ_zFY6hqBtK2rg,5767
 portal/templates/portal/contribute.html,sha256=UIC_N3Lun9wB_6jEra0wvlT9fDiiIeMby7_onXYo6k0,4176
 portal/templates/portal/dotmailer_consent_form.html,sha256=UDdizPoKYZGybr6z9nzDV4WPhJPa-S3bIKywvVgFrxg,918
 portal/templates/portal/email_invitation_sent.html,sha256=hAMzQXE3NFGnOsQlCGuo3Aps-vazSJb5BhAN7bWT48M,641
@@ -457,9 +456,9 @@ portal/templates/portal/reset_password.html,sha256=YzsREz5D2OwhicMLahVOVDXiNDxoH
 portal/templates/portal/reset_password_confirm.html,sha256=jPHSDatezRXzCG4zH_5BQPWAxLblidqro0hzvsH54ho,3499
 portal/templates/portal/reset_password_done.html,sha256=rpzN3svZne5H2FS3TJaGnHypRj2KX-SRS6DbFQkgLf0,667
 portal/templates/portal/reset_password_email_sent.html,sha256=kwNvoH_M-Qd5s-g0HiULwfQt_SD12WEMgPRSnLmldTQ,914
-portal/templates/portal/teach.html,sha256=bRzwfmrZr53G5zr_QF7l5peT9r5e9z7dhgIFL3POzrQ,9006
+portal/templates/portal/teach.html,sha256=2qOWzA00evHYlwSvXDOz8VQo1yXB-95Db7KgqpOItm0,9006
 portal/templates/portal/ten_year_map.html,sha256=_NxEXDJMGdtguuZ3vYl00yBgYo12wv1w8QJ-LMhw8fg,8390
-portal/templates/portal/terms.html,sha256=SO8ruLF2kdYpOinxlVx1CHfPNgphemX4wvWJ9-W6Nj4,29155
+portal/templates/portal/terms.html,sha256=ekhBnhJVHcr5BE5W4PZ-YNzGsmhvRTrj1gdpdNdSYRk,29314
 portal/templates/portal/login/independent_student.html,sha256=G4u82m0lko4yQvqRDMger5p63A6KtFI_bsEOsQWlyJw,1777
 portal/templates/portal/login/student.html,sha256=s5rUyT-u7gei2xWQ-Ba35ePC5WbtwReEzUZAKwUoZVY,1261
 portal/templates/portal/login/student_class_code.html,sha256=rJr6NB4Oz7XjZXDOUHpwzT6r6yxh7nZ5joca-z2bK-s,966
@@ -536,7 +535,6 @@ portal/tests/test_admin.py,sha256=AM2dgv8j9m4L-SDO-sMA9tQvQH9GwRBrlwRG9OgqtfI,14
 portal/tests/test_api.py,sha256=Yo5s_nEGOoG35jA39yZ6nuDOUZvuCZ8o8o8XhZos61w,13819
 portal/tests/test_captcha_forms.py,sha256=lirhIli-sHovun8VdrF0he7KRFTAd8DMCpkJ8cQNotg,1015
 portal/tests/test_class.py,sha256=43g2HslNosbSuSnnMBzM6VWk4LaV0HXkWS3f8VKVRmw,15930
-portal/tests/test_daily_activities.py,sha256=-siDCMGBD1ijjccHVk7eEmrk4bgTsvbh0B6hDoj2fo0,1803
 portal/tests/test_emails.py,sha256=pLr06j3uMBxP1raoZQWzUTBVFvsEDFtUh85J8OnqCwE,9238
 portal/tests/test_global_forms.py,sha256=A5JpAe4AYK-wpu0o1qU4THmeNv_wr7lhzaMbjz5czpY,1543
 portal/tests/test_helper_methods.py,sha256=-SQCDZm2XUtyXGEp0CHIb_SSC9CPD-XOSnpnY8QclHk,890
@@ -611,7 +609,7 @@ portal/views/admin.py,sha256=4Xt3zEyQH7sUwQSrwuRtoCodWidjOzd7gJUwWU96pXY,957
 portal/views/api.py,sha256=lCwiclR98G-yTgK55u8IjkueIH8iremeiZSa3jAvO-M,6990
 portal/views/dotmailer.py,sha256=x49p89TtwA1MLysRLtq5yRRzVtIpzGoU__Xb5hPuHak,3208
 portal/views/email.py,sha256=V3wXRxIjeZ4OJBVqGCQrPn-GQWKZK1PCXbR1f2Zpa_4,2174
-portal/views/home.py,sha256=GlNTJqSST_jQi0REuaV2aI2zram-KAhedmATdC6yU58,10247
+portal/views/home.py,sha256=qt5kW7TAaRFXz7BA2BrnHe5oYc69jjoLksEbfr0Aa3c,9715
 portal/views/legal.py,sha256=nUunsTHnhMcXBcDlg1GmUal86k9Vhinne4A2FWfq78M,342
 portal/views/organisation.py,sha256=sPDbiM7hdtpF8GKyh_4n4VPl2a-WnAgnF4q9aSvQCVI,3341
 portal/views/play_landing_page.py,sha256=FFmjUFub3ZdlbMqkB8yX3jAImCzqrUqgb8AZcpKywZ4,308
@@ -628,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=pjzOOCz29d4VHukaCI5QhkDsu-RPvy7SXC9dDcPo50k,27422
-portal/views/teacher/teach.py,sha256=MxheM_kxt_K1J7jEWlim8yZonnp63iYUTw5dCaLscLI,37056
+portal/views/teacher/teach.py,sha256=yWe2K0FHEQB_K3vzPJO8MR0gU2ZaDrXGw8gXMJBH0T0,35765
 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.4.0.dist-info/LICENSE.md,sha256=9AbRlCDqD2D1tPibimysFv3zg3AIc49-eyv9aEsyq9w,115
-codeforlife_portal-7.4.0.dist-info/METADATA,sha256=Nnx8oLJTfx1yuUsKVh7pTcZQDhXxkLSvr3_ehnB9X04,3317
-codeforlife_portal-7.4.0.dist-info/WHEEL,sha256=fS9sRbCBHs7VFcwJLnLXN1MZRR0_TVTxvXKzOnaSFs8,110
-codeforlife_portal-7.4.0.dist-info/top_level.txt,sha256=8e5pdsuIoTqEAMqpelHBjGjLbffcBtgOoggmd2q7nMw,41
-codeforlife_portal-7.4.0.dist-info/RECORD,,
+codeforlife_portal-7.4.2.dist-info/LICENSE.md,sha256=9AbRlCDqD2D1tPibimysFv3zg3AIc49-eyv9aEsyq9w,115
+codeforlife_portal-7.4.2.dist-info/METADATA,sha256=MNGjSumPZ-NuAy21Z5JrTcZBPa-W_2kkQCNlD-cuOFE,3317
+codeforlife_portal-7.4.2.dist-info/WHEEL,sha256=fS9sRbCBHs7VFcwJLnLXN1MZRR0_TVTxvXKzOnaSFs8,110
+codeforlife_portal-7.4.2.dist-info/top_level.txt,sha256=8e5pdsuIoTqEAMqpelHBjGjLbffcBtgOoggmd2q7nMw,41
+codeforlife_portal-7.4.2.dist-info/RECORD,,

portal/__init__.py

@@ -1 +1 @@
-__version__ = "7.4.0"
+__version__ = "7.4.2"

portal/static/portal/sass/colorbox.scss

@@ -51,7 +51,6 @@
         #cboxPrevious:hover{background-position:-75px -25px;}
         #cboxNext{position:absolute; bottom:0; left:27px; background:url(../img/colorboxImages/controls.png) no-repeat -50px 0; width:25px; height:25px; text-indent:-9999px;}
         #cboxNext:hover{background-position:-50px -25px;}
-        #cboxClose{position:absolute; top:0; right:0; background:url(../img/x_close_video.png) no-repeat; width:52px; height:52px; text-indent:-9999px;}
 
 /*
   The following fixes a problem where IE7 and IE8 replace a PNG's alpha transparency with a black fill

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>

portal/templates/portal/teach.html

@@ -175,7 +175,7 @@
                 </div>
             </div>
             <div class="col-sm-6">
-                <a href="https://www.youtube-nocookie.com/embed/ko4nrr4kDzA?rel=0&amp;autoplay=1" class="youtube">
+                <a href="https://www.youtube-nocookie.com/embed/xMmcg-LOc3I?rel=0&amp;autoplay=1" class="youtube">
                     <img src="{% static 'portal/img/thumbnail_python_den.png' %}"
                          alt="Python Den logo">
                 </a>

portal/templates/portal/terms.html

@@ -67,10 +67,11 @@
                     consent to register for a Code for Life account, and to use their email address. If you are using
                     this at school, you must first have your teacher’s permission to use this site. These Terms of Use
                     were most recently updated on {{ last_updated }}.</strong></p>
-                <p>Code for Life includes all versions of &ldquo;Rapid Router&rdquo;, &ldquo;Kurono&rdquo; and any other games, platforms and
-                    other products or services released by us (whether online or otherwise), from time to time,
-                    including all Code for Life websites used to play the games, platforms and any other products or
-                    services that we make available. &ldquo;Code for Life&rdquo; and &ldquo;Rapid Router&rdquo; are registered UK trade marks of
+                <p>Code for Life includes all versions of &ldquo;Rapid Router&rdquo;, &ldquo;Python Den&rdquo;,
+                    &ldquo;Kurono&rdquo; and any other games, platforms and other products or services released by us
+                    (whether online or otherwise), from time to time, including all Code for Life websites used to play
+                    the games, platforms and any other products or services that we make available.
+                    &ldquo;Code for Life&rdquo;, &ldquo;Rapid Router&rdquo; and "&ldquo;Kurono&rdquo;" are registered UK trademarks of
                     Ocado Innovation Limited.</p>
                 <p>You must take the time to read and understand the Terms of Use and the Privacy Notice before
                     registering for Code for Life.</p>
@@ -98,7 +99,7 @@
         <ul>
             <li><p>Administrators: person or persons assigned responsibility for the management and security of
                 membership by other Users;</p></li>
-            <li><p>Users: any person using the Code for Life website, Rapid Router, Kurono or any other game,
+            <li><p>Users: any person using the Code for Life website, Rapid Router, Python Den, Kurono or any other game,
                 application or platform of ours regardless of membership;</p></li>
             <li><p>Students: Users who are provided with login information for Code for Life by a teacher, parent,
                 guardian or carer;</p></li>
@@ -213,8 +214,8 @@
 
         <h5 id="intellectual-property">6. Intellectual Property</h5>
         <p>You acknowledge that all copyright, trademarks, and other intellectual property rights in and relating to
-            Code for Life (including all content of the Code for Life website, the Rapid Router application, the Kurono
-            application, related software (including any drawn and/or animated avatars, whether or not such avatars have
+            Code for Life (including all content of the Code for Life website, the Rapid Router application, the Python Den
+            application, the Kurono application, related software (including any drawn and/or animated avatars, whether or not such avatars have
             any modifications) and any other games, applications or any other content that we make available from time
             to time) are owned by Ocado Innovation Limited. These rights protect all of the applications, games,
             products and services you see on the Code for Life website from time to time, including the graphics of
@@ -277,7 +278,8 @@
                 <ul>
                     <li><p>all Code for Life websites used to play the games, platforms and any other products or
                         services that we make available to you</p></li>
-                    <li><p>all versions of “Rapid Router”, “Kurono” and any other games, platforms and other products or
+                    <li><p>all versions of “Rapid Router”, “Python Den”, “Kurono” and any
+                        other games, platforms and other products or
                         services we released (whether online or otherwise)</p></li>
                 </ul>
                 <p><strong>When you visit the Code for Life site or register with us you agree to follow these rules.</strong></p>
@@ -373,7 +375,7 @@
             reuse them without our permission. Just because it is easy to copy some of the content on the website, this
             does not mean it is allowed. The content covered by Intellectual Property includes:</p>
         <ol type="a">
-            <li><p>Rapid Router and the Kurono applications</p></li>
+            <li><p>Rapid Router, Python Den and Kurono applications</p></li>
             <li><p>Games – this will include the design of the games (for example their graphics, style and gameplay)</p></li>
             <li><p>Avatars, whether they are drawn or animated</p></li>
             <li><p>Any other software or services you see on our website</p></li>

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",

portal/views/teacher/teach.py

@@ -1,11 +1,11 @@
 import csv
 import json
-import pytz
 from datetime import datetime, timedelta
 from enum import Enum
 from functools import partial, wraps
 from uuid import uuid4
 
+import pytz
 from common.helpers.emails import send_verification_email
 from common.helpers.generators import (
     generate_access_code,
@@ -34,12 +34,10 @@ from django.urls import reverse, reverse_lazy
 from django.utils import timezone
 from django.views.decorators.http import require_POST
 from game.views.level_selection import get_blockly_episodes, get_python_episodes
-from portal.views.registration import handle_reset_password_tracking
 from reportlab.lib.colors import black, red
 from reportlab.lib.pagesizes import A4
 from reportlab.lib.utils import ImageReader
 from reportlab.pdfgen import canvas
-from portal.helpers.ratelimit import clear_ratelimit_cache_for_user
 
 from portal.forms.teach import (
     BaseTeacherDismissStudentsFormSet,
@@ -55,13 +53,13 @@ from portal.forms.teach import (
     TeacherMoveStudentsDestinationForm,
     TeacherSetStudentPass,
 )
+from portal.helpers.ratelimit import clear_ratelimit_cache_for_user
+from portal.views.registration import handle_reset_password_tracking
 
 STUDENT_PASSWORD_LENGTH = 6
 REMINDER_CARDS_PDF_ROWS = 8
 REMINDER_CARDS_PDF_COLUMNS = 1
-REMINDER_CARDS_PDF_WARNING_TEXT = (
-    "Please ensure students keep login details in a secure place"
-)
+REMINDER_CARDS_PDF_WARNING_TEXT = "Please ensure students keep login details in a secure place"
 
 
 @login_required(login_url=reverse_lazy("teacher_login"))
@@ -71,9 +69,7 @@ def teacher_onboarding_create_class(request):
     Onboarding view for creating a class (and organisation if there isn't one, yet)
     """
     teacher = request.user.new_teacher
-    requests = Student.objects.filter(
-        pending_class_request__teacher=teacher, new_user__is_active=True
-    )
+    requests = Student.objects.filter(pending_class_request__teacher=teacher, new_user__is_active=True)
 
     if not teacher.school:
         return HttpResponseRedirect(reverse_lazy("onboarding-organisation"))
@@ -84,9 +80,7 @@ def teacher_onboarding_create_class(request):
             created_class = create_class(form, teacher)
             messages.success(
                 request,
-                "The class '{className}' has been created successfully.".format(
-                    className=created_class.name
-                ),
+                "The class '{className}' has been created successfully.".format(className=created_class.name),
             )
             return HttpResponseRedirect(
                 reverse_lazy(
@@ -133,9 +127,7 @@ def process_edit_class(request, access_code, onboarding_done, next_url):
     """
     klass = get_object_or_404(Class, access_code=access_code)
     teacher = request.user.new_teacher
-    students = Student.objects.filter(
-        class_field=klass, new_user__is_active=True
-    ).order_by("new_user__first_name")
+    students = Student.objects.filter(class_field=klass, new_user__is_active=True).order_by("new_user__first_name")
 
     check_teacher_authorised(request, klass.teacher)
 
@@ -156,9 +148,7 @@ def process_edit_class(request, access_code, onboarding_done, next_url):
                     login_id=hashed_login_id,
                 )
 
-                TotalActivity.objects.update(
-                    student_registrations=F("student_registrations") + 1
-                )
+                TotalActivity.objects.update(student_registrations=F("student_registrations") + 1)
 
                 login_url = generate_student_url(request, new_student, login_id)
                 students_info.append(
@@ -241,16 +231,12 @@ def teacher_delete_class(request, access_code):
     # check user authorised to see class
     check_teacher_authorised(request, klass.teacher)
 
-    if Student.objects.filter(
-        class_field=klass, new_user__is_active=True
-    ).exists():
+    if Student.objects.filter(class_field=klass, new_user__is_active=True).exists():
         messages.info(
             request,
             "This class still has students, please remove or delete them all before deleting the class.",
         )
-        return HttpResponseRedirect(
-            reverse_lazy("view_class", kwargs={"access_code": access_code})
-        )
+        return HttpResponseRedirect(reverse_lazy("view_class", kwargs={"access_code": access_code}))
 
     klass.anonymise()
 
@@ -267,9 +253,7 @@ def teacher_delete_students(request, access_code):
 
     # get student objects for students to be deleted, confirming they are in the class
     student_ids = json.loads(request.POST.get("transfer_students", "[]"))
-    students = [
-        get_object_or_404(Student, id=i, class_field=klass) for i in student_ids
-    ]
+    students = [get_object_or_404(Student, id=i, class_field=klass) for i in student_ids]
 
     def __anonymise(user):
         # Delete all personal data from inactive user and mark as inactive.
@@ -291,9 +275,7 @@ def teacher_delete_students(request, access_code):
         else:  # otherwise, just delete
             student.new_user.delete()
 
-    return HttpResponseRedirect(
-        reverse_lazy("view_class", kwargs={"access_code": access_code})
-    )
+    return HttpResponseRedirect(reverse_lazy("view_class", kwargs={"access_code": access_code}))
 
 
 @login_required(login_url=reverse_lazy("teacher_login"))
@@ -307,9 +289,7 @@ def teacher_edit_class(request, access_code):
     """
     klass = get_object_or_404(Class, access_code=access_code)
     old_teacher = klass.teacher
-    other_teachers = Teacher.objects.filter(school=old_teacher.school).exclude(
-        user=old_teacher.user
-    )
+    other_teachers = Teacher.objects.filter(school=old_teacher.school).exclude(user=old_teacher.user)
 
     # check user authorised to see class
     check_teacher_authorised(request, klass.teacher)
@@ -339,9 +319,7 @@ def teacher_edit_class(request, access_code):
         elif "level_control_submit" in request.POST:
             level_control_form = ClassLevelControlForm(request.POST)
             if level_control_form.is_valid():
-                return process_level_control_form(
-                    request, klass, blockly_episodes, python_episodes
-                )
+                return process_level_control_form(request, klass, blockly_episodes, python_episodes)
         elif "class_move_submit" in request.POST:
             class_move_form = ClassMoveForm(other_teachers, request.POST)
             if class_move_form.is_valid():
@@ -383,9 +361,7 @@ def process_edit_class_form(request, klass, form):
         elif hours < 1000:
             # Setting to number of hours
             klass.always_accept_requests = False
-            klass.accept_requests_until = timezone.now() + timedelta(
-                hours=hours
-            )
+            klass.accept_requests_until = timezone.now() + timedelta(hours=hours)
             messages.info(
                 request,
                 "Class set successfully to receive requests from external students until "
@@ -407,18 +383,12 @@ def process_edit_class_form(request, klass, form):
     klass.classmates_data_viewable = classmate_progress
     klass.save()
 
-    messages.success(
-        request, "The class's settings have been changed successfully."
-    )
+    messages.success(request, "The class's settings have been changed successfully.")
 
-    return HttpResponseRedirect(
-        reverse_lazy("view_class", kwargs={"access_code": klass.access_code})
-    )
+    return HttpResponseRedirect(reverse_lazy("view_class", kwargs={"access_code": klass.access_code}))
 
 
-def process_level_control_form(
-    request, klass, blockly_episodes, python_episodes
-):
+def process_level_control_form(request, klass, blockly_episodes, python_episodes):
     """
     Find the levels that the user wants to lock and lock them for the specific class.
     :param request: The request sent by the user submitting the form.
@@ -429,23 +399,14 @@ def process_level_control_form(
     """
     levels_to_lock_ids = []
 
-    mark_levels_to_lock_in_episodes(
-        request, blockly_episodes, levels_to_lock_ids
-    )
-    mark_levels_to_lock_in_episodes(
-        request, python_episodes, levels_to_lock_ids
-    )
+    mark_levels_to_lock_in_episodes(request, blockly_episodes, levels_to_lock_ids)
+    mark_levels_to_lock_in_episodes(request, python_episodes, levels_to_lock_ids)
 
     klass.locked_levels.clear()
-    [
-        klass.locked_levels.add(levels_to_lock_id)
-        for levels_to_lock_id in levels_to_lock_ids
-    ]
+    [klass.locked_levels.add(levels_to_lock_id) for levels_to_lock_id in levels_to_lock_ids]
 
     messages.success(request, "Your level preferences have been saved.")
-    activity_today = DailyActivity.objects.get_or_create(
-        date=datetime.now().date()
-    )[0]
+    activity_today = DailyActivity.objects.get_or_create(date=datetime.now().date())[0]
     activity_today.level_control_submits += 1
     activity_today.save()
 
@@ -468,14 +429,10 @@ def mark_levels_to_lock_in_episodes(request, episodes, levels_to_lock_ids):
             [
                 levels_to_lock_ids.append(episode_level["id"])
                 for episode_level in episode_levels
-                if str(episode_level["id"])
-                not in request.POST.getlist(episode_name)
+                if str(episode_level["id"]) not in request.POST.getlist(episode_name)
             ]
         else:
-            [
-                levels_to_lock_ids.append(episode_level["id"])
-                for episode_level in episode_levels
-            ]
+            [levels_to_lock_ids.append(episode_level["id"]) for episode_level in episode_levels]
 
 
 def process_move_class_form(request, klass, form):
@@ -501,9 +458,7 @@ def teacher_edit_student(request, pk):
     student = get_object_or_404(Student, id=pk)
     check_teacher_authorised(request, student.class_field.teacher)
 
-    name_form = TeacherEditStudentForm(
-        student, initial={"name": student.new_user.first_name}
-    )
+    name_form = TeacherEditStudentForm(student, initial={"name": student.new_user.first_name})
 
     password_form = TeacherSetStudentPass()
     set_password_mode = False
@@ -532,9 +487,7 @@ def teacher_edit_student(request, pk):
         else:
             password_form = TeacherSetStudentPass(request.POST)
             if password_form.is_valid():
-                return process_reset_password_form(
-                    request, student, password_form
-                )
+                return process_reset_password_form(request, student, password_form)
             set_password_mode = True
 
     return render(
@@ -577,9 +530,7 @@ def process_reset_password_form(request, student, password_form):
         student.new_user.set_password(new_password)
         student.new_user.save()
         student.login_id = login_id
-        clear_ratelimit_cache_for_user(
-            f"{student.new_user.first_name},{student.class_field.access_code}"
-        )
+        clear_ratelimit_cache_for_user(f"{student.new_user.first_name},{student.class_field.access_code}")
         student.blocked_time = datetime.now(tz=pytz.utc) - timedelta(days=1)
         student.save()
 
@@ -613,9 +564,7 @@ def teacher_dismiss_students(request, access_code):
 
     # get student objects for students to be dismissed, confirming they are in the class
     student_ids = json.loads(request.POST.get("transfer_students", "[]"))
-    students = [
-        get_object_or_404(Student, id=i, class_field=klass) for i in student_ids
-    ]
+    students = [get_object_or_404(Student, id=i, class_field=klass) for i in student_ids]
 
     TeacherDismissStudentsFormSet = formset_factory(
         wraps(TeacherDismissStudentsForm)(partial(TeacherDismissStudentsForm)),
@@ -626,9 +575,7 @@ def teacher_dismiss_students(request, access_code):
     if is_right_dismiss_form(request):
         formset = TeacherDismissStudentsFormSet(request.POST)
         if formset.is_valid():
-            return process_dismiss_student_form(
-                request, formset, klass, access_code
-            )
+            return process_dismiss_student_form(request, formset, klass, access_code)
 
     else:
         initial_data = [
@@ -679,14 +626,10 @@ def process_dismiss_student_form(request, formset, klass, access_code):
         student.user.save()
 
         # log the data
-        joinrelease = JoinReleaseStudent.objects.create(
-            student=student, action_type=JoinReleaseStudent.RELEASE
-        )
+        joinrelease = JoinReleaseStudent.objects.create(student=student, action_type=JoinReleaseStudent.RELEASE)
         joinrelease.save()
 
-        send_verification_email(
-            request, student.new_user, data, school=klass.teacher.school
-        )
+        send_verification_email(request, student.new_user, data, school=klass.teacher.school)
 
     if not failed_users:
         messages.success(
@@ -700,9 +643,7 @@ def process_dismiss_student_form(request, formset, klass, access_code):
             "Please make sure the email has not been registered to another account.",
         )
 
-    return HttpResponseRedirect(
-        reverse_lazy("view_class", kwargs={"access_code": access_code})
-    )
+    return HttpResponseRedirect(reverse_lazy("view_class", kwargs={"access_code": access_code}))
 
 
 @login_required(login_url=reverse_lazy("teacher_login"))
@@ -717,9 +658,7 @@ def teacher_class_password_reset(request, access_code):
     check_teacher_authorised(request, klass.teacher)
 
     student_ids = json.loads(request.POST.get("transfer_students", "[]"))
-    students = [
-        get_object_or_404(Student, id=i, class_field=klass) for i in student_ids
-    ]
+    students = [get_object_or_404(Student, id=i, class_field=klass) for i in student_ids]
 
     students_info = []
     handle_reset_password_tracking(request, "SCHOOL_STUDENT", access_code)
@@ -741,9 +680,7 @@ def teacher_class_password_reset(request, access_code):
         student.new_user.set_password(password)
         student.new_user.save()
         student.login_id = hashed_login_id
-        clear_ratelimit_cache_for_user(
-            f"{student.new_user.first_name},{access_code}"
-        )
+        clear_ratelimit_cache_for_user(f"{student.new_user.first_name},{access_code}")
         student.blocked_time = datetime.now(tz=pytz.utc) - timedelta(days=1)
         student.save()
 
@@ -757,9 +694,7 @@ def teacher_class_password_reset(request, access_code):
             "students_info": students_info,
             "query_data": json.dumps(students_info),
             "class_url": request.build_absolute_uri(
-                reverse(
-                    "student_login", kwargs={"access_code": klass.access_code}
-                )
+                reverse("student_login", kwargs={"access_code": klass.access_code})
             ),
         },
     )
@@ -809,37 +744,26 @@ def teacher_move_students_to_class(request, access_code):
 
     check_if_move_authorised(request, old_class, new_class)
 
-    transfer_students_ids = json.loads(
-        request.POST.get("transfer_students", "[]")
-    )
+    transfer_students_ids = json.loads(request.POST.get("transfer_students", "[]"))
 
     # get student objects for students to be transferred, confirming they are in the old class still
-    transfer_students = [
-        get_object_or_404(Student, id=i, class_field=old_class)
-        for i in transfer_students_ids
-    ]
+    transfer_students = [get_object_or_404(Student, id=i, class_field=old_class) for i in transfer_students_ids]
 
     # get new class' students
-    new_class_students = Student.objects.filter(
-        class_field=new_class, new_user__is_active=True
-    ).order_by("new_user__first_name")
+    new_class_students = Student.objects.filter(class_field=new_class, new_user__is_active=True).order_by(
+        "new_user__first_name"
+    )
 
     TeacherMoveStudentDisambiguationFormSet = formset_factory(
-        wraps(TeacherMoveStudentDisambiguationForm)(
-            partial(TeacherMoveStudentDisambiguationForm)
-        ),
+        wraps(TeacherMoveStudentDisambiguationForm)(partial(TeacherMoveStudentDisambiguationForm)),
         extra=0,
         formset=BaseTeacherMoveStudentsDisambiguationFormSet,
     )
 
     if is_right_move_form(request):
-        formset = TeacherMoveStudentDisambiguationFormSet(
-            new_class, request.POST
-        )
+        formset = TeacherMoveStudentDisambiguationFormSet(new_class, request.POST)
         if formset.is_valid():
-            return process_move_students_form(
-                request, formset, old_class, new_class
-            )
+            return process_move_students_form(request, formset, old_class, new_class)
     else:
         # format the students for the form
         initial_data = [
@@ -850,9 +774,7 @@ def teacher_move_students_to_class(request, access_code):
             for student in transfer_students
         ]
 
-        formset = TeacherMoveStudentDisambiguationFormSet(
-            new_class, initial=initial_data
-        )
+        formset = TeacherMoveStudentDisambiguationFormSet(new_class, initial=initial_data)
 
     return render(
         request,
@@ -872,9 +794,7 @@ def check_if_move_authorised(request, old_class, new_class):
 
     # check teacher has permission to edit old_class and that both classes
     # are in the same school
-    if (
-        not teacher.is_admin and teacher != old_class.teacher
-    ) or teacher.school != new_class.teacher.school:
+    if (not teacher.is_admin and teacher != old_class.teacher) or teacher.school != new_class.teacher.school:
         raise Http404
 
 
@@ -898,14 +818,8 @@ def process_move_students_form(request, formset, old_class, new_class):
         student.save()
         student.new_user.save()
 
-    messages.success(
-        request, "The students have been transferred successfully."
-    )
-    return HttpResponseRedirect(
-        reverse_lazy(
-            "view_class", kwargs={"access_code": old_class.access_code}
-        )
-    )
+    messages.success(request, "The students have been transferred successfully.")
+    return HttpResponseRedirect(reverse_lazy("view_class", kwargs={"access_code": old_class.access_code}))
 
 
 class DownloadType(Enum):
@@ -938,9 +852,7 @@ def teacher_print_reminder_cards(request, access_code):
 
     CARD_INNER_HEIGHT = CARD_HEIGHT - CARD_PADDING * 2
 
-    logo_image = ImageReader(
-        staticfiles_storage.path("portal/img/logo_cfl_reminder_cards.jpg")
-    )
+    logo_image = ImageReader(staticfiles_storage.path("portal/img/logo_cfl_reminder_cards.jpg"))
 
     klass = get_object_or_404(Class, access_code=access_code)
     # Check auth
@@ -948,12 +860,8 @@ def teacher_print_reminder_cards(request, access_code):
 
     # Use data from the query string if given
     student_data = get_student_data(request)
-    student_login_link = request.build_absolute_uri(
-        reverse("student_login_access_code")
-    )
-    class_login_link = request.build_absolute_uri(
-        reverse("student_login", kwargs={"access_code": access_code})
-    )
+    student_login_link = request.build_absolute_uri(reverse("student_login_access_code"))
+    class_login_link = request.build_absolute_uri(reverse("student_login", kwargs={"access_code": access_code}))
 
     # Now draw everything
     x = 0
@@ -965,17 +873,10 @@ def teacher_print_reminder_cards(request, access_code):
         if current_student_count % (NUM_X * NUM_Y) == 0:
             p.setFillColor(red)
             p.setFont("Helvetica-Bold", 10)
-            p.drawString(
-                PAGE_MARGIN, PAGE_MARGIN / 2, REMINDER_CARDS_PDF_WARNING_TEXT
-            )
+            p.drawString(PAGE_MARGIN, PAGE_MARGIN / 2, REMINDER_CARDS_PDF_WARNING_TEXT)
 
         left = PAGE_MARGIN + x * CARD_WIDTH + x * INTER_CARD_MARGIN * 2
-        bottom = (
-            PAGE_HEIGHT
-            - PAGE_MARGIN
-            - (y + 1) * CARD_HEIGHT
-            - y * INTER_CARD_MARGIN
-        )
+        bottom = PAGE_HEIGHT - PAGE_MARGIN - (y + 1) * CARD_HEIGHT - y * INTER_CARD_MARGIN
 
         inner_bottom = bottom + CARD_PADDING
 
@@ -995,12 +896,7 @@ def teacher_print_reminder_cards(request, access_code):
             anchor="w",
         )
 
-        text_left = (
-            left
-            + INTER_CARD_MARGIN
-            + (logo_image.getSize()[0] / logo_image.getSize()[1])
-            * card_logo_height
-        )
+        text_left = left + INTER_CARD_MARGIN + (logo_image.getSize()[0] / logo_image.getSize()[1]) * card_logo_height
 
         # student details
         p.setFillColor(black)
@@ -1023,9 +919,7 @@ def teacher_print_reminder_cards(request, access_code):
             inner_bottom + CARD_INNER_HEIGHT * 0.3,
             f"Name: {student['name']}",
         )
-        p.drawString(
-            text_left, inner_bottom, f"Password: {student['password']}"
-        )
+        p.drawString(text_left, inner_bottom, f"Password: {student['password']}")
 
         x = (x + 1) % NUM_X
         y = compute_show_page_character(p, x, y, NUM_Y)
@@ -1044,17 +938,13 @@ def teacher_print_reminder_cards(request, access_code):
 @user_passes_test(logged_in_as_teacher, login_url=reverse_lazy("teacher_login"))
 def teacher_download_csv(request, access_code):
     response = HttpResponse(content_type="text/csv")
-    response[
-        "Content-Disposition"
-    ] = 'attachment; filename="student_login_urls.csv"'
+    response["Content-Disposition"] = 'attachment; filename="student_login_urls.csv"'
 
     klass = get_object_or_404(Class, access_code=access_code)
     # Check auth
     check_teacher_authorised(request, klass.teacher)
 
-    class_url = request.build_absolute_uri(
-        reverse("student_login", kwargs={"access_code": access_code})
-    )
+    class_url = request.build_absolute_uri(reverse("student_login", kwargs={"access_code": access_code}))
 
     # Use data from the query string if given
     student_data = get_student_data(request)
@@ -1062,9 +952,7 @@ def teacher_download_csv(request, access_code):
         writer = csv.writer(response)
         writer.writerow([access_code, class_url])
         for student in student_data:
-            writer.writerow(
-                [student["name"], student["password"], student["login_url"]]
-            )
+            writer.writerow([student["name"], student["password"], student["login_url"]])
 
     count_student_details_click(DownloadType.CSV)
 
@@ -1092,22 +980,16 @@ def compute_show_page_end(p, x, y):
 
 
 def count_student_pack_downloads_click(student_pack_type):
-    activity_today = DailyActivity.objects.get_or_create(
-        date=datetime.now().date()
-    )[0]
+    activity_today = DailyActivity.objects.get_or_create(date=datetime.now().date())[0]
     if DownloadType(student_pack_type) == DownloadType.PRIMARY_PACK:
         activity_today.primary_coding_club_downloads += 1
-    elif DownloadType(student_pack_type) == DownloadType.PYTHON_PACK:
-        activity_today.python_coding_club_downloads += 1
     else:
         raise Exception("Unknown download type")
     activity_today.save()
 
 
 def count_student_details_click(download_type):
-    activity_today = DailyActivity.objects.get_or_create(
-        date=datetime.now().date()
-    )[0]
+    activity_today = DailyActivity.objects.get_or_create(date=datetime.now().date())[0]
 
     if download_type == DownloadType.CSV:
         activity_today.csv_click_count += 1

portal/tests/test_daily_activities.py

@@ -1,41 +0,0 @@
-from datetime import timedelta, datetime
-
-from common.models import DailyActivity
-from selenium.webdriver.common.by import By
-from selenium.webdriver.support import expected_conditions as EC
-from selenium.webdriver.support.ui import WebDriverWait
-
-from portal.tests.base_test import BaseTest
-
-
-class TestDailyActivities(BaseTest):
-    def test_coding_club_increment(self):
-
-        # first create dailyActivity one day before datetime.now()
-        # to check if it can handle incrementing on different days
-        # then check if increments are done on the same day
-        old_date = datetime.now() - timedelta(days=1)
-        old_daily_activity = DailyActivity(date=old_date)
-        old_daily_activity.save()
-
-        for i in range(4):
-            # check both buttons
-            self.go_to_homepage()
-            button_id = "primary_pack" if i < 2 else "python_pack"
-            find_out_more_button = WebDriverWait(self.selenium, 10).until(
-                EC.element_to_be_clickable((By.ID, "find_out_more"))
-            )
-            find_out_more_button.click()
-
-            daily_count_button = WebDriverWait(self.selenium, 10).until(
-                EC.visibility_of_element_located((By.ID, button_id))
-            )
-            daily_count_button.click()
-        # check the old_date is still the same
-        old_daily_activity = DailyActivity.objects.get(date=old_date)
-        assert old_daily_activity.primary_coding_club_downloads == 0
-        assert old_daily_activity.python_coding_club_downloads == 0
-        # check the current_date is incremented to 2
-        current_daily_activity = DailyActivity.objects.get(date=datetime.now())
-        assert current_daily_activity.primary_coding_club_downloads == 2
-        assert current_daily_activity.python_coding_club_downloads == 2