Merge pull request #211 from hltcoe/dashboard-upgrade

inclusion of abandoned and bookmark tables to consolidate PR

Author: vrose99

turkle/admin.py

@@ -1199,7 +1199,7 @@ def has_delete_permission(self, request, obj=None):
 
 
 class TaskAssignmentAdmin(admin.ModelAdmin):
-    """View for assignments to expire abandoned ones"""
+    """View for assignments to expire open ones"""
 
     class Media:
         css = {
@@ -1225,17 +1225,17 @@ def changelist_view(self, request, extra_context=None):
         return super().changelist_view(request, extra_context)
 
     @staticmethod
-    def expire_abandoned_assignments(request):
-        (total_deleted, _) = TaskAssignment.expire_all_abandoned()
-        messages.info(request, 'All {} abandoned Tasks have been expired'.format(total_deleted))
+    def expire_open_assignments(request):
+        (total_deleted, _) = TaskAssignment.expire_all_open()
+        messages.info(request, 'All {} open Tasks have been expired'.format(total_deleted))
         return redirect(reverse('admin:turkle_taskassignment_changelist'))
 
     def get_urls(self):
         urls = super().get_urls()
         my_urls = [
-            path('expire_abandoned_assignments/',
-                 self.admin_site.admin_view(self.expire_abandoned_assignments),
-                 name='turkle_expire_abandoned_assignments'),
+            path('expire_open_assignments/',
+                 self.admin_site.admin_view(self.expire_open_assignments),
+                 name='turkle_expire_open_assignments'),
         ]
         return my_urls + urls
 

turkle/management/commands/expire_assignments.py

@@ -11,9 +11,9 @@ class Command(BaseCommand):
 
     def handle(self, *args, **options):
         t0 = datetime.now()
-        (total_deleted, _) = TaskAssignment.expire_all_abandoned()
+        (total_deleted, _) = TaskAssignment.expire_all_open()
         t = datetime.now()
         dt = (t - t0).total_seconds()
         logging.basicConfig(format="%(asctime)-15s %(message)s", level=logging.INFO)
-        logging.info('TURKLE: Expired {0} abandoned Task Assignments in {1:.3f} seconds'.
+        logging.info('TURKLE: Expired {0} open Task Assignments in {1:.3f} seconds'.
                      format(total_deleted, dt))

turkle/migrations/0014_bookmark.py

@@ -1,4 +1,4 @@
-# Generated by Django 4.2.6 on 2023-11-14 13:41
+# Generated by Django 4.2.6 on 2024-03-21 14:02
 
 from django.conf import settings
 from django.db import migrations, models
@@ -26,6 +26,7 @@ class Migration(migrations.Migration):
                     ),
                 ),
                 ("bookmarked", models.BooleanField(default=False)),
+                ("updated_at", models.DateTimeField(auto_now=True)),
                 (
                     "batch",
                     models.ForeignKey(

turkle/models.py

@@ -165,7 +165,7 @@ class Meta:
     updated_at = models.DateTimeField(auto_now=True, db_index=True)
 
     @classmethod
-    def expire_all_abandoned(cls):
+    def expire_all_open(cls):
         result = cls.objects.\
             filter(completed=False).\
             filter(expires_at__lt=timezone.now()).\
@@ -944,3 +944,4 @@ class Bookmark(models.Model):
     user = models.ForeignKey(User, on_delete=models.CASCADE)
     batch = models.ForeignKey(Batch, on_delete=models.CASCADE)
     bookmarked = models.BooleanField(default=False)
+    updated_at = models.DateTimeField(auto_now=True)

turkle/static/turkle/bootstrap-4.1.3/css/bootstrap.css.map

@@ -62,3 +62,38 @@ div.task-preview {
   background: #fff;
   opacity: 0.8;
 }
+.table-alert{
+  margin-bottom: 0;
+  height: 100%;
+}
+.column-div {
+  float: left;
+  width: 50%;  
+  min-width:500pt;
+  border-radius: 5px;
+  padding: 5pt;
+  position: relative;
+  overflow: hidden;
+  height: 100%;
+}
+.table-header, .table-body {
+  width: 100%;
+  table-layout: fixed;
+  border-collapse: collapse; 
+}
+
+.table-body-container { 
+  min-height: 80pt;
+  height: 12vh;
+  overflow-y: auto;
+}
+.column-div th, td {
+  text-align: left;
+  padding: 8px;
+}
+.top-tables{
+  height: 25vh;
+  min-height: 175pt;
+  display: block;
+  
+}

turkle/static/turkle/bootstrap-4.1.3/css/bootstrap.min.css.map

@@ -15,8 +15,8 @@
   </table>
 </div>
 <p class="mt-2">
-  <a href="{% url 'admin:turkle_expire_abandoned_assignments' %}" class="button">
-    Expire Abandoned Assignments
+  <a href="{% url 'admin:turkle_expire_open_assignments' %}" class="button">
+    Expire Open Assignments
   </a>
 </p>
 {% endblock %}

turkle/static/turkle/css/turkle.css

@@ -8,9 +8,11 @@
     {% load turkle_tags %}{% for tag in turkle_meta_tags %}{{ tag|meta_tag }}{% endfor %}
     <link rel="icon" type="image/png" sizes="32x32" href="{% static 'favicon-32x32.png' %}">
     <link rel="icon" type="image/png" sizes="16x16" href="{% static 'favicon-16x16.png' %}">
-    <link href="{% static "turkle/css/turkle.css" %}" rel="stylesheet" type="text/css"/>
-    <link href="{% static "turkle/bootstrap-4.1.3/css/bootstrap.min.css" %}" rel="stylesheet" type="text/css"/>
+    <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.5.2/css/bootstrap.min.css">
+    <link rel="stylesheet" href="https://cdn.datatables.net/1.13.7/css/jquery.dataTables.css" />
+    <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap-icons/font/bootstrap-icons.css">
     <link href="{% static "turkle/bootstrap4-glyphicons/css/bootstrap-glyphicons.min.css" %}" rel="stylesheet" type="text/css"/>
+    <link href="{% static "turkle/css/turkle.css" %}" rel="stylesheet" type="text/css"/>
     {% block head %}
     {% endblock %}
   </head>

turkle/templates/admin/turkle/taskassignment/change_list.html

@@ -11,7 +11,7 @@ <h5>Accept next Task</h5>
       <hr>
       <p>
         The task is assigned to you.
-        If you do not finish it, you will be reminded on the main page that you have abandoned the task.
+        If you do not finish it, you will be reminded on the main page that you have open the task.
         If you do not complete it by the deadline, it is returned to the task list.
       </p>
     </div>