ross/penracourses
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Enhance AnatomyQuestion string representation; improve formatting and handle missing attributes for better readability

Browse Source
This commit is contained in:
Ross
2025-11-11 14:04:46 +00:00
parent c69eecc1ec
commit 87dde70fd3
2 changed files with 53 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files
anatomy/models.py
+10 -8
View File
@@ -132,14 +132,16 @@ class AnatomyQuestion(QuestionBase):
return "anatomy" return "anatomy"
def __str__(self): def __str__(self):
# Get first answer # Nicely formatted representation
return "{}/{}: {} [{}, {}]".format( pk = self.pk or ""
self.pk, qtype = str(self.question_type) if self.question_type else "N/A"
self.question_type, primary = self.get_primary_answer() or "None"
self.get_primary_answer(), modality = str(self.modality) if self.modality else "Unknown"
self.modality, structure = str(self.structure) if self.structure else "Unknown"
self.structure, title = self.get_title() if hasattr(self, "get_title") else (self.description or "")
) if title and len(title) > 60:
title = title[:57] + "..."
return f"{title} (Type: {qtype}) — Answer: {primary} — Modality: {modality}; Structure: {structure}"
def get_link(self): def get_link(self):
return format_html("<a href='{}'>{}</a>", self.get_absolute_url(), self) return format_html("<a href='{}'>{}</a>", self.get_absolute_url(), self)
anatomy/templates/anatomy/mark2_overview.html
+43 -43
View File
@@ -19,62 +19,62 @@
<div class="card"> <div class="card">
<div class="card-body p-2"> <div class="card-body p-2">
<ul class="list-group list-group-flush" id="question-mark-list"> <ul class="list-group list-group-flush" id="question-mark-list">
{% for question, unmarked_count, unmarked_count2 in question_unmarked_map %} {% for question, unmarked_count, unmarked_count2 in question_unmarked_map %}
<li class="list-group-item d-flex justify-content-between align-items-start" data-unmarked="{{ unmarked_count }}"> <li class="list-group-item d-flex justify-content-between align-items-start" data-unmarked="{{ unmarked_count }}">
<div class="me-3"> <div class="me-3">
<a href="{% url 'anatomy:mark2' exam_pk=exam.pk sk=forloop.counter0 %}" class="fw-semibold">Question {{ forloop.counter }}:</a> <a href="{% url 'anatomy:mark2' exam_pk=exam.pk sk=forloop.counter0 %}" class="fw-semibold">Question {{ forloop.counter }}:</a>
<div class="small text-truncate" style="max-width:60vw;">{{ question }}</div> <div class="small text-truncate" style="max-width:60vw;">{{ question }}</div>
</div> </div>
<div class="text-end"> <div class="text-end">
<div class="small text-muted">Unmarked</div> <div class="small text-muted">Unmarked</div>
{% if unmarked_count > 0 %} {% if unmarked_count > 0 %}
<span class="badge bg-danger">{{ unmarked_count }}</span> <span class="badge bg-danger">{{ unmarked_count }}</span>
{% else %} {% else %}
<span class="badge bg-secondary">{{ unmarked_count }}</span> <span class="badge bg-secondary">{{ unmarked_count }}</span>
{% endif %} {% endif %}
</div> </div>
</li> </li>
{% empty %} {% empty %}
<li class="list-group-item small text-muted">No questions found.</li> <li class="list-group-item small text-muted">No questions found.</li>
{% endfor %} {% endfor %}
</ul> </ul>
</div>
</div>
</div> </div>
</div>
</div>
<script> <script>
(function(){ (function(){
function $(sel, ctx){ return (ctx||document).querySelector(sel); } function $(sel, ctx){ return (ctx||document).querySelector(sel); }
function $all(sel, ctx){ return Array.from((ctx||document).querySelectorAll(sel)); } function $all(sel, ctx){ return Array.from((ctx||document).querySelectorAll(sel)); }
var showAllBtn = $('.show-all-button'); var showAllBtn = $('.show-all-button');
var showUnmarkedBtn = $('.show-unmarked-button'); var showUnmarkedBtn = $('.show-unmarked-button');
var list = $('#question-mark-list'); var list = $('#question-mark-list');
if (!list) return; if (!list) return;
function showAll(){ function showAll(){
$all('#question-mark-list .list-group-item').forEach(function(li){ li.classList.remove('d-none'); }); $all('#question-mark-list .list-group-item').forEach(function(li){ li.classList.remove('d-none'); });
showAllBtn && showAllBtn.classList.add('active'); showAllBtn && showAllBtn.classList.add('active');
showUnmarkedBtn && showUnmarkedBtn.classList.remove('active'); showUnmarkedBtn && showUnmarkedBtn.classList.remove('active');
} }
function showUnmarked(){ function showUnmarked(){
$all('#question-mark-list .list-group-item').forEach(function(li){ $all('#question-mark-list .list-group-item').forEach(function(li){
var u = parseInt(li.getAttribute('data-unmarked') || '0', 10); var u = parseInt(li.getAttribute('data-unmarked') || '0', 10);
if (u > 0) li.classList.remove('d-none'); else li.classList.add('d-none'); if (u > 0) li.classList.remove('d-none'); else li.classList.add('d-none');
}); });
showUnmarkedBtn && showUnmarkedBtn.classList.add('active'); showUnmarkedBtn && showUnmarkedBtn.classList.add('active');
showAllBtn && showAllBtn.classList.remove('active'); showAllBtn && showAllBtn.classList.remove('active');
} }
if (showAllBtn) showAllBtn.addEventListener('click', function(e){ e.preventDefault(); showAll(); }); if (showAllBtn) showAllBtn.addEventListener('click', function(e){ e.preventDefault(); showAll(); });
if (showUnmarkedBtn) showUnmarkedBtn.addEventListener('click', function(e){ e.preventDefault(); showUnmarked(); }); if (showUnmarkedBtn) showUnmarkedBtn.addEventListener('click', function(e){ e.preventDefault(); showUnmarked(); });
// Initialize to show all // Initialize to show all
showAll(); showAll();
})(); })();
</script> </script>
<style> <style>
.show-all-button.active, .show-unmarked-button.active { box-shadow: inset 0 -2px 0 rgba(0,0,0,0.08); } .show-all-button.active, .show-unmarked-button.active { box-shadow: inset 0 -2px 0 rgba(0,0,0,0.08); }
</style> </style>
{% endblock %} {% endblock %}