Bookmarking added and dashboard update

.github/workflows/docs.yml

@@ -9,4 +9,5 @@ jobs:
     - uses: actions/checkout@v2
     - uses: ammaraskar/sphinx-action@master
       with:
+        pre-build-command: "pip install 'sphinx==7.1.2' --force-reinstall"
         docs-folder: "docs/"

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

@@ -0,0 +1,45 @@
+# Generated by Django 4.2.6 on 2024-03-21 14:02
+
+from django.conf import settings
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+        ("turkle", "0013_activeproject_activeuser"),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name="Bookmark",
+            fields=[
+                (
+                    "id",
+                    models.AutoField(
+                        auto_created=True,
+                        primary_key=True,
+                        serialize=False,
+                        verbose_name="ID",
+                    ),
+                ),
+                ("bookmarked", models.BooleanField(default=False)),
+                ("updated_at", models.DateTimeField(auto_now=True)),
+                (
+                    "batch",
+                    models.ForeignKey(
+                        on_delete=django.db.models.deletion.CASCADE, to="turkle.batch"
+                    ),
+                ),
+                (
+                    "user",
+                    models.ForeignKey(
+                        on_delete=django.db.models.deletion.CASCADE,
+                        to=settings.AUTH_USER_MODEL,
+                    ),
+                ),
+            ],
+        ),
+    ]

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()).\
@@ -938,3 +938,10 @@ def completed_assignments(self):
     def most_recent(self):
         return self.last_finished_time
     most_recent.admin_order_field = 'last_finished_time'
+
+
+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)