rapid-router 5.18.0__py2.py3-none-any.whl → 7.6.8__py2.py3-none-any.whl

game/templates/game/python_den_worksheet.html

@@ -0,0 +1,101 @@
+{% extends 'game/base.html' %}
+
+{% load static %}
+{% load i18n %}
+{% load app_tags %}
+
+{% block scripts %}
+{{block.super}}
+<script type="text/javascript" src="https://editor-static.raspberrypi.org/releases/v0.29.1/web-component.js"></script>
+<script type="text/javascript" src="{% static 'game/js/editor.js' %}"></script>
+
+<script>
+    var EPISODE = "{{ worksheet.episode.name|escapejs }}"
+</script>
+{% endblock %}
+
+{% block css %}
+{{block.super}}
+<link href="{% static 'game/css/level_selection.css' %}" rel="stylesheet" type="text/css">
+<link href="{% static 'game/css/editor.css' %}" rel="stylesheet" type="text/css">
+{% endblock %}
+
+{% block header %}
+<section class="banner">
+    {% if user|is_logged_in_as_student or user|is_independent_student %}
+        <img class="banner--python-den--image" title="Python Den logo" alt="Python Den logo" src="{% static 'game/image/Python_Den_hero_student.png' %}">
+    {% else %}
+        <img class="banner--python-den--image" title="Python Den logo" alt="Python Den logo" src="{% static 'game/image/Python_levels_page.svg' %}">
+    {% endif %}
+</section>
+{% endblock header %}
+
+{% block content %}
+<div class="container">
+    <h4 class="text-center">{{worksheet.episode.name}}</h4>
+    <p>You can write your code and see its output using the code editor below.</p>
+    <p>Next to it, you can view your worksheet - you can't write anything in it, but you can copy and paste from it.</p>
+</div>
+
+<div>
+    <div class="d-flex align-items-stretch justify-content-between m-5 flex-lg-row flex-md-column flex-sm-column">
+        <div class="d-flex align-items-stretch justify-content-center">
+            <a href="{% if user|is_independent_student %} {{worksheet.indy_worksheet_link}} {% else %} {{worksheet.student_worksheet_link}} {% endif %}"
+               class="button button--level button--icon hidden-md hidden-lg mb-5" target="_blank">
+                Worksheet<span class="iconify" data-icon="mdi:open-in-new"></span></a>
+            {% if not user|is_logged_in_as_student %}
+                <a href="{{worksheet.video_link}}" class="button button--level button--icon hidden-md hidden-lg mb-5 ml-5" target="_blank">
+                    Video<span class="iconify" data-icon="mdi:open-in-new"></span></a>
+            {% endif %}
+        </div>
+
+        <editor-wc
+                code="{{starter_code}}"
+                use_editor_styles="true">
+        </editor-wc>
+
+        <div class="hidden-sm hidden-xs">
+            <div class="d-flex flex-column">
+                {% if user|is_logged_in_as_student %}
+                <iframe height="500" width="600" src="{{worksheet.student_worksheet_link}}"></iframe>
+                {% else %}
+                <ul class="nav nav-tabs" role="tablist">
+                    <li role="presentation" class="active">
+                        {% if user|is_independent_student %}
+                            <a href="#worksheet" aria-controls="worksheet" role="tab" data-toggle="tab">Worksheet</a>
+                        {% else %}
+                            <a href="#student-worksheet" aria-controls="student_worksheet" role="tab" data-toggle="tab">Student Worksheet</a>
+                        {% endif %}
+                    </li>
+                    {% if user|is_logged_in_as_teacher %}
+                    <li role="presentation">
+                        <a href="#worksheet" aria-controls="worksheet" role="tab" data-toggle="tab">Lesson plan</a>
+                    </li>
+                    {% endif %}
+                    <li role="presentation">
+                        <a href="#video" aria-controls="video" role="tab" data-toggle="tab">Video</a>
+                    </li>
+                </ul>
+
+                <div class="tab-content">
+                    {% if user|is_logged_in_as_teacher %}
+                    <div role="tabpanel" class="tab-pane active" id="student-worksheet">
+                        <iframe height="500" width="600" src="{{worksheet.student_worksheet_link}}"></iframe>
+                    </div>
+                    {% endif %}
+                    <div role="tabpanel" class="tab-pane {% if user|is_independent_student %} active {% endif %}" id="worksheet">
+                        <iframe height="500" width="600" src="{% if user|is_independent_student %} {{worksheet.indy_worksheet_link}} {% else %} {{worksheet.lesson_plan_link}} {% endif %}"></iframe>
+                    </div>
+                    <div role="tabpanel" class="tab-pane" id="video">
+                        <video height="500" width="600"
+                               src="{{worksheet.video_link}}" type="video/mp4" controls></video>
+                    </div>
+                </div>
+                {% endif %}
+            </div>
+        </div>
+
+    </div>
+</div>
+
+{% endblock content %}

game/templates/game/scoreboard.html

@@ -4,24 +4,29 @@
 {% load game.utils %}
 {% load app_tags %}
 
-{% block title %}Code for Life - Rapid Router - Scoreboard{% endblock %}
+{% block title %}
+    {% if language == "blockly" %}
+        Code for Life - Rapid Router - Scoreboard
+    {% else %}
+        Code for Life - Python Den - Scoreboard
+    {% endif %}
+{% endblock %}
 
 {% block scripts %}
     {{block.super}}
     <script src="{% static 'game/js/jquery.dataTables.min.js' %}"></script>
     <script src="{% static 'game/js/dataTables.fixedColumns.js' %}"></script>
-    <script src="{% static 'game/js/widget-scroller.js' %}"></script>
-    <script src="{% static 'game/js/pqselect.min.js' %}"></script>
     <script src="{% static 'game/js/jquery.outerhtml.js' %}"></script>
     <script src="{% static 'game/js/scoreboard.js' %}"></script>
+    {% if language == "blockly" %}
+        <script src="{% static 'game/js/scoreboardSharedLevels.js' %}"></script>
+    {% endif %}
 {% endblock %}
 
 {% block css %}
 {{block.super}}
     <link href="https://code.jquery.com/ui/1.13.1/themes/base/jquery-ui.css" rel="stylesheet" type="text/css">
     <link href="{% static 'game/css/scoreboard.css' %}" rel="stylesheet" type="text/css">
-    <link href="{% static 'game/css/pqselect.min.css' %}" rel="stylesheet" type="text/css">
-    <link href="{% static 'game/css/pqselect.multiselect.css' %}" rel="stylesheet" type="text/css">
     <link href="{% static 'game/css/jquery.dataTables.css' %}" rel="stylesheet" type="text/css">
     <link href="{% static 'game/css/dataTables.fixedColumns.css' %}" rel="stylesheet" type="text/css">
     <link href="{% static 'game/css/dataTables.jqueryui.css' %}" rel="stylesheet" type="text/css">
@@ -31,9 +36,21 @@
 {% endblock %}
 
 {% block header %}
-<section class="banner banner--rapid-router">
-    <img title="Rapid Router logo" alt="Rapid Router logo" src="{% static 'common/img/RR_logo.svg' %}">
-</section>
+    {% if language == "blockly" %}
+        <section class="banner banner--rapid-router">
+            <img title="Rapid Router logo" alt="Rapid Router logo" src="{% static 'common/img/RR_logo.svg' %}">
+        </section>
+    {% else %}
+        <section class="banner">
+            {% if user|is_logged_in_as_student or user|is_independent_student %}
+                <img class="banner--python-den--image" title="Python Den logo"
+                     alt="Python Den logo" src="{% static 'game/image/Python_Den_hero_student.png' %}">
+            {% else %}
+                <img class="banner--python-den--image" title="Python Den logo"
+                     alt="Python Den logo" src="{% static 'game/image/Python_levels_page.svg' %}">
+            {% endif %}
+        </section>
+    {% endif %}
 {% endblock header %}
 
 {% block nav_ocargo_scoreboard %}
@@ -150,22 +167,22 @@
                 </tr>
                 </thead>
                 {% for student in student_data %}
-                    {% ifnotequal student.name user.first_name %}
+                    {% if student.name != user.first_name %}
                     <tr>
                     {% else %}
                     <tr class="current-student">
-                    {% endifnotequal %}
+                    {% endif %}
                         <td class="fixed-width">{{ student.class_field }}</td>
                         <td class="fixed-width">{{ student.name }}</td>
                         <td>{{ student.completed }}</td>
                         <td>{{ student.total_time }}</td>
                         {% for level_id, level_score in student.level_scores.items %}
                             {% if level_score.full_score %}
-                                {% ifnotequal student.name user.first_name %}
+                                {% if student.name != user.first_name %}
                                 <td class="text-center scoreboard--completed">
                                 {% else %}
                                 <td class="text-center scoreboard--completed-secondary">
-                                {% endifnotequal %}
+                                {% endif %}
                                     <div title="{{ level_score.score }}" class="d-flex justify-content-center">
                                         <span class="iconify" data-icon="mdi:star"></span>
                                     </div>
@@ -201,65 +218,67 @@
     </div>
 </div>
 
-<div class="container">
+{% if language == "blockly" %}
+    <div class="container">
 
-    <h5>Shared levels</h5>
-    {% if user|is_logged_in_as_teacher %}
-        <p>The shared levels table displays levels that have been shared and then played by others.
-            You can moderate which levels are shared on the <a href="{% url 'level_moderation' %}">moderation page</a>.</p>
-    {% endif %}
+        <h5>Shared levels</h5>
+        {% if user|is_logged_in_as_teacher %}
+            <p>The shared levels table displays levels that have been shared and then played by others.
+                You can moderate which levels are shared on the <a href="{% url 'level_moderation' %}">moderation page</a>.</p>
+        {% endif %}
 
-    <div class="background tableWrapper" id="tableWrapper">
-        {% if shared_student_data %}
-            <div class="dataTables_info" role="status" aria-live="polite"></div>
-            <table id="sharedLevelsTable" class="display cell-border wide header-primary data-primary">
-                <thead>
-                <tr>
-                    {% for shared_header in shared_headers %}
-                        <th class="fixed-width">{{ shared_header }}</th>
-                    {% endfor %}
-                    {% for shared_level_header in shared_level_headers %}
-                        <th class="no-sort text-center">{{ shared_level_header }}</th>
-                    {% endfor %}
-                </tr>
-                </thead>
-                {% for student in shared_student_data %}
-                    {% ifnotequal student.name user.first_name %}
+        <div class="background tableWrapper" id="tableWrapper">
+            {% if shared_student_data %}
+                <div class="dataTables_info" role="status" aria-live="polite"></div>
+                <table id="sharedLevelsTable" class="display cell-border wide header-primary data-primary">
+                    <thead>
                     <tr>
-                    {% else %}
-                    <tr class="current-student">
-                    {% endifnotequal %}
-                        <td class="fixed-width">{{ student.class_field }}</td>
-                        <td class="fixed-width">{{ student.name }}</td>
-                        {% for level_id, level_score in student.level_scores.items %}
-                            {% if level_score.full_score %}
-                                {% ifnotequal student.name user.first_name %}
-                                    <td class="text-center scoreboard--completed">
-                                {% else %}
-                                    <td class="text-center scoreboard--completed-secondary">
-                                {% endifnotequal %}
-                                        <div title="{{ level_score.score }}" class="d-flex justify-content-center">
-                                            <span class="iconify" data-icon="mdi:star"></span>
-                                        </div>
-                                    </td>
-                            {% elif level_score.is_low_attempt %}
-                                {% if user|is_logged_in_as_teacher %}
-                                    <td class="text-center scoreboard--started">{{ level_score.score }}</td>
+                        {% for shared_header in shared_headers %}
+                            <th class="fixed-width">{{ shared_header }}</th>
+                        {% endfor %}
+                        {% for shared_level_header in shared_level_headers %}
+                            <th class="no-sort text-center">{{ shared_level_header }}</th>
+                        {% endfor %}
+                    </tr>
+                    </thead>
+                    {% for student in shared_student_data %}
+                        {% if student.name != user.first_name %}
+                        <tr>
+                        {% else %}
+                        <tr class="current-student">
+                        {% endif %}
+                            <td class="fixed-width">{{ student.class_field }}</td>
+                            <td class="fixed-width">{{ student.name }}</td>
+                            {% for level_id, level_score in student.level_scores.items %}
+                                {% if level_score.full_score %}
+                                    {% if student.name != user.first_name %}
+                                        <td class="text-center scoreboard--completed">
+                                    {% else %}
+                                        <td class="text-center scoreboard--completed-secondary">
+                                    {% endif %}
+                                            <div title="{{ level_score.score }}" class="d-flex justify-content-center">
+                                                <span class="iconify" data-icon="mdi:star"></span>
+                                            </div>
+                                        </td>
+                                {% elif level_score.is_low_attempt %}
+                                    {% if user|is_logged_in_as_teacher %}
+                                        <td class="text-center scoreboard--started">{{ level_score.score }}</td>
+                                    {% else %}
+                                        <td class="text-center">{{ level_score.score }}</td>
+                                    {% endif %}
                                 {% else %}
                                     <td class="text-center">{{ level_score.score }}</td>
                                 {% endif %}
-                            {% else %}
-                                <td class="text-center">{{ level_score.score }}</td>
-                            {% endif %}
-                        {% endfor %}
-                    </tr>
-                {% endfor %}
-            </table>
-        {% else %}
-            <p>No data.</p>
-        {% endif %}
+                            {% endfor %}
+                        </tr>
+                    {% endfor %}
+                </table>
+            {% else %}
+                <p>No data.</p>
+            {% endif %}
+        </div>
     </div>
-</div>
+{% endif %}
 
 {% if user|is_logged_in_as_teacher %}
 <div class="container">

game/tests/test_level_editor.py

@@ -1,6 +1,7 @@
 import json
+from unittest.mock import patch
 
-from common.models import Teacher
+from common.models import Teacher, User
 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_school_student_directly
@@ -10,22 +11,21 @@ from django.core import mail
 from django.test.client import Client
 from django.test.testcases import TestCase
 from django.urls import reverse
-from hamcrest import assert_that, equal_to
 
 from game.models import Level
-from game.tests.utils.level import create_save_level, create_save_level_with_multiple_houses
+from game.tests.utils.level import create_save_level, create_save_level_with_multiple_houses, multiple_house_data
 from game.tests.utils.teacher import add_teacher_to_school, create_school
 
 
 class LevelEditorTestCase(TestCase):
     LEVEL_DATA1 = {
         "origin": '{"coordinate":[3,5],"direction":"S"}',
-        "pythonEnabled": False,
+        "python_enabled": False,
         "decor": [],
-        "blocklyEnabled": True,
+        "blockly_enabled": True,
         "blocks": [{"type": "move_forwards"}, {"type": "turn_left"}, {"type": "turn_right"}],
         "max_fuel": "50",
-        "pythonViewEnabled": False,
+        "python_view_enabled": False,
         "character": "3",
         "name": "abc",
         "theme": 1,
@@ -87,10 +87,21 @@ class LevelEditorTestCase(TestCase):
         url = reverse("save_level_for_editor")
         response = self.client.post(url, {"data": json.dumps(self.LEVEL_DATA1)})
 
-        assert_that(response.status_code, equal_to(200))
+        assert response.status_code == 200
+
+        level = Level.objects.all().last()
+        teacher_user = User.objects.get(email=email)
+
+        assert level.needs_approval == True
+        assert level.shared_with.count() == 1
+        assert level.shared_with.filter(id=teacher_user.id).exists()
+        assert len(mail.outbox) == 1
+
+        level.needs_approval = False
+        level.save()
+
         sharing_info1 = json.loads(self.get_sharing_information(json.loads(response.content)["id"]).getvalue())
         assert sharing_info1["teacher"]["shared"]
-        assert len(mail.outbox) == 1
 
     def test_anonymous_level_saving_school_student(self):
         email, password = signup_teacher_directly()
@@ -102,12 +113,12 @@ class LevelEditorTestCase(TestCase):
         url = reverse("save_level_for_editor")
         data1 = {
             "origin": '{"coordinate":[3,5],"direction":"S"}',
-            "pythonEnabled": False,
+            "python_enabled": False,
             "decor": [],
-            "blocklyEnabled": True,
+            "blockly_enabled": True,
             "blocks": [{"type": "move_forwards"}, {"type": "turn_left"}, {"type": "turn_right"}],
             "max_fuel": "50",
-            "pythonViewEnabled": False,
+            "python_view_enabled": False,
             "character": "3",
             "name": "abc",
             "theme": 1,
@@ -119,6 +130,10 @@ class LevelEditorTestCase(TestCase):
         }
         response = self.client.post(url, {"data": json.dumps(data1)})
 
+        level = Level.objects.all().last()
+        level.needs_approval = False
+        level.save()
+
         assert response.status_code == 200
         sharing_info1 = json.loads(self.get_sharing_information(json.loads(response.content)["id"]).getvalue())
         assert sharing_info1["teacher"]["shared"]
@@ -210,7 +225,7 @@ class LevelEditorTestCase(TestCase):
         response = self.client.get(load_level_url)
         assert response.status_code == 200
 
-        # Login as the first student
+        # Log in as the first student
         self.logout()
         self.student_login(student_name1, access_code2, student_password1)
 
@@ -222,7 +237,7 @@ class LevelEditorTestCase(TestCase):
         response = self.client.get(reverse("play_custom_level", args=[level.id]))
         assert response.status_code == 200
 
-        # Login as first teacher again
+        # Log in as first teacher again
         self.logout()
         self.login(email1, password1)
 
@@ -230,7 +245,7 @@ class LevelEditorTestCase(TestCase):
         response = self.client.post(share_url, {"recipientIDs[]": [student2.new_user.id], "action": ["share"]})
         assert response.status_code == 200
 
-        # Login as the second student
+        # Log in as the second student
         self.logout()
         self.student_login(student_name2, access_code2, student_password2)
 
@@ -276,12 +291,12 @@ class LevelEditorTestCase(TestCase):
         url = reverse("save_level_for_editor")
         data_with_no_character = {
             "origin": '{"coordinate":[3,5],"direction":"S"}',
-            "pythonEnabled": False,
+            "python_enabled": False,
             "decor": [],
-            "blocklyEnabled": True,
+            "blockly_enabled": True,
             "blocks": [{"type": "move_forwards"}, {"type": "turn_left"}, {"type": "turn_right"}],
             "max_fuel": "50",
-            "pythonViewEnabled": False,
+            "python_view_enabled": False,
             "name": "abc",
             "theme": 1,
             "anonymous": True,
@@ -307,16 +322,16 @@ class LevelEditorTestCase(TestCase):
         url = reverse("save_level_for_editor")
         data_with_split_language = {
             "origin": '{"coordinate":[3,5],"direction":"S"}',
-            "pythonEnabled": False,
+            "python_enabled": False,
             "decor": [],
-            "blocklyEnabled": True,
+            "blockly_enabled": True,
             "blocks": [
                 {"type": "move_forwards"},
                 {"type": "turn_left"},
                 {"type": "turn_right"},
             ],
             "max_fuel": "50",
-            "pythonViewEnabled": True,
+            "python_view_enabled": True,
             "name": "abc",
             "theme": 1,
             "anonymous": True,
@@ -331,9 +346,9 @@ class LevelEditorTestCase(TestCase):
         assert response.status_code == 200
         new_level = Level.objects.get(name="abc")
 
-        assert new_level.pythonViewEnabled
-        assert not new_level.pythonEnabled
-        assert new_level.blocklyEnabled
+        assert new_level.python_view_enabled
+        assert not new_level.python_enabled
+        assert new_level.blockly_enabled
 
     def test_level_loading(self):
         email1, password1 = signup_teacher_directly()
@@ -357,12 +372,12 @@ class LevelEditorTestCase(TestCase):
         url = reverse("save_level_for_editor")
         data_with_multiple_houses = {
             "origin": '{"coordinate":[3,5],"direction":"S"}',
-            "pythonEnabled": False,
+            "python_enabled": False,
             "decor": [],
-            "blocklyEnabled": True,
+            "blockly_enabled": True,
             "blocks": [{"type": "move_forwards"}, {"type": "turn_left"}, {"type": "turn_right"}],
             "max_fuel": "50",
-            "pythonViewEnabled": False,
+            "python_view_enabled": False,
             "name": "multiple_houses",
             "theme": 1,
             "anonymous": True,
@@ -392,6 +407,24 @@ class LevelEditorTestCase(TestCase):
         assert response.status_code == 200
         assert response_data["level"]["destinations"] == "[[3,4], [3,3]]"
 
+    @patch("game.level_management.save_level")
+    def test_custom_level_scoring(self, mock_save_level):
+        email1, password1 = signup_teacher_directly()
+
+        teacher1 = Teacher.objects.get(new_user__email=email1)
+
+        self.login(email1, password1)
+
+        level = create_save_level_with_multiple_houses(teacher1)
+
+        save_url = reverse("save_level_for_editor", kwargs={"levelId": level.id})
+        response = self.client.post(save_url, {"data": json.dumps(multiple_house_data)})
+
+        disable_algorithm_score = mock_save_level.call_args.args[1]["disable_algorithm_score"]
+
+        assert response.status_code == 200
+        assert disable_algorithm_score
+
     def test_level_of_anonymised_teacher_is_hidden(self):
         # Create 2 teacher accounts
         email1, password1 = signup_teacher_directly()
@@ -455,3 +488,38 @@ class LevelEditorTestCase(TestCase):
         # Teacher shouldn't see any shared levels now
         response = self.client.get(levels_url)
         assert len(response.context["directly_shared_levels"]) == 0
+
+    def test_level_cannot_be_created_with_invalid_fields(self):
+        email, password = signup_teacher_directly()
+        create_organisation_directly(email)
+        _, _, access_code = create_class_directly(email)
+        create_school_student_directly(access_code)
+
+        level_data = self.LEVEL_DATA1
+        level_data["subtitle"] = "<a>invalid subtitle</a>"
+
+        self.login(email, password)
+        url = reverse("save_level_for_editor")
+        response = self.client.post(url, {"data": json.dumps(self.LEVEL_DATA1)})
+
+        assert response.status_code == 401
+
+        level_data["subtitle"] = "valid subtitle"
+        level_data["lesson"] = "<a>invalid lesson</a>"
+
+        response = self.client.post(url, {"data": json.dumps(self.LEVEL_DATA1)})
+
+        assert response.status_code == 401
+
+        level_data["lesson"] = "valid lesson"
+        level_data["hint"] = "<a>invalid hint</a>"
+
+        response = self.client.post(url, {"data": json.dumps(self.LEVEL_DATA1)})
+
+        assert response.status_code == 401
+
+        level_data["hint"] = "valid hint"
+
+        response = self.client.post(url, {"data": json.dumps(self.LEVEL_DATA1)})
+
+        assert response.status_code == 200