django-transcribe 0.7.0__py3-none-any.whl → 0.8.0__py3-none-any.whl

{django_transcribe-0.7.0.dist-info → django_transcribe-0.8.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: django-transcribe
-Version: 0.7.0
+Version: 0.8.0
 Summary: crowd source transcription
 Home-page: https://gitlab.com/byuhbll/lib/python/django-transcribe
 Author: BYU Library Software Engineering

{django_transcribe-0.7.0.dist-info → django_transcribe-0.8.0.dist-info}/RECORD

@@ -1,12 +1,12 @@
-transcribe/__init__.py,sha256=bEBoHMQqYV-w9gc5bwGNT0UXJvGeZxeijjOPyN1p-QI,78
-transcribe/admin.py,sha256=HwrJafMjSoIKgb_En0zNvZ3nk5rCZWtJ5n0DdGU9nfI,6512
+transcribe/__init__.py,sha256=ImF9MiNHXiXNij30OnrUoNFX56QIW5ho0CDmr3s5FVo,78
+transcribe/admin.py,sha256=qPLL0XNzK0abIRBVRtjQq8SaEK2gzb_yyshafbxk9B4,6766
 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=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
@@ -142,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.7.0.dist-info/AUTHORS,sha256=rNmFConshTlNpyhcu4CKZSeQQMwuyVYXbeqXgRko-Yc,640
-django_transcribe-0.7.0.dist-info/LICENSE,sha256=I9xp13yeayqZikrv7rQrzsDWviTwy1R0phFlKtM1meg,1472
-django_transcribe-0.7.0.dist-info/METADATA,sha256=85LOoJ3YJ-ewMWcOcv8M3qR5cWI2pzw22kJf8EdHio0,1021
-django_transcribe-0.7.0.dist-info/WHEEL,sha256=uCRv0ZEik_232NlR4YDw4Pv3Ajt5bKvMH13NUU7hFuI,91
-django_transcribe-0.7.0.dist-info/top_level.txt,sha256=NljSay7zO6czcjqjVmivw6VW58aXlYHVZQvnwmpy08g,11
-django_transcribe-0.7.0.dist-info/RECORD,,
+transcribe/views/web.py,sha256=WoVs-iwYc2hesuBxCmwfo-wza15C1fiMRY6S0TAdxQs,15213
+django_transcribe-0.8.0.dist-info/AUTHORS,sha256=rNmFConshTlNpyhcu4CKZSeQQMwuyVYXbeqXgRko-Yc,640
+django_transcribe-0.8.0.dist-info/LICENSE,sha256=I9xp13yeayqZikrv7rQrzsDWviTwy1R0phFlKtM1meg,1472
+django_transcribe-0.8.0.dist-info/METADATA,sha256=aOVYGiqY0N9n0R5JfnLRelfe91r8odmqIVHdiM5Dc80,1021
+django_transcribe-0.8.0.dist-info/WHEEL,sha256=cVxcB9AmuTcXqmwrtPhNK88dr7IR_b6qagTj0UvIEbY,91
+django_transcribe-0.8.0.dist-info/top_level.txt,sha256=NljSay7zO6czcjqjVmivw6VW58aXlYHVZQvnwmpy08g,11
+django_transcribe-0.8.0.dist-info/RECORD,,

{django_transcribe-0.7.0.dist-info → django_transcribe-0.8.0.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.7.0'
+__version__ = '0.8.0'

transcribe/admin.py

@@ -3,7 +3,7 @@ import logging
 
 from django.contrib import admin
 from django.db.models import Count
-from django.shortcuts import resolve_url
+from django.shortcuts import resolve_url, reverse
 from django.utils.html import format_html
 
 from . import filters, forms, models
@@ -14,11 +14,11 @@ log = logging.getLogger(__name__)
 @admin.register(models.UserTask)
 class UserTaskAdmin(admin.ModelAdmin):
     list_display = (
-        'task',
+        'user_admin_display_name',
+        'task_link',
         'status',
         'task_type',
         'project_link',
-        'user_admin_display_name',
         'modified',
     )
     search_fields = (
@@ -45,6 +45,15 @@ class UserTaskAdmin(admin.ModelAdmin):
         filters.TaskFilterForUserTask,
     ]
 
+    def task_link(self, obj):
+        return format_html(
+            '<a href="{}">{}</a>',
+            reverse('admin:transcribe_usertask_change', args=[obj.pk]),
+            obj.task,
+        )
+
+    task_link.short_description = 'Task'
+
     def file_link(self, obj):
         if obj.task.file:
             return format_html(

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/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: