diff --git a/rad/urls.py b/rad/urls.py index 34e1d981..f790ece9 100644 --- a/rad/urls.py +++ b/rad/urls.py @@ -102,7 +102,8 @@ urlpatterns = [ path("accounts/", include("django.contrib.auth.urls")), path("accounts/profile", views.profile, name="profile"), path("accounts/profile//", views.account_profile, name="account_profile"), - path("", TemplateView.as_view(template_name="index.html"), name="home"), + #path("", TemplateView.as_view(template_name="index.html"), name="home"), + path("", views.index, name="home"), path("cid/results//", views.cid_results, name="cid_results"), path("cid//", views.cid_scores, name="cid_scores"), path("cid//", views.cid_scores_admin, name="cid_scores_admin"), diff --git a/rad/views.py b/rad/views.py index 371f1159..7b6d29ae 100644 --- a/rad/views.py +++ b/rad/views.py @@ -75,6 +75,7 @@ import json from django.template import RequestContext +from django.db.models import Q def feedback_checker(user): return user.groups.filter(name="feedback_checker").exists() @@ -88,6 +89,10 @@ def profile(request): user = request.user return render(request, "profile.html", {"user": user}) +def index(request): + + rcr_assessor = request.user.groups.filter(Q(name="rcr_radiology_assessor") | Q(name="rcr_oncology_assessor")| Q(name="rcr_assessor")).exists() + return render(request, "index.html", {"rcr_assessor": rcr_assessor}) @user_is_cid_user_manager def account_profile(request, slug): diff --git a/rcr/templates/rcr/base.html b/rcr/templates/rcr/base.html index 589f8fa0..f67aeacb 100644 --- a/rcr/templates/rcr/base.html +++ b/rcr/templates/rcr/base.html @@ -85,6 +85,9 @@ Assessors + + Review + {% if request.user.is_staff %} Admin diff --git a/rcr/urls.py b/rcr/urls.py index 27891128..35f851aa 100644 --- a/rcr/urls.py +++ b/rcr/urls.py @@ -11,6 +11,7 @@ app_name = "rcr" urlpatterns = [ path("radiology/", views.radiology_index, name="radiology_index_view"), path("radiology/all", views.radiology_index_all, name="radiology_index_all_view"), + path("radiology/review", views.radiology_review, name="radiology_review_view"), path( "radiology/completed", views.radiology_index_completed, diff --git a/rcr/views.py b/rcr/views.py index c7851234..fc837519 100644 --- a/rcr/views.py +++ b/rcr/views.py @@ -68,6 +68,10 @@ def radiology_index_all(request): }, ) +@user_is_rcr +def radiology_review(request): + return redirect(f"{reverse('rcr:radiology_index_all_view')}?needs_review=true") + @user_is_rcr def radiology_index(request, assigned=True, user_pk: int | None = None): diff --git a/templates/index.html b/templates/index.html index cb45ee0d..0a9a82b7 100644 --- a/templates/index.html +++ b/templates/index.html @@ -42,6 +42,11 @@

RTS is available here

+ {% if rcr_assessor %} + + {% endif %} {% if not request.user.is_authenticated %}

CID users can log in here