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

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