Merge pull request #13747 from SORMAS-Foundation/bugfix-13734-add-therapy-and-clinical-course-tabs-visibility

Displaying the case module forms like Therapy, Clinical course and sy…

Author: KarnaiahPesula

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

@@ -15,8 +15,11 @@
 
 package de.symeda.sormas.ui.caze;
 
+import java.util.Arrays;
+import java.util.Collections;
 import java.util.EnumSet;
-import java.util.List;
+import java.util.HashSet;
+import java.util.Set;
 
 import com.vaadin.navigator.ViewChangeListener.ViewChangeEvent;
 import com.vaadin.ui.UI;
@@ -61,6 +64,27 @@ public abstract class AbstractCaseView extends AbstractEditAllowedDetailView<Cas
 
 	public static final String ROOT_VIEW_NAME = CasesView.VIEW_NAME;
 
+	public static final Set<Disease> CLINICAL_COURSE_DISABLED_DISEASES = Collections.unmodifiableSet(
+		new HashSet<>(
+			Arrays.asList(
+				Disease.MEASLES,
+				Disease.INVASIVE_MENINGOCOCCAL_INFECTION,
+				Disease.INVASIVE_PNEUMOCOCCAL_INFECTION,
+				Disease.GIARDIASIS,
+				Disease.CRYPTOSPORIDIOSIS)));
+
+	public static final Set<Disease> THERAPY_DISABLED_DISEASES = Collections.unmodifiableSet(
+		new HashSet<>(
+			Arrays.asList(
+				Disease.MEASLES,
+				Disease.GIARDIASIS,
+				Disease.CRYPTOSPORIDIOSIS,
+				Disease.INVASIVE_MENINGOCOCCAL_INFECTION,
+				Disease.INVASIVE_PNEUMOCOCCAL_INFECTION)));
+
+	public static final Set<Disease> SYMPTOMS_DISABLED_DISEASES =
+		Collections.unmodifiableSet(new HashSet<>(Arrays.asList(Disease.INFLUENZA, Disease.LATENT_TUBERCULOSIS)));
+
 	private Boolean hasOutbreak;
 	private boolean caseFollowupEnabled;
 
@@ -177,7 +201,7 @@ public void refreshMenu(SubMenu menu, String params) {
 					I18nProperties.getPrefixCaption(CaseDataDto.I18N_PREFIX, CaseDataDto.PORT_HEALTH_INFO),
 					params);
 			}
-			if (UiUtil.enabled(FeatureType.VIEW_TAB_CASES_SYMPTOMS) && !List.of(Disease.LATENT_TUBERCULOSIS).contains(caze.getDisease())) {
+			if (UiUtil.enabled(FeatureType.VIEW_TAB_CASES_SYMPTOMS) && !SYMPTOMS_DISABLED_DISEASES.contains(caze.getDisease())) {
 				menu.addView(CaseSymptomsView.VIEW_NAME, I18nProperties.getPrefixCaption(CaseDataDto.I18N_PREFIX, CaseDataDto.SYMPTOMS), params);
 			}
 			if (UiUtil.enabled(FeatureType.VIEW_TAB_CASES_EPIDEMIOLOGICAL_DATA) && caze.getDisease() != Disease.CONGENITAL_RUBELLA) {
@@ -187,9 +211,11 @@ public void refreshMenu(SubMenu menu, String params) {
 				&& !caze.checkIsUnreferredPortHealthCase()
 				&& UiUtil.enabled(FeatureType.CLINICAL_MANAGEMENT)
 				&& (!(FacadeProvider.getConfigFacade().isConfiguredCountry(CountryHelper.COUNTRY_CODE_LUXEMBOURG)
-					&& List.of(Disease.MEASLES).contains(caze.getDisease())))
-				&& !List.of(Disease.GIARDIASIS, Disease.CRYPTOSPORIDIOSIS).contains(caze.getDisease())) {
-				// Therapy view is not available for Luxembourg for Measles cases and for all Gradiastis & Cryptosporidiosis cases.
+					&& THERAPY_DISABLED_DISEASES.contains(caze.getDisease())))
+				&& Disease.INFLUENZA != caze.getDisease()) {
+				// Therapy view is not available for Luxembourg for Measles, IMI, IPI, Gradiastis & Cryptosporidiosis cases.
+				// But for other countries, it should be available for the above diseases
+				// Therapy view is not available for all countries Influenza cases. #13708
 				menu.addView(TherapyView.VIEW_NAME, I18nProperties.getPrefixCaption(CaseDataDto.I18N_PREFIX, CaseDataDto.THERAPY), params);
 			}
 		}
@@ -205,17 +231,11 @@ public void refreshMenu(SubMenu menu, String params) {
 				EnumSet.of(FeatureType.VIEW_TAB_CASES_FOLLOW_UP, FeatureType.VIEW_TAB_CASES_CLINICAL_COURSE, FeatureType.CLINICAL_MANAGEMENT),
 				UserRight.CLINICAL_COURSE_VIEW)
 				&& !caze.checkIsUnreferredPortHealthCase()
-				&& !List
-					.of(
-						Disease.INVASIVE_MENINGOCOCCAL_INFECTION,
-						Disease.INVASIVE_PNEUMOCOCCAL_INFECTION,
-						Disease.GIARDIASIS,
-						Disease.CRYPTOSPORIDIOSIS)
-					.contains(caze.getDisease())
 				&& !(FacadeProvider.getConfigFacade().isConfiguredCountry(CountryHelper.COUNTRY_CODE_LUXEMBOURG)
-					&& List.of(Disease.MEASLES).contains(caze.getDisease()))) {
-				// clinical course view is not available for Luxembourg for Measles cases,
-				// and for all other countries GIARDIASIS, Cryptosporidiosis, IMI & IPI cases.
+					&& CLINICAL_COURSE_DISABLED_DISEASES.contains(caze.getDisease()))
+				&& Disease.INFLUENZA != caze.getDisease()) {
+				// clinical course view is not available for Luxembourg for Measles, IMI, IPI, GIARDIASIS, Cryptosporidiosis cases,
+				// and for all other countries Influenza cases. 13708
 				menu.addView(
 					ClinicalCourseView.VIEW_NAME,
 					I18nProperties.getPrefixCaption(CaseDataDto.I18N_PREFIX, CaseDataDto.CLINICAL_COURSE),