diff --git a/anatomy/templates/anatomy/question_detail.html b/anatomy/templates/anatomy/question_detail.html index e326aaa0..fb259e27 100644 --- a/anatomy/templates/anatomy/question_detail.html +++ b/anatomy/templates/anatomy/question_detail.html @@ -1,5 +1,5 @@ {% extends 'anatomy/base.html' %} - + {% block content %} {% load static %} {% include 'anatomy/question_link_header.html' %} diff --git a/atlas/tables.py b/atlas/tables.py index 333c64ed..874810be 100755 --- a/atlas/tables.py +++ b/atlas/tables.py @@ -434,6 +434,9 @@ class CaseCollectionTable(SelectionTable): view = tables.LinkColumn( "atlas:collection_detail", text="View", args=[A("pk")], orderable=False ) + + created = tables.DateTimeColumn(verbose_name="Created", accessor="created", orderable=True) + updated = tables.DateTimeColumn(verbose_name="Updated", accessor="updated", orderable=True) #clone = tables.LinkColumn( # "atlas:case_clone", text="Clone", args=[A("pk")], orderable=False #) @@ -449,6 +452,8 @@ class CaseCollectionTable(SelectionTable): template_name = "django_tables2/bootstrap4.html" fields = ( "name", + "created", + "updated", "collection_type", "publish_results", "active", @@ -466,6 +471,25 @@ class CaseCollectionTable(SelectionTable): **kwargs, ) + def render_created(self, value): + if not value: + return "" + # compact date for display, full datetime in tooltip + return format_html( + '{}', + value.strftime("%Y-%m-%d %H:%M"), + value.strftime("%Y-%m-%d"), + ) + + def render_updated(self, value): + if not value: + return "" + return format_html( + '{}', + value.strftime("%Y-%m-%d %H:%M"), + value.strftime("%Y-%m-%d"), + ) + class QuestionSchemaTable(SelectionTable): name = tables.Column( linkify=("atlas:question_schema_detail", {"pk": tables.A("pk")}), diff --git a/atlas/templates/atlas/case_display_block.html b/atlas/templates/atlas/case_display_block.html index e86559cc..b153d898 100755 --- a/atlas/templates/atlas/case_display_block.html +++ b/atlas/templates/atlas/case_display_block.html @@ -1,4 +1,4 @@ - + {% partialdef case-series %} {% for series in case.get_ordered_series %} @@ -204,9 +204,9 @@
Resources
{% if can_edit%} -
- {% include 'atlas/partials/resource_search_panel.html' %} -
+
+ {% include 'atlas/partials/resource_search_panel.html' %} +
{% endif %}
diff --git a/atlas/templates/atlas/collection_detail.html b/atlas/templates/atlas/collection_detail.html index 05a8d7ef..4587e883 100644 --- a/atlas/templates/atlas/collection_detail.html +++ b/atlas/templates/atlas/collection_detail.html @@ -1,156 +1,156 @@ {% extends 'atlas/exams.html' %} - + {% partialdef casedetails-management-links %} - + {% endpartialdef %} {% block content %} -
-
-
-
-
-

{{ collection.name }}

+
+
+
+
+
+

{{ collection.name }}

- {% include 'exam_notes.html' %} + {% include 'exam_notes.html' %} -

- {{ collection.exam_mode }} - (open access: {{ collection.exam_open_access }}) -

+

+ {{ collection.exam_mode }} + (open access: {{ collection.exam_open_access }}) +

-

- {% include "generic/partials/exams/exam_status.html#publish-results" %} - {% include "generic/partials/exams/exam_status.html#exam-active" %} -

+

+ {% include "generic/partials/exams/exam_status.html#publish-results" %} + {% include "generic/partials/exams/exam_status.html#exam-active" %} +

-

- {{ collection.get_collection_type_display }} - Self review: {{ collection.self_review }} - {% if collection.open_access %} - Open - {% else %} - Restricted - {% endif %} -

+

+ {{ collection.get_collection_type_display }} + Self review: {{ collection.self_review }} + {% if collection.open_access %} + Open + {% else %} + Restricted + {% endif %} +

- {% if collection.prerequisites.exists %} -
- Prerequisites -
    - {% for prereq in collection.prerequisites.all %} -
  • {{ prereq.name }}
  • - {% endfor %} -
-
- {% endif %} -
- -
-
- {% if collection.collection_type == "VIV" %} - Start Viva - {% else %} -
- Open - + {% if collection.prerequisites.exists %} +
+ Prerequisites +
    + {% for prereq in collection.prerequisites.all %} +
  • {{ prereq.name }}
  • + {% endfor %} +
{% endif %}
- {% if collection.prerequisites.exists %} -
- +
+
+ {% if collection.collection_type == "VIV" %} + Start Viva + {% else %} +
+ Open + +
+ {% endif %}
- {% endif %} + + {% if collection.prerequisites.exists %} +
+ +
+ {% endif %} +
-
-
-
-

Cases

- -
    - {% for casedetail in casesdetails %} - {% include 'atlas/partials/case_list_item.html' %} - {% endfor %} -
-
-
- - {% if can_edit %} -
-
- - - - -
-
-
- -
+
-
- Answer management +

Cases

-
-

Manage answers for this collection.

- Please note these are permanent and cannot be undone. -
- -
- - - -
- -
-
+
    + {% for casedetail in casesdetails %} + {% include 'atlas/partials/case_list_item.html' %} + {% endfor %} +
- {% endif %} - {% include 'exam_overview_js.html' %} -
+ {% if can_edit %} +
+
+ + + + +
+
+
+ +
+
+
+ Answer management + +
+

Manage answers for this collection.

+ Please note these are permanent and cannot be undone. +
+ +
+ + + +
+ +
+
+
+
+ {% endif %} + + {% include 'exam_overview_js.html' %} +
{% endblock %} diff --git a/atlas/templates/atlas/linked_cases_overview.html b/atlas/templates/atlas/linked_cases_overview.html index 20946c99..a3f08ee9 100644 --- a/atlas/templates/atlas/linked_cases_overview.html +++ b/atlas/templates/atlas/linked_cases_overview.html @@ -1,7 +1,7 @@ {% extends "base.html" %} - + {% block content %}

Linked Cases Overview

diff --git a/generic/templates/generic/partials/exam_list_fragment.html b/generic/templates/generic/partials/exam_list_fragment.html index bf369ed1..719cc2c1 100644 --- a/generic/templates/generic/partials/exam_list_fragment.html +++ b/generic/templates/generic/partials/exam_list_fragment.html @@ -1,4 +1,4 @@ - + {% comment %} Minimal fragment rendering the exam-list partialdef for HTMX swaps. {% endcomment %} {% with exams=exams app_name=app_name marking=marking collection=collection %} {% include "exam_list.html#exam-list" %} diff --git a/generic/templates/generic/partials/exams/exam_status.html b/generic/templates/generic/partials/exams/exam_status.html index d620f449..3c0fc635 100644 --- a/generic/templates/generic/partials/exams/exam_status.html +++ b/generic/templates/generic/partials/exams/exam_status.html @@ -1,4 +1,4 @@ - + {% partialdef publish-results %}
Results
diff --git a/sbas/templates/sbas/question_detail.html b/sbas/templates/sbas/question_detail.html index c83df094..b13873a0 100644 --- a/sbas/templates/sbas/question_detail.html +++ b/sbas/templates/sbas/question_detail.html @@ -1,5 +1,5 @@ {% extends 'sbas/base.html' %} - + {% partialdef links-partial %}
diff --git a/sbas/templates/sbas/question_form.html b/sbas/templates/sbas/question_form.html index e2885433..9e54cffb 100644 --- a/sbas/templates/sbas/question_form.html +++ b/sbas/templates/sbas/question_form.html @@ -1,7 +1,7 @@ {% extends 'sbas/base.html' %} {% load static %} - + {% load crispy_forms_tags %} {% block js %} diff --git a/sbas/templates/sbas/question_review_list.html b/sbas/templates/sbas/question_review_list.html index e7bb8aa9..81b4ebe0 100644 --- a/sbas/templates/sbas/question_review_list.html +++ b/sbas/templates/sbas/question_review_list.html @@ -1,5 +1,5 @@ {% extends 'sbas/base.html' %} - + {% block content %}

Filtered questions

diff --git a/sbas/templates/sbas/question_review_start.html b/sbas/templates/sbas/question_review_start.html index 78d8a720..70de0614 100644 --- a/sbas/templates/sbas/question_review_start.html +++ b/sbas/templates/sbas/question_review_start.html @@ -1,5 +1,5 @@ {% extends 'sbas/base.html' %} - + {% block content %}

Review Questions

diff --git a/templates/cimar_embed.html b/templates/cimar_embed.html index b3fd487a..0f1e7538 100644 --- a/templates/cimar_embed.html +++ b/templates/cimar_embed.html @@ -1,39 +1,38 @@ {% extends 'base.html' %} - + {% partialdef viewer %}
- +
- - + + {% endpartialdef %} {% partialdef embed %} -Close + Close + + {% partial viewer %} -{% partial viewer %} - {% endpartialdef %} {% block content %} -{% partial viewer %} - + {% partial viewer %} + {% endblock content %} - + {% block css %} - + {% endblock css %} - \ No newline at end of file diff --git a/templates/cimar_login.html b/templates/cimar_login.html index 5ef64178..7fd58639 100644 --- a/templates/cimar_login.html +++ b/templates/cimar_login.html @@ -1,16 +1,16 @@ {% extends 'base.html' %} - + {% partialdef login-block %} - Logging in here allows your account to be linked with CIMAR. You may periodically need to re-login to keep the link active. -
- Username:
-Password:
- -
+ Logging in here allows your account to be linked with CIMAR. You may periodically need to re-login to keep the link active. +
+ Username:
+ Password:
+ +
-
+
{% endpartialdef %} @@ -18,20 +18,20 @@ hx-target="#results">Login {% block content %}
- -

CIMAR login

-Login status: {{ login_status }} ({{cimar_sid}}) -{% if login_status %} - -{% endif %} -
+

CIMAR login

+ Login status: {{ login_status }} ({{cimar_sid}}) -{% partial login-block %} + {% if login_status %} + + {% endif %} +
+ + {% partial login-block %}
{% endblock %} \ No newline at end of file diff --git a/templates/exam_list.html b/templates/exam_list.html index e6eec882..db5fbe42 100644 --- a/templates/exam_list.html +++ b/templates/exam_list.html @@ -1,6 +1,6 @@ {% extends app_name|add:'/base.html' %} - + {% partialdef exam-list %}
    {% for exam in exams %}