codeforlife-portal 5.33.5__py2.py3-none-any.whl → 8.9.9__py2.py3-none-any.whl

portal/templates/portal/teach/onboarding_print.html

@@ -1,5 +1,5 @@
 {% extends 'portal/teach/base_registering.html' %}
-{% load staticfiles %}
+{% load static %}
 {% load app_tags %}
 
 {% block content %}

portal/templates/portal/teach/onboarding_school.html

@@ -1,52 +1,10 @@
 {% extends "portal/teach/base_registering.html" %}
-{% load staticfiles %}
+{% load static %}
 {% load app_tags %}
 
 {% block content %}
-<script type="text/javascript" src="{% static 'portal/js/fuzzySchoolLookup.js' %}"></script>
-<script>
-    var FUZZY_NAME_FIELD_ID = "{{ join_form.fuzzy_name.auto_id }}";
-    var CHOSEN_ORG_FIELD_ID = "{{ join_form.chosen_org.auto_id }}";
-    var FUZZY_ORG_LOOKUP_URL = "{% url 'organisation_fuzzy_lookup' %}";
-</script>
-
 <div id="onboarding_organisation_page"></div>
 
-{% if teacher.pending_join_request %}
-<div id="onboarding_revoke_request_page"></div>
-
-<div class="background container">
-    <div class="row">
-        <div class="form col-sm-12">
-            <h4>Join an existing school or club</h4>
-
-            <p class="text-danger">
-                <b>
-                    You have a pending request to join {{ teacher.pending_join_request.name }}, {{ teacher.pending_join_request.postcode }}.<br>
-                    Once the administrator of your school or club has approved your request, you will be able to continue.
-                </b>
-            </p>
-
-            <p>
-                Please note: You may only have one request to join a school or club at a time. If you wish to join
-                another school or club, you must withdraw your pending request first.
-            </p>
-
-            <form id="revoke_form" method="post" class="p-0">
-
-                {% csrf_token %}
-
-                <div class="section group">
-                    <button class="button button--primary" type="submit"
-                        name="revoke_join_request">Withdraw request
-                    </button>
-                </div>
-
-            </form>
-        </div>
-    </div>
-</div>
-{% else %}
 {% if teacher.school %}
 <div class="background background--primary">
     <div class="form col-sm-8 col-center">
@@ -60,28 +18,7 @@
 <div class="background container">
     <div class="row">
         <div class="form col-sm-12">
-            <div id="create-header">
-                <div class="d-flex justify-content-between align-items-end">
-                    <h4>Create a school or club</h4>
-                    <a id="join-button" class="button button--secondary button--secondary--dark" href="#join" aria-controls="join" role="tab" data-toggle="tab">
-                        <div class="d-flex align-items-center">
-                            <div>Join an existing school</div>
-                            <span class="iconify ml-3" data-icon="mdi:arrow-right"></span>
-                        </div>
-                    </a>
-                </div>
-            </div>
-            <div id="join-header" class="hidden">
-                <div class="d-flex justify-content-between align-items-end">
-                    <h4>Join an existing school or club</h4>
-                    <a id="create-button" class="button button--secondary button--secondary--dark" href="#create" aria-controls="create" role="tab" data-toggle="tab">
-                        <div class="d-flex align-items-center">
-                            <span class="iconify mr-3" data-icon="mdi:arrow-left"></span>
-                            <div>Create a school or club</div>
-                        </div>
-                    </a>
-                </div>
-            </div>
+            <h4>Create a school or club</h4>
 
             <p class="mb-3">Progress &lt; 1 of 4 &gt;</p>
             <div class="progress">
@@ -89,91 +26,41 @@
                     <span class="sr-only">25% Complete</span>
                 </div>
             </div>
+            <p>As the first person from your school or club to register for Code for Life, by default, you become the
+                organisation's administrator.</p>
 
-            <div class="tab-content">
-                <div role="tabpanel" class="tab-pane active" id="create">
-                    <p>As the first person from your school or club to register for Code for Life, by default, you become the organisation's administrator.</p>
+            <form id="form-create-organisation" method="post">
 
-                    <form id="form-create-organisation" method="post">
-
-                        {% csrf_token %}
-
-                        {{ create_form.non_field_errors }}
+                {% csrf_token %}
 
-                        {% for field in create_form %}
-                            <div class="row form--row">
-                                <div class="form--row__input col-sm-6 col-xs-12">
-                                    <div class="input--icon">
-                                        {{ field }}
-                                        {% if not field == create_form.country %}
-                                            <span class="iconify" data-icon="mdi:domain"></span>
-                                        {% endif %}
-                                    </div>
-                                    <small>{{ field.help_text }}</small>
-                                    {{ field.errors }}
-                                </div>
-                            </div>
-                        {% endfor %}
+                {{ create_form.non_field_errors }}
 
-                        <div class="section group">
-                            <button type="submit" class="button button--primary" name="create_organisation">Create school or club</button>
+                {% for field in create_form %}
+                <div id="form-row-{{ field.name }}" class="row form--row">
+                    <div class="form--row__input col-sm-6 col-xs-12">
+                        <div class="input--icon">
+                            {{ field }}
+                            {% if not field == create_form.country and not field == create_form.county %}
+                            <span class="iconify" data-icon="mdi:domain"></span>
+                            {% endif %}
                         </div>
-
-                    </form>
+                        <small>{{ field.help_text }}</small>
+                        {{ field.errors }}
+                    </div>
                 </div>
+                {% endfor %}
 
-                <div role="tabpanel" class="tab-pane" id="join">
-                    <p>You can search for your school or club by name and/or postcode below. A request will be sent to the school or club administrator for processing.</p>
-                    <form id="form-join-organisation" method="post">
-
-                        {% csrf_token %}
-
-                        {{ join_form.non_field_errors }}
-
-                        <div class="row form--row">
-                            <div class="form--row__input col-md-6 col-sm-9 col-xs-12">
-                                <div class="input--icon">
-                                    {{ join_form.fuzzy_name }}
-                                    <span class="iconify" data-icon="mdi:magnify"></span>
-                                </div>
-                                <small>{{ join_form.fuzzy_name.help_text }}</small>
-                                {{ join_form.fuzzy_name.errors }}
-                            </div>
-                        </div>
-                        <div class="row form--row">
-                            <div class="form--row__input col-md-6 col-sm-9 col-xs-12">
-                                <div class="input--icon">
-                                    {{ join_form.chosen_org }}
-                                </div>
-                                <small>{{ join_form.chosen_org.help_text }}</small>
-                                {{ join_form.chosen_org.errors }}
-                            </div>
-                        </div>
-
-                        <div class="section group">
-                            <button type="submit" class="button button--primary" name="join_organisation">Join school or club</button>
-                        </div>
-
-                    </form>
+                <div class="section group">
+                    <button type="submit" class="button button--primary" name="create_organisation" id="create_organisation_button">Create school or club</button>
                 </div>
-            </div>
+
+            </form>
         </div>
     </div>
 </div>
-
-<script>
-    $('#join-button').on('show.bs.tab', function() {
-        // hide create header and show join header
-        $('#create-header').addClass('hidden')
-        $('#join-header').removeClass('hidden')
-    })
-    $('#create-button').on('show.bs.tab', function() {
-        // hide join header and show create header
-        $('#join-header').addClass('hidden')
-        $('#create-header').removeClass('hidden')
-    })
-</script>
-{% endif %}
 {% endif %}
 
+<script type="text/javascript"
+        src="{% static 'portal/js/school.js' %}"></script>
+
 {% endblock content %}

portal/templates/portal/teach/onboarding_students.html

@@ -1,5 +1,5 @@
 {% extends 'portal/teach/base_registering.html' %}
-{% load staticfiles %}
+{% load static %}
 {% load app_tags %}
 
 {% block content %}

portal/templates/portal/teach/teacher_dismiss_students.html

@@ -8,77 +8,95 @@
 {% block content %}
 <div id="dismiss_students_page"></div>
 
-<section class="background container">
-    <h4>Release student from class {{ class.name }} ({{ class.access_code }})</h4><br>
-</section>
+<div class="background container">
+    <section>
+        <h4>Release student from class {{ class.name }} ({{ class.access_code }})</h4>
+    </section>
+    <p><a href="{% url 'view_class' class.access_code %}" class="button--menu button--menu--enabled">< Back to Edit class</a></p>
+    <p>Convert students into independent students.</p>
+    <h5>Students to release from school</h5>
 
-<div class="background">
-    <div class="container">
-        <p><a href="{% url 'view_class' class.access_code %}" class="button--menu button--menu--enabled">&lt; Back to Edit class</a></p>
-        <p>Convert students into independent students.</p>
-        <h4>Students to release from school</h4>
+    <p>You are about to remove students from your class and set them up as independent students. Neither you nor
+        your school will be able to manage them once you have submitted this request.</p>
 
-        <p>You are about to remove students from your class and set them up as independent students. Neither you nor your school will
-            be able to manage them once you have submitted this request.</p>
+    <p>Email addresses are required for independent student accounts. If a student is too young to own an email 
+        address, a parent or guardian's email address will be required.</p>
 
-        <p>You may want to change the username for these students to something more memorable. The students will then log in with
-            these new usernames via the <a href="{% url 'independent_student_login' %}" target="_blank">independent student login</a>. Their passwords will stay the same.
-            Independent students do not need to provide a class access code.</p>
+    <p>The email address will have to be validated through a verification email before the student can log in.
+        The email has to be unique and not used for other accounts in Code for Life.
+        <b>Make sure you type the correct email, as otherwise we may not be able to recover the account.</b>
+    </p>
 
-        <p>Please also set and confirm email addresses for the students. Email addresses are required for independent student accounts.
-            If a student is too young to own an email address, a parent or guardian's email address will be required. These email addresses will
-            have to be validated through a verification email before the student can log in. More than one student can be registered to the same email address.</p>
+    <p>The students will then log in with their email via the
+        <a href="{% url 'independent_student_login' %}" target="_blank">independent student login</a>. Their passwords
+        will stay the same. Independent students do not need to provide a class access code.</p>
 
-        <form method="POST">
+    <form method="POST">
 
-            {% csrf_token %}
+        {% csrf_token %}
 
-            {{ formset.management_form }}
-            {{ formset.non_form_errors }}
+        {{ formset.management_form }}
+        {{ formset.non_form_errors }}
 
-            {% for form in formset %}
-            <div class="background">
-                <div class="row form--row">
-                    <div class="form--row__input col-sm-6">
-                        <div class="input--icon">
-                            {{ form.orig_name }}
-                        </div>
-                        <p><small>{{ form.orig_name.help_text }}</small></p>
+        {% for form in formset %}
+        <div class="background">
+            <div class="row form--row">
+                <div class="form--row__input col-sm-6">
+                    <div class="input--icon">
+                        {{ form.orig_name }}
                     </div>
-                    <div class="col-sm-6">
-                        <div class="input--icon">
-                            {{ form.name }} <span class="iconify" data-icon="mdi:account-outline"></span>
-                        </div>
-                        <p><small>{{ form.name.help_text }}</small></p>
-                        {{ form.name.errors }}
+                    <p><small>{{ form.orig_name.help_text }}</small></p>
+                </div>
+                <div class="col-sm-6">
+                    <div class="input--icon">
+                        {{ form.name }} <span class="iconify" data-icon="mdi:account-outline"></span>
                     </div>
+                    <p><small>{{ form.name.help_text }}</small></p>
+                </div>
+            </div>
+            <div class="row form--row">
+                <div class="col-sm-6">
+                    {{ form.orig_name.errors }}
                 </div>
-                <div class="row form--row">
-                    <div class="col-sm-6">
-                        <div class="input--icon">
-                            {{ form.email }} <span class="iconify" data-icon="mdi:email-outline"></span>
-                        </div>
-                        <p><small>{{ form.email.help_text }}</small></p>
-                        {{ form.email.errors }}
+                <div class="col-sm-6">
+                    {{ form.name.errors }}
+                </div>
+            </div>
+            <div class="row form--row">
+                <div class="col-sm-6">
+                    <div class="input--icon mt-3">
+                        {{ form.email }} <span class="iconify" data-icon="mdi:email-outline"></span>
                     </div>
-                    <div class="col-sm-6">
-                        <div class="input--icon">
-                            {{ form.confirm_email }} <span class="iconify" data-icon="mdi:email-outline"></span>
-                        </div>
-                        <p><small>{{ form.confirm_email.help_text }}</small></p>
-                        {{ form.email.confirm_errors }}
+                    <p><small>{{ form.email.help_text }}</small></p>
+                </div>
+                <div class="col-sm-6">
+                    <div class="input--icon mt-3">
+                        {{ form.confirm_email }} <span class="iconify" data-icon="mdi:email-outline"></span>
                     </div>
+                    <p><small>{{ form.confirm_email.help_text }}</small></p>
                 </div>
             </div>
-            {% endfor %}
-
-            <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="dismiss_button" type="submit" name="submit_dismiss" class="button button--primary button--primary--danger button--icon">Remove student <span class="iconify" data-icon="ic:outline-person-remove"></span>
-</button>
+            <div class="row form--row">
+                <div class="col-sm-6">
+                    {{ form.email.errors }}
+                </div>
+                <div class="col-sm-6">
+                    {{ form.confirm_email.errors }}
+                </div>
             </div>
-        </form>
-    </div>
+            {{ form.non_field_errors }}
+        </div>
+        {% endfor %}
+
+        <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="dismiss_button" type="submit" name="submit_dismiss"
+                    class="button button--primary button--primary--danger button--icon">Remove student
+                <span class="iconify" data-icon="ic:outline-person-remove"></span>
+            </button>
+        </div>
+    </form>
 </div>
 
 {% endblock %}

portal/templates/portal/teach/teacher_edit_class.html

@@ -1,24 +1,48 @@
 {% 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">
+<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">
-        <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>
-
         <form method="post" class="pb-3">
             {% csrf_token %}
 
@@ -69,6 +93,139 @@
     </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>

portal/templates/portal/teach/teacher_edit_student.html

@@ -1,4 +1,5 @@
 {% extends 'portal/base.html' %}
+{% load static %}
 
 {% block subNav %}
     {% include "portal/partials/teacher_non_dashboard_subnav.html" %}
@@ -39,7 +40,7 @@
 
         <p>You can set this student's password. Setting the password will also regenerate their direct access link.</p>
 
-        <form method="post">
+        <form id="edit-student-password-form" method="post">
 
             {% csrf_token %}
 
@@ -49,16 +50,20 @@
             {{ password_form.non_field_errors }}
 
             <div class="row form-row">
-                <div class="form--row__input col-sm-6 col-md-6">
-                    {{ password_form.password }}
+                <div class="form--row col-sm-6 col-md-6">
+                    <div class="input--icon">
+                        {{ password_form.password }} <span id="password-field-icon" class="iconify" data-icon="material-symbols:visibility-off"></span>
+                    </div>
                     {{ password_form.password.errors }}
                     <small>{{ password_form.password.help_text}}</small>
                 </div>
             </div>
 
             <div class="row form-row">
-                <div class="form--row__input col-sm-6 col-md-6">
-                    {{ password_form.confirm_password }}
+                <div class="form--row col-sm-6 col-md-6">
+                    <div class="input--icon">
+                        {{ password_form.confirm_password }} <span id="confirm-password-field-icon" class="iconify" data-icon="material-symbols:visibility-off"></span>
+                    </div>
                     {{ password_form.confirm_password.errors }}
                     <small>{{ password_form.confirm_password.help_text }}</small>
                 </div>
@@ -68,4 +73,6 @@
     </div>
 </div>
 
+<script type="text/javascript" src="{% static 'portal/js/teacherEditStudent.js' %}"></script>
+
 {% endblock %}