Merge development into master

Author: SORMAS-Robot

README.md

@@ -19,6 +19,9 @@
 
 ## FAQ (Frequently Asked Questions)
 
+### Where can I find the documentation?
+We provide an extensive documentation of SORMAS for users, system administrators, Developers and DevOps in our <a href="https://wiki.sorm.as" target="_blank">Wiki</a>.
+
 ### How Does it Work?
 You can give SORMAS a try on our demo server at <https://demo.sormas.org>!
 

sormas-api/pom.xml

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

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

@@ -0,0 +1,30 @@
+/*
+ * SORMAS® - Surveillance Outbreak Response Management & Analysis System
+ * Copyright © 2016-2024 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;
+
+import de.symeda.sormas.api.i18n.I18nProperties;
+
+public enum ActiveRelevanceStatus {
+
+	ALL,
+	ACTIVE,
+	INACTIVE;
+
+	@Override
+	public String toString() {
+		return I18nProperties.getEnumCaption(this);
+	}
+}

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

@@ -40,16 +40,6 @@ public interface ConfigFacade {
 
 	String getSormasStatsUrl();
 
-	String getEmailSenderAddress();
-
-	String getEmailSenderName();
-
-	String getSmsSenderName();
-
-	String getSmsAuthKey();
-
-	String getSmsAuthSecret();
-
 	String getDocumentFilesPath();
 
 	String getTempFilesPath();

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

@@ -33,7 +33,7 @@ public enum Disease
 	EVD(true, true, true, false, true, 21, true, false, false),
 	GUINEA_WORM(true, true, true, false, false, 0, true, false, false),
 	LASSA(true, true, true, false, true, 21, true, false, false),
-	MEASLES(true, true, true, false, false, 21, true, true, false),
+	MEASLES(true, true, true, false, true, 21, true, true, false),
 	MONKEYPOX(true, true, true, false, true, 21, true, false, false),
 	NEW_INFLUENZA(true, true, true, false, true, 17, true, false, false),
 	PLAGUE(true, true, true, false, true, 7, true, false, false),
@@ -57,7 +57,8 @@ public enum Disease
 	DIARRHEA_BLOOD(true, false, false, true, false, 0, true, false, false),
 	SNAKE_BITE(true, false, false, true, false, 0, true, false, false),
 	RUBELLA(true, false, false, true, false, 0, true, false, false),
-	TUBERCULOSIS(true, false, false, true, false, 0, true, false, false),
+	TUBERCULOSIS(true, true, true, true, false, 0, true, false, false),
+	LATENT_TUBERCULOSIS(true, true, true, true, false, 0, true, false, false),
 	LEPROSY(true, false, false, true, false, 0, true, false, false),
 	LYMPHATIC_FILARIASIS(true, false, false, true, false, 0, true, false, false),
 	BURULI_ULCER(true, false, false, true, false, 0, true, false, false),
@@ -85,6 +86,8 @@ public enum Disease
 	POST_IMMUNIZATION_ADVERSE_EVENTS_MILD(true, false, false, true, false, 0, true, false, false),
 	POST_IMMUNIZATION_ADVERSE_EVENTS_SEVERE(true, false, false, true, false, 0, true, false, false),
 	FHA(true, false, false, true, false, 0, true, false, false),
+	INVASIVE_PNEUMOCOCCAL_INFECTION(true, true, true, false, false, 0, false, false, false),
+	INVASIVE_MENINGOCOCCAL_INFECTION(true, true, true, false, true, 7, false, false, false),
 	OTHER(true, true, true, false, true, 21, false, false, false),
 	UNDEFINED(true, true, true, false, true, 0, false, false, false);
 

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

@@ -70,4 +70,13 @@ public static String toString(Disease disease, String diseaseDetails, DiseaseVar
 	public static String variantInBrackets(DiseaseVariant diseaseVariant) {
 		return diseaseVariant == null ? StringUtils.EMPTY : String.format("(%s)", diseaseVariant.getCaption());
 	}
+
+	/**
+	 * Checks if the case is an invasive bacterial disease (meningococcal or pneumococcal)
+	 * @return boolean
+	 */
+	public static boolean checkDiseaseIsInvasiveBacterialDiseases(Disease disease){
+		return disease != null && (disease == Disease.INVASIVE_MENINGOCOCCAL_INFECTION ||
+				disease == Disease.INVASIVE_PNEUMOCOCCAL_INFECTION);
+	}
 }

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

@@ -85,6 +85,7 @@
 import de.symeda.sormas.api.manualmessagelog.ManualMessageLogFacade;
 import de.symeda.sormas.api.outbreak.OutbreakFacade;
 import de.symeda.sormas.api.person.PersonFacade;
+import de.symeda.sormas.api.person.notifier.NotifierFacade;
 import de.symeda.sormas.api.report.AggregateReportFacade;
 import de.symeda.sormas.api.report.WeeklyReportFacade;
 import de.symeda.sormas.api.sample.AdditionalTestFacade;
@@ -106,6 +107,8 @@
 import de.symeda.sormas.api.survey.SurveyFacade;
 import de.symeda.sormas.api.survey.SurveyTokenFacade;
 import de.symeda.sormas.api.symptoms.SymptomsFacade;
+import de.symeda.sormas.api.systemconfiguration.SystemConfigurationCategoryFacade;
+import de.symeda.sormas.api.systemconfiguration.SystemConfigurationValueFacade;
 import de.symeda.sormas.api.systemevents.SystemEventFacade;
 import de.symeda.sormas.api.systemevents.sync.SyncFacade;
 import de.symeda.sormas.api.task.TaskFacade;
@@ -564,6 +567,18 @@ public static SurveyTokenFacade getSurveyTokenFacade() {
 		return get().lookupEjbRemote(SurveyTokenFacade.class);
 	}
 
+	public static SystemConfigurationValueFacade getSystemConfigurationValueFacade() {
+		return get().lookupEjbRemote(SystemConfigurationValueFacade.class);
+	}
+
+	public static SystemConfigurationCategoryFacade getSystemConfigurationCategoryFacade() {
+		return get().lookupEjbRemote(SystemConfigurationCategoryFacade.class);
+	}
+
+	public static NotifierFacade getNotifierFacade() {
+		return get().lookupEjbRemote(NotifierFacade.class);
+	}
+
 	@SuppressWarnings("unchecked")
 	public <P> P lookupEjbRemote(Class<P> clazz) {
 		try {

sormas-api/src/main/java/de/symeda/sormas/api/adverseeventsfollowingimmunization/AefiCriteria.java

@@ -71,6 +71,10 @@ public class AefiCriteria extends BaseCriteria implements Serializable {
 	private Date toDate;
 	private EntityRelevanceStatus relevanceStatus;
 
+	private Boolean gisMapCriteria = false;
+	private Boolean showSeriousAefiForMap = false;
+	private Boolean showNonSeriousAefiForMap = false;
+
 	public Disease getDisease() {
 		return disease;
 	}
@@ -226,4 +230,31 @@ public AefiCriteria aefiType(AefiType aefiType) {
 		this.aefiType = aefiType;
 		return this;
 	}
+
+	public AefiCriteria gisMapCriteria(Boolean gisMapCriteria) {
+		this.gisMapCriteria = gisMapCriteria;
+		return this;
+	}
+
+	public AefiCriteria showSeriousAefiForMap(Boolean showSeriousAefi) {
+		this.showSeriousAefiForMap = showSeriousAefi;
+		return this;
+	}
+
+	public AefiCriteria showNonSeriousAefiForMap(Boolean showNonSeriousAefi) {
+		this.showNonSeriousAefiForMap = showNonSeriousAefi;
+		return this;
+	}
+
+	public Boolean isGisMapCriteria() {
+		return gisMapCriteria;
+	}
+
+	public Boolean isShowSeriousAefiForMap() {
+		return showSeriousAefiForMap;
+	}
+
+	public Boolean isShowNonSeriousAefiForMap() {
+		return showNonSeriousAefiForMap;
+	}
 }

sormas-api/src/main/java/de/symeda/sormas/api/caze/CaseDataDto.java

@@ -17,6 +17,7 @@
 
 import static de.symeda.sormas.api.CountryHelper.COUNTRY_CODE_FRANCE;
 import static de.symeda.sormas.api.CountryHelper.COUNTRY_CODE_GERMANY;
+import static de.symeda.sormas.api.CountryHelper.COUNTRY_CODE_LUXEMBOURG;
 import static de.symeda.sormas.api.CountryHelper.COUNTRY_CODE_SWITZERLAND;
 import static de.symeda.sormas.api.utils.FieldConstraints.CHARACTER_LIMIT_BIG;
 
@@ -60,6 +61,7 @@
 import de.symeda.sormas.api.infrastructure.region.RegionReferenceDto;
 import de.symeda.sormas.api.person.PersonDto;
 import de.symeda.sormas.api.person.PersonReferenceDto;
+import de.symeda.sormas.api.person.notifier.NotifierReferenceDto;
 import de.symeda.sormas.api.sormastosormas.S2SIgnoreProperty;
 import de.symeda.sormas.api.sormastosormas.SormasToSormasConfig;
 import de.symeda.sormas.api.sormastosormas.SormasToSormasShareableDto;
@@ -227,6 +229,12 @@ public class CaseDataDto extends SormasToSormasShareableDto implements IsCase {
 	public static final String EXTERNAL_DATA = "externalData";
 	public static final String DELETION_REASON = "deletionReason";
 	public static final String OTHER_DELETION_REASON = "otherDeletionReason";
+	public static final String POST_MORTEM = "postMortem";
+	public static final String DEPARTMENT = "department";
+
+	public static final String NOTIFIER = "notifier";
+	public static final String RADIOGRAPHY_COMPATIBILITY = "radiographyCompatibility";
+	public static final String OTHER_DIAGNOSTIC_CRITERIA = "otherDiagnosticCriteria";
 
 	// Fields are declared in the order they should appear in the import template
 
@@ -269,18 +277,21 @@ public class CaseDataDto extends SormasToSormasShareableDto implements IsCase {
 	@HideForCountries(countries = {
 		COUNTRY_CODE_FRANCE,
 		COUNTRY_CODE_GERMANY,
-		COUNTRY_CODE_SWITZERLAND })
+		COUNTRY_CODE_SWITZERLAND,
+		COUNTRY_CODE_LUXEMBOURG })
 	private Date regionLevelDate;
 	@HideForCountries(countries = {
 		COUNTRY_CODE_FRANCE,
 		COUNTRY_CODE_GERMANY,
-		COUNTRY_CODE_SWITZERLAND })
+		COUNTRY_CODE_SWITZERLAND,
+		COUNTRY_CODE_LUXEMBOURG })
 	private Date nationalLevelDate;
 	@Outbreaks
 	@HideForCountries(countries = {
 		COUNTRY_CODE_FRANCE,
 		COUNTRY_CODE_GERMANY,
-		COUNTRY_CODE_SWITZERLAND })
+		COUNTRY_CODE_SWITZERLAND,
+		COUNTRY_CODE_LUXEMBOURG })
 	private Date districtLevelDate;
 	@Outbreaks
 	@Diseases(value = Disease.RESPIRATORY_SYNCYTIAL_VIRUS, hide = true)
@@ -351,8 +362,10 @@ public class CaseDataDto extends SormasToSormasShareableDto implements IsCase {
 	@EmbeddedPersonalData
 	@EmbeddedSensitiveData
 	@SensitiveData
+	@Diseases(value = {
+		Disease.INVASIVE_MENINGOCOCCAL_INFECTION,
+		Disease.INVASIVE_PNEUMOCOCCAL_INFECTION}, hide = true)
 	private HealthConditionsDto healthConditions;
-
 	private YesNoUnknown pregnant;
 	@Diseases({
 		Disease.AFP,
@@ -620,6 +633,16 @@ public class CaseDataDto extends SormasToSormasShareableDto implements IsCase {
 	@SensitiveData
 	@Size(max = FieldConstraints.CHARACTER_LIMIT_TEXT, message = Validations.textTooLong)
 	private String otherDeletionReason;
+	@HideForCountriesExcept(countries = COUNTRY_CODE_LUXEMBOURG)
+	@Diseases(value = {
+		Disease.TUBERCULOSIS })
+	private boolean postMortem;
+	@HideForCountriesExcept(countries = COUNTRY_CODE_LUXEMBOURG)
+	private String department;
+
+	private NotifierReferenceDto notifier;
+	private RadiographyCompatibility radiographyCompatibility;
+	private String otherDiagnosticCriteria;
 
 	public static CaseDataDto build(PersonReferenceDto person, Disease disease) {
 		return build(person, disease, HealthConditionsDto.build());
@@ -1777,6 +1800,48 @@ public void setHealthConditions(HealthConditionsDto healthConditions) {
 		this.healthConditions = healthConditions;
 	}
 
+	public NotifierReferenceDto getNotifier() {
+		return notifier;
+	}
+
+	public void setNotifier(NotifierReferenceDto notifier) {
+		this.notifier = notifier;
+	}
+
+	public boolean isPostMortem() {
+		return postMortem;
+	}
+
+	public void setPostMortem(boolean postMortem) {
+		this.postMortem = postMortem;
+	}
+
+	public String getDepartment() {
+		return department;
+	}
+
+	public void setDepartment(String department) {
+		this.department = department;
+	}
+
+	public RadiographyCompatibility getRadiographyCompatibility() {
+		return radiographyCompatibility;
+	}
+
+	public void setRadiographyCompatibility(RadiographyCompatibility radiographyCompatibility) {
+		this.radiographyCompatibility = radiographyCompatibility;
+	}
+
+	public String getOtherDiagnosticCriteria() {
+		return otherDiagnosticCriteria;
+	}
+
+	public void setOtherDiagnosticCriteria(String otherDiagnosticCriteria) {
+		this.otherDiagnosticCriteria = otherDiagnosticCriteria;
+	}
+
+
+
 	@JsonIgnore
 	public String i18nPrefix() {
 		return I18N_PREFIX;