Fixed SORMAS-Foundation#3342

Author: MateStrysewske

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

@@ -5,7 +5,6 @@
 
 import javax.ejb.Remote;
 
-import de.symeda.sormas.api.campaign.data.CampaignFormDataDto;
 import de.symeda.sormas.api.campaign.diagram.CampaignDashboardElement;
 import de.symeda.sormas.api.utils.SortProperty;
 
@@ -14,7 +13,7 @@ public interface CampaignFacade {
 
 	List<CampaignIndexDto> getIndexList(CampaignCriteria campaignCriteria, Integer first, Integer max, List<SortProperty> sortProperties);
 
-	List<CampaignReferenceDto> getAllCampaignsAsReference();
+	List<CampaignReferenceDto> getAllActiveCampaignsAsReference();
 
 	CampaignReferenceDto getLastStartedCampaign();
 

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

@@ -116,8 +116,12 @@ public List<CampaignIndexDto> getIndexList(CampaignCriteria campaignCriteria, In
 	}
 
 	@Override
-	public List<CampaignReferenceDto> getAllCampaignsAsReference() {
-		return campaignService.getAll().stream().map(c -> toReferenceDto(c)).collect(Collectors.toList());
+	public List<CampaignReferenceDto> getAllActiveCampaignsAsReference() {
+		return campaignService.getAll()
+			.stream()
+			.filter(c -> !c.isDeleted() && !c.isArchived())
+			.map(CampaignFacadeEjb::toReferenceDto)
+			.collect(Collectors.toList());
 	}
 
 	@Override
@@ -198,7 +202,11 @@ private void validate(CampaignDto campaignDto) {
 		final List<CampaignDashboardElement> campaignDashboardElements = campaignDto.getCampaignDashboardElements();
 		if (campaignDashboardElements != null) {
 			for (CampaignDashboardElement cde : campaignDashboardElements) {
-				if (cde.getDiagramId() == null || cde.getTabId() == null || cde.getWidth() == null || cde.getHeight() == null || cde.getOrder() == null) {
+				if (cde.getDiagramId() == null
+					|| cde.getTabId() == null
+					|| cde.getWidth() == null
+					|| cde.getHeight() == null
+					|| cde.getOrder() == null) {
 					throw new ValidationRuntimeException(I18nProperties.getValidationError(Validations.campaignDashboardChartValueNull));
 				}
 			}

sormas-ui/src/main/java/de/symeda/sormas/ui/campaign/campaigndata/CampaignDataView.java

@@ -83,7 +83,7 @@ public CampaignDataView() {
 		criteria = ViewModelProviders.of(getClass()).get(CampaignFormDataCriteria.class);
 
 		campaignCombo = new ComboBox(" ");
-		List<CampaignReferenceDto> campaigns = FacadeProvider.getCampaignFacade().getAllCampaignsAsReference();
+		List<CampaignReferenceDto> campaigns = FacadeProvider.getCampaignFacade().getAllActiveCampaignsAsReference();
 		campaignCombo.setItems(campaigns);
 		final CampaignReferenceDto lastStartedCampaign = FacadeProvider.getCampaignFacade().getLastStartedCampaign();
 		if (lastStartedCampaign != null && campaigns.contains(lastStartedCampaign)) {

sormas-ui/src/main/java/de/symeda/sormas/ui/campaign/campaigndata/CampaignFormDataEditForm.java

@@ -75,7 +75,7 @@ public CampaignFormDataEditForm(boolean create) {
 	@Override
 	protected void addFields() {
 		ComboBox cbCampaign = addField(CampaignFormDataDto.CAMPAIGN, ComboBox.class);
-		cbCampaign.addItems(FacadeProvider.getCampaignFacade().getAllCampaignsAsReference());
+		cbCampaign.addItems(FacadeProvider.getCampaignFacade().getAllActiveCampaignsAsReference());
 
 		ComboBox cbRegion = addInfrastructureField(CampaignFormDataDto.REGION);
 		ComboBox cbDistrict = addInfrastructureField(CampaignFormDataDto.DISTRICT);

sormas-ui/src/main/java/de/symeda/sormas/ui/campaign/importer/CampaignImportLayout.java

@@ -74,7 +74,7 @@ protected ComboBox addCampaignDropdown(int step) {
 		ImportLayoutComponent importCsvComponent = new ImportLayoutComponent(step, headline, null, null, null);
 		addComponent(importCsvComponent);
 		ComboBox cbCampaign = new ComboBox();
-		cbCampaign.setItems(FacadeProvider.getCampaignFacade().getAllCampaignsAsReference());
+		cbCampaign.setItems(FacadeProvider.getCampaignFacade().getAllActiveCampaignsAsReference());
 		cbCampaign.addValueChangeListener(event -> {
 			if (Objects.nonNull(cbCampaign.getValue())) {
 				this.getComponent(2).setEnabled(true);

sormas-ui/src/main/java/de/symeda/sormas/ui/dashboard/campaigns/CampaignDashboardFilterLayout.java

@@ -12,7 +12,6 @@
 import de.symeda.sormas.api.i18n.Captions;
 import de.symeda.sormas.api.i18n.I18nProperties;
 import de.symeda.sormas.api.i18n.Strings;
-import de.symeda.sormas.api.person.PersonDto;
 import de.symeda.sormas.api.region.AreaReferenceDto;
 import de.symeda.sormas.api.region.DistrictReferenceDto;
 import de.symeda.sormas.api.region.RegionReferenceDto;
@@ -55,7 +54,7 @@ private void createCampaignFilter() {
 		campaignFilter.setCaption(I18nProperties.getCaption(Captions.Campaign));
 		campaignFilter.setWidth(200, Unit.PIXELS);
 		campaignFilter.setInputPrompt(I18nProperties.getString(Strings.promptCampaign));
-		campaignFilter.addItems(FacadeProvider.getCampaignFacade().getAllCampaignsAsReference().toArray());
+		campaignFilter.addItems(FacadeProvider.getCampaignFacade().getAllActiveCampaignsAsReference().toArray());
 		campaignFilter.addValueChangeListener(e -> {
 			dashboardDataProvider.setCampaign((CampaignReferenceDto) campaignFilter.getValue());
 			dashboardView.refreshDashboard();
@@ -72,7 +71,8 @@ private void createCampaignFilter() {
 	@SuppressWarnings("deprecation")
 	private void createJurisdictionFilters() {
 		final RegionReferenceDto userRegion = UserProvider.getCurrent().getUser().getRegion();
-		final AreaReferenceDto userArea = FacadeProvider.getRegionFacade().getRegionByUuid(userRegion.getUuid()).getArea();
+		final AreaReferenceDto userArea =
+			userRegion != null ? FacadeProvider.getRegionFacade().getRegionByUuid(userRegion.getUuid()).getArea() : null;
 		final DistrictReferenceDto userDistrict = UserProvider.getCurrent().getUser().getDistrict();
 
 		dashboardDataProvider.setArea(userArea);