From 2427998bd93fbe6f6c8211443c2471bc7ab97a17 Mon Sep 17 00:00:00 2001
From: Ross <xkjq@ymail.com>
Date: Tue, 23 Jan 2024 10:53:20 +0000
Subject: [PATCH] add admin edit link

---
 generic/tables.py            | 12 +++++++++++-
 rcr/forms.py                 |  2 ++
 rcr/templates/rcr/index.html |  4 ++--
 rcr/views.py                 |  5 ++++-
 4 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/generic/tables.py b/generic/tables.py
index c1e05e09..b80d0312 100644
--- a/generic/tables.py
+++ b/generic/tables.py
@@ -206,9 +206,15 @@ class UserUserTable(tables.Table):
     edit = tables.Column(
         empty_values=(),
         linkify={"viewname": "account_update", "args": [A("username")]},
-        orderable=True,
+        orderable=False,
         verbose_name="Edit",
     )
+    admin_edit = tables.Column(
+        empty_values=(),
+        linkify={"viewname": "admin:auth_user_change", "args": [A("pk")]},
+        orderable=False,
+        verbose_name="Admin",
+    )
 
     user_groups = tables.ManyToManyColumn(verbose_name="Groups", linkify_item=True)
 
@@ -233,6 +239,7 @@ class UserUserTable(tables.Table):
             "user_groups",
             "date_joined",
             "edit",
+            "admin_edit",
         )
 
     def __init__(self, data=None, *args, **kwargs):
@@ -251,6 +258,9 @@ class UserUserTable(tables.Table):
     def render_edit(self, value, record):
         return "Edit"
 
+    def render_admin_edit(self, value, record):
+        return "Admin"
+
     def render_user(self, value, record):
         span_class = ""
         if record.userprofile.peninsula_trainee:
diff --git a/rcr/forms.py b/rcr/forms.py
index 414cafdc..d8710a2c 100644
--- a/rcr/forms.py
+++ b/rcr/forms.py
@@ -23,6 +23,8 @@ class ItemForm(ModelForm):
     radiology_category = ModelMultipleChoiceField(queryset=RadiologyCategory.objects.all())
     oncology_category = ModelMultipleChoiceField(queryset=OncologyCategory.objects.all())
 
+    
+
 
     class Meta:
         model = Item
diff --git a/rcr/templates/rcr/index.html b/rcr/templates/rcr/index.html
index e98f4133..ebbc671a 100644
--- a/rcr/templates/rcr/index.html
+++ b/rcr/templates/rcr/index.html
@@ -18,7 +18,7 @@
     {% endif %}
 
 
-    {% if items %}
+    {% if items and assessor %}
 
         <a href="{% url 'rcr:radiology_update_next_view' %}">Click to assess next item</a>
 
@@ -28,7 +28,7 @@
     <table>
         {% for item in items %}
             <tr class="{{item.content_type}} {% if item.completed_radiology %} completed-radiology{% endif %}{% if item.completed_radiology %} completed-oncology{% endif %}">
-                <td class="{{item.specialty}}">
+                <td class="{{item.specialty}}" title="{{item.specialty}}">
                     {{forloop.counter}}:
                 </td>
                 <td> {{item.content_type}}</td>
diff --git a/rcr/views.py b/rcr/views.py
index c7079b26..c7851234 100644
--- a/rcr/views.py
+++ b/rcr/views.py
@@ -22,7 +22,7 @@ from django.core.exceptions import PermissionDenied
 def user_is_rcr(function):
     def wrap(request, *args, **kwargs):
         if (
-            request.user.groups.filter(Q(name="rcr_radiology_assessor") | Q(name="rcr_oncology_assessor")).exists()
+            request.user.groups.filter(Q(name="rcr_radiology_assessor") | Q(name="rcr_oncology_assessor")| Q(name="rcr_assessor")).exists()
             or request.user.is_superuser
         ):
             return function(request, *args, **kwargs)
@@ -83,6 +83,9 @@ def radiology_index(request, assigned=True, user_pk: int | None = None):
         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)
+    elif assessor.groups.filter(name="rcr_assessor").exists():
+        items = Item.objects.all()
+        assessor = None
     else:
         raise Http404