Skip to content

Commit ec71eb5

Browse files
committed
fix: add diagnosis year to breast cancer history card
1 parent 8a28899 commit ec71eb5

File tree

3 files changed

+16
-0
lines changed

3 files changed

+16
-0
lines changed

manage_breast_screening/mammograms/jinja2/mammograms/medical_information/medical_history/cards/breast_cancer_history_card.jinja

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,12 @@
3131
"html": paragraph(presented_item.cancer_location)
3232
}
3333
},
34+
{
35+
"key": "Diagnosis year",
36+
"value": {
37+
"html": paragraph(presented_item.diagnosis_year)
38+
}
39+
} if presented_item.diagnosis_year,
3440
{
3541
"key": "Procedures",
3642
"value": {

manage_breast_screening/mammograms/presenters/medical_history/breast_cancer_history_item_presenter.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
from django.urls import reverse
22

33
from manage_breast_screening.core.template_helpers import nl2br
4+
from manage_breast_screening.core.utils.date_formatting import format_year_with_relative
45
from manage_breast_screening.participants.models.medical_history.breast_cancer_history_item import (
56
BreastCancerHistoryItem,
67
)
@@ -16,6 +17,8 @@ def __init__(self, breast_cancer_history_item, counter=None):
1617
self.right_breast_procedure = self._item.get_right_breast_procedure_display()
1718
self.left_breast_procedure = self._item.get_left_breast_procedure_display()
1819

20+
self.diagnosis_year = format_year_with_relative(self._item.diagnosis_year)
21+
1922
self.right_breast_other_surgery = [
2023
BreastCancerHistoryItem.Surgery(choice).label
2124
for choice in self._item.right_breast_other_surgery

manage_breast_screening/mammograms/tests/presenters/medical_history/test_breast_cancer_history_item_presenter.py

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
1+
from datetime import date
2+
13
import pytest
4+
import time_machine
25

36
from manage_breast_screening.mammograms.presenters.medical_history.breast_cancer_history_item_presenter import (
47
BreastCancerHistoryItemPresenter,
@@ -16,16 +19,19 @@ class TestBreastCancerHistoryItemPresenter:
1619
def item(self):
1720
return BreastCancerHistoryItemFactory.build(
1821
diagnosis_location=BreastCancerHistoryItem.DiagnosisLocationChoices.RIGHT_BREAST,
22+
diagnosis_year=2000,
1923
right_breast_procedure=BreastCancerHistoryItem.Procedure.LUMPECTOMY,
2024
intervention_location=BreastCancerHistoryItem.InterventionLocation.NHS_HOSPITAL,
2125
intervention_location_details="East Tester Hospital",
2226
additional_details="some details",
2327
)
2428

2529
@pytest.fixture
30+
@time_machine.travel(date(2025, 1, 1))
2631
def presenter(self, item):
2732
return BreastCancerHistoryItemPresenter(item)
2833

34+
@time_machine.travel(date(2025, 1, 1))
2935
def test_attributes(self, presenter):
3036
assert presenter.cancer_location == "Right breast"
3137
assert presenter.right_breast_procedure == "Lumpectomy"
@@ -36,6 +42,7 @@ def test_attributes(self, presenter):
3642
assert presenter.left_breast_treatments == ["No radiotherapy"]
3743
assert presenter.systemic_treatments == ["No systemic treatments"]
3844
assert presenter.additional_details == "some details"
45+
assert presenter.diagnosis_year == "2000 (25 years ago)"
3946

4047
def test_change_link(self):
4148
item = BreastCancerHistoryItemFactory.build()

0 commit comments

Comments
 (0)