align flash messages

MatMoore · MatMoore · commit bd1a084e7e3e · 2025-12-11T15:23:09.000Z
Use "Added/Updated/Deleted &lt;THING&gt;" format for all medical history forms.
diff --git a/manage_breast_screening/mammograms/tests/views/medical_history/test_benign_lump_history_item_views.py b/manage_breast_screening/mammograms/tests/views/medical_history/test_benign_lump_history_item_views.py
@@ -57,7 +57,7 @@ def test_valid_post_redirects_to_appointment(self, clinical_user_client):
             [
                 messages.Message(
                     level=messages.SUCCESS,
-                    message="Benign lumps added",
+                    message="Added benign lumps",
                 )
             ],
         )
@@ -150,7 +150,7 @@ def test_valid_post_redirects_to_appointment(
             [
                 messages.Message(
                     level=messages.SUCCESS,
-                    message="Benign lumps updated",
+                    message="Updated benign lumps",
                 )
             ],
         )
diff --git a/manage_breast_screening/mammograms/tests/views/medical_history/test_breast_augmentation_history_views.py b/manage_breast_screening/mammograms/tests/views/medical_history/test_breast_augmentation_history_views.py
@@ -55,7 +55,7 @@ def test_valid_post_redirects_to_appointment(self, clinical_user_client):
             [
                 messages.Message(
                     level=messages.SUCCESS,
-                    message="Details of breast implants or augmentation added",
+                    message="Added breast implants or augmentation",
                 )
             ],
         )
@@ -144,7 +144,7 @@ def test_valid_post_redirects_to_appointment(
             [
                 messages.Message(
                     level=messages.SUCCESS,
-                    message="Details of breast implants or augmentation updated",
+                    message="Updated breast implants or augmentation",
                 )
             ],
         )
diff --git a/manage_breast_screening/mammograms/tests/views/medical_history/test_breast_cancer_history_views.py b/manage_breast_screening/mammograms/tests/views/medical_history/test_breast_cancer_history_views.py
@@ -73,7 +73,7 @@ def test_valid_post_redirects_to_appointment(self, clinical_user_client):
             [
                 messages.Message(
                     level=messages.SUCCESS,
-                    message="Breast cancer history added",
+                    message="Added breast cancer",
                 )
             ],
         )
@@ -161,7 +161,7 @@ def test_valid_post_redirects_to_appointment(
             [
                 messages.Message(
                     level=messages.SUCCESS,
-                    message="Breast cancer history updated",
+                    message="Updated breast cancer",
                 )
             ],
         )
diff --git a/manage_breast_screening/mammograms/tests/views/medical_history/test_cyst_history_views.py b/manage_breast_screening/mammograms/tests/views/medical_history/test_cyst_history_views.py
@@ -51,7 +51,7 @@ def test_valid_post_redirects_to_appointment(self, clinical_user_client):
             [
                 messages.Message(
                     level=messages.SUCCESS,
-                    message="Details of cysts added",
+                    message="Added cysts",
                 )
             ],
         )
@@ -128,7 +128,7 @@ def test_valid_post_redirects_to_appointment(
             [
                 messages.Message(
                     level=messages.SUCCESS,
-                    message="Details of cysts updated",
+                    message="Updated cysts",
                 )
             ],
         )
diff --git a/manage_breast_screening/mammograms/tests/views/medical_history/test_implanted_medical_device_history_views.py b/manage_breast_screening/mammograms/tests/views/medical_history/test_implanted_medical_device_history_views.py
@@ -51,7 +51,7 @@ def test_valid_post_redirects_to_appointment(self, clinical_user_client):
             [
                 messages.Message(
                     level=messages.SUCCESS,
-                    message="Implanted medical device added",
+                    message="Added implanted medical device",
                 )
             ],
         )
@@ -129,7 +129,7 @@ def test_valid_post_redirects_to_appointment(
             [
                 messages.Message(
                     level=messages.SUCCESS,
-                    message="Details of implanted medical device updated",
+                    message="Updated implanted medical device",
                 )
             ],
         )
diff --git a/manage_breast_screening/mammograms/tests/views/medical_history/test_mastectomy_or_lumpectomy_history_views.py b/manage_breast_screening/mammograms/tests/views/medical_history/test_mastectomy_or_lumpectomy_history_views.py
@@ -61,7 +61,7 @@ def test_valid_post_redirects_to_appointment(self, clinical_user_client):
             [
                 messages.Message(
                     level=messages.SUCCESS,
-                    message="Details of mastectomy or lumpectomy added",
+                    message="Added mastectomy or lumpectomy",
                 )
             ],
         )
@@ -157,7 +157,7 @@ def test_valid_post_redirects_to_appointment(
             [
                 messages.Message(
                     level=messages.SUCCESS,
-                    message="Details of mastectomy or lumpectomy updated",
+                    message="Updated mastectomy or lumpectomy",
                 )
             ],
         )
diff --git a/manage_breast_screening/mammograms/tests/views/medical_history/test_other_procedure_history_views.py b/manage_breast_screening/mammograms/tests/views/medical_history/test_other_procedure_history_views.py
@@ -57,7 +57,7 @@ def test_valid_post_redirects_to_appointment(self, clinical_user_client):
             [
                 messages.Message(
                     level=messages.SUCCESS,
-                    message="Details of other procedure added",
+                    message="Added other procedures",
                 )
             ],
         )
@@ -137,7 +137,7 @@ def test_valid_post_redirects_to_record_medical_information(
             [
                 messages.Message(
                     level=messages.SUCCESS,
-                    message="Details of other procedure updated",
+                    message="Updated other procedures",
                 )
             ],
         )
diff --git a/manage_breast_screening/mammograms/views/medical_history/benign_lump_history_item_views.py b/manage_breast_screening/mammograms/views/medical_history/benign_lump_history_item_views.py
@@ -1,6 +1,5 @@
 import logging
 
-from manage_breast_screening.core.utils.string_formatting import sentence_case
 from manage_breast_screening.core.views.generic import (
     AddWithAuditView,
     UpdateWithAuditView,
@@ -25,9 +24,6 @@ class AddBenignLumpHistoryItemView(MedicalInformationMixin, AddWithAuditView):
     def add_title(self, thing_name):
         return f"Add details of {thing_name}"
 
-    def added_message(self, thing_name):
-        return f"{sentence_case(thing_name)} added"
-
     def get_create_kwargs(self):
         return {"appointment": self.appointment}
 
@@ -40,9 +36,6 @@ class UpdateBenignLumpHistoryItemView(MedicalInformationMixin, UpdateWithAuditVi
     def update_title(self, thing_name):
         return f"Edit details of {thing_name}"
 
-    def updated_message(self, thing_name):
-        return f"{sentence_case(thing_name)} updated"
-
     def get_object(self):
         try:
             return BenignLumpHistoryItem.objects.get(
diff --git a/manage_breast_screening/mammograms/views/medical_history/breast_augmentation_history_item_views.py b/manage_breast_screening/mammograms/views/medical_history/breast_augmentation_history_item_views.py
@@ -24,9 +24,6 @@ class AddBreastAugmentationHistoryView(MedicalInformationMixin, AddWithAuditView
     def add_title(self, thing_name):
         return f"Add details of {thing_name}"
 
-    def added_message(self, thing_name):
-        return f"Details of {thing_name} added"
-
     def get_create_kwargs(self):
         return {"appointment": self.appointment}
 
@@ -39,9 +36,6 @@ class UpdateBreastAugmentationHistoryView(MedicalInformationMixin, UpdateWithAud
     def update_title(self, thing_name):
         return f"Edit details of {thing_name}"
 
-    def updated_message(self, thing_name):
-        return f"Details of {thing_name} updated"
-
     def get_object(self):
         try:
             return BreastAugmentationHistoryItem.objects.get(
diff --git a/manage_breast_screening/mammograms/views/medical_history/breast_cancer_history_item_views.py b/manage_breast_screening/mammograms/views/medical_history/breast_cancer_history_item_views.py
@@ -2,7 +2,6 @@
 
 from django.urls import reverse
 
-from manage_breast_screening.core.utils.string_formatting import sentence_case
 from manage_breast_screening.core.views.generic import (
     AddWithAuditView,
     DeleteWithAuditView,
@@ -28,9 +27,6 @@ class AddBreastCancerHistoryView(MedicalInformationMixin, AddWithAuditView):
     def add_title(self, thing_name):
         return f"Add details of {thing_name}"
 
-    def added_message(self, thing_name):
-        return f"{sentence_case(thing_name)} history added"
-
     def get_create_kwargs(self):
         return {"appointment": self.appointment}
 
@@ -43,9 +39,6 @@ class UpdateBreastCancerHistoryView(MedicalInformationMixin, UpdateWithAuditView
     def update_title(self, thing_name):
         return f"Edit details of {thing_name}"
 
-    def updated_message(self, thing_name):
-        return f"{sentence_case(thing_name)} history updated"
-
     def confirm_delete_link_text(self, thing_name):
         return "Delete this item"
 
diff --git a/manage_breast_screening/mammograms/views/medical_history/cyst_history_item_views.py b/manage_breast_screening/mammograms/views/medical_history/cyst_history_item_views.py
@@ -24,9 +24,6 @@ class AddCystHistoryView(MedicalInformationMixin, AddWithAuditView):
     def add_title(self, thing_name):
         return f"Add details of {thing_name}"
 
-    def added_message(self, thing_name):
-        return f"Details of {thing_name} added"
-
     def get_form_kwargs(self):
         kwargs = super().get_form_kwargs()
         kwargs["participant"] = self.participant
@@ -46,9 +43,6 @@ class UpdateCystHistoryView(MedicalInformationMixin, UpdateWithAuditView):
     def update_title(self, thing_name):
         return f"Edit details of {thing_name}"
 
-    def updated_message(self, thing_name):
-        return f"Details of {thing_name} updated"
-
     def get_object(self):
         try:
             return CystHistoryItem.objects.get(
diff --git a/manage_breast_screening/mammograms/views/medical_history/implanted_medical_device_history_item_views.py b/manage_breast_screening/mammograms/views/medical_history/implanted_medical_device_history_item_views.py
@@ -1,6 +1,5 @@
 import logging
 
-from manage_breast_screening.core.utils.string_formatting import sentence_case
 from manage_breast_screening.core.views.generic import (
     AddWithAuditView,
     UpdateWithAuditView,
@@ -25,9 +24,6 @@ class AddImplantedMedicalDeviceHistoryView(MedicalInformationMixin, AddWithAudit
     def add_title(self, thing_name):
         return f"Add details of {thing_name}"
 
-    def added_message(self, thing_name):
-        return f"{sentence_case(thing_name)} added"
-
     def get_form_kwargs(self):
         kwargs = super().get_form_kwargs()
         kwargs["participant"] = self.participant
@@ -47,9 +43,6 @@ class UpdateImplantedMedicalDeviceHistoryView(
     def update_title(self, thing_name):
         return f"Edit details of {thing_name}"
 
-    def updated_message(self, thing_name):
-        return f"Details of {thing_name} updated"
-
     def get_object(self):
         try:
             return ImplantedMedicalDeviceHistoryItem.objects.get(
diff --git a/manage_breast_screening/mammograms/views/medical_history/mastectomy_or_lumpectomy_history_item_views.py b/manage_breast_screening/mammograms/views/medical_history/mastectomy_or_lumpectomy_history_item_views.py
@@ -27,9 +27,6 @@ class AddMastectomyOrLumpectomyHistoryView(MedicalInformationMixin, AddWithAudit
     def add_title(self, thing_name):
         return f"Add details of {thing_name}"
 
-    def added_message(self, thing_name):
-        return f"Details of {thing_name} added"
-
     def get_create_kwargs(self):
         return {"appointment": self.appointment}
 
@@ -49,9 +46,6 @@ class UpdateMastectomyOrLumpectomyHistoryView(
     def update_title(self, thing_name):
         return f"Edit details of {thing_name}"
 
-    def updated_message(self, thing_name):
-        return f"Details of {thing_name} updated"
-
     def get_object(self):
         try:
             return MastectomyOrLumpectomyHistoryItem.objects.get(
diff --git a/manage_breast_screening/mammograms/views/medical_history/other_procedure_history_item_views.py b/manage_breast_screening/mammograms/views/medical_history/other_procedure_history_item_views.py
@@ -27,9 +27,6 @@ class AddOtherProcedureHistoryView(MedicalInformationMixin, AddWithAuditView):
     def add_title(self, thing_name):
         return f"Add details of {thing_name}"
 
-    def added_message(self, thing_name):
-        return "Details of other procedure added"
-
     def get_form_kwargs(self):
         kwargs = super().get_form_kwargs()
         kwargs["participant"] = self.participant
@@ -47,9 +44,6 @@ class UpdateOtherProcedureHistoryView(MedicalInformationMixin, UpdateWithAuditVi
     def update_title(self, thing_name):
         return f"Edit details of {thing_name}"
 
-    def updated_message(self, thing_name):
-        return "Details of other procedure updated"
-
     def confirm_delete_link_text(self, thing_name):
         return "Delete this item"
 
diff --git a/manage_breast_screening/tests/system/clinical/test_benign_lump_history.py b/manage_breast_screening/tests/system/clinical/test_benign_lump_history.py
@@ -158,7 +158,7 @@ def and_the_message_says_benign_lump_history_added(self):
         alert = self.page.get_by_role("alert")
 
         expect(alert).to_contain_text("Success")
-        expect(alert).to_contain_text("Benign lumps added")
+        expect(alert).to_contain_text("Added benign lumps")
 
     def and_there_is_a_benign_lump_history_item(self):
         self.benign_lump_history_item = BenignLumpHistoryItemFactory(
@@ -217,4 +217,4 @@ def and_the_message_says_benign_lump_history_updated(self):
         alert = self.page.get_by_role("alert")
 
         expect(alert).to_contain_text("Success")
-        expect(alert).to_contain_text("Benign lumps updated")
+        expect(alert).to_contain_text("Updated benign lumps")
diff --git a/manage_breast_screening/tests/system/clinical/test_breast_augmentation_history.py b/manage_breast_screening/tests/system/clinical/test_breast_augmentation_history.py
@@ -135,9 +135,7 @@ def and_the_message_says_augmentation_added(self):
         alert = self.page.get_by_role("alert")
 
         expect(alert).to_contain_text("Success")
-        expect(alert).to_contain_text(
-            "Details of breast implants or augmentation added"
-        )
+        expect(alert).to_contain_text("Added breast implants or augmentation")
 
     def when_i_click_change(self):
         self.page.get_by_text("Change breast implants or augmentation item").click()
@@ -169,6 +167,4 @@ def and_the_message_says_breast_augmentation_history_updated(self):
         alert = self.page.get_by_role("alert")
 
         expect(alert).to_contain_text("Success")
-        expect(alert).to_contain_text(
-            "Details of breast implants or augmentation updated"
-        )
+        expect(alert).to_contain_text("Updated breast implants or augmentation")
diff --git a/manage_breast_screening/tests/system/clinical/test_breast_cancer_history.py b/manage_breast_screening/tests/system/clinical/test_breast_cancer_history.py
@@ -111,7 +111,7 @@ def and_the_message_says_device_added(self):
         alert = self.page.get_by_role("alert")
 
         expect(alert).to_contain_text("Success")
-        expect(alert).to_contain_text("Breast cancer history added")
+        expect(alert).to_contain_text("Added breast cancer")
 
     def and_i_select_lumpectomy_in_right_breast(self):
         fieldset = self.get_fieldset_by_legend(
@@ -199,7 +199,7 @@ def and_the_message_says_breast_cancer_history_updated(self):
         alert = self.page.get_by_role("alert")
 
         expect(alert).to_contain_text("Success")
-        expect(alert).to_contain_text("Breast cancer history updated")
+        expect(alert).to_contain_text("Updated breast cancer")
 
     def and_i_click_delete_this_item(self):
         self.page.get_by_text("Delete this item").click()
diff --git a/manage_breast_screening/tests/system/clinical/test_cyst_history.py b/manage_breast_screening/tests/system/clinical/test_cyst_history.py
@@ -84,7 +84,7 @@ def and_the_message_says_cyst_added(self):
         alert = self.page.get_by_role("alert")
 
         expect(alert).to_contain_text("Success")
-        expect(alert).to_contain_text("Details of cysts added")
+        expect(alert).to_contain_text("Added cysts")
 
     def then_i_see_the_edit_cyst_form(self):
         expect(self.page.get_by_text("Edit details of cysts")).to_be_visible()
@@ -108,4 +108,4 @@ def and_the_message_says_cyst_updated(self):
         alert = self.page.get_by_role("alert")
 
         expect(alert).to_contain_text("Success")
-        expect(alert).to_contain_text("Details of cysts updated")
+        expect(alert).to_contain_text("Updated cysts")
diff --git a/manage_breast_screening/tests/system/clinical/test_implanted_medical_device_history.py b/manage_breast_screening/tests/system/clinical/test_implanted_medical_device_history.py
@@ -121,7 +121,7 @@ def and_the_message_says_device_added(self):
         alert = self.page.get_by_role("alert")
 
         expect(alert).to_contain_text("Success")
-        expect(alert).to_contain_text("Implanted medical device added")
+        expect(alert).to_contain_text("Added implanted medical device")
 
     def when_i_click_change(self):
         self.page.get_by_text("Change implanted medical device item").click()
@@ -149,4 +149,4 @@ def and_the_message_says_implanted_medical_device_updated(self):
         alert = self.page.get_by_role("alert")
 
         expect(alert).to_contain_text("Success")
-        expect(alert).to_contain_text("Details of implanted medical device updated")
+        expect(alert).to_contain_text("Updated implanted medical device")
diff --git a/manage_breast_screening/tests/system/clinical/test_mastectomy_or_lumpectomy_history.py b/manage_breast_screening/tests/system/clinical/test_mastectomy_or_lumpectomy_history.py
@@ -166,7 +166,7 @@ def and_the_message_says_mastectomy_or_lumpectomy_added(self):
         alert = self.page.get_by_role("alert")
 
         expect(alert).to_contain_text("Success")
-        expect(alert).to_contain_text("Details of mastectomy or lumpectomy added")
+        expect(alert).to_contain_text("Added mastectomy or lumpectomy")
 
     def when_i_click_change(self):
         self.page.get_by_text("Change mastectomy or lumpectomy item").click()
@@ -196,4 +196,4 @@ def and_the_message_says_mastectomy_or_lumpectomy_updated(self):
         alert = self.page.get_by_role("alert")
 
         expect(alert).to_contain_text("Success")
-        expect(alert).to_contain_text("Details of mastectomy or lumpectomy updated")
+        expect(alert).to_contain_text("Updated mastectomy or lumpectomy")
diff --git a/manage_breast_screening/tests/system/clinical/test_other_procedure_history.py b/manage_breast_screening/tests/system/clinical/test_other_procedure_history.py

Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,7 @@ def test_valid_post_redirects_to_appointment(self, clinical_user_client):`
`57`	`57`	`[`
`58`	`58`	`messages.Message(`
`59`	`59`	`level=messages.SUCCESS,`
`60`		`- message="Benign lumps added",`
	`60`	`+ message="Added benign lumps",`
`61`	`61`	`)`
`62`	`62`	`],`
`63`	`63`	`)`
`@@ -150,7 +150,7 @@ def test_valid_post_redirects_to_appointment(`
`150`	`150`	`[`
`151`	`151`	`messages.Message(`
`152`	`152`	`level=messages.SUCCESS,`
`153`		`- message="Benign lumps updated",`
	`153`	`+ message="Updated benign lumps",`
`154`	`154`	`)`
`155`	`155`	`],`
`156`	`156`	`)`
Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,7 @@ def test_valid_post_redirects_to_appointment(self, clinical_user_client):`
`55`	`55`	`[`
`56`	`56`	`messages.Message(`
`57`	`57`	`level=messages.SUCCESS,`
`58`		`- message="Details of breast implants or augmentation added",`
	`58`	`+ message="Added breast implants or augmentation",`
`59`	`59`	`)`
`60`	`60`	`],`
`61`	`61`	`)`
`@@ -144,7 +144,7 @@ def test_valid_post_redirects_to_appointment(`
`144`	`144`	`[`
`145`	`145`	`messages.Message(`
`146`	`146`	`level=messages.SUCCESS,`
`147`		`- message="Details of breast implants or augmentation updated",`
	`147`	`+ message="Updated breast implants or augmentation",`
`148`	`148`	`)`
`149`	`149`	`],`
`150`	`150`	`)`
Original file line number	Diff line number	Diff line change
`@@ -73,7 +73,7 @@ def test_valid_post_redirects_to_appointment(self, clinical_user_client):`
`73`	`73`	`[`
`74`	`74`	`messages.Message(`
`75`	`75`	`level=messages.SUCCESS,`
`76`		`- message="Breast cancer history added",`
	`76`	`+ message="Added breast cancer",`
`77`	`77`	`)`
`78`	`78`	`],`
`79`	`79`	`)`
`@@ -161,7 +161,7 @@ def test_valid_post_redirects_to_appointment(`
`161`	`161`	`[`
`162`	`162`	`messages.Message(`
`163`	`163`	`level=messages.SUCCESS,`
`164`		`- message="Breast cancer history updated",`
	`164`	`+ message="Updated breast cancer",`
`165`	`165`	`)`
`166`	`166`	`],`
`167`	`167`	`)`
Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@ def test_valid_post_redirects_to_appointment(self, clinical_user_client):`
`51`	`51`	`[`
`52`	`52`	`messages.Message(`
`53`	`53`	`level=messages.SUCCESS,`
`54`		`- message="Details of cysts added",`
	`54`	`+ message="Added cysts",`
`55`	`55`	`)`
`56`	`56`	`],`
`57`	`57`	`)`
`@@ -128,7 +128,7 @@ def test_valid_post_redirects_to_appointment(`
`128`	`128`	`[`
`129`	`129`	`messages.Message(`
`130`	`130`	`level=messages.SUCCESS,`
`131`		`- message="Details of cysts updated",`
	`131`	`+ message="Updated cysts",`
`132`	`132`	`)`
`133`	`133`	`],`
`134`	`134`	`)`
Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,7 @@ def test_valid_post_redirects_to_appointment(self, clinical_user_client):`
`61`	`61`	`[`
`62`	`62`	`messages.Message(`
`63`	`63`	`level=messages.SUCCESS,`
`64`		`- message="Details of mastectomy or lumpectomy added",`
	`64`	`+ message="Added mastectomy or lumpectomy",`
`65`	`65`	`)`
`66`	`66`	`],`
`67`	`67`	`)`
`@@ -157,7 +157,7 @@ def test_valid_post_redirects_to_appointment(`
`157`	`157`	`[`
`158`	`158`	`messages.Message(`
`159`	`159`	`level=messages.SUCCESS,`
`160`		`- message="Details of mastectomy or lumpectomy updated",`
	`160`	`+ message="Updated mastectomy or lumpectomy",`
`161`	`161`	`)`
`162`	`162`	`],`
`163`	`163`	`)`