codeforlife-portal 7.1.2__py2.py3-none-any.whl → 7.2.0__py2.py3-none-any.whl

portal/static/portal/sass/modules/_colours.scss

@@ -107,6 +107,7 @@ $color-background-danger: #ff0000;
 $color-background-tint-primary: #f1ecec;
 $color-background-sub-banner: $color-secondary-300;
 $color-background-box-shadow: rgba(0, 0, 0, 0.2);
+$color-background-python-den: #213ce7;
 // Popups & Messages
 $color-ui-dialog-border: #808080;
 $color-ui-widget-overlay: #666666;

portal/static/portal/sass/partials/_text.scss

@@ -180,6 +180,11 @@ blockquote {
   }
 }
 
+.background--python-den {
+  background-color: $color-background-python-den;
+  color: $color-text-secondary;
+}
+
 @media (min-width: $tablet-small-min-width) {
   .list--two-columns {
     columns: 2;

portal/templates/portal/contribute.html

@@ -54,6 +54,12 @@
                     Built on Blockly, it's a visual programming language similar
                     to Scratch. Rapid Router is our flagship game with the
                     biggest user base.</p>
+
+                <p><b>Python Den</b></p>
+                <p>Our new Python Den uses Blockly, Blockly/Python split
+                    screen, and an IDE. It takes students from no previous
+                    Python experience to a foundation in Python, helping
+                    prepare them for GCSE and beyond.</p>
             </div>
             <div class="col-sm-6">
                 <img title="Rapid Router" alt="Rapid Router"

portal/templates/portal/partials/header.html

@@ -37,6 +37,7 @@
                             Games <span class="material-icons-outlined md-32">arrow_drop_down</span></a>
                         <div class="dropdown-content">
                             <a href="{% url 'levels' %}"><small>Rapid Router</small></a>
+                            <a href="{% url 'python_levels' %}"><small>Python Den</small></a>
                         </div>
                     </div>
                     <div class="dropdown">
@@ -46,6 +47,8 @@
                         <div class="dropdown-content">
                             <a id="rapid_router_resources_button" href="https://code-for-life.gitbook.io/teaching-resources/" target="_blank">
                                 <small>Rapid Router</small> <span class="iconify" data-icon="mdi:open-in-new"></span></a>
+                            <a href="https://code-for-life.gitbook.io/python-lessons-with-raspberry-pi-ide/DGiFT28ihVJK7ghZQHqu" target="_blank">
+                                <small>Python Den</small> <span class="iconify" data-icon="mdi:open-in-new"></span></a>
                             <a href="{% url 'codingClub' %}"><small>Coding Clubs</small></a>
                         </div>
                     </div>
@@ -75,6 +78,7 @@
                     </a>
                     <div class="dropdown-content">
                         <a href="{% url 'levels' %}"><small>Rapid Router</small></a>
+                        <a href="{% url 'python_levels' %}"><small>Python Den</small></a>
                     </div>
                 </div>
                 {% if user|is_logged_in_as_school_user %}
@@ -186,11 +190,15 @@
                       href="{% url 'dashboard' %}">School / Club<span class="material-icons-outlined md-32">chevron_right</span></a>
                     <a class="button button--menu__item button--menu__item__sub"
                       href="{% url 'levels' %}">Rapid Router<span class="material-icons-outlined md-32">chevron_right</span></a>
+                    <a class="button button--menu__item button--menu__item__sub"
+                       href="{% url 'python_levels' %}">Python Den<span class="material-icons-outlined md-32">chevron_right</span></a>
                     <button class="button--menu__item button--menu__item__sub
                     button--menu__item--sub-header" data-toggle="collapse" data-target="#resources-tabs">Teaching Resources</button>
                     <div id="resources-tabs" class="collapse">
                         <a class="button button--menu__item button--menu__item__sub__sub"
                           href="https://code-for-life.gitbook.io/teaching-resources/" target="_blank">Rapid Router<span class="material-icons-outlined md-32">chevron_right</span></a>
+                        <a class="button button--menu__item button--menu__item__sub__sub"
+                           href="https://code-for-life.gitbook.io/python-lessons-with-raspberry-pi-ide/DGiFT28ihVJK7ghZQHqu" target="_blank">Python Den<span class="material-icons-outlined md-32">chevron_right</span></a>
                     </div>
                 </div>
             {% else %}
@@ -209,6 +217,8 @@
                     <div id="games-tabs" class="collapse">
                         <a class="button button--menu__item button--menu__item--{% if user|is_independent_student %}independent{% else %}student{% endif %} button--menu__item__sub"
                           href="{% url 'levels' %}">Rapid Router<span class="material-icons-outlined md-32">chevron_right</span></a>
+                        <a class="button button--menu__item button--menu__item--{% if user|is_independent_student %}independent{% else %}student{% endif %} button--menu__item__sub"
+                           href="{% url 'python_levels' %}">Python Den<span class="material-icons-outlined md-32">chevron_right</span></a>
                     </div>
                     {% if user|is_logged_in_as_school_user %}
                     <a class="button button--menu__item button--menu__item--student"

portal/templates/portal/play/student_dashboard.html

@@ -3,7 +3,11 @@
 {% load app_tags %}
 
 {% block subNav %}
+{% if user|is_independent_student %}
+<section class="banner banner--independent-student row mx-0">
+{% else %}
 <section class="banner banner--student row mx-0">
+{% endif %}
     <div>
         <h1 class="banner__text--primary">
             Welcome, {{ user|make_into_username }}
@@ -16,13 +20,13 @@
 {% block content %}
 <div id="play_dashboard_page">
     <div class="background container">
-        <section><h4>Your class games</h4></section>
-        <div class="grid-games col-center col-sm-4">
+        <section><h4>Your games</h4></section>
+        <div class="grid-games col-center col-sm-9">
             <div class="card">
                 <div class="card__images">
                     <img title="Rapid Router" alt="Rapid Router"
                          class="card__image"
-                         src="{% static 'portal/img/RR_logo_green.svg' %}">
+                         src="{% static 'portal/img/RR_logo_grass_background.png' %}">
                 </div>
                 <div class="card__text">
                     <h5 class="card__title">Rapid Router</h5>
@@ -35,17 +39,34 @@
                     </div>
                 </div>
             </div>
+            <div class="card">
+                <div class="card__images">
+                    <img title="Python Den" alt="Python Den"
+                         class="card__image"
+                         src="{% static 'portal/img/python_den.png' %}">
+                </div>
+                <div class="card__text">
+                    <h5 class="card__title">Python Den</h5>
+                    <p>The Python Den takes you on a programming journey from
+                        beginner to syntax superhero. Build a good solid
+                        foundation of Python to start your coding career!</p>
+                    <div class="button-group">
+                        <a href="{% url 'python_levels'%}"
+                           class="button button--primary">Play</a>
+                    </div>
+                </div>
+            </div>
         </div>
     </div>
     <div class="background background--primary">
         <div class="container">
             <div class="text-center">
                 <section><img title="Rapid Router logo" alt="Rapid Router logo" src="{% static 'portal/img/RR_logo_simple.png' %}"></section>
-                <h4>You have completed {{ num_completed }} Rapid Router level{{ num_completed|pluralize }}!</h4>
-                <h4>You have {{ num_top_scores }} top score{{ num_top_scores|pluralize }}!</h4>
-                <h4>You have a score of {{ total_score }}. There are {{ total_available_score }} available points.</h4>
-                {% if total_custom_available_score %}
-                    <h4>You have a score of {{ total_custom_score }} out of {{ total_custom_available_score }} available points on custom levels.</h4>
+                <h4>You have completed {{ rapid_router.num_completed }} Rapid Router level{{ rapid_router.num_completed|pluralize }}!</h4>
+                <h4>You have {{ rapid_router.num_top_scores }} top score{{ rapid_router.num_top_scores|pluralize }}!</h4>
+                <h4>You have a score of {{ rapid_router.total_score }}. There are {{ rapid_router.total_available_score }} available points.</h4>
+                {% if rapid_router.total_custom_available_score %}
+                    <h4>You have a score of {{ rapid_router.total_custom_score }} out of {{ rapid_router.total_custom_available_score }} available points on custom levels.</h4>
                 {% endif %}
                 <section>
                     <a href="{% url 'scoreboard' %}"
@@ -56,5 +77,15 @@
             </div>
         </div>
     </div>
+    <div class="background background--python-den">
+        <div class="container">
+            <div class="text-center">
+                <section><img title="Python Den logo" alt="Python Den logo" src="{% static 'portal/img/logo_python_den.svg' %}"></section>
+                <h4>You have completed {{ python_den.num_completed }} Python Den level{{ python_den.num_completed|pluralize }}!</h4>
+                <h4>You have {{ python_den.num_top_scores }} top score{{ python_den.num_top_scores|pluralize }}!</h4>
+                <h4>You have a score of {{ python_den.total_score }}. There are {{ python_den.total_available_score }} available points.</h4>
+            </div>
+        </div>
+    </div>
 </div>
 {% endblock %}

portal/templates/portal/play.html

@@ -94,6 +94,40 @@
     </div>
 </section>
 
+<div class="background container">
+    <section>
+        <img title="Python Den logo"
+             alt="Banner image of Python Den logo and game"
+             src="{% static 'portal/img/python_den_banner.svg' %}">
+    </section>
+    <div class="background row d-flex">
+        <div class="col-sm-6">
+            <img src="{% static 'portal/img/python_den.png' %}"
+                 alt="Python Den logo and characters">
+        </div>
+        <div class="col-sm-6 d-flex flex-column">
+            <div class="flex-grow-1">
+                <h5 class="mt-0">Python programming</h5>
+                <p>The Python Den is an exploration of Python programming
+                    through a comprehensive course with free lesson plans,
+                    videos and worksheets to support you in your learning.</p>
+                <p>From foundational syntax to advanced concepts like loops
+                    and data manipulation, each session is a new challenge.</p>
+                <p>We aim to provide a tried-and-tested, structured set of
+                    lessons that you can use at home or in class, no matter
+                    your own level of experience.</p>
+            </div>
+            <div class="row my-4">
+                <div class="col-sm-12">
+                    <a href="{% url 'python_levels' %}"
+                       class="button button--primary button--icon col-sm-8">
+                        Play Python Den <span class="iconify" data-icon="mdi:chevron-right"></span></a>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+
 <script type="text/javascript">
     $(document).ready(function () {
         invokeColorbox();

portal/templates/portal/teach.html

@@ -149,6 +149,41 @@
     </div>
 </div>
 
+<div class="background background--primary">
+    <div class="container">
+        <div class="row d-flex">
+            <div class="col-sm-6 d-flex flex-column">
+                <div class="flex-grow-1">
+                    <h4 class="mt-0">Python programming</h4>
+                    <p>The Python Den is an exploration of Python
+                        programming through a comprehensive course with free
+                        lesson plans, videos and worksheets to support you in
+                        teaching Python programming to your students. From
+                        foundational syntax to advanced concepts like loops
+                        and data manipulation, each session is tailored to
+                        engage young learners.</p>
+                    <p>We aim to provide a tried-and-tested, structured set
+                        of lessons that you can use in your classroom, no
+                        matter your own level of experience.
+                    </p>
+                </div>
+                <div>
+                    <a href="{% url 'python_levels' %}"
+                       class="button button--primary button-right-arrow">
+                        Try out Python Den
+                    </a>
+                </div>
+            </div>
+            <div class="col-sm-6">
+                <a href="https://www.youtube-nocookie.com/embed/ko4nrr4kDzA?rel=0&amp;autoplay=1" class="youtube">
+                    <img src="{% static 'portal/img/thumbnail_python_den.png' %}"
+                         alt="Python Den logo">
+                </a>
+            </div>
+        </div>
+    </div>
+</div>
+
 <script type="text/javascript">
     $(document).ready(function(){
         invokeColorbox();

portal/tests/test_views.py

@@ -560,29 +560,53 @@ class TestViews(TestCase):
 
         # Expected context data when a student hasn't played anything yet
         EXPECTED_DATA_FIRST_LOGIN = {
-            "num_completed": 0,
-            "num_top_scores": 0,
-            "total_score": 0,
-            "total_available_score": 1450,
+            "rapid_router": {
+                "num_completed": 0,
+                "num_top_scores": 0,
+                "total_score": 0,
+                "total_available_score": 1450,
+            },
+            "python_den": {
+                "num_completed": 0,
+                "num_top_scores": 0,
+                "total_score": 0,
+                "total_available_score": 830,
+            },
         }
 
         # Expected context data when a student has attempted some RR levels
         EXPECTED_DATA_WITH_ATTEMPTS = {
-            "num_completed": 2,
-            "num_top_scores": 1,
-            "total_score": 39,
-            "total_available_score": 1450,
+            "rapid_router": {
+                "num_completed": 2,
+                "num_top_scores": 1,
+                "total_score": 39,
+                "total_available_score": 1450,
+            },
+            "python_den": {
+                "num_completed": 2,
+                "num_top_scores": 2,
+                "total_score": 30,
+                "total_available_score": 830,
+            },
         }
 
         # Expected context data when a student has also attempted some custom RR
         # levels
         EXPECTED_DATA_WITH_CUSTOM_ATTEMPTS = {
-            "num_completed": 2,
-            "num_top_scores": 1,
-            "total_score": 39,
-            "total_available_score": 1450,
-            "total_custom_score": 10,
-            "total_custom_available_score": 20,
+            "rapid_router": {
+                "num_completed": 2,
+                "num_top_scores": 1,
+                "total_score": 39,
+                "total_available_score": 1450,
+                "total_custom_score": 10,
+                "total_custom_available_score": 20,
+            },
+            "python_den": {
+                "num_completed": 2,
+                "num_top_scores": 2,
+                "total_score": 30,
+                "total_available_score": 830,
+            },
         }
 
         c = Client()
@@ -599,13 +623,20 @@ class TestViews(TestCase):
         assert response.status_code == 200
         assert response.context_data == EXPECTED_DATA_FIRST_LOGIN
 
-        # Attempt the first two levels, one perfect attempt, one not
+        # Attempt the first two RR levels, one perfect attempt, one not
         level1 = Level.objects.get(name="1")
         level2 = Level.objects.get(name="2")
 
         create_attempt(student, level1, 20)
         create_attempt(student, level2, 19)
 
+        # Attempt the first and fourth Python Den levels, both perfect
+        level1001 = Level.objects.get(name="1001")
+        level1004 = Level.objects.get(name="1004")
+
+        create_attempt(student, level1001, 20)
+        create_attempt(student, level1004, 10)
+
         response = c.get(student_dashboard_url)
 
         assert response.status_code == 200

portal/views/student/play.py

@@ -37,10 +37,16 @@ class SchoolStudentDashboard(
         the student's scores for any levels shared with them by their teacher.
         """
         # Get score data for all original levels
-        levels = Level.objects.filter(episode__pk__in=range(1, 10))
+        rapid_router_levels = Level.objects.filter(episode__pk__in=range(1, 10))
+        python_den_levels = Level.objects.filter(
+            episode__pk__in=[12, 13, 14, 15, 22]
+        )
         student = self.request.user.new_student
 
-        context_data = _compute_rapid_router_scores(student, levels)
+        context_data = {
+            "rapid_router": _compute_scores(student, rapid_router_levels),
+            "python_den": _compute_scores(student, python_den_levels),
+        }
 
         # Find any custom levels created by the teacher and shared with the
         # student
@@ -49,16 +55,15 @@ class SchoolStudentDashboard(
         custom_levels = student.new_user.shared.filter(owner=teacher)
 
         if custom_levels:
-            custom_levels_data = _compute_rapid_router_scores(
-                student, custom_levels
-            )
+            custom_levels_data = _compute_scores(student, custom_levels)
 
-            context_data["total_custom_score"] = custom_levels_data[
-                "total_score"
-            ]
-            context_data["total_custom_available_score"] = custom_levels_data[
-                "total_available_score"
-            ]
+            context_data["rapid_router"]["total_custom_score"] = (
+                custom_levels_data
+            )["total_score"]
+
+            context_data["rapid_router"][
+                "total_custom_available_score"
+            ] = custom_levels_data["total_available_score"]
 
         return context_data
 
@@ -66,23 +71,26 @@ class SchoolStudentDashboard(
 class IndependentStudentDashboard(
     LoginRequiredNoErrorMixin, UserPassesTestMixin, TemplateView, FormView
 ):
-    template_name = "portal/play/independent_student_dashboard.html"
+    template_name = "portal/play/student_dashboard.html"
     login_url = reverse_lazy("independent_student_login")
 
     def test_func(self) -> Optional[bool]:
         return logged_in_as_independent_student(self.request.user)
 
     def get_context_data(self, **kwargs: Any) -> Dict[str, Any]:
-        levels = Level.objects.filter(episode__pk__in=range(1, 10))
+        rapid_router_levels = Level.objects.filter(episode__pk__in=range(1, 10))
+        python_den_levels = Level.objects.filter(
+            episode__pk__in=[12, 13, 14, 15, 22]
+        )
         student = self.request.user.new_student
 
-        return _compute_rapid_router_scores(
-            student,
-            levels,
-        )
+        return {
+            "rapid_router": _compute_scores(student, rapid_router_levels),
+            "python_den": _compute_scores(student, python_den_levels),
+        }
 
 
-def _compute_rapid_router_scores(
+def _compute_scores(
     student: Student, levels: List[Level] or QuerySet
 ) -> Dict[str, int]:
     """

portal/templates/portal/play/independent_student_dashboard.html

@@ -1,51 +0,0 @@
-{% extends 'portal/base.html' %}
-{% load static %}
-{% load app_tags %}
-
-{% block subNav %}
-<section class="banner banner--independent-student row mx-0">
-    <div>
-        <h1 class="banner__text--primary">
-            Welcome, {{ user|make_into_username }}
-        </h1>
-        <h4>This is where you can access your games</h4>
-    </div>
-</section>
-{% endblock subNav %}
-
-{% block content %}
-<div id="play_dashboard_page">
-    <div class="background container">
-        <section><h4>Your games</h4></section>
-        <div class="grid-games col-center col-sm-4">
-            <div class="card">
-                <div class="card__images">
-                    <img title="Rapid Router" alt="Rapid Router"
-                         class="card__image"
-                         src="{% static 'portal/img/RR_logo_green.svg' %}">
-                </div>
-                <div class="card__text">
-                    <h5 class="card__title">Rapid Router</h5>
-                    <p>Rapid Router guides you, and makes learning to code easy
-                        and great fun. Using Blockly, you can advance through
-                        the levels to become an Ocado delivery hero.</p>
-                    <div class="button-group">
-                        <a href="{% url 'levels'%}"
-                           class="button button--primary">Play</a>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </div>
-    <div class="background background--primary">
-        <div class="container">
-            <div class="col-center text-center col-sm-9">
-                <section><img title="Rapid Router logo" alt="Rapid Router logo" src="{% static 'portal/img/RR_logo_simple.png' %}"></section>
-                <h4>You have completed {{ num_completed }} Rapid Router level{{ num_completed|pluralize }}!</h4>
-                <h4>You have {{ num_top_scores }} top score{{ num_top_scores|pluralize }}!</h4>
-                <h4>You have a score of {{ total_score }}. There are {{ total_available_score }} available points.</h4>
-            </div>
-        </div>
-    </div>
-</div>
-{% endblock %}