a few updates to rcr mig

This commit is contained in:
Ross
2023-12-13 21:58:56 +00:00
parent 1936a66d7f
commit 3f013099fe
8 changed files with 84 additions and 5 deletions
+17 -4
View File
@@ -57,7 +57,7 @@ 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)
items = Item.objects.filter(completed=True, assessed_by=user_pk).order_by("pk")
assessor = User.objects.get(pk=user_pk)
else:
items = Item.objects.filter(completed=True)
@@ -95,20 +95,33 @@ class ItemUpdateNextView(ItemUpdateBase):
form_class = ItemForm
template_name = "rcr/item_update.html"
skip = 0
def get_context_data(self, **kwargs: Any) -> dict[str, Any]:
context = super().get_context_data(**kwargs)
context["skip"] = self.skip
return context
def get(self, request, *args, **kwargs):
try:
if "skip" in kwargs:
self.skip = kwargs["skip"]
self.object = self.get_object()
print("What", self.object)
except Http404:
print("YES")
# redirect here
return redirect("rcr:radiology_index_view")
context = self.get_context_data(object=self.object)
return self.render_to_response(context)
def get_object(self):
obj = Item.objects.filter(completed=False).first()
if self.skip < 1:
obj = Item.objects.filter(completed=False).order_by("pk").first()
else:
try:
obj = Item.objects.filter(completed=False)[self.skip]
except IndexError:
raise Http404
print("HELLO", obj)
print(obj)