Skip to content

🐛 calender: Fix incorrect end dates for engagements and tests #13593 #13595

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
valentijnscholten merged 3 commits into from
Nov 5, 2025
Merged

🐛 calender: Fix incorrect end dates for engagements and tests #13593 #13595

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c46e2a0
:bug: calender: Fix incorrect end dates for engagements and tests
manuel-sommer Nov 3, 2025
2e8efae
Merge branch 'bugfix' into issue_13593
manuel-sommer Nov 3, 2025
d8e8ccd
Merge branch 'bugfix' into issue_13593
manuel-sommer Nov 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion dojo/engagement/views.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
import operator
import re
import time
from datetime import datetime
from datetime import datetime, timedelta
from functools import partial, reduce
from pathlib import Path
from tempfile import NamedTemporaryFile
Expand Down Expand Up @@ -142,6 +142,9 @@ def engagement_calendar(request):
engagements = engagements.select_related("lead")
engagements = engagements.prefetch_related("product")

for e in engagements:
if e.target_end:
e.target_end += timedelta(days=1)
add_breadcrumb(
title="Engagement Calendar", top_level=True, request=request)
return render(
Expand Down
5 changes: 4 additions & 1 deletion dojo/test/views.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import logging
import operator
import time
from datetime import datetime
from datetime import datetime, timedelta
from functools import reduce

from django.contrib import messages
Expand Down Expand Up @@ -393,6 +393,9 @@ def test_calendar(request):
tests = tests.prefetch_related("test_type", "lead", "engagement__product")

add_breadcrumb(title=_("Test Calendar"), top_level=True, request=request)
for t in tests:
if t.target_end:
t.target_end += timedelta(days=1)
return render(request, "dojo/calendar.html", {
"caltype": "tests",
"leads": request.GET.getlist("lead", ""),
Expand Down