Add buddy information to extra shifts display

Tubo · Mar 15, 2024 · 3accc89 · 3accc89
1 parent 6cde872
commit 3accc89
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 7 deletions.
diff --git a/radscheduler/core/views/extra_duties.py b/radscheduler/core/views/extra_duties.py
@@ -77,11 +77,15 @@ def interest(request, interest_id):
 @staff_member_required
 def edit_page(request):
     subquery = ShiftInterest.objects.filter(registrar=request.user.registrar, shift=OuterRef("pk"))
+    buddy_shifts = Shift.objects.filter(date=OuterRef("date"), type=OuterRef("type"), extra_duty=False).values(
+        "registrar__user__username"
+    )
     extra_shifts = (
         Shift.objects.filter(extra_duty=True, date__gte=date.today() - timedelta(days=30))
         .annotate(
             interest_id=Subquery(subquery.values("pk")),
             comment=Subquery(subquery.values("comment")),
+            buddy=Subquery(buddy_shifts[:1]),
         )
         .order_by("-date")
         .select_related("registrar__user")

diff --git a/radscheduler/templates/extra_duties/edit_page.html b/radscheduler/templates/extra_duties/edit_page.html
@@ -23,7 +23,10 @@
                             {{ shift.date|date:"Y-m-d D" }}
                             {% if shift.date in holidays %}🎉{% endif %}
                         </th>
-                        <td>{{ shift.get_type_display }}</td>
+                        <td>
+                            {{ shift.get_type_display }}
+                            {% if shift.buddy %}- {{ shift.buddy }}{% endif %}
+                        </td>
                         <td>
                             {% for interest in shift.interests.all %}
                                 {{ interest.registrar }}

diff --git a/radscheduler/templates/extra_duties/page.html b/radscheduler/templates/extra_duties/page.html
@@ -10,10 +10,10 @@
         <table class="table text-center">
             <thead>
                 <tr>
-                    <th scope="col" class="w-25">Date</th>
-                    <th scope="col" class="w-25">Type</th>
+                    <th scope="col" class="w-25 text-start">Date</th>
+                    <th scope="col" class="w-25 text-start">Type</th>
                     <th scope="col" class="w-25">People interested</th>
-                    <th scope="col" class="w-25"></th>
+                    <th scope="col" class="w-25">Winner</th>
                 </tr>
             </thead>
             <tbody>

diff --git a/radscheduler/templates/extra_duties/row.html b/radscheduler/templates/extra_duties/row.html
@@ -2,11 +2,14 @@
     hx-swap="outerHTML"
     hx-headers='{"X-CSRFToken": "{{ csrf_token }}"}'
     class="h-50">
-    <th scope="row">
-        {{ shift.date|date:"Y-m-d D" }}
+    <th scope="row" class="font-monospace text-start">
+        {{ shift.date|date:"Y-m-d" }}
         {% if shift.date in holidays %}🎉{% endif %}
     </th>
-    <td>{{ shift.get_type_display }}</td>
+    <td class="text-start">
+        <span class="">{{ shift.get_type_display }}</span>
+        <span class="text-secondary">({{ shift.date|date:"D" }})</span>
+    </td>
     <td>{{ shift.interests.count }}</td>
     <td>
         {% if shift.registrar %}