Compare commits

...

3 Commits

Author SHA1 Message Date
5a1df7345d UI element added
All checks were successful
SonarQube Scan / SonarQube Trigger (push) Successful in 55s
2025-12-04 14:26:35 +01:00
e3c5f6a9d7 Last date removed from array - tests adapted 2025-12-04 14:16:18 +01:00
a26290fc92 Date array calculation for documents added
All checks were successful
SonarQube Scan / SonarQube Trigger (push) Successful in 57s
2025-12-04 14:08:18 +01:00
3 changed files with 321 additions and 0 deletions

View File

@@ -54,6 +54,34 @@ class Dokument(models.Model):
def __str__(self):
return f"{self.nummer} {self.name}"
@property
def dates(self):
"""
Returns an array of unique, chronologically sorted dates representing
state-change dates from all Vorgaben in this document.
These are dates where Vorgaben become active (gueltigkeit_von) or change state
(the day after gueltigkeit_bis). The very last date in the list is excluded
as it has no relevance (nothing changes after it).
"""
dates_set = set()
# Get all vorgaben for this document
for vorgabe in self.vorgaben.all():
# Add gueltigkeit_von (when vorgabe becomes active)
if vorgabe.gueltigkeit_von:
dates_set.add(vorgabe.gueltigkeit_von)
# Add the day after gueltigkeit_bis (when vorgabe expires/changes state)
# Only if gueltigkeit_bis is defined (not None)
if vorgabe.gueltigkeit_bis:
dates_set.add(vorgabe.gueltigkeit_bis + datetime.timedelta(days=1))
# Return sorted unique dates from oldest to newest, excluding the last date
# (but only if there are multiple dates; single dates are kept)
sorted_dates = sorted(list(dates_set))
return sorted_dates[:-1] if len(sorted_dates) > 1 else sorted_dates
class Meta:
verbose_name_plural="Dokumente"
verbose_name="Dokument"

View File

@@ -19,6 +19,25 @@
<strong>Historische Version vom {{ standard.check_date }}</strong>
</div>
{% endif %}
<!-- History Dates Dropdown -->
{% if standard.dates %}
<div class="mb-3">
<div class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown" style="text-decoration: none;">
📅 Historische Versionen
</a>
<ul class="dropdown-menu" role="menu">
<li><a href="/dokumente/{{ standard.nummer }}/">Aktuelle Version</a></li>
<li class="divider"></li>
{% for date in standard.dates %}
<li><a href="/dokumente/{{ standard.nummer }}/history/{{ date|date:'Y-m-d' }}/">{{ date|date:'d.m.Y' }}</a></li>
{% endfor %}
</ul>
</div>
</div>
{% endif %}
<!-- Einleitung -->
{% if standard.einleitung_html %}
<div class="row mb-4">

View File

@@ -1792,6 +1792,279 @@ class GetVorgabeCommentsViewTest(TestCase):
self.assertEqual(response['X-Content-Type-Options'], 'nosniff')
class DokumentDatesPropertyTest(TestCase):
"""Test cases for Dokument.dates property"""
def setUp(self):
"""Set up test data for dates property tests"""
self.dokumententyp = Dokumententyp.objects.create(
name="Standard IT-Sicherheit",
verantwortliche_ve="SR-SUR-SEC"
)
self.dokument = Dokument.objects.create(
nummer="R0066",
dokumententyp=self.dokumententyp,
name="IT Security Standard",
aktiv=True
)
self.thema = Thema.objects.create(name="Organisation")
def test_dates_property_no_vorgaben(self):
"""Test dates property returns empty list when dokument has no vorgaben"""
dates = self.dokument.dates
self.assertEqual(dates, [])
def test_dates_property_single_vorgabe_with_only_gueltigkeit_von(self):
"""Test dates property with single vorgabe with only gueltigkeit_von"""
vorgabe = Vorgabe.objects.create(
order=1,
nummer=1,
dokument=self.dokument,
thema=self.thema,
titel="Test Vorgabe",
gueltigkeit_von=date(2025, 1, 1)
)
dates = self.dokument.dates
self.assertEqual(len(dates), 1)
self.assertEqual(dates[0], date(2025, 1, 1))
def test_dates_property_single_vorgabe_with_both_dates(self):
"""Test dates property with single vorgabe with both gueltigkeit_von and gueltigkeit_bis"""
vorgabe = Vorgabe.objects.create(
order=1,
nummer=1,
dokument=self.dokument,
thema=self.thema,
titel="Test Vorgabe",
gueltigkeit_von=date(2025, 1, 1),
gueltigkeit_bis=date(2026, 1, 1)
)
dates = self.dokument.dates
# gueltigkeit_bis would add 2026-01-02, but that's the last date so it's excluded
self.assertEqual(len(dates), 1)
self.assertEqual(dates[0], date(2025, 1, 1))
def test_dates_property_multiple_vorgaben_different_dates(self):
"""Test dates property with multiple vorgaben with different dates"""
vorgabe1 = Vorgabe.objects.create(
order=1,
nummer=1,
dokument=self.dokument,
thema=self.thema,
titel="Vorgabe 1",
gueltigkeit_von=date(2025, 1, 1),
gueltigkeit_bis=date(2025, 6, 30)
)
vorgabe2 = Vorgabe.objects.create(
order=2,
nummer=2,
dokument=self.dokument,
thema=self.thema,
titel="Vorgabe 2",
gueltigkeit_von=date(2025, 7, 1),
gueltigkeit_bis=date(2026, 1, 1)
)
dates = self.dokument.dates
# Dates: 2025-01-01, 2025-07-01, 2026-01-02 (but last one excluded)
self.assertEqual(len(dates), 2)
self.assertIn(date(2025, 1, 1), dates) # Start of vorgabe1
self.assertIn(date(2025, 7, 1), dates) # End of vorgabe1 + 1 day = Start of vorgabe2 (deduplicated)
def test_dates_property_ensures_uniqueness(self):
"""Test dates property returns unique dates only"""
# Create two vorgaben with overlapping dates
vorgabe1 = Vorgabe.objects.create(
order=1,
nummer=1,
dokument=self.dokument,
thema=self.thema,
titel="Vorgabe A",
gueltigkeit_von=date(2025, 1, 1),
gueltigkeit_bis=date(2026, 1, 1)
)
vorgabe2 = Vorgabe.objects.create(
order=2,
nummer=2,
dokument=self.dokument,
thema=self.thema,
titel="Vorgabe B",
gueltigkeit_von=date(2025, 1, 1), # Same start date
gueltigkeit_bis=date(2026, 1, 1) # Same end date
)
dates = self.dokument.dates
# Both vorgaben have same dates, and the last date (2026-01-02) is excluded
self.assertEqual(len(dates), 1)
self.assertEqual(dates[0], date(2025, 1, 1))
def test_dates_property_sorted_chronologically(self):
"""Test dates property returns dates sorted from oldest to newest"""
# Create vorgaben in non-chronological order
vorgabe1 = Vorgabe.objects.create(
order=1,
nummer=1,
dokument=self.dokument,
thema=self.thema,
titel="Vorgabe 1",
gueltigkeit_von=date(2026, 1, 1)
)
vorgabe2 = Vorgabe.objects.create(
order=2,
nummer=2,
dokument=self.dokument,
thema=self.thema,
titel="Vorgabe 2",
gueltigkeit_von=date(2024, 1, 1)
)
vorgabe3 = Vorgabe.objects.create(
order=3,
nummer=3,
dokument=self.dokument,
thema=self.thema,
titel="Vorgabe 3",
gueltigkeit_von=date(2025, 1, 1)
)
dates = self.dokument.dates
# Dates are [2024-01-01, 2025-01-01, 2026-01-01] but the last one is excluded
self.assertEqual(len(dates), 2)
self.assertEqual(dates[0], date(2024, 1, 1))
self.assertEqual(dates[1], date(2025, 1, 1))
def test_dates_property_ignores_none_dates(self):
"""Test dates property ignores None date values"""
vorgabe1 = Vorgabe.objects.create(
order=1,
nummer=1,
dokument=self.dokument,
thema=self.thema,
titel="Vorgabe 1",
gueltigkeit_von=date(2025, 1, 1)
# No gueltigkeit_bis (None)
)
vorgabe2 = Vorgabe.objects.create(
order=2,
nummer=2,
dokument=self.dokument,
thema=self.thema,
titel="Vorgabe 2",
gueltigkeit_von=date(2026, 1, 1),
gueltigkeit_bis=None # Explicitly None
)
dates = self.dokument.dates
# Dates are 2025-01-01 and 2026-01-01, but the last date (2026-01-01) is excluded
self.assertEqual(len(dates), 1)
self.assertEqual(dates[0], date(2025, 1, 1))
def test_dates_property_complex_scenario(self):
"""Test dates property with complex real-world scenario
Vorgabe A: 2025-01-01 to 2025-12-31
Vorgabe B: 2025-06-01 to 2026-01-01 (overlaps with A)
Vorgabe C: 2026-02-01 to None (no end date)
Expected dates: [2025-01-01, 2025-06-01, 2025-12-31, 2026-01-01, 2026-02-01]
The middle date (2026-01-01) should NOT be excluded even though B overlaps with A
"""
vorgabe_a = Vorgabe.objects.create(
order=1,
nummer=1,
dokument=self.dokument,
thema=self.thema,
titel="Vorgabe A",
gueltigkeit_von=date(2025, 1, 1),
gueltigkeit_bis=date(2025, 12, 31)
)
vorgabe_b = Vorgabe.objects.create(
order=2,
nummer=2,
dokument=self.dokument,
thema=self.thema,
titel="Vorgabe B",
gueltigkeit_von=date(2025, 6, 1),
gueltigkeit_bis=date(2026, 1, 1)
)
vorgabe_c = Vorgabe.objects.create(
order=3,
nummer=3,
dokument=self.dokument,
thema=self.thema,
titel="Vorgabe C",
gueltigkeit_von=date(2026, 2, 1)
# No gueltigkeit_bis
)
dates = self.dokument.dates
# All dates: 2025-01-01, 2025-06-01, 2026-01-01, 2026-01-02, 2026-02-01
# Last date (2026-02-01) is excluded
expected = [
date(2025, 1, 1), # Start of A
date(2025, 6, 1), # Start of B
date(2026, 1, 1), # End of A + 1 day
date(2026, 1, 2) # End of B + 1 day
]
self.assertEqual(dates, expected)
def test_dates_property_returns_list(self):
"""Test dates property returns a list (not a set or tuple)"""
vorgabe = Vorgabe.objects.create(
order=1,
nummer=1,
dokument=self.dokument,
thema=self.thema,
titel="Test Vorgabe",
gueltigkeit_von=date(2025, 1, 1)
)
dates = self.dokument.dates
self.assertIsInstance(dates, list)
def test_dates_property_does_not_persist_to_database(self):
"""Test dates property is calculated on-the-fly, not stored"""
vorgabe = Vorgabe.objects.create(
order=1,
nummer=1,
dokument=self.dokument,
thema=self.thema,
titel="Test Vorgabe",
gueltigkeit_von=date(2025, 1, 1),
gueltigkeit_bis=date(2025, 12, 31)
)
# Get dates before adding new vorgabe
dates_before = self.dokument.dates
self.assertEqual(len(dates_before), 1) # 2025-01-01 (2026-01-02 is last, so excluded)
# Add new vorgabe
vorgabe2 = Vorgabe.objects.create(
order=2,
nummer=2,
dokument=self.dokument,
thema=self.thema,
titel="Test Vorgabe 2",
gueltigkeit_von=date(2026, 2, 1)
)
# Get dates after - new dates are 2025-01-01, 2026-01-02, 2026-02-01
# Last date (2026-02-01) is excluded, so we get [2025-01-01, 2026-01-01]
dates_after = self.dokument.dates
self.assertEqual(len(dates_after), 2)
self.assertEqual(dates_after[0], date(2025, 1, 1))
self.assertEqual(dates_after[1], date(2026, 1, 1))
class AddVorgabeCommentViewTest(TestCase):
"""Test cases for add_vorgabe_comment view"""
@@ -2562,3 +2835,4 @@ class AllCommentsViewTest(TestCase):
# Both users' comments on the same vorgabe should be visible
self.assertEqual(response.context['total_comments'], 4)