codeforlife-portal 8.4.2__tar.gz → 8.4.3__tar.gz

{codeforlife_portal-8.4.2/codeforlife_portal.egg-info → codeforlife_portal-8.4.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: codeforlife-portal
-Version: 8.4.2
+Version: 8.4.3
 Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Framework :: Django

{codeforlife_portal-8.4.2 → codeforlife_portal-8.4.3/codeforlife_portal.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: codeforlife-portal
-Version: 8.4.2
+Version: 8.4.3
 Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Framework :: Django

codeforlife_portal-8.4.3/portal/__init__.py

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

{codeforlife_portal-8.4.2 → codeforlife_portal-8.4.3}/portal/forms/teach.py

@@ -327,7 +327,7 @@ class ClassLevelControlForm(forms.Form):
             for worksheet in episode.worksheets.filter(before_level__isnull=True):
                 choices.append((f"worksheet:{worksheet.id}", episode.name))
 
-            self.fields[episode.name] = forms.MultipleChoiceField(
+            self.fields[f"episode{episode.id}"] = forms.MultipleChoiceField(
                 choices=itertools.chain(choices),
                 widget=forms.CheckboxSelectMultiple(),
                 required=False,

codeforlife_portal-8.4.3/portal/templates/portal/teach/teacher_edit_class.html

@@ -0,0 +1,261 @@
+{% extends 'portal/base.html' %}
+{% load static %}
+{% load app_tags %}
+
+{% block subNav %}
+    {% include "portal/partials/teacher_non_dashboard_subnav.html" %}
+{% endblock subNav %}
+
+{% block scripts %}
+    {{ block.super }}
+    <script type="text/javascript" src="{% static 'portal/js/levelControl.js' %}"></script>
+    <script>
+        // Uncheck the checkboxes that correspond to the already-locked levels
+        $(document).ready(function(){
+            const lockedLevelsIds = {{ locked_levels }};
+            const lockedWorksheetIds = {{ locked_worksheet_ids }};
+
+            lockedLevelsIds.forEach(function(lockedLevelId) {
+                const selector = `[value="level:${lockedLevelId}"]`;
+                $(selector).click();
+            })
+            lockedWorksheetIds.forEach(function(lockedWorksheetId) {
+                const selector = `[value="worksheet:${lockedWorksheetId}"]`;
+                $(selector).click();
+            })
+        })
+    </script>
+{% endblock scripts %}
+
+{% block content %}
+<div id="teach_edit_class_page"></div>
+
+<div class="background container">
+    <section>
+        <h4>Additional settings for class {{ class.name }} ({{ class.access_code }})</h4>
+    </section>
+    <p>
+        <a id="return_to_class_button" href="{% url 'view_class' class.access_code %}" class="button--menu button--menu--enabled">&lt; Back to Edit Class</a>
+    </p>
+    <p>You may change the name of the class, or change permissions to allow external requests from independent
+        students to join this class. You may also transfer the class to another teacher, or change permissions to
+        allow pupils to see their classmates' progress.</p>
+</div>
+<div class="background background--primary">
+    <div class="container">
+        <form method="post" class="pb-3">
+            {% csrf_token %}
+
+            {{ form.non_field_errors }}
+
+            <h5>Class details</h5>
+
+            <div class="row form--row">
+                <div class="form--row__input col-sm-6 col-md-6">
+                    <div class="input--icon">
+                        {{ form.name }}
+                        <span class="iconify" data-icon="mdi:account-multiple"></span>
+                    </div>
+                    <small>{{ form.name.help_text }}</small>
+                    {{ form.name.errors }}
+                </div>
+                <div class="form--row__input col-sm-12 col-md-6">
+                    <div class="form__checkbox">
+                        <div class="form__checkbox-input">
+                            {{ form.classmate_progress }}
+                        </div>
+                        <label for="id_{{ form.classmate_progress.html_name }}" class="font-weight-normal">{{ form.classmate_progress.label }}</label>
+                    </div>
+                    {{ form.classmate_progress.errors }}
+                </div>
+            </div>
+
+            <div class="background">
+                <h5>External requests setting</h5>
+                <p>You can set up permissions for this class allowing students to send requests asking to join your class
+                    from outside of your school or club.</p>
+                <p class="background"><strong>{{ external_requests_message }}</strong></p>
+                <div class="row form--row">
+                    <div class="form--row__input col-md-6">
+                        <label for="id_{{ form.external_requests.html_name }}" class="font-weight-normal">{{ form.external_requests.label }}</label>
+                        {{ form.external_requests }}
+                        <small>{{ form.external_requests.help_text }}</small>
+                        {{ form.external_requests.errors }}
+                    </div>
+                </div>
+            </div>
+
+            <div class="button-group">
+                <a id="cancel_button" class="button button--secondary button--secondary--dark" href="{% url 'view_class' class.access_code %}">Cancel</a>
+                <button id="update_button" type="submit" class="button button--primary" name="class_edit_submit">Update</button>
+            </div>
+        </form>
+    </div>
+</div>
+
+<div class="background container">
+    <h5>Levels access settings</h5>
+    <p>You may control access to levels here by selecting what you wish to display to the students.</p>
+
+    <form method="post">
+        {% csrf_token %}
+
+        {{ level_control_form.non_field_errors }}
+
+        <div id="episodes">
+            <div class="panel-intro d-flex align-items-center justify-content-between">
+                <h6>Rapid Router levels</h6>
+                <label class="pr-5 mb-0 mr-5">
+                    <input type="checkbox" id="select-all-blockly-levels">
+                </label>
+            </div>
+            {% for episode in blockly_episodes %}
+                {% with episode.id|stringformat:"s" as episode_id %}
+                    {% with "episode"|add:episode_id as episode_index %}
+                        <div class="panel">
+                            <div class="panel-header bg--{{ episode.difficulty }}" id="episode-{{episode.id}}">
+                                <div class="d-flex align-items-center justify-content-end" data-toggle="collapse"
+                                    data-target="#collapse-{{episode.id}}" aria-expanded="false"
+                                    aria-controls="collapse-{{episode.id}}" data-parent="#episodes">
+                                    <p class="episode-title flex-grow-1">{{episode.name}}</p>
+                                    <span>Levels {{episode.first_level}}-{{episode.last_level}}</span>
+                                    <div class="episode_range_text collapsed d-flex align-items-center justify-content-end"
+                                        data-toggle="collapse" data-target="#collapse-{{episode.id}}"
+                                        aria-expanded="false" aria-controls="collapse-{{episode.id}}" data-parent="#episodes">
+                                        <label class="mb-0" for="select-all-episode-levels">
+                                            <input type="checkbox" value="{{ episode_index }}" id="select-all-blockly-levels-{{ episode.id }}">
+                                        </label>
+                                    </div>
+                                </div>
+                            </div>
+                            <div id="collapse-{{episode.id}}" aria-labelledby="episode-{{episode.id}}" class="collapse">
+                                <div class="panel-body d-flex justify-content-between">
+                                    <div class="d-flex flex-grow-1 flex-column justify-content-between">
+                                        {% for level in episode.levels %}
+                                            <p>{{level.name}}: {{level.title.strip | safe}}</p>
+                                        {% endfor %}
+                                    </div>
+                                    <div class="form__checkbox flex-column justify-content-between p-0">
+                                        {% for input in level_control_form|get_dict_item:episode_index %}
+                                            <div class="form__checkbox-input p-0">
+                                                {{ input }}
+                                            </div>
+                                        {% endfor %}
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    {% endwith %}
+                {% endwith %}
+            {% endfor %}
+            <div class="panel-intro d-flex align-items-center justify-content-between">
+                <h6>Python Den levels</h6>
+                <label class="pr-5 mb-0 mr-5">
+                    <input type="checkbox" id="select-all-python-levels">
+                </label>
+            </div>
+            {% for episode in python_episodes %}
+                {% with episode.id|stringformat:"s" as episode_id %}
+                    {% with "episode"|add:episode_id as episode_index %}
+                        <div class="panel">
+                            <div class="panel-header bg--{{ episode.difficulty }}" id="episode-{{episode.id}}">
+                                <div class="d-flex align-items-center justify-content-end" data-toggle="collapse"
+                                    data-target="#collapse-{{episode.id}}" aria-expanded="false"
+                                    aria-controls="collapse-{{episode.id}}" data-parent="#episodes">
+                                    <p class="episode-title flex-grow-1">{{episode.name}}</p>
+                                    {% if episode.levels %}
+                                        {% if episode.first_level > 1009 %}
+                                            <span>Levels {{episode.first_level|stringformat:"i"|slice:"2:4"}}-{{episode.last_level|stringformat:"i"|slice:"2:4"}}</span>
+                                        {% else %}
+                                            {% if episode.last_level > 1009 %}
+                                                <span>Levels {{episode.first_level|stringformat:"i"|slice:"3:4"}}-{{episode.last_level|stringformat:"i"|slice:"2:4"}}</span>
+                                            {% else %}
+                                                <span>Levels {{episode.first_level|stringformat:"i"|slice:"3:4"}}-{{episode.last_level|stringformat:"i"|slice:"3:4"}}</span>
+                                            {% endif %}
+                                        {% endif %}
+                                    {% endif %}
+                                    <div class="episode_range_text collapsed d-flex align-items-center justify-content-end"
+                                        data-toggle="collapse" data-target="#collapse-{{episode.id}}"
+                                        aria-expanded="false" aria-controls="collapse-{{episode.id}}" data-parent="#episodes">
+                                        <label class="mb-0" for="select-all-episode-levels">
+                                            <input type="checkbox" value="{{ episode_index }}" id="select-all-python-levels-{{ episode.id }}">
+                                        </label>
+                                    </div>
+                                </div>
+                            </div>
+                            <div id="collapse-{{episode.id}}" aria-labelledby="episode-{{episode.id}}" class="collapse">
+                                <div class="panel-body d-flex justify-content-between">
+                                    <div class="d-flex flex-grow-1 flex-column justify-content-between">
+                                        {% for level in episode.levels %}
+                                            {% for worksheet in episode.worksheets %}
+                                                {% if worksheet.before_level == level.id %}
+                                                    <p>{{episode.name}}{% if episode.worksheets|length > 1 %} pt. {{ worksheet.index }}{% endif %}</p>
+                                                {% endif %}
+                                            {% endfor %}
+                                            {% if level.name < 1010 %}
+                                                <p>{{level.name|stringformat:"i"|slice:"3:4"}}: {{level.title.strip | safe}}</p>
+                                            {% else %}
+                                                <p>{{level.name|stringformat:"i"|slice:"2:4"}}: {{level.title.strip | safe}}</p>
+                                            {% endif %}
+                                        {% endfor %}
+                                        {% for worksheet in episode.worksheets %}
+                                            {% if not worksheet.before_level %}
+                                                <p>{{episode.name}}{% if episode.worksheets|length > 1 %} pt. {{ worksheet.index }}{% endif %}</p>
+                                            {% endif %}
+                                        {% endfor %}
+                                    </div>
+                                    <div class="form__checkbox flex-column justify-content-between p-0">
+                                        {% for input in level_control_form|get_dict_item:episode_index %}
+                                        <div class="form__checkbox-input p-0">
+                                            {{ input }}
+                                        </div>
+                                        {% endfor %}
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    {% endwith %}
+                {% endwith %}
+            {% endfor %}
+        </div>
+
+        <div class="button-group">
+            <button id="lock_levels_button" class="button button--primary" type="submit" name="level_control_submit">
+                Save level settings</button>
+        </div>
+    </form>
+</div>
+
+<div class="background background--primary">
+    <div class="container">
+        <h5>Transfer class to another teacher</h5>
+        <p>Select a new teacher from your school or club to take over the above class from the list below.</p>
+
+        <p class="text-danger">
+            <strong>
+                Warning: The class will move immediately to the new teacher. Should you wish to undo this action,
+                please contact that teacher.
+            </strong>
+        </p>
+
+        <form method="post" class="pb-0">
+            {% csrf_token %}
+
+            {{ class_move_form.non_field_errors }}
+
+            <div class="row form--row">
+                <div class="form--row__input col-md-6">
+                    <label for="id_{{ class_move_form.new_teacher.html_name }}" class="font-weight-normal"><strong>{{ class_move_form.new_teacher.label }}</strong></label>
+                    {{ class_move_form.new_teacher }}
+                    <small>{{ class_move_form.new_teacher.help_text }}</small>
+                    {{ class_move_form.new_teacher.errors }}
+                </div>
+            </div>
+
+            <div class="button-group">
+                <button id="move_button" class="button button--primary" type="submit" name="class_move_submit">Transfer class</button>
+            </div>
+        </form>
+    </div>
+</div>
+{% endblock %}

{codeforlife_portal-8.4.2 → codeforlife_portal-8.4.3}/portal/tests/test_class.py

@@ -138,7 +138,7 @@ class TestClass(TestCase):
         url = reverse("teacher_edit_class", kwargs={"access_code": access_code1})
         # POST request data for locking only the first level
         data = {
-            "Getting Started": [
+            "episode1": [
                 "level:2",
                 "level:3",
                 "level:4",
@@ -151,7 +151,7 @@ class TestClass(TestCase):
                 "level:11",
                 "level:12",
             ],
-            "Shortest Route": [
+            "episode2": [
                 "level:13",
                 "level:14",
                 "level:15",
@@ -159,7 +159,7 @@ class TestClass(TestCase):
                 "level:17",
                 "level:18",
             ],
-            "Loops and Repetitions": [
+            "episode3": [
                 "level:19",
                 "level:20",
                 "level:21",
@@ -171,13 +171,13 @@ class TestClass(TestCase):
                 "level:27",
                 "level:28",
             ],
-            "Loops with Conditions": [
+            "episode4": [
                 "level:29",
                 "level:30",
                 "level:31",
                 "level:32",
             ],
-            "If... Only": [
+            "episode5": [
                 "level:33",
                 "level:34",
                 "level:35",
@@ -190,7 +190,7 @@ class TestClass(TestCase):
                 "level:42",
                 "level:43",
             ],
-            "Traffic Lights": [
+            "episode6": [
                 "level:44",
                 "level:45",
                 "level:46",
@@ -199,7 +199,7 @@ class TestClass(TestCase):
                 "level:49",
                 "level:50",
             ],
-            "Limited Blocks": [
+            "episode7": [
                 "level:53",
                 "level:78",
                 "level:79",
@@ -211,7 +211,7 @@ class TestClass(TestCase):
                 "level:54",
                 "level:55",
             ],
-            "Procedures": [
+            "episode8": [
                 # "level:85",
                 # "level:52",
                 # "level:60",
@@ -220,7 +220,7 @@ class TestClass(TestCase):
                 # "level:87",
                 # "level:61",
             ],
-            "Blockly Brain Teasers": [
+            "episode9": [
                 "level:56",
                 "level:57",
                 "level:58",
@@ -234,7 +234,7 @@ class TestClass(TestCase):
                 "level:112",
                 "level:92",
             ],
-            "Introduction to Python": [
+            "episode10": [
                 "level:93",
                 "level:63",
                 "level:64",
@@ -248,7 +248,7 @@ class TestClass(TestCase):
                 "level:96",
                 "level:97",
             ],
-            "Python": [
+            "episode11": [
                 "level:98",
                 "level:70",
                 "level:71",
@@ -291,7 +291,7 @@ class TestClass(TestCase):
 
         # Resubmitting to unlock level 1
         data = {
-            "Getting Started": [
+            "episode1": [
                 "level:1",
                 "level:2",
                 "level:3",
@@ -305,7 +305,7 @@ class TestClass(TestCase):
                 "level:11",
                 "level:12",
             ],
-            "Shortest Route": [
+            "episode2": [
                 "level:13",
                 "level:14",
                 "level:15",
@@ -313,7 +313,7 @@ class TestClass(TestCase):
                 "level:17",
                 "level:18",
             ],
-            "Loops and Repetitions": [
+            "episode3": [
                 "level:19",
                 "level:20",
                 "level:21",
@@ -325,13 +325,13 @@ class TestClass(TestCase):
                 "level:27",
                 "level:28",
             ],
-            "Loops with Conditions": [
+            "episode4": [
                 "level:29",
                 "level:30",
                 "level:31",
                 "level:32",
             ],
-            "If... Only": [
+            "episode5": [
                 "level:33",
                 "level:34",
                 "level:35",
@@ -344,7 +344,7 @@ class TestClass(TestCase):
                 "level:42",
                 "level:43",
             ],
-            "Traffic Lights": [
+            "episode6": [
                 "level:44",
                 "level:45",
                 "level:46",
@@ -353,7 +353,7 @@ class TestClass(TestCase):
                 "level:49",
                 "level:50",
             ],
-            "Limited Blocks": [
+            "episode7": [
                 "level:53",
                 "level:78",
                 "level:79",
@@ -365,7 +365,7 @@ class TestClass(TestCase):
                 "level:54",
                 "level:55",
             ],
-            "Procedures": [
+            "episode8": [
                 # "level:85",
                 # "level:52",
                 # "level:60",
@@ -374,7 +374,7 @@ class TestClass(TestCase):
                 # "level:87",
                 # "level:61",
             ],
-            "Blockly Brain Teasers": [
+            "episode9": [
                 "level:56",
                 "level:57",
                 "level:58",
@@ -388,7 +388,7 @@ class TestClass(TestCase):
                 "level:112",
                 "level:92",
             ],
-            "Introduction to Python": [
+            "episode10": [
                 "level:93",
                 "level:63",
                 "level:64",
@@ -402,7 +402,7 @@ class TestClass(TestCase):
                 "level:96",
                 "level:97",
             ],
-            "Python": [
+            "episode11": [
                 "level:98",
                 "level:70",
                 "level:71",
@@ -546,12 +546,7 @@ class TestClassFrontend(BaseTest):
         class_name = "Class!"
 
         self.selenium.get(self.live_server_url)
-        page = (
-            HomePage(self.selenium)
-            .go_to_teacher_login_page()
-            .login_no_class(email, password)
-            .open_classes_tab()
-        )
+        page = HomePage(self.selenium).go_to_teacher_login_page().login_no_class(email, password).open_classes_tab()
 
         page = page.create_class(class_name, False)
 

{codeforlife_portal-8.4.2 → codeforlife_portal-8.4.3}/portal/views/teacher/teach.py

@@ -431,18 +431,18 @@ def mark_levels_to_lock_in_episodes(request, episodes, levels_to_lock_ids, locke
     :param levels_to_lock_ids: A list of Level IDs marked to be locked.
     """
     for episode in episodes:
-        episode_name = episode["name"]
         episode_levels = episode["levels"]
         episode_worksheets = episode["worksheets"]
-        if episode_name in request.POST:
+        episode_index = f"episode{episode['id']}"
+        if episode_index in request.POST:
             [
                 levels_to_lock_ids.append(episode_level["id"])
                 for episode_level in episode_levels
-                if f'level:{episode_level["id"]}' not in request.POST.getlist(episode_name)
+                if f'level:{episode_level["id"]}' not in request.POST.getlist(episode_index)
             ]
             for episode_worksheet in episode_worksheets:
                 worksheet_id = episode_worksheet["id"]
-                if f"worksheet:{worksheet_id}" not in request.POST.getlist(episode_name):
+                if f"worksheet:{worksheet_id}" not in request.POST.getlist(episode_index):
                     locked_worksheet_ids.append(worksheet_id)
         else:
             [levels_to_lock_ids.append(episode_level["id"]) for episode_level in episode_levels]

codeforlife_portal-8.4.2/portal/__init__.py

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