Merge pull request #13371 from SORMAS-Foundation/change-13364-changes_ui_for_notified_by

#13364 - Fixes the UI for the "Notified by" field in case notifier si…

Author: raulbob

sormas-ui/src/main/java/de/symeda/sormas/ui/caze/notifier/CaseNotifierSideViewComponent.java

@@ -16,10 +16,12 @@
 package de.symeda.sormas.ui.caze.notifier;
 
 import com.vaadin.icons.VaadinIcons;
+import com.vaadin.server.Sizeable.Unit;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Label;
 import com.vaadin.ui.themes.ValoTheme;
 
+import de.symeda.sormas.api.FacadeProvider;
 import de.symeda.sormas.api.caze.CaseDataDto;
 import de.symeda.sormas.api.i18n.Captions;
 import de.symeda.sormas.api.i18n.I18nProperties;
@@ -49,12 +51,22 @@ public CaseNotifierSideViewComponent(CaseDataDto caze) {
 		setSpacing(false);
 
 		if (caze.getNotifier() != null) {
-			var component = ControllerProvider.getCaseNotifierSideViewController().getNotifierComponent(caze);
+			final var component = ControllerProvider.getCaseNotifierSideViewController().getNotifierComponent(caze);
 			addComponent(component);
-			Button notficationButton = ButtonHelper.createIconButton(Captions.Notifier_notification, VaadinIcons.BOOK, e -> {
+
+			Button notificationButton = ButtonHelper.createIconButton(Captions.Notifier_notification, VaadinIcons.BOOK, e -> {
+				final var oldestReport = ControllerProvider.getCaseNotifierSideViewController().getOldestReport(caze);
+				if (oldestReport == null) {
+					return;
+				}
+				final var externalMessage = FacadeProvider.getExternalMessageFacade().getForSurveillanceReport(oldestReport.toReference());
+				if (externalMessage == null) {
+					return;
+				}
+				ControllerProvider.getExternalMessageController().showExternalMessage(externalMessage.getUuid(), false, null);
 			}, ValoTheme.BUTTON_PRIMARY);
 
-			addCreateButton(notficationButton);
+			addCreateButton(notificationButton);
 		} else {
 			addComponent(new Label(I18nProperties.getCaption(Captions.Notification_noNotification)));
 		}

sormas-ui/src/main/java/de/symeda/sormas/ui/caze/notifier/CaseNotifierSideViewContent.java

@@ -114,20 +114,31 @@ private void buildNotifierDetails() {
         // Full name
         Label fullNameLabel = new Label(notifier.getFirstName() + " " + notifier.getLastName());
         CssStyles.style(fullNameLabel, CssStyles.LABEL_BOLD, CssStyles.LABEL_UPPERCASE);
+        addComponent(fullNameLabel);
 
         // Registration number
         Label registrationNumberLabel = new Label(notifier.getRegistrationNumber());
         CssStyles.style(registrationNumberLabel, CssStyles.LABEL_BOLD);
+        addComponent(registrationNumberLabel);
 
-        // Spacer before phone label
-        Label spacerBeforePhone = new Label();
-        spacerBeforePhone.setHeight("0.05rem");
+        // Spacer before contact label
+        if ((notifier.getPhone() != null && !notifier.getPhone().isEmpty()) || (notifier.getEmail() != null && !notifier.getEmail().isEmpty())) {
+            Label spacerBeforeContact = new Label();
+            spacerBeforeContact.setHeight("0.1rem");
+            addComponent(spacerBeforeContact);
+        }
 
         // Phone
-        Label phoneLabel = new Label(notifier.getPhone());
+        if (notifier.getPhone() != null && !notifier.getPhone().isEmpty()) {
+            Label phoneLabel = new Label(notifier.getPhone());
+            addComponent(phoneLabel);
+        }
 
         // Email
-        Label emailLabel = new Label(notifier.getEmail());
+        if (notifier.getEmail() != null && !notifier.getEmail().isEmpty()) {
+            Label emailLabel = new Label(notifier.getEmail());
+            addComponent(emailLabel);
+        }
 
         // Spacer before email label
         Label spacerDates = new Label();
@@ -147,22 +158,10 @@ private void buildNotifierDetails() {
         HorizontalLayout dateFieldsLayout = new HorizontalLayout(notificationDateField, diagnosticDateField);
         dateFieldsLayout.setSpacing(true);
         dateFieldsLayout.setDefaultComponentAlignment(Alignment.MIDDLE_LEFT);
-
-        // Spacer before treatment group
-        Label spacerBeforeTreatment = new Label();
-        spacerBeforeTreatment.setHeight("0.05rem");
-
-        RadioButtonGroup<TreatmentOption> treatmentGroup = buildTreatmentOptions();
-
-        // Add components to the layout
-        addComponent(fullNameLabel);
-        addComponent(registrationNumberLabel);
-        addComponent(spacerBeforePhone);
-        addComponent(phoneLabel);
-        addComponent(emailLabel);
         addComponent(spacerDates);
         addComponent(dateFieldsLayout);
-        addComponent(spacerBeforeTreatment);
+
+        RadioButtonGroup<TreatmentOption> treatmentGroup = buildTreatmentOptions();
         addComponent(treatmentGroup);
 
     }

sormas-ui/src/main/java/de/symeda/sormas/ui/caze/notifier/CaseNotifierSideViewController.java

@@ -40,27 +40,39 @@ public class CaseNotifierSideViewController {
     /**
      * Retrieves the notifier component for a given case.
      *
-     * @param caze The case data for which the notifier component is to be retrieved.
+     * @param caze
+     *            The case data for which the notifier component is to be retrieved.
      * @return A {@link CaseNotifierSideViewContent} object containing the notifier, oldest report, and treatment details.
      */
     public CaseNotifierSideViewContent getNotifierComponent(CaseDataDto caze) {
 
         NotifierDto notifier =
             FacadeProvider.getNotifierFacade().getByUuidAndTime(caze.getNotifier().getUuid(), caze.getNotifier().getVersionDate().toInstant());
 
+        return new CaseNotifierSideViewContent(caze, notifier, getOldestReport(caze), getTreatment(caze.getTherapy()), true);
+    }
+
+    /**
+     * Retrieves the oldest surveillance report for a given case.
+     * 
+     * @param caze
+     *            The case
+     * @return The oldest {@link SurveillanceReportDto} for the case, or null if no reports are found.
+     */
+    public SurveillanceReportDto getOldestReport(CaseDataDto caze) {
         CaseReferenceDto cazeRef = new CaseReferenceDto();
         cazeRef.setUuid(caze.getUuid());
-
-        return new CaseNotifierSideViewContent(caze, notifier, getOldestReport(cazeRef), getTreatment(caze.getTherapy()), true);
+        return getOldestReport(cazeRef);
     }
 
     /**
      * Retrieves the oldest surveillance report for a given case reference.
      *
-     * @param caze The reference to the case for which the oldest report is to be retrieved.
+     * @param caze
+     *            The reference to the case for which the oldest report is to be retrieved.
      * @return The oldest {@link SurveillanceReportDto} for the case, or null if no reports are found.
      */
-    protected SurveillanceReportDto getOldestReport(CaseReferenceDto caze) {
+    public SurveillanceReportDto getOldestReport(CaseReferenceDto caze) {
 
         SurveillanceReportCriteria criteria = new SurveillanceReportCriteria();
         criteria.caze(caze);
@@ -77,7 +89,8 @@ protected SurveillanceReportDto getOldestReport(CaseReferenceDto caze) {
     /**
      * Retrieves the treatment details for a given therapy.
      *
-     * @param therapy The therapy for which the treatment details are to be retrieved.
+     * @param therapy
+     *            The therapy for which the treatment details are to be retrieved.
      * @return A {@link TreatmentDto} object containing the treatment details, or null if no treatment is found.
      */
     protected TreatmentDto getTreatment(TherapyDto therapy) {