django-transcribe 0.8.4__py3-none-any.whl → 0.8.6__py3-none-any.whl

{django_transcribe-0.8.4.dist-info → django_transcribe-0.8.6.dist-info}/METADATA

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

{django_transcribe-0.8.4.dist-info → django_transcribe-0.8.6.dist-info}/RECORD

@@ -1,4 +1,4 @@
-transcribe/__init__.py,sha256=CdnV5vNV8nJ4z-ZLMOPhcneN8dfD5OIAUkq7Xz6yaks,78
+transcribe/__init__.py,sha256=r34ohxWgkIOyeUWdJBIRYPDHXkuKpDlB3bvtkRmXdxA,78
 transcribe/admin.py,sha256=qPLL0XNzK0abIRBVRtjQq8SaEK2gzb_yyshafbxk9B4,6766
 transcribe/api.py,sha256=2m_y44ilQh87CWksHHqiE4A14javR8omlXEXm65lmC4,74
 transcribe/apps.py,sha256=XUdPQkCjpqWAKDCIaE6Mh8Q4xN5upKv95MG1u2_5pig,246
@@ -6,7 +6,7 @@ transcribe/diff_match_patch.py,sha256=HZC5DNab5OVwbB4Zc7G17l1OHbBlH2g9-xOtT1zkQ1
 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=zdEGgQGji-xLfsG0cShOmYLGNRezGg6V_nFTrVcBoKc,38636
+transcribe/models.py,sha256=1Dp0TKozlRH3z3Z22CuDgNqx6yPjGGe4sg10C7TUd3g,38613
 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=Uu58Kv_jCuqLx5CKiFAZYjgfoR4kDAPHAqdgPM5auC4,15348
-django_transcribe-0.8.4.dist-info/AUTHORS,sha256=rNmFConshTlNpyhcu4CKZSeQQMwuyVYXbeqXgRko-Yc,640
-django_transcribe-0.8.4.dist-info/LICENSE,sha256=I9xp13yeayqZikrv7rQrzsDWviTwy1R0phFlKtM1meg,1472
-django_transcribe-0.8.4.dist-info/METADATA,sha256=jUHxriHO7xRrTROiM5QZJzmwDiqKUFpYjo3wHweHYhc,1021
-django_transcribe-0.8.4.dist-info/WHEEL,sha256=iAkIy5fosb7FzIOwONchHf19Qu7_1wCWyFNR5gu9nU0,91
-django_transcribe-0.8.4.dist-info/top_level.txt,sha256=NljSay7zO6czcjqjVmivw6VW58aXlYHVZQvnwmpy08g,11
-django_transcribe-0.8.4.dist-info/RECORD,,
+transcribe/views/web.py,sha256=WsejNr0k2_fRTU9XKlwHsxhOB9vFUmoTJtbhkLzWuIc,15363
+django_transcribe-0.8.6.dist-info/AUTHORS,sha256=rNmFConshTlNpyhcu4CKZSeQQMwuyVYXbeqXgRko-Yc,640
+django_transcribe-0.8.6.dist-info/LICENSE,sha256=I9xp13yeayqZikrv7rQrzsDWviTwy1R0phFlKtM1meg,1472
+django_transcribe-0.8.6.dist-info/METADATA,sha256=IzTIlPp0o_ksAQ4syaP8zBhNSaAjjHJb08siEw1XqR8,1021
+django_transcribe-0.8.6.dist-info/WHEEL,sha256=iAkIy5fosb7FzIOwONchHf19Qu7_1wCWyFNR5gu9nU0,91
+django_transcribe-0.8.6.dist-info/top_level.txt,sha256=NljSay7zO6czcjqjVmivw6VW58aXlYHVZQvnwmpy08g,11
+django_transcribe-0.8.6.dist-info/RECORD,,

transcribe/__init__.py

@@ -1,2 +1,2 @@
 default_app_config = 'transcribe.apps.transcribeConfig'
-__version__ = '0.8.4'
+__version__ = '0.8.6'

transcribe/models.py

@@ -7,7 +7,7 @@ from xml.sax.saxutils import escape
 
 from django.contrib.auth import get_user_model
 from django.db import models
-from django.db.models import Count, Q
+from django.db.models import Count, Max, Q
 from django.urls import reverse
 from django.utils import timezone
 from django.utils.functional import cached_property
@@ -759,23 +759,19 @@ class Project(TimeStampedModel):
             )
             reviews_remaining = total_tasks - total_finished_reviews
         # stats for the given date range
-        finished_transcriptions = (
+        user_tasks_grouped_by_task_id = (
             UserTask.objects.filter(task__project=self.id)
             .filter(task__finished_transcription=1)
-            .filter(modified__range=[datetime_start, datetime_end])
-            .filter(task_type='transcription')
             .filter(status='finished')
+            .order_by()  # Reset the default ordering defined in UserTask.meta to avoid issues with .values()
             .values('task__id')
-            .distinct()
+            .annotate(max_modified=Max('modified'))
+        ).filter(max_modified__range=[datetime_start, datetime_end])
+        finished_transcriptions = (
+            user_tasks_grouped_by_task_id.filter(task_type='transcription')
         ).count()
         finished_reviews = (
-            UserTask.objects.filter(task__project=self.id)
-            .filter(task__finished_review=1)
-            .filter(modified__range=[datetime_start, datetime_end])
-            .filter(task_type='review')
-            .filter(status='finished')
-            .values('task__id')
-            .distinct()
+            user_tasks_grouped_by_task_id.filter(task_type='review')
         ).count()
 
         return {

transcribe/views/web.py

@@ -271,7 +271,7 @@ class ProjectDownloadView(mixins.AdminUsersOnlyMixin, View):
             content_type = 'application/xml'
         elif type == 'txt':
             result = project.generate_txt()
-            content_type = 'text/plain'
+            content_type = 'text/plain; charset=utf-8'
         elif type == 'html':
             result = project.generate_html()
             content_type = 'text/html'