fix extra duty comment page

Tubo · Jun 24, 2024 · ac3bf28 · ac3bf28
1 parent 46d2b60
commit ac3bf28
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/radscheduler/core/views/extra_duties.py b/radscheduler/core/views/extra_duties.py
@@ -76,7 +76,7 @@ def interest(request, interest_id):
 
 @staff_member_required
 def edit_page(request):
-    subquery = ShiftInterest.objects.filter(registrar=request.user.registrar, shift=OuterRef("pk"))
+    subquery = ShiftInterest.objects.filter(registrar=OuterRef("registrar"), shift=OuterRef("pk"))
     buddy_shifts = Shift.objects.filter(date=OuterRef("date"), type=OuterRef("type"), extra_duty=False).values(
         "registrar__user__username"
     )

diff --git a/radscheduler/templates/extra_duties/edit_page.html b/radscheduler/templates/extra_duties/edit_page.html
@@ -10,10 +10,11 @@
         <table class="table">
             <thead>
                 <tr>
-                    <th scope="col" class="w-25">Date</th>
+                    <th scope="col" class="">Date</th>
                     <th scope="col">Type</th>
                     <th scope="col">Applicants</th>
                     <th scope="col">Winner</th>
+                    <th scope="col" class="w-25">Comment</th>
                 </tr>
             </thead>
             <tbody>
@@ -35,7 +36,7 @@
                         </td>
                         <td>
                             {% if shift.registrar %}
-                                {{ shift.registrar }}: {{ shift.comment }}
+                                <span class="fw-bold">{{ shift.registrar }}</span>
                             {% else %}
                                 <div x-data="{shift_id: {{ shift.id }} }" class="input-group">
                                     <select class="form-select"
@@ -60,6 +61,9 @@
                                 </div>
                             {% endif %}
                         </td>
+                        <td>
+                            {% if shift.comment %}<p>{{ shift.comment }}</p>{% endif %}
+                        </td>
                     </tr>
                 {% endfor %}
             </tbody>