major rcr update
This commit is contained in:
Ross
+97
-21
@@ -10,6 +10,8 @@ from django.conf import settings
|
||||
from django.contrib.auth.models import User
|
||||
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.forms import AssessorAssignmentForm, ItemForm
|
||||
@@ -20,7 +22,7 @@ from django.core.exceptions import PermissionDenied
|
||||
def user_is_rcr(function):
|
||||
def wrap(request, *args, **kwargs):
|
||||
if (
|
||||
request.user.groups.filter(name="rcr_radiology_assessor").exists()
|
||||
request.user.groups.filter(Q(name="rcr_radiology_assessor") | Q(name="rcr_oncology_assessor")).exists()
|
||||
or request.user.is_superuser
|
||||
):
|
||||
return function(request, *args, **kwargs)
|
||||
@@ -31,12 +33,16 @@ def user_is_rcr(function):
|
||||
wrap.__name__ = function.__name__
|
||||
return wrap
|
||||
|
||||
def user_is_radiology(user):
|
||||
return user.groups.filter(name="rcr_radiology_assessor").exists()
|
||||
def user_is_oncology(user):
|
||||
return user.groups.filter(name="rcr_oncology_assessor").exists()
|
||||
|
||||
class RCRRequiredMixin(object):
|
||||
def get_object(self, *args, **kwargs):
|
||||
obj = super().get_object(*args, **kwargs)
|
||||
if (
|
||||
self.request.user.groups.filter(name="rcr_radiology_assessor").exists()
|
||||
self.request.user.groups.filter(Q(name="rcr_radiology_assessor") | Q(name="rcr_oncology_assessor")).exists()
|
||||
or self.request.user.is_superuser
|
||||
):
|
||||
return obj
|
||||
@@ -45,66 +51,121 @@ class RCRRequiredMixin(object):
|
||||
|
||||
return obj
|
||||
|
||||
@user_is_rcr
|
||||
def radiology_index_all(request):
|
||||
|
||||
item_filter = ItemFilter(request.GET, queryset=Item.objects.all())
|
||||
|
||||
return render(
|
||||
request,
|
||||
"rcr/index.html",
|
||||
{
|
||||
"items": item_filter.qs,
|
||||
"completed": False,
|
||||
"assessor": None,
|
||||
"item_filter": item_filter,
|
||||
|
||||
},
|
||||
)
|
||||
|
||||
@user_is_rcr
|
||||
def radiology_index(request, assigned=True, user_pk: int | None = None):
|
||||
|
||||
if assigned:
|
||||
items = Item.objects.filter(assigned_to=request.user).exclude(completed=True)
|
||||
elif user_pk is not None:
|
||||
items = Item.objects.filter(assigned_to__pk=user_pk).exclude(completed=True)
|
||||
assessor = None
|
||||
if user_pk is not None:
|
||||
assessor = User.objects.get(pk=user_pk)
|
||||
elif assigned:
|
||||
assessor = request.user
|
||||
|
||||
if assessor is None:
|
||||
items = Item.objects.all().exclude(completed_radiology=True).exclude(completed_oncology=True)
|
||||
elif assessor.groups.filter(name="rcr_radiology_assessor").exists():
|
||||
items = Item.objects.filter(assigned_to_radiology=assessor).exclude(completed_radiology=True)
|
||||
elif assessor.groups.filter(name="rcr_oncology_assessor").exists():
|
||||
items = Item.objects.filter(assigned_to_oncology=assessor).exclude(completed_oncology=True)
|
||||
else:
|
||||
items = Item.objects.all().exclude(completed=True)
|
||||
raise Http404
|
||||
|
||||
return render(
|
||||
request,
|
||||
"rcr/index.html",
|
||||
{
|
||||
"items": items,
|
||||
"completed": False
|
||||
"completed": False,
|
||||
"assessor": assessor
|
||||
|
||||
},
|
||||
)
|
||||
|
||||
@user_passes_test(lambda u: u.is_superuser)
|
||||
def radiology_assessor_assignment(request, assessor_pk: int):
|
||||
#def radiology_assessor_assignment_rad(request, assessor_pk: int):
|
||||
# return radiology_assessor_assignment(request, assessor_pk, "rad")
|
||||
#def radiology_assessor_assignment_onc(request, assessor_pk: int):
|
||||
# return radiology_assessor_assignment(request, assessor_pk, "onc")
|
||||
#def radiology_assessor_assignment_cross(request, assessor_pk: int):
|
||||
# return radiology_assessor_assignment(request, assessor_pk, "cross")
|
||||
|
||||
@user_is_rcr
|
||||
def radiology_assessor_assignment(request, assessor_pk: int, specialty=None):
|
||||
|
||||
item_filter = ItemFilter(request.GET, queryset=Item.objects.all())
|
||||
|
||||
user = get_object_or_404(User, pk=assessor_pk)
|
||||
if request.method == "POST":
|
||||
assessor_assignment_form = AssessorAssignmentForm(request.POST)
|
||||
assessor_assignment_form.fields["items"].queryset = item_filter.qs
|
||||
|
||||
print(assessor_assignment_form)
|
||||
|
||||
if assessor_assignment_form.is_valid():
|
||||
items_to_update = assessor_assignment_form.cleaned_data["items"]
|
||||
for item in items_to_update:
|
||||
item.assigned_to = user
|
||||
|
||||
Item.objects.filter(pk__in=items_to_update).bulk_update(items_to_update, ["assigned_to"])
|
||||
|
||||
for item in items_to_update:
|
||||
if user_is_radiology(user):
|
||||
item.assigned_to_radiology = user
|
||||
elif user_is_oncology(user):
|
||||
item.assigned_to_oncology = user
|
||||
else:
|
||||
raise Http404
|
||||
|
||||
if user_is_radiology(user):
|
||||
Item.objects.filter(pk__in=items_to_update).bulk_update(items_to_update, ["assigned_to_radiology"])
|
||||
elif user_is_oncology(user):
|
||||
Item.objects.filter(pk__in=items_to_update).bulk_update(items_to_update, ["assigned_to_oncology"])
|
||||
else:
|
||||
raise Http404
|
||||
|
||||
return HttpResponseRedirect(reverse("rcr:radiology_assessors_view"))
|
||||
else:
|
||||
assessor_assignment_form = AssessorAssignmentForm()
|
||||
assessor_assignment_form.fields["items"].queryset = item_filter.qs
|
||||
|
||||
return render(
|
||||
request,
|
||||
"rcr/assessor_assignment_form.html",
|
||||
{
|
||||
"assessor_assignment_form": assessor_assignment_form,
|
||||
"user_to_assign": user
|
||||
"user_to_assign": user,
|
||||
"item_filter": item_filter
|
||||
},
|
||||
)
|
||||
|
||||
@user_is_rcr
|
||||
def radiology_assigned_user(request, user_pk=int):
|
||||
return radiology_index(request, user_pk=user_pk)
|
||||
pass
|
||||
|
||||
@user_is_rcr
|
||||
def radiology_assessors(request):
|
||||
assessors = User.objects.filter(groups__name="rcr_radiology_assessor")
|
||||
rad_assessors = User.objects.filter(groups__name="rcr_radiology_assessor")
|
||||
onc_assessors = User.objects.filter(groups__name="rcr_oncology_assessor")
|
||||
|
||||
|
||||
return render(
|
||||
request,
|
||||
"rcr/assessors.html",
|
||||
{
|
||||
"assessors": assessors
|
||||
"rad_assessors": rad_assessors,
|
||||
"onc_assessors": onc_assessors,
|
||||
},
|
||||
)
|
||||
|
||||
@@ -117,10 +178,13 @@ 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).order_by("pk")
|
||||
assessor = User.objects.get(pk=user_pk)
|
||||
if assessor.groups.filter(name="rcr_radiology_assessor").exists():
|
||||
items = Item.objects.filter(completed_radiology=True, assessed_by=user_pk).order_by("pk")
|
||||
elif assessor.groups.filter(name="rcr_oncology_assessor").exists():
|
||||
items = Item.objects.filter(completed_oncology=True, assessed_by=user_pk).order_by("pk")
|
||||
else:
|
||||
items = Item.objects.filter(completed=True)
|
||||
items = Item.objects.filter(Q(completed_radiology=True) | Q(completed_oncology=True))
|
||||
|
||||
return render(
|
||||
request,
|
||||
@@ -175,11 +239,23 @@ class ItemUpdateNextView(ItemUpdateBase, RCRRequiredMixin):
|
||||
return self.render_to_response(context)
|
||||
|
||||
def get_object(self):
|
||||
user = self.request.user
|
||||
if self.skip < 1:
|
||||
obj = Item.objects.filter(completed=False).order_by("pk").first()
|
||||
if user.groups.filter(name="rcr_radiology_assessor").exists():
|
||||
obj = Item.objects.filter(assigned_to_radiology=user, completed_radiology=False).order_by("pk").first()
|
||||
elif user.groups.filter(name="rcr_oncology_assessor").exists():
|
||||
obj = Item.objects.filter(assigned_to_oncology=user, completed_oncology=False).order_by("pk").first()
|
||||
else:
|
||||
raise Http404
|
||||
else:
|
||||
try:
|
||||
obj = Item.objects.filter(completed=False)[self.skip]
|
||||
if user.groups.filter(name="rcr_radiology_assessor").exists():
|
||||
obj = Item.objects.filter(assigned_to_radiology=user, completed_radiology=False).order_by("pk")[self.skip]
|
||||
elif user.groups.filter(name="rcr_oncology_assessor").exists():
|
||||
obj = Item.objects.filter(assigned_to_oncology=user, completed_oncology=False).order_by("pk")[self.skip]
|
||||
else:
|
||||
raise Http404
|
||||
#obj = Item.objects.filter(completed=False)[self.skip]
|
||||
except IndexError:
|
||||
raise Http404
|
||||
|
||||
|
||||
Reference in New Issue
Block a user