codeforlife-portal 6.44.0__py2.py3-none-any.whl → 6.44.2__py2.py3-none-any.whl

cfl_common/common/migrations/0051_verify_returning_users.py

@@ -14,7 +14,9 @@ def verify_returning_users(apps: Apps, *args):
         user__last_login__isnull=False, is_verified=False
     )
 
-    for unverified_returning_userprofile in unverified_returning_userprofiles:
+    for (
+        unverified_returning_userprofile
+    ) in unverified_returning_userprofiles.iterator(chunk_size=1000):
         unverified_returning_userprofile.is_verified = True
         unverified_returning_userprofile.save()
 

{codeforlife_portal-6.44.0.dist-info → codeforlife_portal-6.44.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: codeforlife-portal
-Version: 6.44.0
+Version: 6.44.2
 Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3.8
 Classifier: Framework :: Django
@@ -24,7 +24,7 @@ Requires-Dist: django-classy-tags ==2.0.0
 Requires-Dist: libsass ==0.23.0
 Requires-Dist: phonenumbers ==8.12.12
 Requires-Dist: more-itertools ==8.7.0
-Requires-Dist: cfl-common ==6.44.0
+Requires-Dist: cfl-common ==6.44.2
 Requires-Dist: django-ratelimit ==3.0.1
 Requires-Dist: django-preventconcurrentlogins ==0.8.2
 Requires-Dist: django-csp ==3.7

{codeforlife_portal-6.44.0.dist-info → codeforlife_portal-6.44.2.dist-info}/RECORD

@@ -64,7 +64,7 @@ cfl_common/common/migrations/0047_delete_school_postcode.py,sha256=GPV0hLfXmbPpx
 cfl_common/common/migrations/0048_unique_school_names.py,sha256=pu5xiuesvFNGngD-hl0OQ6Gi2r6pEY9fPCayKyb9n04,1433
 cfl_common/common/migrations/0049_anonymise_orphan_users.py,sha256=tw9xMrDMRPDCO8HWjBVlnQF8r1YVCKZnVr2wZ3He6og,847
 cfl_common/common/migrations/0050_anonymise_orphan_schools.py,sha256=_KCkSkoObTpLplX6gXvlV3JXpddn7neyJEa8YKFWeW0,869
-cfl_common/common/migrations/0051_verify_returning_users.py,sha256=GVdMtOFIJQveYvKlK5EW-1tA_T-mEP_L_HfHarsaPvY,957
+cfl_common/common/migrations/0051_verify_returning_users.py,sha256=TI-wllQ2OSG56eUYatp5W7tZZcnw0UHPJCDIs4G_REQ,999
 cfl_common/common/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 cfl_common/common/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 cfl_common/common/tests/test_migration_aimmo_characters.py,sha256=pdCCsns90Qz05QqmaBUYK18jKe9aP-symtZjkKG4rag,1079
@@ -105,8 +105,8 @@ example_project/portal_test_settings.py,sha256=frp_XMpd-z1g3VFCRxB2w7AaFW2ivRVKn
 example_project/settings.py,sha256=XRZZvASoIl5a9xe3masTq_CUBleuJq9ByHx8f_e2UFc,5613
 example_project/urls.py,sha256=OVeRQ-TCpzHISBRuzqD0yd3ewF7H5U3c-f2p2alfUD0,430
 example_project/wsgi.py,sha256=U1W6WzZxZaIdYZ5tks7w9fqp5WS5qvn2iThsVcskrWw,829
-portal/__init__.py,sha256=OdLqrrLY-3hWmVhZcg-vMjcu_27OHcXKm8zANkQ5Dgs,23
-portal/admin.py,sha256=k5Hsiln43DlVPoufnrx5AXWu_RijX8xi_n7wwBuuCJo,5132
+portal/__init__.py,sha256=OVxkfOV4_cLnh0dP0fyYbwDlVQG1uti8-QYSVsVaDQw,23
+portal/admin.py,sha256=on1-zNRnZvf2cwBN6GVRVYRhkaksrCgfzX8XPWtkvz8,6062
 portal/app_settings.py,sha256=DhWLQOwM0zVOXE3O5TNKbMM9K6agfLuCsHOdr1J7xEI,651
 portal/backends.py,sha256=2Dss6_WoQwPuDzJUF1yEaTQTNG4eUrD12ujJQ5cp5Tc,812
 portal/beta.py,sha256=0TCC-9_KZoM1nuzJ9FiuKR5n9JITdMYenHGQtRvn9UU,255
@@ -642,8 +642,8 @@ portal/views/two_factor/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG
 portal/views/two_factor/core.py,sha256=O_wcBeFqdPYSGNGv-pT_vbs5-Dj1Z-Jfkd6f9-E5yZI,760
 portal/views/two_factor/form.py,sha256=lnHNKI-BMlpncTuW3zUzjPaJJNuEra2I_nOam0eOKFY,257
 portal/views/two_factor/profile.py,sha256=tkl_ludo8arMtd5LKNmohM66vpC_YQiP-0nspTSJiJ4,383
-codeforlife_portal-6.44.0.dist-info/LICENSE.md,sha256=9AbRlCDqD2D1tPibimysFv3zg3AIc49-eyv9aEsyq9w,115
-codeforlife_portal-6.44.0.dist-info/METADATA,sha256=Xe_kzrIl8cU43fI0jiMKMDmBnX4IGMHPSKkZY0oA48o,1137
-codeforlife_portal-6.44.0.dist-info/WHEEL,sha256=DZajD4pwLWue70CAfc7YaxT1wLUciNBvN_TTcvXpltE,110
-codeforlife_portal-6.44.0.dist-info/top_level.txt,sha256=8e5pdsuIoTqEAMqpelHBjGjLbffcBtgOoggmd2q7nMw,41
-codeforlife_portal-6.44.0.dist-info/RECORD,,
+codeforlife_portal-6.44.2.dist-info/LICENSE.md,sha256=9AbRlCDqD2D1tPibimysFv3zg3AIc49-eyv9aEsyq9w,115
+codeforlife_portal-6.44.2.dist-info/METADATA,sha256=x65imK3Q0-BmSMarM_nCFTcL6pgoCxlrpFxq7V8zVAI,1137
+codeforlife_portal-6.44.2.dist-info/WHEEL,sha256=DZajD4pwLWue70CAfc7YaxT1wLUciNBvN_TTcvXpltE,110
+codeforlife_portal-6.44.2.dist-info/top_level.txt,sha256=8e5pdsuIoTqEAMqpelHBjGjLbffcBtgOoggmd2q7nMw,41
+codeforlife_portal-6.44.2.dist-info/RECORD,,

portal/__init__.py

@@ -1 +1 @@
-__version__ = "6.44.0"
+__version__ = "6.44.2"

portal/admin.py

@@ -17,23 +17,46 @@ from django.contrib.auth.models import User
 from django.http import HttpResponse
 from import_export.admin import ExportActionMixin
 
-from portal.forms.admin import AdminChangeUserPasswordForm, AdminUserCreationForm
+from portal.forms.admin import (
+    AdminChangeUserPasswordForm,
+    AdminUserCreationForm,
+)
 from portal.views.api import anonymise
 
 
 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"]
+    search_fields = [
+        "name",
+        "teacher__new_user__first_name",
+        "teacher__new_user__last_name",
+        "teacher__school__name",
+    ]
+    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"]
+    list_display = [
+        "__str__",
+        "country",
+        "county",
+        "number_of_teachers",
+        "number_of_classes",
+    ]
 
     def number_of_teachers(self, obj):
         return len(obj.teacher_school.all())
@@ -52,7 +75,13 @@ class StudentAdmin(admin.ModelAdmin, ExportActionMixin):
         "class_field__teacher__new_user__last_name",
         "class_field__teacher__school__name",
     ]
-    list_display = ["__str__", "class_field", "class_field_teacher", "class_field_school", "new_user"]
+    list_display = [
+        "__str__",
+        "class_field",
+        "class_field_teacher",
+        "class_field_school",
+        "new_user",
+    ]
     readonly_fields = ["user", "new_user", "login_id"]
     autocomplete_fields = ["class_field", "pending_class_request"]
 
@@ -70,18 +99,45 @@ class StudentAdmin(admin.ModelAdmin, ExportActionMixin):
 
 
 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", "is_admin"]
+    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"]
     autocomplete_fields = ["school", "invited_by"]
 
+    def number_of_classes(self, obj):
+        return len(obj.class_teacher.all())
+
 
 class UserProfileAdmin(admin.ModelAdmin, ExportActionMixin):
-    search_fields = ["user__first_name", "user__last_name", "user__username", "user__date_joined"]
+    search_fields = [
+        "id",
+        "user__first_name",
+        "user__last_name",
+        "user__username",
+        "user__date_joined",
+    ]
     list_filter = ["user__date_joined"]
-    list_display = ["user", "__str__", "is_verified"]
+    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 SchoolTeacherInvitationAdmin(admin.ModelAdmin, ExportActionMixin):
     search_fields = [
@@ -103,6 +159,11 @@ class DynamicElementAdmin(admin.ModelAdmin, ExportActionMixin):
         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
@@ -118,7 +179,9 @@ def anonymise_user(user_admin, request, queryset):
 
 def export_as_csv(self, request, queryset):
     meta = self.model._meta
-    field_names = [field.name for field in meta.fields if field.name != "password"]
+    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)
@@ -135,7 +198,7 @@ anonymise_user.short_description = "Anonymise selected users"
 export_as_csv.short_description = "Export selected users data as CSV"
 
 
-UserAdmin.list_display += ("date_joined",)
+UserAdmin.list_display += ("date_joined", "id")
 UserAdmin.list_filter += ("date_joined",)
 UserAdmin.add_form = AdminUserCreationForm
 UserAdmin.change_password_form = AdminChangeUserPasswordForm
@@ -152,5 +215,5 @@ admin.site.register(User, UserAdmin)
 admin.site.register(UserProfile, UserProfileAdmin)
 admin.site.register(SchoolTeacherInvitation, SchoolTeacherInvitationAdmin)
 admin.site.register(DynamicElement, DynamicElementAdmin)
-admin.site.register(DailyActivity)
+admin.site.register(DailyActivity, DailyActivityAdmin)
 admin.site.register(TotalActivity, TotalActivityAdmin)