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

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)
 
 

django_transcribe-0.5.17.dist-info/METADATA

@@ -1,24 +0,0 @@
-Metadata-Version: 2.1
-Name: django-transcribe
-Version: 0.5.17
-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
-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)
-
-Crowd source the transcription of texts, audio, and video.
-