rapid-router 7.6.8__tar.gz → 7.6.9__tar.gz

{rapid_router-7.6.8/rapid_router.egg-info → rapid_router-7.6.9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rapid-router
-Version: 7.6.8
+Version: 7.6.9
 Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Framework :: Django

rapid_router-7.6.9/game/__init__.py

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

{rapid_router-7.6.8 → rapid_router-7.6.9}/game/messages.py

@@ -47,11 +47,22 @@ def no_permission_title():
 
 def no_permission_scoreboard():
     return (
-        "Scoreboard is only visible to school students and teachers. Log in if you "
+        "The scoreboard is only visible to school students and teachers. Log in if you "
         "think you should be able to see it."
     )
 
 
+def no_classes_title():
+    return "No classes"
+
+
+def no_classes_scoreboard():
+    return (
+        "The scoreboard can only be used by teachers who have classes assigned to them. "
+        "It seems you don't have any classes, please create one so you can use this feature."
+    )
+
+
 """ Strings used on the level moderation page. """
 
 

{rapid_router-7.6.8 → rapid_router-7.6.9}/game/tests/test_scoreboard.py

@@ -5,7 +5,10 @@ from datetime import datetime, timedelta
 
 from common.models import Class, Teacher, Student
 from common.tests.utils.classes import create_class_directly
-from common.tests.utils.organisation import create_organisation_directly, join_teacher_to_organisation
+from common.tests.utils.organisation import (
+    create_organisation_directly,
+    join_teacher_to_organisation,
+)
 from common.tests.utils.student import (
     create_school_student_directly,
     create_independent_student_directly,
@@ -39,8 +42,7 @@ class ScoreboardTestCase(TestCase):
         episode1 = Episode.objects.get(id=1)
         episode2 = Episode.objects.get(id=2)
         level_ids = [
-            f"{x}"
-            for x in range(1, len(episode1.levels) + len(episode2.levels) + 1)
+            f"{x}" for x in range(1, len(episode1.levels) + len(episode2.levels) + 1)
         ]
         level1 = Level.objects.get(name="1")
         level13 = Level.objects.get(name="13")
@@ -119,9 +121,7 @@ class ScoreboardTestCase(TestCase):
 
         # Check data for custom levels matches
         assert shared_headers == SharedHeaders
-        assert shared_level_headers == [
-            f"{shared_level.name} ({shared_level.owner})"
-        ]
+        assert shared_level_headers == [f"{shared_level.name} ({shared_level.owner})"]
 
         assert len(shared_student_data) == 1
 
@@ -234,9 +234,7 @@ class ScoreboardTestCase(TestCase):
         )
 
         c = Client()
-        c.login(
-            username=admin_teacher.user.user.email, password="secretpa$sword2"
-        )
+        c.login(username=admin_teacher.user.user.email, password="secretpa$sword2")
 
         url = reverse("scoreboard")
         response = c.get(url)
@@ -306,8 +304,22 @@ class ScoreboardTestCase(TestCase):
         url = reverse("scoreboard")
         response = c.get(url)
 
+        assert "The scoreboard is only visible to school students and teachers" in str(
+            response.content
+        )
+
+    def test_teacher_without_classes_cannot_see_scoreboard(self):
+        email, password = signup_teacher_directly()
+        create_organisation_directly(email)
+
+        c = Client()
+        c.login(username=email, password=password)
+
+        url = reverse("scoreboard")
+        response = c.get(url)
+
         assert (
-            "Scoreboard is only visible to school students and teachers"
+            "The scoreboard can only be used by teachers who have classes assigned to them."
             in str(response.content)
         )
 
@@ -332,18 +344,11 @@ class ScoreboardCsvTestCase(TestCase):
         shared_levels = [shared_level1, shared_level2]
 
         shared_levels_headers = list(
-            [
-                shared_level_to_name(level, level.owner)
-                for level in shared_levels
-            ]
+            [shared_level_to_name(level, level.owner) for level in shared_levels]
         )
 
-        shared_level_rows[0] = self.shared_student_row(
-            students[0], shared_levels
-        )
-        shared_level_rows[1] = self.shared_student_row(
-            students[1], shared_levels
-        )
+        shared_level_rows[0] = self.shared_student_row(students[0], shared_levels)
+        shared_level_rows[1] = self.shared_student_row(students[1], shared_levels)
 
         # Create students' improvement table data
         improvement_data = []
@@ -369,13 +374,10 @@ class ScoreboardCsvTestCase(TestCase):
         ) = self.actual_data(response.content.decode("utf-8"), len(students))
 
         # Check the headers and the number or rows match expectations
-        assert actual_scoreboard_header == self.expected_scoreboard_header(
-            levels
-        )
+        assert actual_scoreboard_header == self.expected_scoreboard_header(levels)
         assert len(actual_scoreboard_rows) == len(student_rows)
-        assert (
-            actual_shared_levels_header
-            == self.expected_shared_levels_header(shared_levels)
+        assert actual_shared_levels_header == self.expected_shared_levels_header(
+            shared_levels
         )
         assert len(actual_shared_levels_rows) == len(shared_level_rows)
 
@@ -491,18 +493,13 @@ class ScoreboardCsvTestCase(TestCase):
 
     def expected_scoreboard_header(self, levels):
         level_strings = list(map(str, levels))
-        all_header_strings = (
-            CSVHeaders + level_strings + ["Areas for improvement"]
-        )
+        all_header_strings = CSVHeaders + level_strings + ["Areas for improvement"]
         joined = ",".join(all_header_strings)
         return joined
 
     def expected_shared_levels_header(self, shared_levels):
         level_strings = list(
-            [
-                shared_level_to_name(level, level.owner)
-                for level in shared_levels
-            ]
+            [shared_level_to_name(level, level.owner) for level in shared_levels]
         )
         all_header_strings = CSVSharedHeaders + level_strings
         joined = ",".join(all_header_strings)
@@ -524,9 +521,7 @@ class ScoreboardCsvTestCase(TestCase):
         scoreboard_header = split[scoreboard_header_row]
         scoreboard_rows = split[scoreboard_rows_start:scoreboard_rows_end]
         shared_levels_header = split[shared_levels_header_row]
-        shared_levels_rows = split[
-            shared_levels_rows_start:shared_levels_rows_end
-        ]
+        shared_levels_rows = split[shared_levels_rows_start:shared_levels_rows_end]
 
         return (
             scoreboard_header,

{rapid_router-7.6.8 → rapid_router-7.6.9}/game/views/scoreboard.py

@@ -313,7 +313,7 @@ def scoreboard(request, language):
             episode_ids = set(all_episode_ids)
 
     if is_teacher_with_no_classes_assigned(user, users_classes):
-        return render_no_permission_error(request)
+        return render_no_classes_error(request)
 
     if not is_valid_request(user, class_ids):
         raise Http404
@@ -430,6 +430,14 @@ def render_no_permission_error(request):
     )
 
 
+def render_no_classes_error(request):
+    return renderError(
+        request,
+        messages.no_classes_title(),
+        messages.no_classes_scoreboard(),
+    )
+
+
 def is_teacher_with_no_classes_assigned(user, users_classes):
     return user.is_teacher() and len(users_classes) == 0
 

{rapid_router-7.6.8 → rapid_router-7.6.9/rapid_router.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rapid-router
-Version: 7.6.8
+Version: 7.6.9
 Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Framework :: Django

rapid_router-7.6.8/game/__init__.py

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