diff --git a/atlas/tables.py b/atlas/tables.py index 23572f94..886fed87 100755 --- a/atlas/tables.py +++ b/atlas/tables.py @@ -25,11 +25,20 @@ from easy_thumbnails.exceptions import InvalidImageFormatError class CaseTable(tables.Table): + def get_view_cell(record): + if record.open_access: + return format_html(f""" + + + View""") + else: + return f'View' + edit = tables.LinkColumn( "atlas:case_update", text="Edit", args=[A("pk")], orderable=False ) view = tables.LinkColumn( - "atlas:case_detail", text="View", args=[A("pk")], orderable=False + "atlas:case_detail", text=get_view_cell, args=[A("pk")], orderable=False ) clone = tables.LinkColumn( "atlas:case_clone", text="Clone", args=[A("pk")], orderable=False diff --git a/generic/templates/generic/cid_group_base.html b/generic/templates/generic/cid_group_base.html index 58307b9b..c8e72038 100644 --- a/generic/templates/generic/cid_group_base.html +++ b/generic/templates/generic/cid_group_base.html @@ -9,13 +9,13 @@ {% if not group %} Group / - Edit Users / + Edit Group / Edit Exams / Delete {% else %} Group / - Edit Users / + Edit Group / Edit Exams / Delete {% endif %} @@ -26,9 +26,16 @@
Group: {{group.name}}-> Group / - Edit Users / + Edit Group / Edit Exams / Delete + {% elif userusergroup %} +
+ Group: {{group.name}}-> + Group / + Edit Group / + Edit Exams / + Delete {% endif %} {% endif %} diff --git a/generic/templates/generic/userusergroup_form.html b/generic/templates/generic/userusergroup_form.html index 9bb88dcd..532f339f 100755 --- a/generic/templates/generic/userusergroup_form.html +++ b/generic/templates/generic/userusergroup_form.html @@ -1,4 +1,4 @@ -{% extends "generic/base.html" %} +{% extends "generic/cid_group_base.html" %} {% load crispy_forms_tags %} diff --git a/templates/exam_list.html b/templates/exam_list.html index b82c6860..4eff2a17 100644 --- a/templates/exam_list.html +++ b/templates/exam_list.html @@ -8,10 +8,12 @@ {% for exam in exams %} {% if exam.active %}
  • - {{exam.name}} + {{exam.name}} {% if marking %}Mark{% endif %} - Candidates - Scores + + Candidates [{{exam.valid_cid_users.count}} / {{exam.valid_user_users.count}}] + + Scores @@ -30,10 +32,10 @@ {% for exam in exams %} {% if not exam.active %}
  • - {{exam.name}} + {{exam.name}} {% if marking %}Mark{% endif %} - Candidates - Scores + Candidates + Scores @@ -57,52 +59,61 @@ {% include 'exam_overview_js.html' %} + .exam-publish-results-switch, .exam-active-switch, .exam-archived-switch { + display: none; + } + + .exam-list li:hover { + border: 1px dashed gray; + margin: -1px; + } + {% endblock %}