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

{django_transcribe-0.6.0.dist-info → django_transcribe-0.7.1.dist-info}/AUTHORS

@@ -1,4 +1,4 @@
-Transcribe was created at the BYU Library in 2012 by Geoff Groberg with UX design help from Grant Zabriskie. In 2014 Chad Hansen helped port the project from PHP to Python. In 2019 it was open sourced and as of this writing it is maintained by Geoff Groberg.
+Transcribe was created at the BYU Library in 2012 by Geoff Groberg with UX design help from Grant Zabriskie. In 2014 Chad Hansen helped port the project from PHP to Python. In 2019 it was open sourced.
 
 Here is an incomplete list of people who have contributed to Transcribe:
 
@@ -6,4 +6,8 @@ Here is an incomplete list of people who have contributed to Transcribe:
      Chad Hansen <cgh@byu.edu>
      Grant Zabriskie <grant_zabriskie@byu.edu>
      Ben Crowder <ben_crowder@byu.edu>
-     Scott Eldredge <scott_eldredge@byu.edu>
+     Scott Eldredge <scott_eldredge@byu.edu>
+     Taylor Payne <taylor_payne@byu.edu>
+     Mathew Behling <mathew_behling@byu.edu>
+     Russell Memory <russell_memory@byu.edu>
+     Winn Madesn <winn_madsen@byu.edu>

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

@@ -1,19 +1,27 @@
 Metadata-Version: 2.1
 Name: django-transcribe
-Version: 0.6.0
+Version: 0.7.1
 Summary: crowd source transcription
 Home-page: https://gitlab.com/byuhbll/lib/python/django-transcribe
-Author: BYU HBLL WebDev team
+Author: BYU Library Software Engineering
 Author-email: support@lib.byu.edu
 Classifier: Intended Audience :: Developers
 Classifier: License :: OSI Approved :: BSD License
 Classifier: Operating System :: OS Independent
+Classifier: Framework :: Django
+Classifier: Framework :: Django :: 3.2
+Classifier: Framework :: Django :: 4.1
+Classifier: Framework :: Django :: 4.2
 Classifier: Programming Language :: Python
-Classifier: Programming Language :: Python :: 3.6
+Classifier: Programming Language :: Python :: 3.8
+Classifier: Programming Language :: Python :: 3.9
+Classifier: Programming Language :: Python :: 3.10
+Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
 License-File: LICENSE
 License-File: AUTHORS
 Requires-Dist: django-model-utils
 Requires-Dist: lxml
-Requires-Dist: Django <2.3.0,>=2.2.0
+Requires-Dist: Django <5.0.0,>=3.2.0
 
 Crowd source the transcription of texts, audio, and video.

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

@@ -1,12 +1,12 @@
-transcribe/__init__.py,sha256=qFp_T9xwXsjX5GhZe6N2ShySfSHh7oBCM8OlR_KtO4Y,78
+transcribe/__init__.py,sha256=WYosA-Pf6uytFfAdwJzG8DXM_qOmYzj1ORX25HtLENM,78
 transcribe/admin.py,sha256=HwrJafMjSoIKgb_En0zNvZ3nk5rCZWtJ5n0DdGU9nfI,6512
 transcribe/api.py,sha256=2m_y44ilQh87CWksHHqiE4A14javR8omlXEXm65lmC4,74
 transcribe/apps.py,sha256=XUdPQkCjpqWAKDCIaE6Mh8Q4xN5upKv95MG1u2_5pig,246
 transcribe/diff_match_patch.py,sha256=HZC5DNab5OVwbB4Zc7G17l1OHbBlH2g9-xOtT1zkQ1A,84937
 transcribe/filters.py,sha256=_ANh6XGDXgmD_wxQo5IPReQsv3_MDqThOwB06LKfbac,1264
-transcribe/forms.py,sha256=iEeZsgWGlYGw0mw81puzhxv91nDefmrjwQ_TdSr7Zfc,5117
+transcribe/forms.py,sha256=6j-MtheDtDeBo9B_hlKhkWkWkKVJsLrJIlSsZAlB7ic,5612
 transcribe/middleware.py,sha256=3SvvNmJMlVohD_4Liv1yT3hc_nudpvt2giAE7Wt9rx4,485
-transcribe/models.py,sha256=g0_rtkLKbrkwxbWQbfZ3q5rnug235aEzFCI5DAUrcI4,38965
+transcribe/models.py,sha256=mcAs_mwX2ROgB5OjlY2ceu_yL34nr4K5wiRrPz3XCf8,38870
 transcribe/settings.py,sha256=TNRFJstZF9X3l5qZSzv3xcrEuPMmOQbB-59mqADn9Dk,569
 transcribe/signals.py,sha256=pvRSWobg__Jw5ZvlFBZZAw3rDk1dvVyiq8Ka2lBGeSY,1105
 transcribe/urls.py,sha256=xgTkOdeC1cWmQAMzAp-VRwvmwyEAfEabncGgHyZiAL0,2040
@@ -17,12 +17,13 @@ transcribe/management/commands/check_media_size.py,sha256=ZT8KT-whEA7-uLqxa3Q10H
 transcribe/management/commands/fix_permissions.py,sha256=2CYzjkD8YMw6CqRCr5LIvXlNom-3NrPm69buaArOiE4,1558
 transcribe/management/commands/functional_tests.py,sha256=flJXZUPbsjbC51KEFaz5TXQLxf4GXHbbKd4diopVMDI,1634
 transcribe/migrations/0001_initial.py,sha256=IuhmY5SWSZ4rVSOtvoQOeQmgSLryPiK98rubp91o0j8,7132
-transcribe/migrations/0002_initial_data.py,sha256=Z5jtudsGAwNuxrw0Jt1FnEVAod1u5H-SuyXjA0laLZA,3352
+transcribe/migrations/0001_initial_squashed_0021_point_fks_to_transcribe_user.py,sha256=u9xq3C4kCKE_o251AaOLXr08ataRkAceaJ7hxt_d3aw,18319
+transcribe/migrations/0002_initial_data.py,sha256=BXK8sjEEV3ACR9u98RRMxI0T1mDIM_QILobFrGIZMGg,3383
 transcribe/migrations/0003_transcribeuser.py,sha256=dYz_tEvCgJBM5sP631AWOK_aMg1VpYRg9xlXWJI-bSw,443
 transcribe/migrations/0004_auto_20150716_1639.py,sha256=BgwqqK2BxbPmUaUQO5RBPIZeZnUphTADAoViFxWMGfQ,512
 transcribe/migrations/0005_auto_20150717_0829.py,sha256=W0l8re8Zp5-Xg_N8wHeWAMaT2SAgFAdlJmWQjx4hU_4,553
 transcribe/migrations/0006_project_archived.py,sha256=N4bfvX_wmRr9OHAoeosZbtKLGUhZchhJF6bH-tQByUY,428
-transcribe/migrations/0007_reviewer_group_addition.py,sha256=SyuuNgk5HLQH5IT60JV63q5Z1scDFCFnbNOeAVL9omk,2376
+transcribe/migrations/0007_reviewer_group_addition.py,sha256=08uhIphclTOXVf5QIlykrXW_I8e4KdOW-Zcw1hC5JOE,2384
 transcribe/migrations/0008_auto_20150925_1522.py,sha256=ujH1uAuTRNJOMw5dWRFPqT2mnkjaC5xAYljL9yJElHg,1266
 transcribe/migrations/0009_auto_20150929_1314.py,sha256=lXElv1W2T0fTggdEnW7ssApkVgGcrD9ZA_i6Ud5vAqk,350
 transcribe/migrations/0010_userprojectpreferences.py,sha256=GGbG-O5OflRcyirhG9uHY7H12yIn0fCwdw6nLNmtv4k,1641
@@ -114,13 +115,10 @@ transcribe/static/transcribe/js/lib/rangy/rangy-highlighter.js,sha256=a0giQ-8tEi
 transcribe/static/transcribe/js/lib/rangy/rangy-selectionsaverestore.js,sha256=KEy_pZhmL1iO_lsmC_ow_oWfNjIfd19Ryw0kJZ974Ik,9546
 transcribe/static/transcribe/js/lib/rangy/rangy-serializer.js,sha256=yjtEFLyoUlDtOM1RPECLtWeIypXprTPFFqaVAkxqCGs,12705
 transcribe/static/transcribe/js/lib/rangy/rangy-textrange.js,sha256=oRuHe4BE3_QpKwVQ457PNs4PBrz7UQ2V6Mu7dva9R7s,81964
-transcribe/templates/.DS_Store,sha256=u7RGGZNMR9uNjsIsfBEMx2fJBjTsIvOsIHHTFaSxm1U,6148
-transcribe/templates/admin/.DS_Store,sha256=1lFlJ5EFymdzGAUAaI30vcaaLHt3F1LwpG7xILf9jsM,6148
-transcribe/templates/admin/base_site.html,sha256=epIGPdKgYnSRMx49oYkcJm6WX1gIXdal4Q_advX-Nyw,589
+transcribe/templates/admin/base_site.html,sha256=ITfmNHf0qOdJ5VJWxya5W4p4qtDsPSXPCaiUQJSp-G8,286
 transcribe/templates/admin/show_hide_filter.html,sha256=WBKFzDAK93yigz1p7NE0Yzh_iBIUm67Rf_pkskubW1k,416
 transcribe/templates/admin/transcribe/project/delete_confirmation.html,sha256=1b0L81DZ7LhPVRcMQmsq7PhzoPG9pQqsAD7xzSs56oM,2584
 transcribe/templates/registration/login.html,sha256=Hh0FFE270p5eyTFbZLWB_K1KfBKyHmrdl9Ylh18cPqA,257
-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=ovEtVFknwhz89wS1nQjeQ1xwk3acmmtCEgZFKw_KuqI,3848
@@ -144,10 +142,10 @@ transcribe/templates/transcribe/xsl/tei-html.xsl,sha256=oOVnAZhDVDVzrQR5UEbNV-97
 transcribe/views/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 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,,
+transcribe/views/web.py,sha256=WoVs-iwYc2hesuBxCmwfo-wza15C1fiMRY6S0TAdxQs,15213
+django_transcribe-0.7.1.dist-info/AUTHORS,sha256=rNmFConshTlNpyhcu4CKZSeQQMwuyVYXbeqXgRko-Yc,640
+django_transcribe-0.7.1.dist-info/LICENSE,sha256=I9xp13yeayqZikrv7rQrzsDWviTwy1R0phFlKtM1meg,1472
+django_transcribe-0.7.1.dist-info/METADATA,sha256=kJaWnePuAJ0UvPfFaqmjN0-jjv5RVVW36tcjWHTd2WM,1021
+django_transcribe-0.7.1.dist-info/WHEEL,sha256=cVxcB9AmuTcXqmwrtPhNK88dr7IR_b6qagTj0UvIEbY,91
+django_transcribe-0.7.1.dist-info/top_level.txt,sha256=NljSay7zO6czcjqjVmivw6VW58aXlYHVZQvnwmpy08g,11
+django_transcribe-0.7.1.dist-info/RECORD,,

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

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

transcribe/__init__.py

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

transcribe/forms.py

@@ -9,6 +9,24 @@ from .models import Project, Task, task_file_name
 log = logging.getLogger(__name__)
 
 
+class MultipleFileInput(forms.ClearableFileInput):
+    allow_multiple_selected = True
+
+
+class MultipleFileField(forms.FileField):
+    def __init__(self, *args, **kwargs):
+        kwargs.setdefault('widget', MultipleFileInput())
+        super().__init__(*args, **kwargs)
+
+    def clean(self, data, initial=None):
+        single_file_clean = super().clean
+        if isinstance(data, (list, tuple)):
+            result = [single_file_clean(d, initial) for d in data]
+        else:
+            result = single_file_clean(data, initial)
+        return result
+
+
 class NoColon(forms.ModelForm):
     def __init__(self, *args, **kwargs):
         kwargs.setdefault('label_suffix', '')
@@ -19,9 +37,8 @@ class NoColon(forms.ModelForm):
 
 
 class ProjectForm(NoColon):
-    upload_media_files = forms.FileField(
+    upload_media_files = MultipleFileField(
         required=False,
-        widget=forms.FileInput(attrs={'multiple': 'multiple'}),
         label='Upload media files',
     )
 

transcribe/migrations/0001_initial_squashed_0021_point_fks_to_transcribe_user.py

@@ -0,0 +1,555 @@
+# Generated by Django 3.2.20 on 2024-08-29 03:24
+
+import django.db.migrations.operations.special
+import django.db.models.deletion
+import django.utils.timezone
+import model_utils.fields
+from django.conf import settings
+from django.contrib.auth.management import create_permissions
+from django.db import migrations, models
+
+import transcribe.models
+
+INITIAL_TAG_DATA = [
+    {
+        'id': 1,
+        'name': 'Heading',
+        'description': 'a heading or chapter title',
+        'open_tag': '<head>',
+        'close_tag': '</head>',
+    },  # noqa
+    {
+        'id': 2,
+        'name': 'Quote',
+        'description': 'quoted text',
+        'open_tag': '<q>',
+        'close_tag': '</q>',
+    },  # noqa
+    {
+        'id': 3,
+        'name': 'Person',
+        'description': 'the name of a person (e.g. John Doe)',
+        'open_tag': '<name type="person">',
+        'close_tag': '</name>',
+    },  # noqa
+    {
+        'id': 4,
+        'name': 'Place',
+        'description': 'the name of a place (e.g. New York City)',
+        'open_tag': '<name type="place">',
+        'close_tag': '</name>',
+    },  # noqa
+    {
+        'id': 5,
+        'name': 'Date',
+        'description': 'Mark a text string as a date. (Include a normalize...',
+        'open_tag': '<date when="YYYY-MM-DD">',
+        'close_tag': '</date>',
+    },  # noqa
+    {
+        'id': 6,
+        'name': 'Add',
+        'description': 'an addition or insertion',
+        'open_tag': '<add>',
+        'close_tag': '</add>',
+    },  # noqa
+    {
+        'id': 7,
+        'name': 'Del',
+        'description': 'as strikeout or deletion',
+        'open_tag': '<del rend="overstrike">',
+        'close_tag': '</del>',
+    },  # noqa
+    {
+        'id': 8,
+        'name': 'Note',
+        'description': 'a note in the margin, or elsewhere',
+        'open_tag': '<note place="margin">',
+        'close_tag': '</note>',
+    },  # noqa
+    {
+        'id': 9,
+        'name': 'Unclear',
+        'description': 'mark something as unclear/illegible',
+        'open_tag': '<unclear reason="illegible">',
+        'close_tag': '</unclear>',
+    },  # noqa
+    {
+        'id': 10,
+        'name': 'Page #',
+        'description': 'mark a new page break along with the printed page ...',
+        'open_tag': '<pb n="',
+        'close_tag': '"/>',
+    },  # noqa
+    {
+        'id': 11,
+        'name': 'Underline',
+        'description': 'underlined text',
+        'open_tag': '<hi rend="underline">',
+        'close_tag': '</hi>',
+    },  # noqa
+    {
+        'id': 12,
+        'name': 'Bold',
+        'description': 'bold text',
+        'open_tag': '<hi rend="bold">',
+        'close_tag': '</hi>',
+    },  # noqa
+    {
+        'id': 13,
+        'name': 'Italic',
+        'description': 'italicized text',
+        'open_tag': '<hi rend="italic">',
+        'close_tag': '</hi>',
+    },  # noqa
+    {
+        'id': 14,
+        'name': 'Superscript',
+        'description': 'superscript text',
+        'open_tag': '<hi rend="sup">',
+        'close_tag': '</hi>',
+    },  # noqa
+    {
+        'id': 15,
+        'name': 'Subscript',
+        'description': 'subscript text',
+        'open_tag': '<hi rend="sub">',
+        'close_tag': '</hi>',
+    },  # noqa
+]
+
+
+def initial_tag_data(apps, schema_editor):
+    Tag = apps.get_model('transcribe', 'Tag')
+    Tag.objects.all().delete()
+    for data in INITIAL_TAG_DATA:
+        Tag.objects.get_or_create(**data)
+
+
+def add_reviewer_group(apps, schema_editor):
+    Group = apps.get_model('auth', 'Group')
+    Group.objects.get_or_create(name='Reviewer')
+
+
+def add_admin_group(apps, schema_editor):
+    Group = apps.get_model('auth', 'Group')
+    Permission = apps.get_model('auth', 'Permission')
+    admin_group, _ = Group.objects.get_or_create(name='Admin')
+
+    # Make sure permissions have been created
+    for app_config in apps.get_app_configs():
+        app_config.models_module = True
+        create_permissions(app_config, verbosity=0)
+        app_config.models_module = None
+
+    permission_codenames = [
+        'add_project',
+        'change_project',
+        'delete_project',
+        'add_task',
+        'change_task',
+        'delete_task',
+        'add_usertask',
+        'change_usertask',
+        'delete_usertask',
+        'add_tag',
+        'change_tag',
+        'delete_tag',
+        'add_transcribeuser',
+        'change_transcribeuser',
+    ]
+
+    permissions = []
+    for codename in permission_codenames:
+        try:
+            permission = Permission.objects.get(codename=codename)
+            permissions.append(permission)
+        except Permission.DoesNotExist:
+            # Optionally log the missing permission
+            print(f"Warning: Permission with codename '{codename}' not found.")
+
+    admin_group.permissions.set(permissions)
+
+
+def create_transcribe_users(apps, schema_editor):
+    User = apps.get_model(settings.AUTH_USER_MODEL)
+    TranscribeUser = apps.get_model('transcribe', 'TranscribeUser')
+
+    for user in User.objects.all():
+        TranscribeUser.objects.get_or_create(user=user)
+
+
+class Migration(migrations.Migration):
+
+    replaces = [
+        ('transcribe', '0001_initial'),
+        ('transcribe', '0002_initial_data'),
+        ('transcribe', '0003_transcribeuser'),
+        ('transcribe', '0004_auto_20150716_1639'),
+        ('transcribe', '0005_auto_20150717_0829'),
+        ('transcribe', '0006_project_archived'),
+        ('transcribe', '0007_reviewer_group_addition'),
+        ('transcribe', '0008_auto_20150925_1522'),
+        ('transcribe', '0009_auto_20150929_1314'),
+        ('transcribe', '0010_userprojectpreferences'),
+        ('transcribe', '0011_project_finding_aid_url'),
+        ('transcribe', '0012_auto_20160107_1410'),
+        ('transcribe', '0013_userpreferences'),
+        ('transcribe', '0014_auto_20160203_1544'),
+        ('transcribe', '0015_auto_20160309_1342'),
+        ('transcribe', '0016_auto_20160817_1343'),
+        ('transcribe', '0017_auto_20191115_1123'),
+        ('transcribe', '0018_point_fks_to_user'),
+        ('transcribe', '0019_create_transcribeuser'),
+        ('transcribe', '0020_populate_transcribe_users'),
+        ('transcribe', '0021_point_fks_to_transcribe_user'),
+    ]
+
+    dependencies = [
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+        ('auth', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='Project',
+            fields=[
+                (
+                    'id',
+                    models.AutoField(
+                        auto_created=True,
+                        primary_key=True,
+                        serialize=False,
+                        verbose_name='ID',
+                    ),
+                ),
+                (
+                    'created',
+                    model_utils.fields.AutoCreatedField(
+                        default=django.utils.timezone.now,
+                        editable=False,
+                        verbose_name='created',
+                    ),
+                ),
+                (
+                    'modified',
+                    model_utils.fields.AutoLastModifiedField(
+                        default=django.utils.timezone.now,
+                        editable=False,
+                        verbose_name='modified',
+                    ),
+                ),
+                ('title', models.CharField(db_index=True, max_length=255)),
+                ('description', models.TextField()),
+                ('guidelines', models.TextField(blank=True)),
+                ('priority', models.IntegerField(default=0)),
+                ('transcribers_per_task', models.IntegerField(default=2)),
+                (
+                    'media_type',
+                    models.CharField(
+                        choices=[
+                            ('audio', 'audio'),
+                            ('text', 'text'),
+                            ('video', 'video'),
+                        ],
+                        default='text',
+                        max_length=6,
+                    ),
+                ),
+                ('archived', models.BooleanField(default=False)),
+                (
+                    'finding_aid_url',
+                    models.CharField(blank=True, max_length=2083),
+                ),
+                (
+                    'allow_global_transcriptions',
+                    models.BooleanField(default=False),
+                ),
+            ],
+            options={
+                'ordering': ['-priority', 'title'],
+            },
+        ),
+        migrations.CreateModel(
+            name='Tag',
+            fields=[
+                (
+                    'id',
+                    models.AutoField(
+                        auto_created=True,
+                        primary_key=True,
+                        serialize=False,
+                        verbose_name='ID',
+                    ),
+                ),
+                ('name', models.CharField(blank=True, max_length=255)),
+                ('description', models.CharField(blank=True, max_length=255)),
+                ('open_tag', models.TextField()),
+                ('close_tag', models.TextField()),
+            ],
+        ),
+        migrations.CreateModel(
+            name='Task',
+            fields=[
+                (
+                    'id',
+                    models.AutoField(
+                        auto_created=True,
+                        primary_key=True,
+                        serialize=False,
+                        verbose_name='ID',
+                    ),
+                ),
+                (
+                    'created',
+                    model_utils.fields.AutoCreatedField(
+                        default=django.utils.timezone.now,
+                        editable=False,
+                        verbose_name='created',
+                    ),
+                ),
+                (
+                    'modified',
+                    model_utils.fields.AutoLastModifiedField(
+                        default=django.utils.timezone.now,
+                        editable=False,
+                        verbose_name='modified',
+                    ),
+                ),
+                (
+                    'file',
+                    models.FileField(
+                        upload_to=transcribe.models.task_file_name
+                    ),
+                ),
+                ('transcription', models.TextField(blank=True)),
+                (
+                    'finished_transcription',
+                    models.BooleanField(
+                        blank=True, db_index=True, default=False
+                    ),
+                ),
+                (
+                    'finished_review',
+                    models.BooleanField(
+                        blank=True, db_index=True, default=False
+                    ),
+                ),
+                (
+                    'project',
+                    models.ForeignKey(
+                        on_delete=django.db.models.deletion.CASCADE,
+                        related_name='tasks',
+                        to='transcribe.project',
+                    ),
+                ),
+            ],
+            options={
+                'abstract': False,
+            },
+        ),
+        migrations.CreateModel(
+            name='TranscribeUser',
+            fields=[
+                (
+                    'id',
+                    models.AutoField(
+                        auto_created=True,
+                        primary_key=True,
+                        serialize=False,
+                        verbose_name='ID',
+                    ),
+                ),
+                (
+                    'user',
+                    models.OneToOneField(
+                        on_delete=django.db.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'],
+            },
+        ),
+        migrations.CreateModel(
+            name='UserTask',
+            fields=[
+                (
+                    'id',
+                    models.AutoField(
+                        auto_created=True,
+                        primary_key=True,
+                        serialize=False,
+                        verbose_name='ID',
+                    ),
+                ),
+                (
+                    'created',
+                    model_utils.fields.AutoCreatedField(
+                        default=django.utils.timezone.now,
+                        editable=False,
+                        verbose_name='created',
+                    ),
+                ),
+                (
+                    'modified',
+                    model_utils.fields.AutoLastModifiedField(
+                        default=django.utils.timezone.now,
+                        editable=False,
+                        verbose_name='modified',
+                    ),
+                ),
+                (
+                    'task_type',
+                    models.CharField(
+                        choices=[
+                            ('transcription', 'transcription'),
+                            ('review', 'review'),
+                        ],
+                        db_index=True,
+                        default='transcription',
+                        max_length=13,
+                    ),
+                ),
+                ('transcription', models.TextField(blank=True, default='')),
+                (
+                    'status',
+                    models.CharField(
+                        choices=[
+                            ('in progress', 'in progress'),
+                            ('skipped', 'skipped'),
+                            ('finished', 'finished'),
+                        ],
+                        db_index=True,
+                        default='in progress',
+                        max_length=11,
+                    ),
+                ),
+                (
+                    'task',
+                    models.ForeignKey(
+                        on_delete=django.db.models.deletion.CASCADE,
+                        related_name='usertasks',
+                        to='transcribe.task',
+                    ),
+                ),
+                (
+                    'user',
+                    models.ForeignKey(
+                        on_delete=django.db.models.deletion.CASCADE,
+                        related_name='tasks',
+                        to='transcribe.transcribeuser',
+                    ),
+                ),
+            ],
+            options={
+                'ordering': ['-modified', 'user'],
+            },
+        ),
+        migrations.CreateModel(
+            name='UserProjectPreferences',
+            fields=[
+                (
+                    'id',
+                    models.AutoField(
+                        auto_created=True,
+                        primary_key=True,
+                        serialize=False,
+                        verbose_name='ID',
+                    ),
+                ),
+                (
+                    'transcription_width',
+                    models.IntegerField(blank=True, null=True),
+                ),
+                (
+                    'transcription_height',
+                    models.IntegerField(blank=True, null=True),
+                ),
+                (
+                    'transcription_stacked',
+                    models.BooleanField(blank=True, default=True),
+                ),
+                (
+                    'project',
+                    models.ForeignKey(
+                        on_delete=django.db.models.deletion.CASCADE,
+                        related_name='userprojects',
+                        to='transcribe.project',
+                    ),
+                ),
+                (
+                    'user',
+                    models.ForeignKey(
+                        on_delete=django.db.models.deletion.CASCADE,
+                        related_name='projects',
+                        to='transcribe.transcribeuser',
+                    ),
+                ),
+            ],
+        ),
+        migrations.CreateModel(
+            name='UserPreferences',
+            fields=[
+                (
+                    'id',
+                    models.AutoField(
+                        auto_created=True,
+                        primary_key=True,
+                        serialize=False,
+                        verbose_name='ID',
+                    ),
+                ),
+                (
+                    'uses_serif_transcription_font',
+                    models.BooleanField(default=True),
+                ),
+                (
+                    'user',
+                    models.OneToOneField(
+                        on_delete=django.db.models.deletion.CASCADE,
+                        related_name='preferences',
+                        to='transcribe.transcribeuser',
+                    ),
+                ),
+            ],
+        ),
+        migrations.AddField(
+            model_name='project',
+            name='reviewers',
+            field=models.ManyToManyField(
+                blank=True,
+                related_name='review_projects',
+                to='transcribe.TranscribeUser',
+            ),
+        ),
+        migrations.AddField(
+            model_name='project',
+            name='transcribers',
+            field=models.ManyToManyField(
+                blank=True,
+                related_name='transcription_projects',
+                to='transcribe.TranscribeUser',
+            ),
+        ),
+        migrations.RunPython(
+            code=initial_tag_data,
+            reverse_code=django.db.migrations.operations.special.RunPython.noop,
+        ),
+        migrations.RunPython(
+            code=add_reviewer_group,
+            reverse_code=django.db.migrations.operations.special.RunPython.noop,
+        ),
+        migrations.RunPython(
+            code=add_admin_group,
+            reverse_code=django.db.migrations.operations.special.RunPython.noop,
+        ),
+        migrations.RunPython(
+            code=create_transcribe_users,
+            reverse_code=django.db.migrations.operations.special.RunPython.noop,
+        ),
+    ]

transcribe/migrations/0002_initial_data.py

@@ -124,5 +124,7 @@ class Migration(migrations.Migration):
     dependencies = [('transcribe', '0001_initial')]
 
     operations = [
-        migrations.RunPython(initial_tag_data, reverse_code=lambda a, b: None)
+        migrations.RunPython(
+            initial_tag_data, reverse_code=migrations.RunPython.noop
+        ),
     ]

transcribe/migrations/0007_reviewer_group_addition.py

@@ -2,8 +2,8 @@
 from __future__ import unicode_literals
 
 from django.db import migrations
-from transcribe.management.commands.fix_permissions import Command
 
+from transcribe.management.commands.fix_permissions import Command
 
 """
 Note:
@@ -81,6 +81,6 @@ class Migration(migrations.Migration):
 
     operations = [
         migrations.RunPython(add_reviewer_group, remove_reviewer_group),
-        migrations.RunPython(fix_permissions, lambda x, y: None),
+        migrations.RunPython(fix_permissions, migrations.RunPython.noop),
         migrations.RunPython(add_admin_group, remove_admin_group),
     ]

transcribe/models.py

@@ -1,17 +1,19 @@
 """Models for transcribe."""
 import logging
 import re
-from datetime import datetime, timedelta
+from datetime import timedelta
 from os import path
 
 from django.contrib.auth import get_user_model
 from django.db import models
 from django.db.models import Count, Q
 from django.urls import reverse
+from django.utils import timezone
 from django.utils.functional import cached_property
 from django.utils.html import format_html, strip_tags
 from model_utils import Choices
 from model_utils.models import TimeStampedModel
+
 from transcribe import settings
 from transcribe.diff_match_patch import diff_match_patch
 from transcribe.utils import html_diffs, remove_markup
@@ -408,8 +410,7 @@ class Project(TimeStampedModel):
 
     @cached_property
     def percent_done(self):
-        """Returns an integer indicating the percent complete for the project.
-        """
+        """Returns an integer indicating the percent complete for the project."""
         counts = Task.objects.filter(project_id=self.pk).aggregate(
             total_tasks=Count('id'),
             finished_review_tasks=Count('id', filter=Q(finished_review=1)),
@@ -487,9 +488,7 @@ class Project(TimeStampedModel):
         # exclude tasks that:
         # - have enough user tasks in progress AND
         # - those user tasks are not too old (expired)
-        expired_dt = (
-            datetime.today() - timedelta(days=settings.TASK_EXPIRE_DAYS)
-        ).strftime('%Y-%m-%d %H:%M:%S')
+        expired_dt = timezone.now() - timedelta(days=settings.TASK_EXPIRE_DAYS)
         task_ids_to_exclude.update(
             self.tasks.defer('transcription')
             .filter(
@@ -557,9 +556,7 @@ class Project(TimeStampedModel):
         ).values_list('id', flat=True)
 
         # in progress tasks that are recent
-        expired_dt = (
-            datetime.today() - timedelta(days=settings.TASK_EXPIRE_DAYS)
-        ).strftime('%Y-%m-%d %H:%M:%S')
+        expired_dt = timezone.now() - timedelta(days=settings.TASK_EXPIRE_DAYS)
         task_ids_already_being_reviewed = self.tasks.filter(
             usertasks__status='in progress',
             usertasks__task_type='review',
@@ -698,9 +695,10 @@ class Project(TimeStampedModel):
 
     def generate_html(self):
         """Generates and returns an HTML representation of the project."""
-        from lxml import etree
         import tempfile
 
+        from lxml import etree
+
         xml = self.generate_xml()
         html = ''
         temp = tempfile.NamedTemporaryFile(mode='w+t', delete=False)

transcribe/templates/admin/base_site.html

@@ -1,13 +1,4 @@
-{% extends "admin/base.html" %}
-{% load admin_static %}
-
-{% block title %}{{ title }} | {{ site_title|default:_('Django site admin') }}{% endblock %}
-
-{% block branding %}
-<h1 id="site-name"><a href="{% url 'admin:index' %}">{{ site_header|default:_('Django administration') }}</a></h1>
-{% endblock %}
-
-{% block nav-global %}{% endblock %}
+{% extends "admin/base_site.html" %}
 
 {% block userlinks %}
 	<a href="{% url 'reports:list' %}">Reports</a>

transcribe/views/web.py

@@ -10,6 +10,7 @@ from django.views.generic import View
 from django.views.generic.detail import DetailView
 from django.views.generic.edit import UpdateView
 from django.views.generic.list import ListView
+
 from transcribe import models, settings
 from transcribe.views import mixins
 
@@ -19,7 +20,7 @@ log = logging.getLogger(__name__)
 def get_project_with_tasks(project, user):
     """Return project with transcription and review tasks attached."""
     if not isinstance(user, models.TranscribeUser):
-        user = models.TranscribeUser.objects.get(pk=user.pk)
+        user = models.TranscribeUser.objects.get(user=user)
     project.pending_trans_task = project.pending_transcription_task(user)
     project.avail_trans_task = False
     if not project.pending_trans_task: