codeforlife-portal 6.46.1__py2.py3-none-any.whl → 7.1.0__py2.py3-none-any.whl

portal/templates/portal/ten_year_map.html

@@ -1,6 +1,6 @@
 {% extends 'portal/base.html' %}
 {% load static %}
-{% load app_tags banner_tags headline_tags character_list_tags %}
+{% load app_tags banner_tags headline_tags %}
 
 {% block subNav %}
 {% banner banner_name="BANNER" %}
@@ -66,14 +66,14 @@
                                         July 2024
                                     </h5>
                                     <p>
-                                        We completed the UK leg of our world tour with an enthusiastic reception from Year 4 students at Howe Dell Primary School 
-                                        in Hatfield. The pupils were captivated by our presentation on different types of robots and Ocado Group's automation 
-                                        technology used in sorting and packing deliveries. They were then tasked with designing robots to solve problems, producing 
-                                        creative concepts like robot childminders and homework helpers. Midway through, we introduced them to coding with Rapid Router, 
-                                        explaining algorithms and letting them experiment with the levels. The students were thrilled about the competition for the 
-                                        best robot design, which included a prize of a golden 3D printed medal. Teachers praised the engaging and educational workshop, 
-                                        while Ocado volunteers found the experience rewarding and beneficial for developing their communication and teaching skills. 
-                                        The children's designs were exceptional, making the judging process challenging, but ultimately a few standout innovations were 
+                                        We completed the UK leg of our world tour with an enthusiastic reception from Year 4 students at Howe Dell Primary School
+                                        in Hatfield. The pupils were captivated by our presentation on different types of robots and Ocado Group's automation
+                                        technology used in sorting and packing deliveries. They were then tasked with designing robots to solve problems, producing
+                                        creative concepts like robot childminders and homework helpers. Midway through, we introduced them to coding with Rapid Router,
+                                        explaining algorithms and letting them experiment with the levels. The students were thrilled about the competition for the
+                                        best robot design, which included a prize of a golden 3D printed medal. Teachers praised the engaging and educational workshop,
+                                        while Ocado volunteers found the experience rewarding and beneficial for developing their communication and teaching skills.
+                                        The children's designs were exceptional, making the judging process challenging, but ultimately a few standout innovations were
                                         selected.
                                     </p>
                                     <div class="carousel-button">

portal/templatetags/app_tags.py

@@ -1,14 +1,7 @@
-from aimmo.templatetags.players_utils import get_user_playable_games
-from aimmo.worksheets import get_complete_worksheets, get_incomplete_worksheets
 from common import app_settings as common_app_settings
-from common.permissions import logged_in_as_teacher
 from common.utils import using_two_factor
 from django import template
 from django.conf import settings
-from django.contrib.auth.models import User
-from django.core.exceptions import ObjectDoesNotExist
-from django.shortcuts import reverse
-from django.template.context import RequestContext
 from django.template.defaultfilters import stringfilter
 
 from portal import __version__, beta
@@ -32,7 +25,10 @@ def is_logged_in(user):
     return (
         user
         and user.is_authenticated
-        and (not using_two_factor(user) or (hasattr(user, "is_verified") and user.userprofile.is_verified))
+        and (
+            not using_two_factor(user)
+            or (hasattr(user, "is_verified") and user.userprofile.is_verified)
+        )
     )
 
 
@@ -52,16 +48,6 @@ def has_beta_access(request):
     return beta.has_beta_access(request)
 
 
-@register.inclusion_tag("portal/partials/aimmo_games_table.html", takes_context=True)
-def games_table(context, base_url):
-    playable_games = get_user_playable_games(context, base_url)
-
-    playable_games["complete_worksheets"] = get_complete_worksheets()
-    playable_games["incomplete_worksheets"] = get_incomplete_worksheets()
-
-    return playable_games
-
-
 @register.filter(name="make_into_username")
 def make_into_username(user):
     username = ""
@@ -76,7 +62,11 @@ def make_into_username(user):
 
 @register.filter(name="is_logged_in_as_teacher")
 def is_logged_in_as_teacher(user):
-    return is_logged_in(user) and user.userprofile and hasattr(user.userprofile, "teacher")
+    return (
+        is_logged_in(user)
+        and user.userprofile
+        and hasattr(user.userprofile, "teacher")
+    )
 
 
 @register.filter(name="is_logged_in_as_admin_teacher")
@@ -116,7 +106,10 @@ def is_logged_in_as_school_user(user):
         is_logged_in(user)
         and user.userprofile
         and (
-            (hasattr(user.userprofile, "student") and user.userprofile.student.class_field is not None)
+            (
+                hasattr(user.userprofile, "student")
+                and user.userprofile.student.class_field is not None
+            )
             or hasattr(user.userprofile, "teacher")
         )
     )
@@ -153,14 +146,6 @@ def get_project_version():
     return __version__
 
 
-@register.simple_tag(takes_context=True)
-def url_for_aimmo_dashboard(context: RequestContext):
-    if logged_in_as_teacher(context.request.user):
-        return reverse("teacher_aimmo_dashboard")
-    else:
-        return reverse("student_aimmo_dashboard")
-
-
 @register.filter
 def get_dict_item(dictionary, key):
     return dictionary[key]

portal/tests/conftest.py

@@ -1,16 +1,15 @@
 from collections import namedtuple
-from unittest.mock import MagicMock
 
 import pytest
-from aimmo.models import Game
 from common.models import Class
 from common.tests.utils.classes import create_class_directly
 from common.tests.utils.organisation import create_organisation_directly
-from common.tests.utils.student import create_independent_student_directly, create_school_student_directly
+from common.tests.utils.student import (
+    create_independent_student_directly,
+    create_school_student_directly,
+)
 from common.tests.utils.teacher import signup_teacher_directly
 
-from .utils.aimmo_games import create_aimmo_game_directly
-
 SchoolStudent = namedtuple("student", ["username", "password"])
 IndependentStudent = namedtuple("independent_student", ["username", "password"])
 TeacherLoginDetails = namedtuple("teacher", ["email", "password"])
@@ -38,14 +37,3 @@ def student1(db, class1) -> SchoolStudent:
 def independent_student1(db) -> IndependentStudent:
     username, password, _ = create_independent_student_directly()
     return IndependentStudent(username, password)
-
-
-@pytest.fixture
-def aimmo_game1(db, class1) -> Game:
-    return create_aimmo_game_directly(klass=class1, worksheet_id=1)
-
-
-@pytest.fixture(autouse=True)
-def mock_game_manager(monkeypatch):
-    """Mock GameManager for all tests."""
-    monkeypatch.setattr("aimmo.models.GameManager", MagicMock())

portal/tests/pageObjects/portal/base_page.py

@@ -26,17 +26,23 @@ class BasePage(object):
     def wait_for_element_by_css(self, css, wait_seconds=DEFAULT_WAIT_SECONDS):
         self.wait_for_presence((By.CSS_SELECTOR, css), wait_seconds)
 
-    def wait_for_element_to_be_clickable(self, locator, wait_seconds=DEFAULT_WAIT_SECONDS):
+    def wait_for_element_to_be_clickable(
+        self, locator, wait_seconds=DEFAULT_WAIT_SECONDS
+    ):
         self.wait(EC.element_to_be_clickable(locator), wait_seconds)
 
-    def wait_for_element_to_be_invisible(self, locator, wait_seconds=DEFAULT_WAIT_SECONDS):
+    def wait_for_element_to_be_invisible(
+        self, locator, wait_seconds=DEFAULT_WAIT_SECONDS
+    ):
         self.wait(EC.invisibility_of_element_located(locator), wait_seconds)
 
     def wait_for_presence(self, locator, wait_seconds=DEFAULT_WAIT_SECONDS):
         self.wait(EC.presence_of_element_located(locator), wait_seconds)
 
     def wait_for_absence(self, locator, wait_seconds=DEFAULT_WAIT_SECONDS):
-        self.wait_until_not(EC.presence_of_element_located(locator), wait_seconds)
+        self.wait_until_not(
+            EC.presence_of_element_located(locator), wait_seconds
+        )
 
     def wait(self, method, wait_seconds=DEFAULT_WAIT_SECONDS):
         WebDriverWait(self.browser, wait_seconds).until(method)
@@ -74,31 +80,21 @@ class BasePage(object):
         return self.element_exists_by_id(pageName)
 
     def hover_over_resources_dropdown(self):
-        resources_dropdown = self.browser.find_element(By.ID, "teaching_resources_button")
+        resources_dropdown = self.browser.find_element(
+            By.ID, "teaching_resources_button"
+        )
         hover = ActionChains(self.browser).move_to_element(resources_dropdown)
         hover.perform()
 
     def go_to_rapid_router_resources_page(self):
         self.hover_over_resources_dropdown()
-        self.browser.find_element(By.ID, "rapid_router_resources_button").click()
+        self.browser.find_element(
+            By.ID, "rapid_router_resources_button"
+        ).click()
         from .resources_page import ResourcesPage
 
         return ResourcesPage(self.browser)
 
-    def go_to_kurono_resources_page(self):
-        self.hover_over_resources_dropdown()
-        self.browser.find_element(By.ID, "kurono_resources_button").click()
-        from .resources_page import ResourcesPage
-
-        return ResourcesPage(self.browser)
-
-    def go_to_kurono_teacher_dashboard_page(self):
-        self.browser.find_element(By.ID, "games_button").click()
-        self.browser.find_element(By.ID, "teacher_kurono_dashboard_button").click()
-        from .kurono_teacher_dashboard_page import KuronoTeacherDashboardPage
-
-        return KuronoTeacherDashboardPage(self.browser)
-
     def is_on_admin_login_page(self):
         return self.on_correct_page("administration_login")
 
@@ -112,7 +108,11 @@ class BasePage(object):
         return self.on_correct_page("403_forbidden")
 
     def was_form_invalid(self, formID, error):
-        errors = self.browser.find_element(By.ID, formID).find_element(By.CLASS_NAME, "errorlist").text
+        errors = (
+            self.browser.find_element(By.ID, formID)
+            .find_element(By.CLASS_NAME, "errorlist")
+            .text
+        )
         return error in errors
 
     def is_dialog_showing(self):