Fix order of tasks and workplaces

organizations/migrations/0018_alter_ordering_by_priority.py

@@ -0,0 +1,46 @@
+# Generated by Django 4.0.3 on 2022-03-29 08:01
+
+from django.db import migrations
+import django.db.models.expressions
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ("organizations", "0017_make_memberships_unique"),
+ ]
+
+ operations = [
+ migrations.AlterModelOptions(
+ name="task",
+ options={
+ "ordering": (
+ "facility",
+ django.db.models.expressions.OrderBy(
+ django.db.models.expressions.F("priority"),
+ descending=True,
+ nulls_last=True,
+ ),
+ "name",
+ ),
+ "verbose_name": "task",
+ "verbose_name_plural": "tasks",
+ },
+ ),
+ migrations.AlterModelOptions(
+ name="workplace",
+ options={
+ "ordering": (
+ "facility",
+ django.db.models.expressions.OrderBy(
+ django.db.models.expressions.F("priority"),
+ descending=True,
+ nulls_last=True,
+ ),
+ "name",
+ ),
+ "verbose_name": "workplace",
+ "verbose_name_plural": "workplaces",
+ },
+ ),
+ ]

organizations/models.py

@@ -1,5 +1,6 @@
 # coding: utf-8
 from django.db import models
+from django.db.models import F
 from django.urls import reverse
 from django.utils.translation import gettext_lazy as _
 
@@ -326,7 +327,7 @@ class Meta:
  verbose_name_plural = _("workplaces")
  ordering = (
  "facility",
- "-priority",
+ F("priority").desc(nulls_last=True),
  "name",
  )
 
@@ -366,7 +367,7 @@ class Meta:
  verbose_name_plural = _("tasks")
  ordering = (
  "facility",
- "-priority",
+ F("priority").desc(nulls_last=True),
  "name",
  )
 

scheduler/views.py

@@ -8,7 +8,7 @@
 from django.contrib.admin.models import DELETION, LogEntry
 from django.contrib.contenttypes.models import ContentType
 from django.core.serializers.json import DjangoJSONEncoder
-from django.db.models import Count, Prefetch
+from django.db.models import Count, F, Prefetch
 from django.http import Http404
 from django.shortcuts import get_object_or_404
 from django.urls import reverse
@@ -195,8 +195,8 @@ def get_context_data(self, **kwargs):
  .annotate(volunteer_count=Count("helpers"))
  .order_by(
  "facility",
- "task__priority",
- "workplace__priority",
+ F("task__priority").desc(nulls_last=True),
+ F("workplace__priority").desc(nulls_last=True),
  "task__name",
  "workplace__name",
  "ending_time",