[GITFLOW]merging 'release-1.44.0' into 'master'

Author: jenkins

ADDING_LICENSE.md

@@ -14,11 +14,11 @@ the Free Software Foundation, either version 3 of the License, or
 
 This program is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with this program.  If not, see <https://www.gnu.org/licenses/>.
+along with this program. If not, see <https://www.gnu.org/licenses/>.
 ```
 
 ## Eclipse
@@ -27,9 +27,9 @@ along with this program.  If not, see <https://www.gnu.org/licenses/>.
 - Make sure to select "Replace all existing copyright comments with this copyright template" and especially "Skip over XML files" (to make sure that headers don't get added to e.g. build files)
 - Whenever you create a new source file: Right click on the file and select "Fix Copyrights"
 
-## Android Studio
+## Android Studio/IntelliJ
 - Open File > Settings > Editor > Copyright > Copyright Profiles
 - Create a new profile and paste the license header from above into the Copyright text area
-- Right click on the "app" project and select "Update Copyright...", select "Custom Scope" and in the dropdown, select "Project Source Files"
-- Click "Ok" and wait until the copyright has been added to all files
+- Head back to the general Copyright settings and select the new copyright profile as the "Default project copyright"
+- (Optional: If the year has changed, right click on all projects containing manual code and select "Update Copyright...", select "Custom Scope" and in the dropdown, select "Project Source Files"; Click "Ok" and wait until the copyright has been added to/changed for all files)
 - Android Studio automatically adds the copyright to newly created files afterwards

CONTRIBUTING.md

@@ -86,12 +86,12 @@ The SORMAS sprint board is segmented into the following categories:
 * **Backlog:** Issues that have been selected to be done in the current sprint, but for which work has not yet started.
 * **In Progress:** Issues that have been assigned to a contributor and for which work has started.
 * **Waiting:** Issues for which work has started and that have been put on hold, e.g. because action or feedback by an external contributor is required.
-* **Review:** Issues that have been resolved, but not been reviewed by another contributor yet.
-* **Done:** Issues that have been resolved, reviewed and satisfy the Definition of Done.
+* **Review:** Issues that have been resolved, but not been reviewed by another contributor yet. The ticket status is usually **Open**, but **Closed** is also allowed if no code change or merge is needed.
+* **Done:** Issues that have been resolved, reviewed and satisfy the Definition of Done. The ticket status is supposed to be **Closed**.
 
 The general workflow is that whenever a contributor starts working on an issue, they **assign** themselves to it and manually **move the issue** from **Backlog** to **In Progress**.
 
-The GitHub project has been configured to **automatically** move issues that are closed to **Review** and issues that are reopened back to **In Progress**.
+The GitHub project has been configured to **automatically** move issues that are closed to **Done** and issues that are reopened back to **In Progress**.
 
 ### Eclipse Troubleshooting
 

SERVER_DEV_SETUP.md

@@ -25,7 +25,7 @@ Download and install Ant, it can be done from [Ant site](https://ant.apache.org/
 
 ### Postgres Database
 
-See [Installing Postgresql](SERVER_SETUP.md#java-8)
+See [Installing Postgresql](SERVER_SETUP.md#postgres-database)
 
 Alternatively you can use the Docker image available in [SORMAS-Docker](https://github.com/hzi-braunschweig/SORMAS-Docker) repository.
 

sormas-api/pom.xml

@@ -2,7 +2,7 @@
 	<parent>
 		<groupId>de.symeda.sormas</groupId>
 		<artifactId>sormas-base</artifactId>
-		<version>1.43.2</version>
+		<version>1.44.0</version>
 		<relativePath>../sormas-base</relativePath>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>

sormas-api/src/main/java/de/symeda/sormas/api/ConfigFacade.java

@@ -17,10 +17,10 @@
  *******************************************************************************/
 package de.symeda.sormas.api;
 
-import javax.ejb.Remote;
-
 import de.symeda.sormas.api.region.GeoLatLon;
 
+import javax.ejb.Remote;
+
 @Remote
 public interface ConfigFacade {
 
@@ -62,6 +62,14 @@ public interface ConfigFacade {
 
 	boolean isDevMode();
 
+	boolean isCustomBranding();
+
+	String getCustomBrandingName();
+
+	String getCustomBrandingLogoPath();
+
+	String getSormasInstanceName();
+
 	double getNameSimilarityThreshold();
 
 	int getInfrastructureSyncThreshold();

sormas-api/src/main/java/de/symeda/sormas/api/FacadeProvider.java

@@ -21,6 +21,8 @@
 import javax.naming.NamingException;
 
 import de.symeda.sormas.api.campaign.CampaignFacade;
+import de.symeda.sormas.api.campaign.data.CampaignFormDataFacade;
+import de.symeda.sormas.api.campaign.form.CampaignFormFacade;
 import de.symeda.sormas.api.caze.CaseFacade;
 import de.symeda.sormas.api.caze.CaseStatisticsFacade;
 import de.symeda.sormas.api.caze.classification.CaseClassificationFacade;
@@ -260,6 +262,14 @@ public static CampaignFacade getCampaignFacade() {
 		return get().lookupEjbRemote(CampaignFacade.class);
 	}
 
+	public static CampaignFormFacade getCampaignFormFacade() {
+		return get().lookupEjbRemote(CampaignFormFacade.class);
+	}
+
+	public static CampaignFormDataFacade getCampaignFormDataFacade() {
+		return get().lookupEjbRemote(CampaignFormDataFacade.class);
+	}
+
 	public static AreaFacade getAreaFacade() {
 		return get().lookupEjbRemote(AreaFacade.class);
 	}

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

@@ -1,16 +1,17 @@
 package de.symeda.sormas.api.campaign;
 
-import java.util.List;
+import de.symeda.sormas.api.utils.SortProperty;
 
 import javax.ejb.Remote;
-
-import de.symeda.sormas.api.utils.SortProperty;
+import java.util.List;
 
 @Remote
 public interface CampaignFacade {
 
 	List<CampaignIndexDto> getIndexList(CampaignCriteria campaignCriteria, Integer first, Integer max, List<SortProperty> sortProperties);
 
+	List<CampaignReferenceDto> getAllCampaignsAsReference();
+
 	long count(CampaignCriteria campaignCriteria);
 
 	CampaignDto saveCampaign(CampaignDto dto);

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

@@ -0,0 +1,38 @@
+/*
+ * ******************************************************************************
+ * * SORMAS® - Surveillance Outbreak Response Management & Analysis System
+ * * Copyright © 2016-2020 Helmholtz-Zentrum für Infektionsforschung GmbH (HZI)
+ * *
+ * * This program is free software: you can redistribute it and/or modify
+ * * it under the terms of the GNU General Public License as published by
+ * * the Free Software Foundation, either version 3 of the License, or
+ * * (at your option) any later version.
+ * *
+ * * This program is distributed in the hope that it will be useful,
+ * * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * * GNU General Public License for more details.
+ * *
+ * * You should have received a copy of the GNU General Public License
+ * * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ * ******************************************************************************
+ */
+
+package de.symeda.sormas.api.campaign;
+
+import de.symeda.sormas.api.ReferenceDto;
+
+public class CampaignReferenceDto extends ReferenceDto {
+
+	public CampaignReferenceDto() {
+	}
+
+	public CampaignReferenceDto(String uuid) {
+		setUuid(uuid);
+	}
+
+	public CampaignReferenceDto(String uuid, String caption) {
+		setUuid(uuid);
+		setCaption(caption);
+	}
+}

sormas-api/src/main/java/de/symeda/sormas/api/campaign/data/CampaignFormDataDto.java

@@ -0,0 +1,114 @@
+/*
+ * ******************************************************************************
+ * * SORMAS® - Surveillance Outbreak Response Management & Analysis System
+ * * Copyright © 2016-2020 Helmholtz-Zentrum für Infektionsforschung GmbH (HZI)
+ * *
+ * * This program is free software: you can redistribute it and/or modify
+ * * it under the terms of the GNU General Public License as published by
+ * * the Free Software Foundation, either version 3 of the License, or
+ * * (at your option) any later version.
+ * *
+ * * This program is distributed in the hope that it will be useful,
+ * * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * * GNU General Public License for more details.
+ * *
+ * * You should have received a copy of the GNU General Public License
+ * * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ * ******************************************************************************
+ */
+
+package de.symeda.sormas.api.campaign.data;
+
+import de.symeda.sormas.api.EntityDto;
+import de.symeda.sormas.api.campaign.CampaignReferenceDto;
+import de.symeda.sormas.api.campaign.form.CampaignFormReferenceDto;
+import de.symeda.sormas.api.region.CommunityReferenceDto;
+import de.symeda.sormas.api.region.DistrictReferenceDto;
+import de.symeda.sormas.api.region.RegionReferenceDto;
+import de.symeda.sormas.api.utils.DataHelper;
+
+import java.util.List;
+
+public class CampaignFormDataDto extends EntityDto {
+
+	private static final long serialVersionUID = -8087195060395038093L;
+
+	public static final String I18N_PREFIX = "campaignformdata";
+
+	public static final String CAMPAIGN = "campaign";
+	public static final String REGION = "region";
+	public static final String DISTRICT = "district";
+	public static final String COMMUNITY = "community";
+
+	private List<CampaignFormValue> formValues;
+	private CampaignReferenceDto campaign;
+	private CampaignFormReferenceDto campaignForm;
+	private RegionReferenceDto region;
+	private DistrictReferenceDto district;
+	private CommunityReferenceDto community;
+
+	public static CampaignFormDataDto build(
+		CampaignReferenceDto campaign,
+		CampaignFormReferenceDto campaignForm,
+		RegionReferenceDto region,
+		DistrictReferenceDto district,
+		CommunityReferenceDto community) {
+		CampaignFormDataDto campaignFormData = new CampaignFormDataDto();
+		campaignFormData.setUuid(DataHelper.createUuid());
+		campaignFormData.setCampaign(campaign);
+		campaignFormData.setCampaignForm(campaignForm);
+		campaignFormData.setRegion(region);
+		campaignFormData.setDistrict(district);
+		campaignFormData.setCommunity(community);
+		return campaignFormData;
+	}
+
+	public List<CampaignFormValue> getFormValues() {
+		return formValues;
+	}
+
+	public void setFormValues(List<CampaignFormValue> formValues) {
+		this.formValues = formValues;
+	}
+
+	public CampaignFormReferenceDto getCampaignForm() {
+		return campaignForm;
+	}
+
+	public void setCampaignForm(CampaignFormReferenceDto campaignForm) {
+		this.campaignForm = campaignForm;
+	}
+
+	public CampaignReferenceDto getCampaign() {
+		return campaign;
+	}
+
+	public void setCampaign(CampaignReferenceDto campaign) {
+		this.campaign = campaign;
+	}
+
+	public RegionReferenceDto getRegion() {
+		return region;
+	}
+
+	public void setRegion(RegionReferenceDto region) {
+		this.region = region;
+	}
+
+	public DistrictReferenceDto getDistrict() {
+		return district;
+	}
+
+	public void setDistrict(DistrictReferenceDto district) {
+		this.district = district;
+	}
+
+	public CommunityReferenceDto getCommunity() {
+		return community;
+	}
+
+	public void setCommunity(CommunityReferenceDto community) {
+		this.community = community;
+	}
+}

sormas-api/src/main/java/de/symeda/sormas/api/campaign/data/CampaignFormDataFacade.java

@@ -0,0 +1,42 @@
+/*
+ * ******************************************************************************
+ * * SORMAS® - Surveillance Outbreak Response Management & Analysis System
+ * * Copyright © 2016-2020 Helmholtz-Zentrum für Infektionsforschung GmbH (HZI)
+ * *
+ * * This program is free software: you can redistribute it and/or modify
+ * * it under the terms of the GNU General Public License as published by
+ * * the Free Software Foundation, either version 3 of the License, or
+ * * (at your option) any later version.
+ * *
+ * * This program is distributed in the hope that it will be useful,
+ * * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * * GNU General Public License for more details.
+ * *
+ * * You should have received a copy of the GNU General Public License
+ * * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ * ******************************************************************************
+ */
+
+package de.symeda.sormas.api.campaign.data;
+
+import javax.ejb.Remote;
+import java.util.List;
+
+@Remote
+public interface CampaignFormDataFacade {
+
+	CampaignFormDataDto saveCampaignFormData(CampaignFormDataDto dto);
+
+	List<CampaignFormDataDto> getByUuids(List<String> uuids);
+
+	CampaignFormDataDto getCampaignFormDataByUuid(String campaignFormDataUuid);
+
+	void deleteCampaignFormData(String campaignFormDataUuid);
+
+	boolean isArchived(String campaignFormDataUuid);
+
+	boolean exists(String uuid);
+
+	CampaignFormDataReferenceDto getReferenceByUuid(String uuid);
+}