Merge pull request SORMAS-Foundation#3770 from hzi-braunschweig/bugfix-3686-ContactBulkActionHeadings

SORMAS-Foundation#3686 - use correct headings for contact bulk action prompts

Author: danRosca

sormas-api/src/main/java/de/symeda/sormas/api/i18n/Strings.java

@@ -250,9 +250,11 @@ public interface Strings {
 	String headingContactDataNotComplete = "headingContactDataNotComplete";
 	String headingContactInformation = "headingContactInformation";
 	String headingContactMap = "headingContactMap";
+	String headingContactsCancelFollowUp = "headingContactsCancelFollowUp";
 	String headingContactsConvertedToCase = "headingContactsConvertedToCase";
 	String headingContactsDeleted = "headingContactsDeleted";
 	String headingContactsInQuarantine = "headingContactsInQuarantine";
+	String headingContactsLostToFollowUp = "headingContactsLostToFollowUp";
 	String headingContactsPerCase = "headingContactsPerCase";
 	String headingContactsPlacedInQuarantine = "headingContactsPlacedInQuarantine";
 	String headingContactTracingFirstContact = "headingContactTracingFirstContact";

sormas-api/src/main/resources/strings.properties

@@ -457,6 +457,8 @@ headingCasesInQuarantine = Cases in Quarantine
 headingCasesPlacedInQuarantine = Cases placed in Quarantine
 headingContactsInQuarantine = Contacts in Quarantine
 headingContactsPlacedInQuarantine = Contacts placed in Quarantine
+headingContactsCancelFollowUp = Confirm canceling follow-up for contacts
+headingContactsLostToFollowUp = Confirm setting contacts to lost to follow-up
 headingPickOrCreateContact = Pick or create contact
 headingNewSourceCases = New Cases not Previously Known to Be Contacts
 headingNoCaseFound = No case found

sormas-ui/src/main/java/de/symeda/sormas/ui/contact/ContactController.java

@@ -547,11 +547,14 @@ public void cancelFollowUpOfAllSelectedItems(Collection<? extends ContactIndexDt
 				Type.WARNING_MESSAGE,
 				false).show(Page.getCurrent());
 		} else {
-			VaadinUiUtil.showDeleteConfirmationWindow(
-				String.format(I18nProperties.getString(Strings.confirmationCancelFollowUp), selectedRows.size()),
-				new Runnable() {
-
-					public void run() {
+			VaadinUiUtil.showConfirmationPopup(
+				String.format(I18nProperties.getString(Strings.headingContactsCancelFollowUp)),
+				new Label(String.format(I18nProperties.getString(Strings.confirmationCancelFollowUp), selectedRows.size())),
+				I18nProperties.getString(Strings.yes),
+				I18nProperties.getString(Strings.no),
+				640,
+				confirmed -> {
+					if (confirmed) {
 						for (ContactIndexDto contact : selectedRows) {
 							if (contact.getFollowUpStatus() != FollowUpStatus.NO_FOLLOW_UP) {
 								ContactDto contactDto = FacadeProvider.getContactFacade().getContactByUuid(contact.getUuid());
@@ -580,11 +583,14 @@ public void setAllSelectedItemsToLostToFollowUp(Collection<? extends ContactInde
 				Type.WARNING_MESSAGE,
 				false).show(Page.getCurrent());
 		} else {
-			VaadinUiUtil.showDeleteConfirmationWindow(
-				String.format(I18nProperties.getString(Strings.confirmationLostToFollowUp), selectedRows.size()),
-				new Runnable() {
-
-					public void run() {
+			VaadinUiUtil.showConfirmationPopup(
+				String.format(I18nProperties.getString(Strings.headingContactsLostToFollowUp)),
+				new Label(String.format(I18nProperties.getString(Strings.confirmationLostToFollowUp), selectedRows.size())),
+				I18nProperties.getString(Strings.yes),
+				I18nProperties.getString(Strings.no),
+				640,
+				confirmed -> {
+					if (confirmed) {
 						for (ContactIndexDto contact : selectedRows) {
 							if (contact.getFollowUpStatus() != FollowUpStatus.NO_FOLLOW_UP) {
 								ContactDto contactDto = FacadeProvider.getContactFacade().getContactByUuid(contact.getUuid());