Merge branch 'development' into feature-3005-campaign-data-import-duplicate-detection

Author: Martin Wahnschaffe

sormas-api/src/main/java/de/symeda/sormas/api/campaign/CampaignPhase.java

@@ -0,0 +1,18 @@
+package de.symeda.sormas.api.campaign;
+
+import de.symeda.sormas.api.IntegerRange;
+import de.symeda.sormas.api.i18n.I18nProperties;
+
+/**
+ * Not used yet
+ */
+public enum CampaignPhase {
+
+	PRE,
+	INTRA,
+	POST;
+
+	public String toString() {
+		return I18nProperties.getEnumCaption(this);
+	}
+}

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-api/src/main/java/de/symeda/sormas/api/i18n/Captions.java

@@ -164,8 +164,10 @@ public interface Captions {
 	String CampaignFormData_area = "CampaignFormData.area";
 	String CampaignFormData_campaign = "CampaignFormData.campaign";
 	String CampaignFormData_campaignFormMeta = "CampaignFormData.campaignFormMeta";
+	String CampaignFormData_edit = "CampaignFormData.edit";
 	String CampaignFormData_formDate = "CampaignFormData.formDate";
 	String campaignNewCampaign = "campaignNewCampaign";
+	String campaignSearch = "campaignSearch";
 	String campaignValidateForms = "campaignValidateForms";
 	String caseActiveCases = "caseActiveCases";
 	String caseAllCases = "caseAllCases";

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

@@ -210,6 +210,7 @@ campaignDashboardSubTabName=Sub-tab name
 campaignDashboardChartWidth=Width in %
 campaignDashboardChartHeight=Height in %
 campaignDashboardOrder=Order
+campaignSearch=Search Campaign
 
 Campaign=Campaign
 Campaign.name=Name
@@ -227,6 +228,7 @@ CampaignFormData.campaign = Campaign
 CampaignFormData.campaignFormMeta = Form
 CampaignFormData.formDate = Form date
 CampaignFormData.area = Area
+CampaignFormData.edit=Edit
 
 # CaseData
 caseCasesList=Cases list

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

@@ -18,6 +18,9 @@
 
 # Descriptions used to detail captions
 
+# Campaign
+Campaign.campaignPhase = This is a preview for a feature that will be implemented later
+
 # CaseData
 CaseData.caseClassification = Select the case status for the person 
 CaseData.clinicianDetails = Please specify the name, phone number and email address of the clinician responsible for this case

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

@@ -101,6 +101,11 @@ ArrivalOrDeparture.UNKNOWN = Unknown
 BurialConductor.FAMILY_COMMUNITY = Family/Community
 BurialConductor.OUTBREAK_TEAM = Outbreak burial team
 
+# CampaignPhase
+CampaignPhase.PRE = Pre-Campaign
+CampaignPhase.INTRA = Intra-Campaign
+CampaignPhase.POST = Post-Campaign
+
 # CaseClassification
 CaseClassification.CONFIRMED = Confirmed case
 CaseClassification.CONFIRMED_NO_SYMPTOMS = Confirmed case with no symptoms

sormas-backend/src/main/java/de/symeda/sormas/backend/campaign/CampaignFacadeEjb.java

@@ -132,7 +132,7 @@ public CampaignReferenceDto getLastStartedCampaign() {
 		final CriteriaQuery<Campaign> query = cb.createQuery(Campaign.class);
 		final Root<Campaign> from = query.from(Campaign.class);
 		query.select(from);
-		query.where(cb.lessThanOrEqualTo(from.get(Campaign.START_DATE), new Date()));
+		query.where(cb.and(campaignService.createActiveCampaignsFilter(cb, from), cb.lessThanOrEqualTo(from.get(Campaign.START_DATE), new Date())));
 		query.orderBy(cb.desc(from.get(Campaign.START_DATE)));
 
 		final TypedQuery<Campaign> q = em.createQuery(query);

sormas-backend/src/main/java/de/symeda/sormas/backend/campaign/CampaignService.java

@@ -81,7 +81,7 @@ public List<String> getAllActiveUuids() {
 
 		if (getCurrentUser() != null) {
 			Predicate userFilter = createUserFilter(cb, cq, from);
-			filter = AbstractAdoService.and(cb, cb.isFalse(from.get(Campaign.ARCHIVED)), userFilter);
+			filter = AbstractAdoService.and(cb, createActiveCampaignsFilter(cb, from), userFilter);
 		}
 
 		cq.where(filter);
@@ -119,9 +119,13 @@ public List<Campaign> getAllActive() {
 		CriteriaBuilder cb = em.getCriteriaBuilder();
 		CriteriaQuery<Campaign> cq = cb.createQuery(getElementClass());
 		Root<Campaign> from = cq.from(getElementClass());
-		cq.where(cb.isFalse(from.get(Campaign.DELETED)));
+		cq.where(createActiveCampaignsFilter(cb, from));
 		cq.orderBy(cb.desc(from.get(AbstractDomainObject.CHANGE_DATE)));
 
 		return em.createQuery(cq).getResultList();
 	}
+
+	public Predicate createActiveCampaignsFilter(CriteriaBuilder cb, Root<Campaign> root) {
+		return cb.and(cb.isFalse(root.get(Campaign.ARCHIVED)), cb.isFalse(root.get(Campaign.DELETED)));
+	}
 }

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);