Merge pull request #13358 from SORMAS-Foundation/bugfix-13356_notification_box_should_always_be_visible

#13356 - Notification box will always be visible

Author: KarnaiahPesula

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

@@ -2154,6 +2154,7 @@ public interface Captions {
 	String nationalHealthId = "nationalHealthId";
 	String notAvailableShort = "notAvailableShort";
 	String Notification_dateOfNotification = "Notification.dateOfNotification";
+	String Notification_noNotification = "Notification.noNotification";
 	String notificationType = "notificationType";
 	String notificationType_caption = "notificationType.caption";
 	String notificationType_description = "notificationType.description";

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

@@ -3484,4 +3484,5 @@ SystemConfigurationValue.General = General
 
 # Notifier
 Notifier.notification = Notification
-Notification.dateOfNotification = Date of notification
+Notification.dateOfNotification = Date of notification
+Notification.noNotification = There are no notifications

sormas-ui/src/main/java/de/symeda/sormas/ui/caze/CaseDataView.java

@@ -134,7 +134,7 @@ protected void initView(String params) {
 		final EditPermissionType caseEditAllowed = FacadeProvider.getCaseFacade().getEditPermissionType(uuid);
 		boolean isEditAllowed = isEditAllowed();
 
-		if (UiUtil.enabled(FeatureType.SURVEILLANCE_REPORTS) && caze.getNotifier() != null) {
+		if (UiUtil.enabled(FeatureType.SURVEILLANCE_REPORTS)) {
 			CaseNotifierSideViewComponent notifierSideViewComponent =
 				new CaseNotifierSideViewComponent(caze);
 			notifierSideViewComponent.addStyleNames(CssStyles.SIDE_COMPONENT);

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

@@ -17,6 +17,7 @@
 
 import com.vaadin.icons.VaadinIcons;
 import com.vaadin.ui.Button;
+import com.vaadin.ui.Label;
 import com.vaadin.ui.themes.ValoTheme;
 
 import de.symeda.sormas.api.caze.CaseDataDto;
@@ -50,12 +51,13 @@ public CaseNotifierSideViewComponent(CaseDataDto caze) {
 		if (caze.getNotifier() != null) {
 			var component = ControllerProvider.getCaseNotifierSideViewController().getNotifierComponent(caze);
 			addComponent(component);
-		}
-
-		Button notficationButton = ButtonHelper.createIconButton(Captions.Notifier_notification, VaadinIcons.BOOK, e -> {
-		}, ValoTheme.BUTTON_PRIMARY);
+			Button notficationButton = ButtonHelper.createIconButton(Captions.Notifier_notification, VaadinIcons.BOOK, e -> {
+			}, ValoTheme.BUTTON_PRIMARY);
 
-		addCreateButton(notficationButton);
+			addCreateButton(notficationButton);
+		} else {
+			addComponent(new Label(I18nProperties.getCaption(Captions.Notification_noNotification)));
+		}
 
 	}