upgrade rcr migration

rcr/views.py

@@ -5,9 +5,13 @@ from django.shortcuts import redirect, render
 from django.urls import reverse_lazy
 from django.views.generic.edit import UpdateView 
 from django.views.generic.detail import DetailView
+from django.shortcuts import get_object_or_404
+from django.conf import settings
+from django.contrib.auth.models import User
+
 
 from rcr.models import Item
-from rcr.forms import ItemForm
+from rcr.forms import AssessorAssignmentForm, ItemForm
 
 # Create your views here.
 
@@ -24,16 +28,47 @@ def radiology_index(request):
         },
     )
 
-def radiology_index_completed(request):
+def radiology_assessor_assignment(request, assessor_pk: int):
+    assessor_assignment_form = AssessorAssignmentForm()
 
-    items = Item.objects.filter(completed=True)
+    return render(
+        request,
+        "rcr/assessor_assignment_form.html",
+        {
+            "assessor_assignment_form": assessor_assignment_form,
+        },
+    )
+
+def radiology_assessors(request):
+    assessors = User.objects.filter(groups__name="rcr_radiology_assessor")
+
+    return render(
+        request,
+        "rcr/assessors.html",
+        {
+            "assessors": assessors
+        },
+    )
+
+def radiology_index_completed_by_user(request, user_pk: int):
+    return radiology_index_completed(request, user_pk = user_pk)
+
+def radiology_index_completed(request, user_pk=None):
+
+    assessor = None
+    if user_pk is not None:
+        items = Item.objects.filter(completed=True, assessed_by=user_pk)
+        assessor = User.objects.get(pk=user_pk)
+    else:
+        items = Item.objects.filter(completed=True)
 
     return render(
         request,
         "rcr/index.html",
         {
             "items": items,
-            "completed": True
+            "completed": True,
+            "assessor": assessor
         },
     )
 
@@ -43,7 +78,7 @@ class ItemUpdateBase(UpdateView):
         self.object = form.save(commit=False)
         self.object.save()
 
-        form.instance.author.add(self.request.user.id)
+        form.instance.assessed_by.add(self.request.user.id)
         return super().form_valid(form)
 
 class ItemUpdateView(ItemUpdateBase):