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

portal/admin.py

@@ -1,41 +1,75 @@
+import csv
+
 from common.models import (
     Class,
-    EmailVerification,
+    DailyActivity,
+    DynamicElement,
     School,
+    SchoolTeacherInvitation,
     Student,
     Teacher,
+    TotalActivity,
     UserProfile,
 )
 from django.contrib import admin
-from django.contrib.auth.admin import UserAdmin
+from django.contrib.auth.admin import UserAdmin as _UserAdmin
 from django.contrib.auth.models import User
+from django.http import HttpResponse
+from import_export.admin import ExportActionMixin
 
-from portal.forms.admin import AdminUserCreationForm, AdminChangeUserPasswordForm
+from portal.forms.admin import (
+    AdminChangeUserPasswordForm,
+    AdminUserCreationForm,
+)
+from portal.views.api import anonymise
 
 
-class ClassAdmin(admin.ModelAdmin):
+class ClassAdmin(admin.ModelAdmin, ExportActionMixin):
     search_fields = [
         "name",
         "teacher__new_user__first_name",
         "teacher__new_user__last_name",
         "teacher__school__name",
     ]
-    list_display = ["__str__", "teacher", "teacher_school"]
-    raw_id_fields = ["teacher"]
+    list_display = [
+        "__str__",
+        "teacher",
+        "teacher_school",
+        "number_of_students",
+        "id",
+    ]
+    autocomplete_fields = ["teacher"]
 
     def teacher_school(self, obj):
         return obj.teacher.school
 
+    def number_of_students(self, obj):
+        return len(obj.students.all())
+
+
+class SchoolAdmin(admin.ModelAdmin, ExportActionMixin):
+    search_fields = ["name", "country", "county"]
+    list_filter = ["county", "country"]
+    list_display = [
+        "__str__",
+        "country",
+        "county",
+        "number_of_teachers",
+        "number_of_classes",
+    ]
+
+    def number_of_teachers(self, obj):
+        return len(obj.teacher_school.all())
 
-class SchoolAdmin(admin.ModelAdmin):
-    search_fields = ["name", "country", "postcode", "town"]
-    list_filter = ["postcode", "country"]
+    def number_of_classes(self, obj):
+        return len(obj.classes()) if obj.classes() else 0
 
 
-class StudentAdmin(admin.ModelAdmin):
+class StudentAdmin(admin.ModelAdmin, ExportActionMixin):
     search_fields = [
         "new_user__first_name",
         "new_user__last_name",
+        "new_user__username",
         "class_field__name",
         "class_field__teacher__new_user__first_name",
         "class_field__teacher__new_user__last_name",
@@ -46,9 +80,10 @@ class StudentAdmin(admin.ModelAdmin):
         "class_field",
         "class_field_teacher",
         "class_field_school",
+        "new_user",
     ]
-    readonly_fields = ["user", "new_user"]
-    raw_id_fields = ["class_field", "pending_class_request"]
+    readonly_fields = ["user", "new_user", "login_id"]
+    autocomplete_fields = ["class_field", "pending_class_request"]
 
     def class_field_teacher(self, obj):
         if obj.class_field:
@@ -63,39 +98,114 @@ class StudentAdmin(admin.ModelAdmin):
             return "Independent"
 
 
-class TeacherAdmin(admin.ModelAdmin):
-    search_fields = ["new_user__first_name", "new_user__last_name", "school__name"]
-    list_display = ["__str__", "school"]
+class TeacherAdmin(admin.ModelAdmin, ExportActionMixin):
+    search_fields = [
+        "new_user__first_name",
+        "new_user__last_name",
+        "school__name",
+        "new_user__username",
+    ]
+    list_display = [
+        "__str__",
+        "school",
+        "new_user",
+        "number_of_classes",
+        "is_admin",
+    ]
     readonly_fields = ["user", "new_user"]
-    raw_id_fields = ["school", "pending_join_request"]
+    autocomplete_fields = ["school", "invited_by"]
 
+    def number_of_classes(self, obj):
+        return len(obj.class_teacher.all())
 
-class UserProfileAdmin(admin.ModelAdmin):
+
+class UserProfileAdmin(admin.ModelAdmin, ExportActionMixin):
     search_fields = [
+        "id",
         "user__first_name",
         "user__last_name",
         "user__username",
         "user__date_joined",
     ]
     list_filter = ["user__date_joined"]
-    list_display = ["user", "__str__", "joined_recently"]
+    list_display = ["user", "__str__", "is_verified", "type", "id"]
     readonly_fields = ["user"]
 
+    def type(self, obj):
+        if hasattr(obj, "student"):
+            if obj.student.class_field is None:
+                return "INDEPENDENT"
+            return "STUDENT"
+        return "TEACHER"
+
 
-class EmailVerificationAdmin(admin.ModelAdmin):
+class SchoolTeacherInvitationAdmin(admin.ModelAdmin, ExportActionMixin):
     search_fields = [
-        "user__first_name",
-        "user__last_name",
-        "user__username",
-        "user__date_joined",
+        "from_teacher__new_user__first_name",
+        "from_teacher__new_user__last_name",
+        "from_teacher__new_user__email",
+        "school__name",
+        "invited_teacher_first_name",
+        "invited_teacher_last_name",
+        "invited_teacher_email",
+        "expiry",
+        "creation_time",
     ]
-    readonly_fields = ["user", "token"]
+    readonly_fields = ["token", "school", "from_teacher"]
+
+
+class DynamicElementAdmin(admin.ModelAdmin, ExportActionMixin):
+    def has_delete_permission(self, request, obj=None):
+        return False
+
+
+class DailyActivityAdmin(admin.ModelAdmin, ExportActionMixin):
+    search_fields = ["date"]
+    list_display = ["__str__", "date"]
+
+
+class TotalActivityAdmin(admin.ModelAdmin, ExportActionMixin):
+    def has_add_permission(self, request):
+        return False
+
+    def has_delete_permission(self, request, obj=None):
+        return False
+
+
+_UserAdmin.list_display += ("date_joined", "id")
+_UserAdmin.list_filter += ("date_joined",)
+
+
+class UserAdmin(_UserAdmin):
+    actions = ["anonymise_user", "export_as_csv"]
+    add_form = AdminUserCreationForm
+    change_password_form = AdminChangeUserPasswordForm
+
+    def anonymise_user(self, request, queryset):
+        for user in queryset:
+            anonymise(user)
+
+    anonymise_user.short_description = "Anonymise selected users"
+
+    def export_as_csv(self, request, queryset):
+        meta = self.model._meta
+        field_names = [
+            field.name for field in meta.fields if field.name != "password"
+        ]
+
+        response = HttpResponse(content_type="text/csv")
+        response["Content-Disposition"] = "attachment; filename={}.csv".format(
+            meta
+        )
+        writer = csv.writer(response)
+
+        writer.writerow(field_names)
+        for obj in queryset:
+            writer.writerow([getattr(obj, field) for field in field_names])
 
+        return response
 
-UserAdmin.list_display += ("date_joined",)
-UserAdmin.list_filter += ("date_joined",)
-UserAdmin.add_form = AdminUserCreationForm
-UserAdmin.change_password_form = AdminChangeUserPasswordForm
+    export_as_csv.short_description = "Export selected users data as CSV"
 
 
 admin.site.register(Class, ClassAdmin)
@@ -105,4 +215,7 @@ admin.site.register(School, SchoolAdmin)
 admin.site.unregister(User)
 admin.site.register(User, UserAdmin)
 admin.site.register(UserProfile, UserProfileAdmin)
-admin.site.register(EmailVerification, EmailVerificationAdmin)
+admin.site.register(SchoolTeacherInvitation, SchoolTeacherInvitationAdmin)
+admin.site.register(DynamicElement, DynamicElementAdmin)
+admin.site.register(DailyActivity, DailyActivityAdmin)
+admin.site.register(TotalActivity, TotalActivityAdmin)

portal/app_settings.py

@@ -1,9 +1,6 @@
 from django.conf import settings
 
-CONTACT_FORM_EMAILS = getattr(
-    settings, "PORTAL_CONTACT_FORM_EMAIL", ("codeforlife@ocado.com",)
-)
-
+CONTACT_FORM_EMAILS = getattr(settings, "PORTAL_CONTACT_FORM_EMAIL", ("codeforlife@ocado.com",))
 
 # Private key for Recaptcha
 RECAPTCHA_PRIVATE_KEY = getattr(settings, "RECAPTCHA_PRIVATE_KEY", None)
@@ -14,6 +11,12 @@ RECAPTCHA_PUBLIC_KEY = getattr(settings, "RECAPTCHA_PUBLIC_KEY", None)
 DEBUG = getattr(settings, "DEBUG", False)
 
 # The permission function for checking if the request is coming from a cron job
-IS_CLOUD_SCHEDULER_FUNCTION = getattr(
-    settings, "IS_CLOUD_SCHEDULER_FUNCTION", lambda _: False
-)
+IS_CLOUD_SCHEDULER_FUNCTION = getattr(settings, "IS_CLOUD_SCHEDULER_FUNCTION", lambda _: False)
+
+# Half an hour
+SESSION_EXPIRY_TIME = 60 * 30
+
+# One hour
+SCREENTIME_WARNING_EXPIRY_TIME = 60 * 60
+
+TMP_AUTH_TOKEN = getattr(settings, "TMP_AUTH_TOKEN", "token")

portal/forms/dotmailer.py

@@ -3,7 +3,7 @@ from django import forms
 
 class NewsletterForm(forms.Form):
     email = forms.EmailField(
-        label="Sign up to our newsletter",
+        label="Sign up to receive updates about Code for Life games and teaching resources.",
         label_suffix="",
         widget=forms.EmailInput(
             attrs={
@@ -14,15 +14,17 @@ class NewsletterForm(forms.Form):
         help_text="Enter email address above",
     )
 
+    age_verification = forms.BooleanField(
+        widget=forms.CheckboxInput(), initial=False, required=True
+    )
+
 
 class ConsentForm(forms.Form):
     email = forms.EmailField(
         label="Email",
         label_suffix="",
         widget=forms.EmailInput(
-            attrs={
-                "placeholder": "your.name@yourdomain.com",
-            }
+            attrs={"placeholder": "your.name@yourdomain.com"}
         ),
     )
 

portal/forms/invite_teacher.py

@@ -3,15 +3,24 @@ from django import forms
 
 class InviteTeacherForm(forms.Form):
 
-    email_regex = "(^[a-zA-Z0-9_.+-]+@[a-zA-Z0-9-]+\.[a-zA-Z0-9-.]+$)"
+    teacher_first_name = forms.CharField(
+        help_text="Enter first name of teacher",
+        max_length=100,
+        widget=forms.TextInput(attrs={"autocomplete": "off", "placeholder": "First name of teacher"}),
+    )
+    teacher_last_name = forms.CharField(
+        help_text="Enter last name of teacher",
+        max_length=100,
+        widget=forms.TextInput(attrs={"autocomplete": "off", "placeholder": "Last name of teacher"}),
+    )
+    teacher_email = forms.EmailField(
+        help_text="Enter email address",
+        widget=forms.EmailInput(attrs={"autocomplete": "off", "placeholder": "Email address"}),
+    )
 
-    email = forms.EmailField(
-        widget=forms.TextInput(
-            attrs={
-                "placeholder": "recipient.name@domain.com",
-                "id": "newsletter_email_field",
-                "pattern": email_regex,
-                "type": "email",
-            }
-        )
+    make_admin_ticked = forms.BooleanField(
+        label="Make an administrator of the school",
+        widget=forms.CheckboxInput(),
+        initial=False,
+        required=False,
     )

portal/forms/organisation.py

@@ -1,107 +1,176 @@
+import re
 from builtins import object
 
 from common.models import School
 from django import forms
 from django.core.exceptions import ObjectDoesNotExist
-from django.core.validators import EmailValidator
 from django_countries.widgets import CountrySelectWidget
 
 
 class OrganisationForm(forms.ModelForm):
-    class Meta(object):
+    county = forms.ChoiceField(
+        choices=[
+            [None, "(select county)"],
+            ["Aberdeen City", "Aberdeen City"],
+            ["Aberdeenshire", "Aberdeenshire"],
+            ["Angus", "Angus"],
+            ["Argyll and Bute", "Argyll and Bute"],
+            ["Bedfordshire", "Bedfordshire"],
+            ["Belfast", "Belfast"],
+            ["Belfast Greater", "Belfast Greater"],
+            ["Berkshire", "Berkshire"],
+            ["Blaenau Gwent", "Blaenau Gwent"],
+            ["Bridgend", "Bridgend"],
+            ["Buckinghamshire", "Buckinghamshire"],
+            ["Caerphilly", "Caerphilly"],
+            ["Cambridgeshire", "Cambridgeshire"],
+            ["Cardiff", "Cardiff"],
+            ["Carmarthenshire", "Carmarthenshire"],
+            ["Ceredigion", "Ceredigion"],
+            ["Channel Islands", "Channel Islands"],
+            ["Cheshire", "Cheshire"],
+            ["City of Edinburgh", "City of Edinburgh"],
+            ["Clackmannanshire", "Clackmannanshire"],
+            ["Conwy", "Conwy"],
+            ["Cornwall", "Cornwall"],
+            ["County Antrim", "County Antrim"],
+            ["County Armagh", "County Armagh"],
+            ["County Down", "County Down"],
+            ["County Fermanagh", "County Fermanagh"],
+            ["County Londonderry", "County Londonderry"],
+            ["County Tyrone", "County Tyrone"],
+            ["County of Bristol", "County of Bristol"],
+            ["Cumbria", "Cumbria"],
+            ["Denbighshire", "Denbighshire"],
+            ["Derbyshire", "Derbyshire"],
+            ["Devon", "Devon"],
+            ["Dorset", "Dorset"],
+            ["Dumfries and Galloway", "Dumfries and Galloway"],
+            ["Dunbartonshire", "Dunbartonshire"],
+            ["Dundee City", "Dundee City"],
+            ["Durham", "Durham"],
+            ["East Ayrshire", "East Ayrshire"],
+            ["East Dunbartonshire", "East Dunbartonshire"],
+            ["East Lothian", "East Lothian"],
+            ["East Renfrewshire", "East Renfrewshire"],
+            ["East Riding of Yorkshire", "East Riding of Yorkshire"],
+            ["East Sussex", "East Sussex"],
+            ["Essex", "Essex"],
+            ["Falkirk", "Falkirk"],
+            ["Fife", "Fife"],
+            ["Flintshire", "Flintshire"],
+            ["Glasgow City", "Glasgow City"],
+            ["Gloucestershire", "Gloucestershire"],
+            ["Greater London", "Greater London"],
+            ["Greater Manchester", "Greater Manchester"],
+            ["Guernsey Channel Islands", "Guernsey Channel Islands"],
+            ["Gwynedd", "Gwynedd"],
+            ["Hampshire", "Hampshire"],
+            ["Hereford and Worcester", "Hereford and Worcester"],
+            ["Herefordshire", "Herefordshire"],
+            ["Hertfordshire", "Hertfordshire"],
+            ["Highland", "Highland"],
+            ["Inverclyde", "Inverclyde"],
+            ["Inverness", "Inverness"],
+            ["Isle of Anglesey", "Isle of Anglesey"],
+            ["Isle of Barra", "Isle of Barra"],
+            ["Isle of Man", "Isle of Man"],
+            ["Isle of Wight", "Isle of Wight"],
+            ["Jersey Channel Islands", "Jersey Channel Islands"],
+            ["Kent", "Kent"],
+            ["Lancashire", "Lancashire"],
+            ["Leicestershire", "Leicestershire"],
+            ["Lincolnshire", "Lincolnshire"],
+            ["Merseyside", "Merseyside"],
+            ["Merthyr Tydfil", "Merthyr Tydfil"],
+            ["Midlothian", "Midlothian"],
+            ["Monmouthshire", "Monmouthshire"],
+            ["Moray", "Moray"],
+            ["Neath Port Talbot", "Neath Port Talbot"],
+            ["Newport", "Newport"],
+            ["Norfolk", "Norfolk"],
+            ["North Ayrshire", "North Ayrshire"],
+            ["North Lanarkshire", "North Lanarkshire"],
+            ["North Yorkshire", "North Yorkshire"],
+            ["Northamptonshire", "Northamptonshire"],
+            ["Northumberland", "Northumberland"],
+            ["Nottinghamshire", "Nottinghamshire"],
+            ["Orkney", "Orkney"],
+            ["Orkney Islands", "Orkney Islands"],
+            ["Oxfordshire", "Oxfordshire"],
+            ["Pembrokeshire", "Pembrokeshire"],
+            ["Perth and Kinross", "Perth and Kinross"],
+            ["Powys", "Powys"],
+            ["Renfrewshire", "Renfrewshire"],
+            ["Rhondda Cynon Taff", "Rhondda Cynon Taff"],
+            ["Rutland", "Rutland"],
+            ["Scottish Borders", "Scottish Borders"],
+            ["Shetland Islands", "Shetland Islands"],
+            ["Shropshire", "Shropshire"],
+            ["Somerset", "Somerset"],
+            ["South Ayrshire", "South Ayrshire"],
+            ["South Lanarkshire", "South Lanarkshire"],
+            ["South Yorkshire", "South Yorkshire"],
+            ["Staffordshire", "Staffordshire"],
+            ["Stirling", "Stirling"],
+            ["Suffolk", "Suffolk"],
+            ["Surrey", "Surrey"],
+            ["Swansea", "Swansea"],
+            ["Torfaen", "Torfaen"],
+            ["Tyne and Wear", "Tyne and Wear"],
+            ["Vale of Glamorgan", "Vale of Glamorgan"],
+            ["Warwickshire", "Warwickshire"],
+            ["West Dunbart", "West Dunbart"],
+            ["West Lothian", "West Lothian"],
+            ["West Midlands", "West Midlands"],
+            ["West Sussex", "West Sussex"],
+            ["West Yorkshire", "West Yorkshire"],
+            ["Western Isles", "Western Isles"],
+            ["Wiltshire", "Wiltshire"],
+            ["Worcestershire", "Worcestershire"],
+            ["Wrexham", "Wrexham"],
+        ],
+        required=False,
+        help_text="County (optional)",
+    )
 
+    class Meta(object):
         model = School
-        fields = ["name", "postcode", "country"]
+        fields = ["name", "country", "county"]
         widgets = {
-            "name": forms.TextInput(
-                attrs={
-                    "autocomplete": "off",
-                    "placeholder": "Name of school or club",
-                },
-            ),
-            "postcode": forms.TextInput(
-                attrs={"autocomplete": "off", "placeholder": "Postcode / Zipcode"}
-            ),
+            "name": forms.TextInput(attrs={"autocomplete": "off", "placeholder": "Name of school or club"}),
             "country": CountrySelectWidget(layout="{widget}"),
         }
         help_texts = {
             "name": "Name of school or club",
-            "postcode": "Postcode / Zipcode",
-            "country": "Country",
+            "country": "Country (optional)",
         }
 
     def __init__(self, *args, **kwargs):
         self.user = kwargs.pop("user", None)
         self.current_school = kwargs.pop("current_school", None)
         super(OrganisationForm, self).__init__(*args, **kwargs)
-        self.fields["postcode"].strip = False
 
     def clean(self):
         name = self.cleaned_data.get("name", None)
-        postcode = self.cleaned_data.get("postcode", None)
 
-        if name and postcode:
+        if name:
             try:
-                school = School.objects.get(name=name, postcode=postcode)
+                school = School.objects.get(name=name)
             except ObjectDoesNotExist:
                 return self.cleaned_data
 
             if not self.current_school or self.current_school.id != school.id:
-                raise forms.ValidationError(
-                    "There is already a school or club registered with that name and postcode"
-                )
+                raise forms.ValidationError("There is already a school or club registered with that name")
 
         return self.cleaned_data
 
     def clean_name(self):
         name = self.cleaned_data.get("name", None)
-        validator = EmailValidator()
 
-        if name:
-            try:
-                validator(name)
-                is_email = True
-            except forms.ValidationError:
-                is_email = False
-
-            if is_email:
-                raise forms.ValidationError(
-                    "Please make sure your organisation name is valid"
-                )
+        if re.match(re.compile("^[\w\.' ]+$"), name) is None:
+            raise forms.ValidationError(
+                "School names cannot contain special characters except full stops and apostrophes."
+            )
 
         return name
-
-    def clean_postcode(self):
-        postcode = self.cleaned_data.get("postcode", None)
-
-        if postcode:
-            if (
-                len(postcode.replace(" ", "")) > 10
-                or len(postcode.replace(" ", "")) == 0
-            ):
-                raise forms.ValidationError("Please enter a valid postcode or ZIP code")
-
-        return postcode
-
-
-class OrganisationJoinForm(forms.Form):
-    fuzzy_name = forms.CharField(
-        widget=forms.TextInput(
-            attrs={"placeholder": "School or club by name or postcode"}
-        ),
-        help_text="Enter school or club by name or postcode",
-    )
-
-    # Note: the reason this is a CharField rather than a ChoiceField is to avoid having to
-    # provide choices which was problematic given that the options are dynamically generated.
-    chosen_org = forms.CharField(
-        widget=forms.Select(), help_text="Select school or club"
-    )
-
-    def clean_chosen_org(self):
-        chosen_org = self.cleaned_data.get("chosen_org", None)
-
-        if chosen_org and not School.objects.filter(id=int(chosen_org)).exists():
-            raise forms.ValidationError("That school or club was not recognised")
-
-        return chosen_org