gap

rcr/views.py

@@ -13,8 +13,9 @@ from django.contrib.auth.decorators import user_passes_test
 from django.db.models import Q
 from rcr.filters import ItemFilter
 
-from rcr.models import Item
+from rcr.models import Item, Outcome, RadiologyCategory
 from rcr.forms import AssessorAssignmentForm, ItemForm
+from atlas.models import Condition
 from django.core.exceptions import PermissionDenied
 
 # Create your views here.
@@ -72,10 +73,32 @@ def radiology_index_all(request):
 def radiology_review(request):
     return redirect(f"{reverse('rcr:radiology_index_all_view')}?needs_review=true")
 
-def radiology_results(request):
-    items = Item.objects.all().prefetch_related("assessed_by")
+def radiology_gap(request):
+    #items = Item.objects.all().prefetch_related("assessed_by")
 
-    return render(request, "rcr/results.html", {"items": items})
+    item_filter = ItemFilter(request.GET, queryset=Item.objects.all().prefetch_related("assessed_by"))
+    items = item_filter.qs.prefetch_related("assessed_by")
+
+    categories = RadiologyCategory.objects.all().order_by("name").prefetch_related("items_radiology", "items_radiology__level", "items_radiology__radiology_condition")
+
+    conditions = Condition.objects.all().order_by("name")
+
+    outcomes = Outcome.objects.all().order_by("name")
+
+    return render(request, "rcr/gap.html", {"items": items, 
+                                            "item_filter": item_filter,
+                                            "categories": categories,
+                                            "conditions": conditions,
+                                            "outcomes": outcomes,
+                                            })
+
+def radiology_results(request):
+    #items = Item.objects.all().prefetch_related("assessed_by")
+
+    item_filter = ItemFilter(request.GET, queryset=Item.objects.all().prefetch_related("assessed_by", "level", "radiology_condition", "radiology_categories", "oncology_category"))
+    items = item_filter.qs.prefetch_related("assessed_by")
+
+    return render(request, "rcr/results.html", {"items": items, "item_filter": item_filter})
 
 @user_is_rcr
 def radiology_index(request, assigned=True, user_pk: int | None = None):