django-transcribe 0.5.17__py3-none-any.whl → 0.6.0__py3-none-any.whl

{django_transcribe-0.5.17.dist-info → django_transcribe-0.6.0.dist-info}/METADATA

@@ -1,12 +1,10 @@
 Metadata-Version: 2.1
 Name: django-transcribe
-Version: 0.5.17
+Version: 0.6.0
 Summary: crowd source transcription
 Home-page: https://gitlab.com/byuhbll/lib/python/django-transcribe
 Author: BYU HBLL WebDev team
 Author-email: support@lib.byu.edu
-License: UNKNOWN
-Platform: UNKNOWN
 Classifier: Intended Audience :: Developers
 Classifier: License :: OSI Approved :: BSD License
 Classifier: Operating System :: OS Independent
@@ -14,11 +12,8 @@ Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3.6
 License-File: LICENSE
 License-File: AUTHORS
-Requires-Dist: requests
 Requires-Dist: django-model-utils
-Requires-Dist: django-spurl
-Requires-Dist: lxml (<=3.5.0)
-Requires-Dist: Django (<2.3.0,>=2.2.0)
+Requires-Dist: lxml
+Requires-Dist: Django <2.3.0,>=2.2.0
 
 Crowd source the transcription of texts, audio, and video.
-

{django_transcribe-0.5.17.dist-info → django_transcribe-0.6.0.dist-info}/RECORD

@@ -1,15 +1,15 @@
-transcribe/__init__.py,sha256=SZ841UIXjHPU4Gmgnhk1CpBuHyTq5b36ip4jagUiz8A,79
-transcribe/admin.py,sha256=pTo2UGPoekpsq3fNY0ve4MeUlmghO5PQXhfuNuXrZJY,5575
+transcribe/__init__.py,sha256=qFp_T9xwXsjX5GhZe6N2ShySfSHh7oBCM8OlR_KtO4Y,78
+transcribe/admin.py,sha256=HwrJafMjSoIKgb_En0zNvZ3nk5rCZWtJ5n0DdGU9nfI,6512
 transcribe/api.py,sha256=2m_y44ilQh87CWksHHqiE4A14javR8omlXEXm65lmC4,74
-transcribe/apps.py,sha256=M07nb8B159r2Lo8v3Q1TjcDLlbM6GvHjXmHjzK7y0Fs,256
+transcribe/apps.py,sha256=XUdPQkCjpqWAKDCIaE6Mh8Q4xN5upKv95MG1u2_5pig,246
 transcribe/diff_match_patch.py,sha256=HZC5DNab5OVwbB4Zc7G17l1OHbBlH2g9-xOtT1zkQ1A,84937
-transcribe/filters.py,sha256=9po0mrCKbEpkhB2NZJ8Ol9roEebI1rdVGeXyjmvAO_E,1321
-transcribe/forms.py,sha256=VJueMilHUTVH3aLIKt6x81Ogf1kPiWMPotdDAEmm_OI,5102
+transcribe/filters.py,sha256=_ANh6XGDXgmD_wxQo5IPReQsv3_MDqThOwB06LKfbac,1264
+transcribe/forms.py,sha256=iEeZsgWGlYGw0mw81puzhxv91nDefmrjwQ_TdSr7Zfc,5117
 transcribe/middleware.py,sha256=3SvvNmJMlVohD_4Liv1yT3hc_nudpvt2giAE7Wt9rx4,485
-transcribe/models.py,sha256=66JGADyUtnDjlJeftbglj1Cpas9oOBzg-Dz56zhoS6k,38598
+transcribe/models.py,sha256=g0_rtkLKbrkwxbWQbfZ3q5rnug235aEzFCI5DAUrcI4,38965
 transcribe/settings.py,sha256=TNRFJstZF9X3l5qZSzv3xcrEuPMmOQbB-59mqADn9Dk,569
-transcribe/signals.py,sha256=YMxsVgh07TjH29SLWWjoMpou-q7rEA65ZyP9aavtQL4,869
-transcribe/urls.py,sha256=yI2P7q4QBrfsl5Zn4C152rPMjSNMtxLDmkx8c2d6VuA,2414
+transcribe/signals.py,sha256=pvRSWobg__Jw5ZvlFBZZAw3rDk1dvVyiq8Ka2lBGeSY,1105
+transcribe/urls.py,sha256=xgTkOdeC1cWmQAMzAp-VRwvmwyEAfEabncGgHyZiAL0,2040
 transcribe/utils.py,sha256=k8OFWqO5vU3jUCJsLZmJiTK0Rlrb0Yf-rqqfDJc2HZw,3747
 transcribe/management/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 transcribe/management/commands/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -33,6 +33,10 @@ transcribe/migrations/0014_auto_20160203_1544.py,sha256=jc0GDUKuj2m4T9FIX6Q-guz0
 transcribe/migrations/0015_auto_20160309_1342.py,sha256=vy2_6J3ax_znwR5DjVhhsbw3GoS3sl3VEa9gA4j6Gks,596
 transcribe/migrations/0016_auto_20160817_1343.py,sha256=wQjpwUXABGLZ1X_noITkBQ1BCaGQSxwRa-cN8wySpjg,391
 transcribe/migrations/0017_auto_20191115_1123.py,sha256=hixGTGYWGKOQakeiL4ISq_97FFPgg9chPEykphDHDt0,866
+transcribe/migrations/0018_point_fks_to_user.py,sha256=qqni_HVTvp1ENajKAuMf2fyps8BNERrwP28Hcmd7TOw,1214
+transcribe/migrations/0019_create_transcribeuser.py,sha256=mLd8rOFfSkI_5t27AFhckpu-RmntN-T9k4Osm-K7skQ,1311
+transcribe/migrations/0020_populate_transcribe_users.py,sha256=nkB5v7vCNLBibR-sENivKBmJY4Yf-VIImZqy4AQs6oA,504
+transcribe/migrations/0021_point_fks_to_transcribe_user.py,sha256=V4LAQ7xkVGc0oAntppKV9CiQj0YBVzSOKco5I-cN_eM,1781
 transcribe/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 transcribe/static/transcribe/favicon.ico,sha256=4towU7vPOvBDh1bq1MT-ZPI_I16Ia0mWcbgtH8rBHCk,318
 transcribe/static/transcribe/css/icons.css,sha256=1Nd20ZYLtTCK-UvBMqQBxfWq6YmHNeW2Wn-HHcKaDQI,24346
@@ -119,31 +123,31 @@ transcribe/templates/registration/login.html,sha256=Hh0FFE270p5eyTFbZLWB_K1KfBKy
 transcribe/templates/transcribe/.DS_Store,sha256=1lFlJ5EFymdzGAUAaI30vcaaLHt3F1LwpG7xILf9jsM,6148
 transcribe/templates/transcribe/errors/404.html,sha256=sWTl4eyIg0ysMiOo6wLg9egGGDLJ9BELoOhLXEEnGrg,178
 transcribe/templates/transcribe/errors/500.html,sha256=B0W2NZiGcQrnFgQIXPefF02ZVAwrXEAm8Ohjnnps-hQ,195
-transcribe/templates/transcribe/reports/list.html,sha256=7YVx3Y_Hyl4TuS63Ycb6Yhkxc1mvuMoLU7pJdtQJ3WU,3851
-transcribe/templates/transcribe/reports/projects.html,sha256=Jce3ET2WWgykjKV99Ysh8hftBREcLRa1r8p7Bl8XUDU,2664
-transcribe/templates/transcribe/reports/users.html,sha256=43IdBTm6NvQ-_Rpam4K_I149ZjBIxPzVV8IVuxrkR_o,1280
+transcribe/templates/transcribe/reports/list.html,sha256=ovEtVFknwhz89wS1nQjeQ1xwk3acmmtCEgZFKw_KuqI,3848
+transcribe/templates/transcribe/reports/projects.html,sha256=wHkcS_DdtU5xoiOHP9RAnieUwDzbttsIKlYxm_MfGo4,1639
+transcribe/templates/transcribe/reports/users.html,sha256=51j4pSrmIM4G0caqeQFXkeIIzgeggnqOlr039jus2ac,1427
 transcribe/templates/transcribe/web/base.html,sha256=zAP49q4DX6bqSn4dBi9IQ8RTy2AsYI8YDDTo4HfDtsg,51
 transcribe/templates/transcribe/web/base_transcribe.html,sha256=KU3J2SRMPu4D14YgdT7Eaiv7BOI0s2e1o195SPf69vI,4048
-transcribe/templates/transcribe/web/dashboard.html,sha256=m76bE9Q36bNz-JVhywa4mnTsy6BvYajgtNPg96nha6E,4213
+transcribe/templates/transcribe/web/dashboard.html,sha256=7CTABKnepEIlL4hygi-WBzkqbfgRiXm60XQ8ES_wAUA,4061
 transcribe/templates/transcribe/web/faq.html,sha256=5ZqGWLsLh3Q3DBmZQXUvZtPJvkIOvUUwL5HLdPyjet8,10192
 transcribe/templates/transcribe/web/help.html,sha256=NjbUm4ZEgu60mFsZdB1nRsmSE7ynzlQ4QgGskVT9DZ8,2482
 transcribe/templates/transcribe/web/index.html,sha256=faHWxkKAxRZNZcVIi1nG8rLBkQqnaSfXudVNhbMMTGI,133
 transcribe/templates/transcribe/web/landing_page.html,sha256=6jEHXMYNXhKsiHJ2NhSm_TTBVQEKUZPma9X6LwxSLPo,376
-transcribe/templates/transcribe/web/project.html,sha256=vtEMBbddP6GkCccQnYVl5Hb6uXHglCJy0mn_rI9z85w,3335
+transcribe/templates/transcribe/web/project.html,sha256=UGxtvknONkiUT3iFuloKPwohnYPohokHhk1FkTE_3xg,3136
 transcribe/templates/transcribe/web/project_confirm_delete.html,sha256=KXZm8nh6J5yErbYY0l2JfhIpQVyS9QaoXp1mGgbQtpE,426
-transcribe/templates/transcribe/web/project_edit.html,sha256=B2uKgNatbFVFTXsuHC44upyv-R9zXylnB_L65eyAhKo,944
+transcribe/templates/transcribe/web/project_edit.html,sha256=UJaHyRCUTf9qbHYTG1MKDzAlLYz7L7UBhJw-Ixtt0Q8,568
 transcribe/templates/transcribe/web/projects_list.html,sha256=-Ib74x7gLND4Q18wUo-JXmmmnpo8nbP-gVJ0lObfvWg,1300
-transcribe/templates/transcribe/web/task_edit.html,sha256=VDh1Q6vujB_OfAGlITd_3R-l8WRAtHuCouaOdN3LWTY,9403
-transcribe/templates/transcribe/web/user.html,sha256=2osZ4SyqJgnbS-c2qF1rOTdngl7CuAat0n6XXcAVqNY,3289
-transcribe/templates/transcribe/web/users_list.html,sha256=gUgsGlJfJWiRTIhgnVXa49ONEc8K1J7PnLLEmCJPjIk,2921
+transcribe/templates/transcribe/web/task_edit.html,sha256=JWisOHN-bd2gh3t0RB8BiuS8Wc3IwRzt6cA_9DiB0Tw,9219
+transcribe/templates/transcribe/web/user.html,sha256=-EzYdRpc383iL31lmNRv4gE-mwFO8L1KeMNGlt633rM,863
+transcribe/templates/transcribe/web/users_list.html,sha256=uXbaDTXXXOJ9iWuw6OoKRXM6B2--qhswGOv6DvYggRU,1830
 transcribe/templates/transcribe/xsl/tei-html.xsl,sha256=oOVnAZhDVDVzrQR5UEbNV-97ZBTfNfzKDThiUr9EGCc,2984
 transcribe/views/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-transcribe/views/mixins.py,sha256=46WewH6ZTFnRhsNM_zJPsrfOqTzVSmN6mZ3mkH0HmOo,2728
-transcribe/views/reports.py,sha256=OilTUjJn2RsxBUSFxQu-1gLQD_jftEu_1OhiHwQ2y10,12876
-transcribe/views/web.py,sha256=5lBhd70cDPjf0zCxiSAoLPdFIOihEUu63AzNnZMkEPU,14830
-django_transcribe-0.5.17.dist-info/AUTHORS,sha256=o63LB-1ge8sViGo8pRhfL8KTfgnwoSqAhTR7_iEkJXo,527
-django_transcribe-0.5.17.dist-info/LICENSE,sha256=I9xp13yeayqZikrv7rQrzsDWviTwy1R0phFlKtM1meg,1472
-django_transcribe-0.5.17.dist-info/METADATA,sha256=iznFLSF72Uk92EWGkw0B_UH5utvtrNF7OQli10wDJcA,758
-django_transcribe-0.5.17.dist-info/WHEEL,sha256=ewwEueio1C2XeHTvT17n8dZUJgOvyCWCt0WVNLClP9o,92
-django_transcribe-0.5.17.dist-info/top_level.txt,sha256=NljSay7zO6czcjqjVmivw6VW58aXlYHVZQvnwmpy08g,11
-django_transcribe-0.5.17.dist-info/RECORD,,
+transcribe/views/mixins.py,sha256=QmFDhWb5VCEaGatLdbsTK72jiBG2OKrlncnz79FUmto,2727
+transcribe/views/reports.py,sha256=7YD5E6CPsIfWP8hG8IFTek29cM2T29NHuowAdlTAyBs,13408
+transcribe/views/web.py,sha256=sU5FNh0jl1yKSRZFo5CvdD5CVV9sb9vtUNdLRZuzAQg,15213
+django_transcribe-0.6.0.dist-info/AUTHORS,sha256=o63LB-1ge8sViGo8pRhfL8KTfgnwoSqAhTR7_iEkJXo,527
+django_transcribe-0.6.0.dist-info/LICENSE,sha256=I9xp13yeayqZikrv7rQrzsDWviTwy1R0phFlKtM1meg,1472
+django_transcribe-0.6.0.dist-info/METADATA,sha256=a9Q9OZ44OUSDojSBX3-cx-jFVZ_1l7uGh1MGYQ5F7-I,657
+django_transcribe-0.6.0.dist-info/WHEEL,sha256=uCRv0ZEik_232NlR4YDw4Pv3Ajt5bKvMH13NUU7hFuI,91
+django_transcribe-0.6.0.dist-info/top_level.txt,sha256=NljSay7zO6czcjqjVmivw6VW58aXlYHVZQvnwmpy08g,11
+django_transcribe-0.6.0.dist-info/RECORD,,

{django_transcribe-0.5.17.dist-info → django_transcribe-0.6.0.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: bdist_wheel (0.37.0)
+Generator: setuptools (74.1.1)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

transcribe/__init__.py

@@ -1,2 +1,2 @@
 default_app_config = 'transcribe.apps.transcribeConfig'
-__version__ = '0.5.17'
+__version__ = '0.6.0'

transcribe/admin.py

@@ -25,9 +25,9 @@ class UserTaskAdmin(admin.ModelAdmin):
         'task__file',
         'status',
         'task_type',
-        'user__username',
-        'user__first_name',
-        'user__last_name',
+        'user__user__username',
+        'user__user__first_name',
+        'user__user__last_name',
         'task__project__title',
     )
     fields = (
@@ -168,17 +168,32 @@ class TagAdmin(admin.ModelAdmin):
 
 @admin.register(models.TranscribeUser)
 class TranscribeUserAdmin(admin.ModelAdmin):
-    readonly_fields = ['last_login', 'usertasks_link']
-    fields = [
+    readonly_fields = (
         'username',
         'first_name',
         'last_name',
         'email',
-        'is_active',
-        'last_login',
         'groups',
         'usertasks_link',
-    ]
+    )
+
+    fieldsets = (
+        (
+            None,
+            {
+                'fields': (
+                    'user',
+                    'username',
+                    'first_name',
+                    'last_name',
+                    'email',
+                    'groups',
+                    'usertasks_link',
+                )
+            },
+        ),
+    )
+
     list_display = [
         'username',
         'first_name',
@@ -191,10 +206,37 @@ class TranscribeUserAdmin(admin.ModelAdmin):
         'num_skipped_reviews',
         'num_in_progress_reviews',
     ]
-    search_fields = ['username', 'first_name', 'last_name', 'email']
+    search_fields = [
+        'user__username',
+        'user__first_name',
+        'user__last_name',
+        'user__email',
+    ]
 
-    def get_queryset(self, request):
-        return self.model.objects.filter(is_active=True)
+    def username(self, obj):
+        return obj.user.username
+
+    username.short_description = 'Username'
+
+    def first_name(self, obj):
+        return obj.user.first_name
+
+    first_name.short_description = 'First name'
+
+    def last_name(self, obj):
+        return obj.user.last_name
+
+    last_name.short_description = 'Last name'
+
+    def email(self, obj):
+        return obj.user.email
+
+    email.short_description = 'Email'
+
+    def groups(self, obj):
+        return ', '.join([group.name for group in obj.user.groups.all()])
+
+    groups.short_description = 'Groups'
 
     def usertasks_link(self, obj):
         url = resolve_url('admin:transcribe_usertask_changelist')
@@ -205,3 +247,6 @@ class TranscribeUserAdmin(admin.ModelAdmin):
         )
 
     usertasks_link.short_description = 'User tasks'
+
+    def get_queryset(self, request):
+        return self.model.objects.filter(user__is_active=True)

transcribe/apps.py

@@ -10,5 +10,4 @@ class transcribeConfig(AppConfig):
     verbose_name = 'transcribe'
 
     def ready(self):
-        pass
-        # from . import signals  # noqa
+        from . import signals  # noqa F401

transcribe/filters.py

@@ -12,14 +12,13 @@ class UserFilterForUserTask(admin.SimpleListFilter):
         user_id = request.GET.get('user_id')
         if not user_id:
             return []
-        user = models.TranscribeUser.objects.get(pk=user_id)
+        user = models.TranscribeUser.objects.get(user__pk=user_id)
         return [(user_id, user.name.strip() or user)]
 
     def queryset(self, request, queryset):
         user_pk = request.GET.get('user_id')
         if not user_pk:
             return queryset
-        # user = models.TranscribeUser.objects.get(pk=user_pk)
         return queryset.filter(user=user_pk)
 
 

transcribe/forms.py

@@ -1,4 +1,4 @@
-import cgi
+import html
 import logging
 
 from django import forms
@@ -96,7 +96,7 @@ class ProjectForm(NoColon):
 
     def get_processed_text(self, text):
         """Given unprocessed text, process it and return the result."""
-        text = cgi.escape(text)  # HTML encode
+        text = html.escape(text, quote=False)  # HTML encode
         text = text.replace('ÿþ', '').replace('þÿ', '')  # remove UTF-16 BOM
         return text
 

transcribe/migrations/0018_point_fks_to_user.py

@@ -0,0 +1,40 @@
+# Generated by Django 2.2.6 on 2024-08-19 23:49
+
+import django.db.models.deletion
+from django.conf import settings
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [('transcribe', '0017_auto_20191115_1123')]
+
+    operations = [
+        migrations.AlterField(
+            model_name='userpreferences',
+            name='user',
+            field=models.OneToOneField(
+                on_delete=django.db.models.deletion.CASCADE,
+                related_name='preferences',
+                to=settings.AUTH_USER_MODEL,
+            ),
+        ),
+        migrations.AlterField(
+            model_name='userprojectpreferences',
+            name='user',
+            field=models.ForeignKey(
+                on_delete=django.db.models.deletion.CASCADE,
+                related_name='projects',
+                to=settings.AUTH_USER_MODEL,
+            ),
+        ),
+        migrations.AlterField(
+            model_name='usertask',
+            name='user',
+            field=models.ForeignKey(
+                on_delete=django.db.models.deletion.CASCADE,
+                related_name='tasks',
+                to=settings.AUTH_USER_MODEL,
+            ),
+        ),
+    ]

transcribe/migrations/0019_create_transcribeuser.py

@@ -0,0 +1,43 @@
+# Generated by Django 2.2.6 on 2024-08-28 18:21
+
+from django.conf import settings
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+        ('transcribe', '0018_point_fks_to_user'),
+    ]
+
+    operations = [
+        migrations.DeleteModel(name='TranscribeUser'),
+        migrations.CreateModel(
+            name='TranscribeUser',
+            fields=[
+                (
+                    'id',
+                    models.AutoField(
+                        auto_created=True,
+                        primary_key=True,
+                        serialize=False,
+                        verbose_name='ID',
+                    ),
+                ),
+                (
+                    'user',
+                    models.OneToOneField(
+                        on_delete=models.deletion.CASCADE,
+                        related_name='transcribe_user',
+                        to=settings.AUTH_USER_MODEL,
+                    ),
+                ),
+            ],
+            options={
+                'verbose_name': 'Transcribe user',
+                'verbose_name_plural': 'Transcribe users',
+                'ordering': ['user__last_name', 'user__first_name'],
+            },
+        ),
+    ]

transcribe/migrations/0020_populate_transcribe_users.py

@@ -0,0 +1,18 @@
+# Generated by Django 2.2.6 on 2024-08-20 15:59
+
+from django.db import migrations
+
+
+def create_transcribe_users(apps, schema_editor):
+    User = apps.get_model('auth', 'User')
+    TranscribeUser = apps.get_model('transcribe', 'TranscribeUser')
+
+    for user in User.objects.all():
+        TranscribeUser.objects.create(user=user)
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [('transcribe', '0019_create_transcribeuser')]
+
+    operations = [migrations.RunPython(create_transcribe_users)]

transcribe/migrations/0021_point_fks_to_transcribe_user.py

@@ -0,0 +1,57 @@
+# Generated by Django 2.2.6 on 2024-08-20 22:20
+
+import django.db.models.deletion
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [('transcribe', '0020_populate_transcribe_users')]
+
+    operations = [
+        migrations.AlterField(
+            model_name='project',
+            name='reviewers',
+            field=models.ManyToManyField(
+                blank=True,
+                related_name='review_projects',
+                to='transcribe.TranscribeUser',
+            ),
+        ),
+        migrations.AlterField(
+            model_name='project',
+            name='transcribers',
+            field=models.ManyToManyField(
+                blank=True,
+                related_name='transcription_projects',
+                to='transcribe.TranscribeUser',
+            ),
+        ),
+        migrations.AlterField(
+            model_name='userpreferences',
+            name='user',
+            field=models.OneToOneField(
+                on_delete=django.db.models.deletion.CASCADE,
+                related_name='preferences',
+                to='transcribe.TranscribeUser',
+            ),
+        ),
+        migrations.AlterField(
+            model_name='userprojectpreferences',
+            name='user',
+            field=models.ForeignKey(
+                on_delete=django.db.models.deletion.CASCADE,
+                related_name='projects',
+                to='transcribe.TranscribeUser',
+            ),
+        ),
+        migrations.AlterField(
+            model_name='usertask',
+            name='user',
+            field=models.ForeignKey(
+                on_delete=django.db.models.deletion.CASCADE,
+                related_name='tasks',
+                to='transcribe.TranscribeUser',
+            ),
+        ),
+    ]

transcribe/models.py

@@ -38,7 +38,7 @@ TASK = Choices(TRANSCRIPTION, REVIEW)
 
 def get_transcribe_user(user):
     if not isinstance(user, TranscribeUser):
-        user = TranscribeUser.objects.get(pk=user.pk)
+        user = TranscribeUser.objects.get(user=user)
     return user
 
 
@@ -64,8 +64,19 @@ def make_task_count_property(task_type, status):
     return task_counter
 
 
-class TranscribeUser(User):
-    """Proxy user model to extend the default User model."""
+class TranscribeUserManager(models.Manager):
+    """Custom manager for TranscribeUser."""
+
+    def get_queryset(self):
+        return super().get_queryset().select_related('user')
+
+
+class TranscribeUser(models.Model):
+    user = models.OneToOneField(
+        User, related_name='transcribe_user', on_delete=models.CASCADE
+    )
+
+    objects = TranscribeUserManager()
 
     num_finished_transcriptions = make_task_count_property(
         TRANSCRIPTION, FINISHED
@@ -83,12 +94,12 @@ class TranscribeUser(User):
     @cached_property
     def name(self):
         """Returns the user's name."""
-        return '{u.first_name} {u.last_name}'.format(u=self)
+        return '{u.first_name} {u.last_name}'.format(u=self.user)
 
     @cached_property
     def sort_name(self):
         """Returns the user's sortable name."""
-        return '{u.last_name}, {u.first_name}'.format(u=self)
+        return '{u.last_name}, {u.first_name}'.format(u=self.user)
 
     @cached_property
     def is_new(self):
@@ -99,12 +110,15 @@ class TranscribeUser(User):
     @cached_property
     def is_admin(self):
         """Returns if the user is part of the Admin group or a superuser."""
-        return self.groups.filter(name='Admin').exists() or self.is_superuser
+        return (
+            self.user.groups.filter(name='Admin').exists()
+            or self.user.is_superuser
+        )
 
     @cached_property
     def is_reviewer(self):
         """Returns if the user is part of the Reviewer group."""
-        return self.groups.filter(name='Reviewer').exists()
+        return self.user.groups.filter(name='Reviewer').exists()
 
     @cached_property
     def num_tasks(self):
@@ -194,7 +208,7 @@ class TranscribeUser(User):
         )
 
     def _get_report_stats(self, datetime_start, datetime_end):
-        counts = UserTask.objects.filter(user_id=self.pk).aggregate(
+        counts = UserTask.objects.filter(user=self).aggregate(
             num_finished_transcriptions=Count(
                 'id',
                 filter=Q(
@@ -264,12 +278,13 @@ class TranscribeUser(User):
     def roles(self):
         pass
 
+    def __str__(self):
+        return self.user.username
+
     class Meta:
-        proxy = True
-        app_label = 'transcribe'
         verbose_name = 'Transcribe user'
         verbose_name_plural = 'Transcribe users'
-        ordering = ['last_name', 'first_name']
+        ordering = ['user__last_name', 'user__first_name']
 
 
 class UserPreferences(models.Model):
@@ -373,10 +388,10 @@ class Project(TimeStampedModel):
     archived = models.BooleanField(default=False)
     finding_aid_url = models.CharField(blank=True, max_length=2083)
     transcribers = models.ManyToManyField(
-        User, blank=True, related_name='transcription_projects'
+        TranscribeUser, blank=True, related_name='transcription_projects'
     )
     reviewers = models.ManyToManyField(
-        User, blank=True, related_name='review_projects'
+        TranscribeUser, blank=True, related_name='review_projects'
     )
     allow_global_transcriptions = models.BooleanField(default=False)
 
@@ -420,7 +435,7 @@ class Project(TimeStampedModel):
             task__project=self,
             status='in progress',
             task_type=task_type,
-            user__id=user.id,
+            user=user,
         ).first()
 
     def pending_transcription_task(self, user):
@@ -891,7 +906,7 @@ class Task(TimeStampedModel):
         # an instance of the TranscribeUser proxy model, and it needs to be.
         # The ids should be the same though.
         users_usertasks_for_task = (
-            self.usertasks.filter(user__id=user.id)
+            self.usertasks.filter(user=user)
             .filter(task_type=TRANSCRIPTION)
             .exclude(status=FINISHED)
         )
@@ -899,7 +914,7 @@ class Task(TimeStampedModel):
         # are transcription tasks and are not finished.
         if users_usertasks_for_task.count() < 1:
             ut = UserTask()
-            ut.user_id = user.id
+            ut.user = user
             ut.transcription = self.transcription
             ut.task = self
             ut.save()
@@ -912,7 +927,7 @@ class Task(TimeStampedModel):
         # See first comment in claim_transcription about working with the user
         # instance in these methods.
         users_usertasks_for_task = (
-            self.usertasks.filter(user__id=user.id)
+            self.usertasks.filter(user=user)
             .filter(task_type=REVIEW)
             .exclude(status=FINISHED)
         )
@@ -927,7 +942,7 @@ class Task(TimeStampedModel):
             num_tasks = self.project.transcribers_per_task
             transcriptions = transcriptions[:num_tasks]
             ut = UserTask()
-            ut.user_id = user.id
+            ut.user = user
             if len(transcriptions):
                 ut.transcription = self.diff_transcriptions(transcriptions)
             ut.task = self
@@ -1066,10 +1081,11 @@ class UserTask(TimeStampedModel):
 
     def user_admin_display_name(self):
         params = {
-            'name': self.user.get_full_name(),
-            'netid': self.user.username,
+            'name': self.user.user.get_full_name(),
+            'netid': self.user.user.username,
             'url': reverse(
-                'admin:transcribe_transcribeuser_change', args=(self.user.pk,)
+                'admin:transcribe_transcribeuser_change',
+                args=(self.user.user.pk,),
             ),
         }
         return format_html('<a href="{url}">{name} ({netid})</a>', **params)

transcribe/signals.py

@@ -1,14 +1,23 @@
 """Application Signals"""
 import logging
-from datetime import datetime, timedelta, timezone
 
 from django.contrib.auth import get_user_model
 from django.contrib.auth.signals import user_logged_in
+from django.db.models.signals import post_save
+from django.dispatch import receiver
+
+from .models import TranscribeUser
 
 logger = logging.getLogger(__file__)
 User = get_user_model()
 
 
+@receiver(post_save, sender=User)
+def manage_user_profile(sender, instance, created, **kwargs):
+    if created:
+        TranscribeUser.objects.create(user=instance)
+
+
 def update_staff_membership(user):
     """
     Makes sure the is_staff attribute is set on the user if they are a

transcribe/templates/transcribe/reports/list.html

@@ -33,7 +33,7 @@
 <h3>User Reports</h3>
 
 <a href="{% url 'reports:users_report' %}?datetime_start={{ previous_week.datetime_start }}&datetime_end={{ previous_week.datetime_end }}">Previous Week, {{ previous_week.week_name }}</a>
-<a href="{% url 'reports:projects_report' %}?datetime_start={{ previous_week.datetime_start }}&datetime_end={{ previous_week.datetime_end }}&download=True">(download)</a>
+<a href="{% url 'reports:users_report' %}?datetime_start={{ previous_week.datetime_start }}&datetime_end={{ previous_week.datetime_end }}&download=True">(download)</a>
 <br>
 <a href="{% url 'reports:users_report' %}?datetime_start={{ current_month.datetime_start }}&datetime_end={{ current_month.datetime_end }}">{{ current_month.month_name }}</a>
 <a href="{% url 'reports:users_report' %}?datetime_start={{ current_month.datetime_start }}&datetime_end={{ current_month.datetime_end }}&download=True">(download)</a>

transcribe/templates/transcribe/reports/projects.html

@@ -29,35 +29,16 @@
     <b>{{ project.title }}</b>
     <br>
     Current Status:
-    <!-- Total Tasks: {{ project.stats.total_tasks }}
-    <br>
-    Transcriptions: {{ project.stats.transcriptions_percent_done }}% complete ({{ project.stats.transcriptions_remaining }} tasks remaining)
-    <br>
-    Reviews: {{ project.stats.reviews_percent_done }}% complete ({{ project.stats.reviews_remaining }} tasks remaining) -->
     
     {{ project.stats.percent_done }}% complete
          ({{ project.stats.total_finished_transcriptions }} / {{ project.stats.total_tasks }} Transcriptions, {{ project.stats.total_finished_reviews }} / {{ project.stats.total_tasks }} Reviews)
     
-    <!-- <br>
-    <b>
-    {% if datetime_start|date:'Y' == datetime_end|date:'Y' and datetime_start|date:'M' == datetime_end|date:'M' %}
-    {{ datetime_start|date:'F j' }} - {{ datetime_end|date:'j, Y' }}
-    {% elif datetime_start|date:'Y' == datetime_end|date:'Y' %}
-    {{ datetime_start|date:'F j' }} - {{ datetime_end|date:'F j, Y' }}
-    {% else %}
-    {{ datetime_start|date:'M j, Y' }} - {{ datetime_end|date:'M j, Y' }}
-    {% endif %}:
-    </b> -->
-
     <br>
     Finished Transcription{{ project.stats.finished_transcriptions|pluralize }}:
     {{ project.stats.finished_transcriptions }}
-    <!-- ({{ project.stats.total_finished_transcriptions }}/{{ project.stats.total_tasks }}) -->
     <br>
     Finished Review{{ project.stats.finished_reviews|pluralize }}:
     {{ project.stats.finished_reviews }}
-    <!-- ({{ project.stats.total_finished_reviews }}/{{ project.stats.total_tasks }}) -->
-    <!-- <p>{{ project.stats }}</p> -->
 </div>
 {% endfor %}
 

transcribe/templates/transcribe/reports/users.html

@@ -16,18 +16,18 @@
 <a href="{% url 'reports:users_report' %}?datetime_start={{ datetime_start|date:'Y-m-d H:i:s' }}&datetime_end={{ datetime_end|date:'Y-m-d H:i:s' }}&download=True">(download)</a>
 </h3>
 
-{% for user in users %}
+{% for transcribe_user in transcribe_users %}
 <p>
-<b>{{ user.last_name }}, {{ user.first_name }}</b>
-({{ user }})
+<b>{{ transcribe_user.user.last_name }}, {{ transcribe_user.user.first_name }}</b>
+({{ transcribe_user }})
 <br>
-Last Login: {{ user.last_login|date:'F j, Y, g:i A' }}
+Last Login: {{ transcribe_user.user.last_login|date:'F j, Y, g:i A' }}
 <br>
-{{ user.num_finished_transcriptions }} finished transcriptions
-({{ user.num_skipped_transcriptions }} skipped, {{ user.num_in_progress_transcriptions }} in progress)
+{{ transcribe_user.num_finished_transcriptions }} finished transcriptions
+({{ transcribe_user.num_skipped_transcriptions }} skipped, {{ transcribe_user.num_in_progress_transcriptions }} in progress)
 <br>
-{{ user.num_finished_reviews }} finished reviews
-({{ user.num_skipped_reviews }} skipped, {{ user.num_in_progress_reviews }} in progress)
+{{ transcribe_user.num_finished_reviews }} finished reviews
+({{ transcribe_user.num_skipped_reviews }} skipped, {{ transcribe_user.num_in_progress_reviews }} in progress)
 </p>
 {% endfor %}
 

transcribe/templates/transcribe/web/dashboard.html

@@ -6,11 +6,6 @@
 {% block content %}
 <h1><span class="icon-user-4"></span> Dashboard</h1>
 
-{% if transcribe_user.is_new %}
-    <!-- message for new users of Transcribe -->
-	<!-- <div class='alert'>Welcome to Transcribe.</div> -->
-{% endif %}
-
 <section id="available">
 	<header>
 		<h2><span class="icon-checkmark"></span> Available Tasks</h2>

transcribe/templates/transcribe/web/project.html

@@ -72,13 +72,11 @@
 		<p>Have a specific question the basic guidelines don't answer? Check the <a href='/faq/'>FAQ page</a>!</p>
 	</div>
 
-    <!-- ADMIN STUFF -->
+    <!-- ADMIN ITEMS -->
     {% if transcribe_user.is_admin %}
     <div class="toolbar">
     	<ul>
     		<li><a href="{% url 'admin:transcribe_project_change' project.id %}" title="Edit this project"><span class="icon-pencil"></span> Edit</a></li>
-    		<!-- <li><a href="/Project/editRoles/{{ project.id }}" title="Mangage user roles for this project (i.e. who is allowed to transcribe it)"><span class="icon-users-2"></span> Roles</a></li> -->
-
     	{% if project.tasks %}
     		<li class="message"><span class="icon-download-2"></span> Download: 
     		<a href="{% url 'project_download' pk=project.id type='xml' %}">XML</a>

transcribe/templates/transcribe/web/project_edit.html

@@ -10,9 +10,6 @@
 	<input class="button" type="submit" value="Save Project">
 
     {% if project %}
-    <!-- <a href="{% url 'project_delete' project.id %}" title="Delete the project" class="button delete" -->
-    <!--     onClick="if(confirm('Are you sure you want to delete this project?\nThe entire project, transcriptions, and media will be permanently deleted.')) return true; else return false"> -->
-    <!--     <span class="icon-remove"></span> delete project</a> -->
     <a href="{% url 'project_delete' project.id %}" title="Delete the project" class="button delete"><span class="icon-remove"></span> delete project</a>
     {% endif %}
 

transcribe/templates/transcribe/web/task_edit.html

@@ -70,30 +70,31 @@
 			<script src="{% static 'transcribe/js/lib/openseadragon/openseadragon.min.js' %}"></script>
 			<script src="{% static 'transcribe/js/lib/openseadragon/openseadragon-filtering.js' %}"></script>
 			<script type="text/javascript">
-                var viewer = OpenSeadragon({
+				var viewer = OpenSeadragon({
 					id: "openseadragon",
 					prefixUrl: '/static/transcribe/js/lib/openseadragon/images/',
 					tileSources: {
 						type: 'image',
-                        url: '{{ usertask.task.file.url }}',
+						url: '{{ usertask.task.file.url }}',
+						crossOriginPolicy: 'Anonymous',
 					},
 					// It was decided to load the images full length instead
- 					// of width. This is to allow people to see the whole page
-  					// before beginning transcribing.
+					// of width. This is to allow people to see the whole page
+					// before beginning transcribing.
 					//visibilityRatio: 1.0,  // don't pan beyond image
 					//defaultZoomLevel: 1,  // fixed width
 					//minZoomLevel: 1,  // can't zoom out more than the full width
 					maxZoomLevel: 5,  // can't zoom out more than the full width
-                    showRotationControl: true, // allow image rotation
+					showRotationControl: true, // allow image rotation
+				});
+				viewer.setFilterOptions({
+					filters: {
+						processors: [
+							OpenSeadragon.Filters.BRIGHTNESS(0),
+							OpenSeadragon.Filters.CONTRAST(1)
+						]
+					}
 				});
-                viewer.setFilterOptions({
-                    filters: {
-                        processors: [
-                            OpenSeadragon.Filters.BRIGHTNESS(0),
-                            OpenSeadragon.Filters.CONTRAST(1)
-                        ]
-                    }
-                });
 				function go_to_top(immediately) {
 					var oldBounds = viewer.viewport.getBounds();
 					//var newBounds = new OpenSeadragon.Rect(0, 0, 1, oldBounds.height / oldBounds.width);
@@ -181,20 +182,20 @@
 
 	<input type="hidden" name="id" value="{{ usertask.id }}" id="id">
 	<input type="hidden" name="task" value="{{ usertask.task.id }}">
-    <input type="hidden" name="task_type" value="{{ usertask.task_type }}">
+	<input type="hidden" name="task_type" value="{{ usertask.task_type }}">
 	<input type="hidden" name="user" value="{{ request.user.id }}">
 </div>
 
 <ul class="toolbar">
 		<li><a id="toggleLayout" href="#"><span class="icon-screen"></span> Toggle Layout</a></li>
 		<li><a class="saveTranscription" href="{{ usertask.task.project.get_absolute_url }}"><span class="icon-info"></span> Project Info</a></li>
-        <li><span><span class="icon-image"></span> {{ usertask.task.filename }}</span></li>
-        <li><span id="pagesNav">
-        	<button onclick="return false;" id="previousPageButton" class="icon-arrow-left" title="view the previous page">
-        	<button onclick="return false;" id="currentPageButton" class="icon-home" title="view the page you are currently transcribing">
-        	<button onclick="return false;" id="nextPageButton" class="icon-arrow-right" title="view the next page">
-        </span></li>
-    	<li><span id="serifToggle" class="serif"><button onclick="return false;" id="serifToggleButton" title="toggle serif font">F</button></span></li>
+		<li><span><span class="icon-image"></span> {{ usertask.task.filename }}</span></li>
+		<li><span id="pagesNav">
+			<button onclick="return false;" id="previousPageButton" class="icon-arrow-left" title="view the previous page">
+			<button onclick="return false;" id="currentPageButton" class="icon-home" title="view the page you are currently transcribing">
+			<button onclick="return false;" id="nextPageButton" class="icon-arrow-right" title="view the next page">
+		</span></li>
+		<li><span id="serifToggle" class="serif"><button onclick="return false;" id="serifToggleButton" title="toggle serif font">F</button></span></li>
 		<li class="right finishButton"><button id="finishButton" class="submit" name="status" value="finished" type="submit"><span class="icon-checkmark"></span> Submit</button></li>
 		<li class="right skipButton"><button id="skipButton" class="skip" name="status" value="skipped" type="submit" onClick="if(confirm('Are you sure you want to skip this task?\n')) return true; else return false"><span class="icon-close"></span> Skip</button></li>
 		<li class="right saveButton"><button id="saveButton" class="save" name="status" value="in progress" type="submit"><span class="icon-disk icon"></span><span class="icon-spinner-5 spinner"></span> Save</button></li>

transcribe/templates/transcribe/web/user.html

@@ -6,71 +6,16 @@
     <h1><a href="/users"><span class="icon-users-2"></span> Users</a> &gt; User</h1>
 </header>
 
-<h2 class='user'>{{ object.name }} ({{ object.username }})</h2>
+<h2 class='user'>{{  transcribe_user.name }} ({{  transcribe_user.user.username }})</h2>
     
 <div class='roles'>
     <h3>Roles</h3>
-    <!-- $userRoles = $user->getRoles(); -->
-    <!-- // check for global roles -->
-    <!-- $globalRoles = array(); -->
-    <!-- if(isset($userRoles[0])) { -->
-    <!--    $globalRoles = $userRoles[0]; -->
-    <!--    // remove global roles, everything else is project-specific -->
-    <!--    unset($userRoles[0]); -->
-    <!-- } -->
-
-    <!-- // roles for a specific project or projects -->
-    <!-- foreach ($userRoles AS $scope => $roles) { -->
-    <!--    $project = Project::get($scope); -->
-    <!--    $projectTitle = $project->getTitle(); -->
-    <!--    echo "<b><a href='/Project/editRoles/" . $project->getId() . "'>$projectTitle</a>: </b>"; -->
-    <!--    $x = 0; -->
-    <!--    foreach($roles AS $role) { -->
-    <!--        $x++; -->
-    <!--        if($x > 1) echo ", "; -->
-    <!--        echo "$role"; -->
-    <!--    } -->
-    <!--    echo "<br>"; -->
-    <!-- } -->
-    
-    <!-- // global roles, ie roles for All projects -->
-    <!-- echo "<b class='globalRoles'>Global Roles (All Projects): </b>"; -->
-    <!-- $x = 0; -->
-    <!-- foreach($globalRoles AS $role) { -->
-    <!--    $x++; -->
-    <!--    if($x > 1) echo ", "; -->
-    <!--    echo "<a href='/ProjectRole/deleteRole/0/$role/" . $user->getId() . "' class='deleteUser'>"; -->
-    <!--    echo "$role"; -->
-    <!--    echo "</a>"; -->
-    <!--    $global[$role] = true; -->
-    <!-- } -->
-    <!-- if(empty($globalRoles)) echo "none"; -->
-
-    <!-- // show options to add global roles for this user? -->
-    <!-- if(!isset($global['transcriber']) || !isset($global['reviewer']) || !isset($global['admin'])) { -->
-    <!--    echo "<br>"; -->
-    <!--    echo "(Add Global Roles: "; -->
-    <!--    if(!isset($global['transcriber'])) { -->                    
-    <!--        echo "<a href='/ProjectRole/addRole/0/transcriber/" . $user->getId() . "' class='addUser'>transcriber</a> "; --> 
-    <!--    } -->
-    <!--    if(!isset($global['reviewer'])) { -->                   
-    <!--        echo "<a href='/ProjectRole/addRole/0/reviewer/" . $user->getId() . "' class='addUser'>reviewer</a> "; --> 
-    <!--    } -->
-    <!--    if(!isset($global['admin'])) { -->                  
-    <!--        echo "<a href='/ProjectRole/addRole/0/admin/" . $user->getId() . "' class='addUser'>admin</a>"; --> 
-    <!--    } -->
-    <!--    echo ")"; -->
-    <!-- } -->
-
-    <!-- echo "</div>"; -->
 </div>
-    
-    <!-- $userTasks = $user->getUserTasks('all', 'updatedAt DESC', '100'); -->
 <br><br>
 <div class='recentActivity'>
     <h3>Recent Activity</h3>
     <ul class='usertasks'>
-    {% for task in object.recent_transcription_tasks %}
+    {% for task in  transcribe_user.recent_transcription_tasks %}
         <li class='{{ task.status }}'>
             <span class='datetime'>{{ task.modified|date:"M j, Y g:i a" }}</span>
             <span class='status'>{{ task.status }}</span> task from

transcribe/templates/transcribe/web/users_list.html

@@ -8,28 +8,6 @@
 	<h1><span class="icon-users-2"></span> Users ({{ users.count }})</h1>
 </header>
 <span class='recentActivity'>Show statistics for the past: </span>
-
-<!-- echo " <a href='/users/recentTime:24_hours'"; -->
-<!-- if($recentTime == '24 hours') echo " class='current'"; -->
-<!-- echo ">24 hours</a>"; -->
-
-<!-- echo " <a href='/users/recentTime:7_days'"; -->
-<!-- if($recentTime == '7 days') echo " class='current'"; -->
-<!-- echo ">7 days</a>"; -->
-
-<!-- echo " <a href='/users/recentTime:1_month'"; -->
-<!-- if($recentTime == '1 month') echo " class='current'"; -->
-<!-- echo ">1 month</a>"; -->
-
-<!-- echo " <a href='/users/recentTime:6_months'"; -->
-<!-- if($recentTime == '6 months') echo " class='current'"; -->
-<!-- echo ">6 months</a>"; -->
-
-<!-- echo " <a href='/users/recentTime:1_year'"; -->
-<!-- if($recentTime == '1 year') echo " class='current'"; -->
-<!-- echo ">1 year</a>"; -->
-<!-- echo "</span>"; -->
-
 <br/>
 <br/>
 <table class="users">
@@ -38,24 +16,20 @@
 		<th>finished</th>
 		<th>skipped</th>
 		<th>in progress</th>
-		<!-- <th><a href='/users/orderBy:lastName' {% if order_by == 'last_name' %}class='current'{% endif %}>User</a></th> -->
-		<!-- <th><a href='/users/orderBy:finishedTasks_DESC' {%if order_by == 'finished_tasks desc' %}class='current'{% endif %}>finished</a></th> -->
-		<!-- <th><a href='/users/orderBy:skippedTasks_DESC'<?php if($orderBy == 'skippedTasks DESC') echo " class='current'"; ?>>skipped</a></th> -->
-		<!-- <th><a href='/users/orderBy:inProgressTasks_DESC'<?php if($orderBy == 'inProgressTasks DESC') echo " class='current'"; ?>>in progress</a></th> -->
 	</tr>
-	{% for user in users %}
+	{% for transcribe_user in transcribe_users %}
 	<tr>
 		<td>
-			<a href="/user/{{ user.pk }}">{{ user.sort_name }} ({{ user.username }})</a>
+			<a href="/user/{{ transcribe_user.pk }}">{{ transcribe_user.sort_name }} ({{ transcribe_user.user.username }})</a>
 		</td>
 		<td align="center">
-            {{ user.num_finished_transcriptions }}
+            {{ transcribe_user.num_finished_transcriptions }}
 		</td>
 		<td align="center">
-            {{ user.num_skipped_transcriptions }}
+            {{ transcribe_user.num_skipped_transcriptions }}
 		</td>
 		<td align="center">
-            {{ user.num_in_progress_transcriptions }}
+            {{ transcribe_user.num_in_progress_transcriptions }}
 		</td>
 	</tr>
 	{% endfor %}
@@ -74,18 +48,18 @@
 		</tr>
 		<tr>
 			<td>
-			{% for user in global_transcribers %}
-				<a href='/user/{{ user.pk }}/'>{{ user.name }} ({{ user.username }})</a><br>
+			{% for transcribe_user in global_transcribers %}
+				<a href='/user/{{ transcribe_user.pk }}/'>{{ transcribe_user.name }} ({{ transcribe_user.user.username }})</a><br>
 			{% endfor %}
 			</td>
 			<td>
-			{% for user in global_reviewers %}
-				<a href='/user/{{ user.pk }}/'>{{ user.name }} ({{ user.username }})</a><br>
+			{% for transcribe_user in global_reviewers %}
+				<a href='/user/{{ transcribe_user.pk }}/'>{{ transcribe_user.name }} ({{ transcribe_user.user.username }})</a><br>
 			{% endfor %}
 			</td>
 			<td>
-			{% for user in global_admins %}
-				<a href='/user/{{ user.pk }}/'>{{ user.name }} ({{ user.username }})</a><br>
+			{% for transcribe_user in global_admins %}
+				<a href='/user/{{ transcribe_user.pk }}/'>{{ transcribe_user.name }} ({{ transcribe_user.user.username }})</a><br>
 			{% endfor %}
 			</td>
 		</tr>

transcribe/urls.py

@@ -1,74 +1,68 @@
 from django.conf import settings as django_settings
-from django.conf.urls import include, static, url
+from django.conf.urls.static import static
+from django.urls import include, path
 from transcribe.views import reports, web
 
 handler404 = 'transcribe.views.web.display404'
 handler500 = 'transcribe.views.web.display500'
 
 project_views = [
-    url(r'^$', web.landing_page, name='landing_page'),
-    url(r'^help/$', web.help, name='help'),
-    url(r'^faq/$', web.faq, name='faq'),
-    url(r'^dashboard/$', web.DashboardView.as_view(), name='dashboard'),
-    url(
-        r'^dashboard/(?P<all_tasks>all_tasks)/$',
+    path('', web.landing_page, name='landing_page'),
+    path('help/', web.help, name='help'),
+    path('faq/', web.faq, name='faq'),
+    path('dashboard/', web.DashboardView.as_view(), name='dashboard'),
+    path(
+        'dashboard/all_tasks/',
         web.DashboardView.as_view(),
         name='dashboard_all_tasks',
+        kwargs={'all_tasks': 'all_tasks'},
     ),
-    url(r'^projects/$', web.ProjectListView.as_view(), name='projects_list'),
-    # url(r'^project/create/$', 'project_create', name='project_create'),
-    url(
-        r'^project/(?P<pk>\d+)/$',
+    path('projects/', web.ProjectListView.as_view(), name='projects_list'),
+    path(
+        'project/<int:pk>/',
         web.ProjectDetailView.as_view(),
         name='project_detail',
     ),
-    # url(r'^project/(?P<pk>\d+)/edit/$', 'project_edit', name='project_edit'),
-    url(
-        r'^project/(?P<pk>\d+)/download\.(?P<type>(xml|txt|html))$',
+    path(
+        'project/<int:pk>/download.<str:type>',
         web.ProjectDownloadView.as_view(),
         name='project_download',
     ),
-    # url(r'^project/(?P<pk>\d+)/delete/$', 'project_delete',
-    #     name='project_delete'),
-    url(
-        r'^project/(?P<pk>\d+)/claim/(?P<type>(review|transcription|any))/$',
+    path(
+        'project/<int:pk>/claim/<str:type>/',
         web.ProjectClaimTaskView.as_view(),
         name='project_claim_task',
     ),
-    url(
-        r'^userpreferences/(?P<pk>\d+)/update/$',
+    path(
+        'userpreferences/<int:pk>/update/',
         web.UserPreferencesUpdateView.as_view(),
         name='user_preferences_update',
     ),
-    url(
-        r'^userprojectpreferences/(?P<pk>\d+)/update/$',
+    path(
+        'userprojectpreferences/<int:pk>/update/',
         web.UserProjectPreferencesUpdateView.as_view(),
         name='user_project_preferences_update',
     ),
-    url(
-        r'^task/(?P<pk>\d+)/$',
-        web.UserTaskUpdateView.as_view(),
-        name='task_workon',
+    path(
+        'task/<int:pk>/', web.UserTaskUpdateView.as_view(), name='task_workon'
     ),
 ]
 
 report_views = (
     [
-        url(r'^$', reports.reports_list, name='list'),
-        url(r'^projects/$', reports.projects_report, name='projects_report'),
-        url(r'^users/$', reports.users_report, name='users_report'),
+        path('', reports.reports_list, name='list'),
+        path('projects/', reports.projects_report, name='projects_report'),
+        path('users/', reports.users_report, name='users_report'),
     ],
     'reports',
 )
 
 urlpatterns = [
-    # url(r'^', include(authentication_views)),
-    url(r'^', include(project_views)),
-    url(r'^reports/', include(report_views)),
+    path('', include(project_views)),
+    path('reports/', include(report_views)),
 ]
 
 if django_settings.DEBUG:
-    static = static.static
     urlpatterns += static(
         django_settings.STATIC_URL, document_root=django_settings.STATIC_ROOT
     )

transcribe/views/mixins.py

@@ -83,6 +83,6 @@ class TranscribeUserContextMixin:
         if hasattr(super(), 'get_context_data'):
             context = super().get_context_data(**kwargs)
         context['transcribe_user'] = TranscribeUser.objects.get(
-            pk=self.request.user.pk
+            user=self.request.user
         )
         return context

transcribe/views/reports.py

@@ -262,25 +262,27 @@ def users_report(request):
     datetime_end = make_aware(datetime_end)
 
     # list of users
-    users = TranscribeUser.objects.filter(last_login__gte=datetime_start)
+    transcribe_users = TranscribeUser.objects.filter(
+        user__last_login__gte=datetime_start
+    )
     # get stats for each user
-    for user in users:
-        user._get_report_stats(datetime_start, datetime_end)
+    for transcribe_user in transcribe_users:
+        transcribe_user._get_report_stats(datetime_start, datetime_end)
     # remove users without any activity
     active_users = []
-    for user in users:
+    for transcribe_user in transcribe_users:
         if (
-            user.num_finished_transcriptions > 0
-            or user.num_finished_reviews > 0
-            or user.num_skipped_transcriptions > 0
-            or user.num_skipped_reviews > 0
+            transcribe_user.num_finished_transcriptions > 0
+            or transcribe_user.num_finished_reviews > 0
+            or transcribe_user.num_skipped_transcriptions > 0
+            or transcribe_user.num_skipped_reviews > 0
         ):
-            active_users.append(user)
-    users = []
+            active_users.append(transcribe_user)
+    transcribe_users = []
     data = {
         'datetime_start': datetime_start,
         'datetime_end': datetime_end,
-        'users': active_users,
+        'transcribe_users': active_users,
     }
 
     # download the report as a csv file
@@ -311,19 +313,23 @@ def users_report(request):
             ]
         )
         # stats for each user
-        for user in active_users:
+        for transcribe_user in active_users:
             user_data = []
-            user_data.append(f'{user.last_name}, {user.first_name}')
-            user_data.append(f'{user}')
             user_data.append(
-                f"{user.last_login.strftime('%B %-d, %Y, %-I:%M %p')}"
+                f'{transcribe_user.user.last_name}, {transcribe_user.user.first_name}'
+            )
+            user_data.append(f'{transcribe_user}')
+            user_data.append(
+                f"{transcribe_user.user.last_login.strftime('%B %-d, %Y, %-I:%M %p')}"
+            )
+            user_data.append(f'{transcribe_user.num_finished_transcriptions}')
+            user_data.append(f'{transcribe_user.num_skipped_transcriptions}')
+            user_data.append(
+                f'{transcribe_user.num_in_progress_transcriptions}'
             )
-            user_data.append(f'{user.num_finished_transcriptions}')
-            user_data.append(f'{user.num_skipped_transcriptions}')
-            user_data.append(f'{user.num_in_progress_transcriptions}')
-            user_data.append(f'{user.num_finished_reviews}')
-            user_data.append(f'{user.num_skipped_reviews}')
-            user_data.append(f'{user.num_in_progress_reviews}')
+            user_data.append(f'{transcribe_user.num_finished_reviews}')
+            user_data.append(f'{transcribe_user.num_skipped_reviews}')
+            user_data.append(f'{transcribe_user.num_in_progress_reviews}')
             writer.writerow(user_data)
         # totals
         writer.writerow(['', ''])
@@ -333,15 +339,21 @@ def users_report(request):
         total_skipped_reviews = 0
         total_in_progress_transcriptions = 0
         total_in_progress_reviews = 0
-        for user in active_users:
-            total_finished_transcriptions += user.num_finished_transcriptions
-            total_skipped_transcriptions += user.num_skipped_transcriptions
-            total_finished_reviews += user.num_finished_reviews
-            total_skipped_reviews += user.num_skipped_reviews
+        for transcribe_user in active_users:
+            total_finished_transcriptions += (
+                transcribe_user.num_finished_transcriptions
+            )
+            total_skipped_transcriptions += (
+                transcribe_user.num_skipped_transcriptions
+            )
+            total_finished_reviews += transcribe_user.num_finished_reviews
+            total_skipped_reviews += transcribe_user.num_skipped_reviews
             total_in_progress_transcriptions += (
-                user.num_in_progress_transcriptions
+                transcribe_user.num_in_progress_transcriptions
+            )
+            total_in_progress_reviews += (
+                transcribe_user.num_in_progress_reviews
             )
-            total_in_progress_reviews += user.num_in_progress_reviews
         writer.writerow(
             [
                 'TOTALS',

transcribe/views/web.py

@@ -4,6 +4,7 @@ from django.contrib import messages
 from django.contrib.auth.decorators import login_required
 from django.db.models import Count, Q
 from django.http import HttpResponse, JsonResponse
+from django.http.response import Http404
 from django.shortcuts import redirect, render
 from django.views.generic import View
 from django.views.generic.detail import DetailView
@@ -90,9 +91,11 @@ def display500(request):
 class DashboardView(
     mixins.ActiveUsersOnlyMixin, mixins.TranscribeUserContextMixin, View
 ):
-    def get(self, request, all_tasks=False):  # noqa
+    def get(  # noqa C901, TODO simplify this method
+        self, request, *args, **kwargs
+    ):
+        all_tasks = kwargs.get('all_tasks', False)
         context = super().get_context_data()
-
         context['projects'] = []
         user = context['transcribe_user']
 
@@ -105,7 +108,7 @@ class DashboardView(
         # 'in progress' tasks for this user
         user_tasks_in_progress = (
             models.UserTask.objects.defer('transcription')
-            .filter(status='in progress', user_id=user.pk)
+            .filter(status='in progress', user=user)
             .select_related('task__project')
             .all()
         )
@@ -190,9 +193,12 @@ class ProjectClaimTaskView(mixins.ActiveUsersOnlyMixin, View):
         Creates a UserTask for a given project and user, then redirects to the
         UserTask page or the dashboard if something failed.
         """
+        if type not in {'transcription', 'review', 'any'}:
+            raise Http404
+
         failed = False
         user_task = None
-        user = models.TranscribeUser.objects.get(pk=request.user.pk)
+        user = models.TranscribeUser.objects.get(user=request.user)
 
         try:
             project = models.Project.objects.get(pk=pk)
@@ -264,6 +270,11 @@ class ProjectDownloadView(mixins.AdminUsersOnlyMixin, View):
         elif type == 'html':
             result = project.generate_html()
             content_type = 'text/html'
+        else:
+            messages.add_message(
+                request, messages.ERROR, 'Invalid export type.'
+            )
+            return redirect('dashboard')
         return HttpResponse(result, content_type=content_type)