SORMAS-Foundation#3171 - Added feature configuration for outbreaks

Author: MateStrysewske

sormas-api/src/main/java/de/symeda/sormas/api/feature/FeatureType.java

@@ -36,7 +36,8 @@ public enum FeatureType {
 	CASE_FOLLOWUP(true, false, null),
 	TASK_NOTIFICATIONS(true, true, null),
 	OTHER_NOTIFICATIONS(true, true, null),
-	DOCUMENTS(true, false, null);
+	DOCUMENTS(true, false, null),
+	OUTBREAKS(true, true, null);
 
 	/**
 	 * Server feature means that the feature only needs to be configured once per server since they define the way the system

sormas-backend/src/main/java/de/symeda/sormas/backend/disease/DiseaseFacadeEjb.java

@@ -18,6 +18,7 @@
 package de.symeda.sormas.backend.disease;
 
 import java.util.Date;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
@@ -31,12 +32,14 @@
 import de.symeda.sormas.api.disease.DiseaseBurdenDto;
 import de.symeda.sormas.api.disease.DiseaseFacade;
 import de.symeda.sormas.api.event.EventCriteria;
+import de.symeda.sormas.api.feature.FeatureType;
 import de.symeda.sormas.api.outbreak.OutbreakCriteria;
 import de.symeda.sormas.api.region.DistrictReferenceDto;
 import de.symeda.sormas.api.region.RegionReferenceDto;
 import de.symeda.sormas.backend.caze.CaseFacadeEjb.CaseFacadeEjbLocal;
 import de.symeda.sormas.backend.disease.DiseaseConfigurationFacadeEjb.DiseaseConfigurationFacadeEjbLocal;
 import de.symeda.sormas.backend.event.EventFacadeEjb.EventFacadeEjbLocal;
+import de.symeda.sormas.backend.feature.FeatureConfigurationFacadeEjb.FeatureConfigurationFacadeEjbLocal;
 import de.symeda.sormas.backend.outbreak.OutbreakFacadeEjb.OutbreakFacadeEjbLocal;
 import de.symeda.sormas.backend.person.PersonFacadeEjb.PersonFacadeEjbLocal;
 import de.symeda.sormas.backend.region.District;
@@ -57,6 +60,8 @@ public class DiseaseFacadeEjb implements DiseaseFacade {
 	private PersonFacadeEjbLocal personFacade;
 	@EJB
 	private DiseaseConfigurationFacadeEjbLocal diseaseConfigurationFacade;
+	@EJB
+	private FeatureConfigurationFacadeEjbLocal featureConfigurationFacade;
 
 	@Override
 	public List<DiseaseBurdenDto> getDiseaseBurdenForDashboard(
@@ -80,8 +85,13 @@ public List<DiseaseBurdenDto> getDiseaseBurdenForDashboard(
 			eventFacade.getEventCountByDisease(new EventCriteria().region(regionRef).district(districtRef).reportedBetween(from, to));
 
 		//outbreaks
-		Map<Disease, Long> outbreakDistrictsCount = outbreakFacade
-			.getOutbreakDistrictCountByDisease(new OutbreakCriteria().region(regionRef).district(districtRef).reportedBetween(from, to));
+		Map<Disease, Long> outbreakDistrictsCount;
+		if (featureConfigurationFacade.isFeatureEnabled(FeatureType.OUTBREAKS)) {
+			outbreakDistrictsCount = outbreakFacade
+				.getOutbreakDistrictCountByDisease(new OutbreakCriteria().region(regionRef).district(districtRef).reportedBetween(from, to));
+		} else {
+			outbreakDistrictsCount = new HashMap<>();
+		}
 
 		//last report district
 		Map<Disease, District> lastReportedDistricts = caseFacade.getLastReportedDistrictByDisease(caseCriteria, true, true);

sormas-ui/src/main/java/de/symeda/sormas/ui/MainScreen.java

@@ -230,7 +230,7 @@ public View getView(String viewName) {
 		if (permitted(UserRight.CONFIGURATION_ACCESS)) {
 			AbstractConfigurationView.registerViews(navigator);
 			menu.addView(
-				OutbreaksView.class,
+				FacadeProvider.getFeatureConfigurationFacade().isFeatureEnabled(FeatureType.OUTBREAKS) ? OutbreaksView.class : CountriesView.class,
 				AbstractConfigurationView.ROOT_VIEW_NAME,
 				I18nProperties.getCaption(Captions.mainMenuConfiguration),
 				VaadinIcons.COGS);

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

@@ -115,7 +115,9 @@ public void refreshMenu(SubMenu menu, Label infoLabel, Label infoLabelSub, Strin
 		CaseDataDto caze = FacadeProvider.getCaseFacade().getCaseDataByUuid(getReference().getUuid());
 
 		// Handle outbreaks for the disease and district of the case
-		if (FacadeProvider.getOutbreakFacade().hasOutbreak(caze.getDistrict(), caze.getDisease()) && caze.getDisease().usesSimpleViewForOutbreaks()) {
+		if (FacadeProvider.getFeatureConfigurationFacade().isFeatureEnabled(FeatureType.OUTBREAKS)
+			&& FacadeProvider.getOutbreakFacade().hasOutbreak(caze.getDistrict(), caze.getDisease())
+			&& caze.getDisease().usesSimpleViewForOutbreaks()) {
 			hasOutbreak = true;
 
 			//			viewConfiguration.setViewMode(ViewMode.SIMPLE);
@@ -141,8 +143,10 @@ public void refreshMenu(SubMenu menu, Label infoLabel, Label infoLabelSub, Strin
 		menu.addView(CasesView.VIEW_NAME, I18nProperties.getPrefixCaption(CaseDataDto.I18N_PREFIX, Captions.caseCasesList));
 		menu.addView(CaseDataView.VIEW_NAME, I18nProperties.getCaption(CaseDataDto.I18N_PREFIX), params);
 
-		boolean showExtraMenuEntries =
-			!hasOutbreak || !caze.getDisease().usesSimpleViewForOutbreaks() || viewConfiguration.getViewMode() != ViewMode.SIMPLE;
+		boolean showExtraMenuEntries = FacadeProvider.getFeatureConfigurationFacade().isFeatureDisabled(FeatureType.OUTBREAKS)
+			|| !hasOutbreak
+			|| !caze.getDisease().usesSimpleViewForOutbreaks()
+			|| viewConfiguration.getViewMode() != ViewMode.SIMPLE;
 		if (showExtraMenuEntries) {
 			menu.addView(CasePersonView.VIEW_NAME, I18nProperties.getPrefixCaption(CaseDataDto.I18N_PREFIX, CaseDataDto.PERSON), params);
 			if (caze.getDisease() == Disease.CONGENITAL_RUBELLA) {

sormas-ui/src/main/java/de/symeda/sormas/ui/configuration/AbstractConfigurationView.java

@@ -59,17 +59,19 @@ protected AbstractConfigurationView(String viewName) {
 	public void refreshMenu(SubMenu menu, Label infoLabel, Label infoLabelSub, String params) {
 		menu.removeAllViews();
 
-		menu.addView(
-			OutbreaksView.VIEW_NAME,
-			I18nProperties.getPrefixCaption("View", OutbreaksView.VIEW_NAME.replaceAll("/", ".") + ".short", ""),
-			params);
+		if (FacadeProvider.getFeatureConfigurationFacade().isFeatureEnabled(FeatureType.OUTBREAKS)) {
+			menu.addView(
+				OutbreaksView.VIEW_NAME,
+				I18nProperties.getPrefixCaption("View", OutbreaksView.VIEW_NAME.replaceAll("/", ".") + ".short", ""),
+				params);
+		}
 
 		if (UserProvider.getCurrent().hasUserRight(UserRight.INFRASTRUCTURE_VIEW)) {
 			menu.addView(
-					CountriesView.VIEW_NAME,
-					I18nProperties.getPrefixCaption("View", CountriesView.VIEW_NAME.replaceAll("/", ".") + ".short", ""),
-					null,
-					false);
+				CountriesView.VIEW_NAME,
+				I18nProperties.getPrefixCaption("View", CountriesView.VIEW_NAME.replaceAll("/", ".") + ".short", ""),
+				null,
+				false);
 			if (FacadeProvider.getFeatureConfigurationFacade().isFeatureEnabled(FeatureType.INFRASTRUCTURE_TYPE_AREA)) {
 				menu.addView(
 					AreasView.VIEW_NAME,
@@ -143,7 +145,10 @@ public void refreshMenu(SubMenu menu, Label infoLabel, Label infoLabelSub, Strin
 	}
 
 	public static void registerViews(Navigator navigator) {
-		navigator.addView(OutbreaksView.VIEW_NAME, OutbreaksView.class);
+
+		if (FacadeProvider.getFeatureConfigurationFacade().isFeatureEnabled(FeatureType.OUTBREAKS)) {
+			navigator.addView(OutbreaksView.VIEW_NAME, OutbreaksView.class);
+		}
 
 		if (UserProvider.getCurrent().hasUserRight(UserRight.INFRASTRUCTURE_VIEW)) {
 			if (FacadeProvider.getFeatureConfigurationFacade().isFeatureEnabled(FeatureType.INFRASTRUCTURE_TYPE_AREA)) {

sormas-ui/src/main/java/de/symeda/sormas/ui/dashboard/surveillance/DiseaseStatisticsComponent.java

@@ -31,9 +31,11 @@
 import com.vaadin.ui.Layout;
 
 import de.symeda.sormas.api.Disease;
+import de.symeda.sormas.api.FacadeProvider;
 import de.symeda.sormas.api.caze.CaseClassification;
 import de.symeda.sormas.api.caze.DashboardCaseDto;
 import de.symeda.sormas.api.event.EventStatus;
+import de.symeda.sormas.api.feature.FeatureType;
 import de.symeda.sormas.api.i18n.Captions;
 import de.symeda.sormas.api.i18n.Descriptions;
 import de.symeda.sormas.api.i18n.I18nProperties;
@@ -165,7 +167,9 @@ private DashboardStatisticsSubComponent createOutbreakDistrictAndCaseFatalityLay
 
 		layout.addComponent(this.createLastReportedDistrictComponent());
 
-		layout.addComponent(createOutbreakDistrictComponent());
+		if (FacadeProvider.getFeatureConfigurationFacade().isFeatureEnabled(FeatureType.OUTBREAKS)) {
+			layout.addComponent(createOutbreakDistrictComponent());
+		}
 
 		layout.addComponent(createCasesInQuarantineLayout());
 
@@ -447,7 +451,9 @@ public void refresh() {
 		updateCaseComponent(disease);
 		updateCaseFatalityComponent(disease);
 		updateLastReportedDistrictComponent(disease);
-		updateOutbreakDistrictComponent(disease);
+		if (FacadeProvider.getFeatureConfigurationFacade().isFeatureEnabled(FeatureType.OUTBREAKS)) {
+			updateOutbreakDistrictComponent(disease);
+		}
 		updateEventComponent(disease);
 		updateTestResultComponent(disease);
 		updateCasesInQuarantineData();