Skip to content

Commit

Permalink
Merge pull request #45 from chnm/feature/modal-forensics
Browse files Browse the repository at this point in the history
This PR updates URL configurations for forensic images and removes unnecessary code.
hepplerj authored Aug 15, 2024
2 parents f122a1c + cab9ed8 commit d46ea1f
Showing 3 changed files with 3 additions and 64 deletions.
5 changes: 0 additions & 5 deletions denig/urls.py
Original file line number Diff line number Diff line change
@@ -7,11 +7,6 @@
path("", views.index, name="index"),
path("about/", views.about, name="about"),
path("forensics/", views.ForensicsListView.as_view(), name="forensics"),
path(
"forensics/<int:pk>/",
views.ForensicDetailView.as_view(),
name="forensic_page",
),
path("music/", views.MusicListView.as_view(), name="music"),
path("education/", views.education, name="education"),
path("scholarship/", views.scholarship, name="scholarship"),
57 changes: 0 additions & 57 deletions denig/views.py
Original file line number Diff line number Diff line change
@@ -196,63 +196,6 @@ def get(self, request, *args, **kwargs):
)


class ForensicDetailView(generic.DetailView):
model = Image
context_object_name = "forensic_page"
template_name = "forensic_page.html"

def get_context_data(self, **kwargs):
context = super().get_context_data(**kwargs)

# Get the current image
current_image = self.object

# Get previous and next pages
try:
previous_page = (
Image.objects.filter(id__lt=current_image.id).order_by("-id").first()
)
except Image.DoesNotExist:
previous_page = None

try:
next_page = (
Image.objects.filter(id__gt=current_image.id).order_by("id").first()
)
except Image.DoesNotExist:
next_page = None

# Get current page
try:
current_page = Document.objects.get(
document_id=current_image.related_document
)
except Document.DoesNotExist:
current_page = None

# Get the page number of the current document
try:
page_number = current_image.related_document.page_range.split("-")[0]
except AttributeError:
page_number = None

context["previous_image"] = previous_page
context["next_image"] = next_page
context["current_image"] = current_page
context["page_number"] = page_number
context["all_pages"] = Image.objects.filter(image_type="forensics").order_by(
"id"
)
context["documents"] = (
Document.objects.filter(attached_images__image_type="forensics")
.order_by("id")
.distinct()
)
# context["fragments"] = self.object.fragment_set.order_by("line_number")

return context


class MusicListView(generic.View):
def get(self, request, *args, **kwargs):
hymnal_list = (
5 changes: 3 additions & 2 deletions templates/forensics.html
Original file line number Diff line number Diff line change
@@ -34,8 +34,9 @@ <h3>Forensic Images for page {{ document.page_range }}</h3>
<li class="flex space-x-4">
<ul style="list-style-type:none;">
<li>
<a href="{% url 'forensic_page' image.id %}"><img src="{{ image.thumbnail.url }}"
alt="Document Image" load="lazy"></a>
<a href="{% url 'manuscript_page' document.slug %}"><img src="{{ image.thumbnail.url }}"
alt="Document Image" load="lazy"></a>

</li>
</ul>
</li>

0 comments on commit d46ea1f

Please sign in to comment.