Merge branch 'master' into development [manual]

Conforms to the GITFLOW process:
* [GITFLOW]merging 'master' into 'development'
* [GITFLOW]Updating develop poms back to pre merge state

Necessary because there were merge conflicts during the hotfix finish

Author: MateStrysewske

sormas-api/pom.xml

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

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

@@ -46,7 +46,6 @@ public class CaseCriteria extends BaseCriteria implements Cloneable {
 	public static final String MUST_HAVE_NO_GEO_COORDINATES = "mustHaveNoGeoCoordinates";
 	public static final String MUST_BE_PORT_HEALTH_CASE_WITHOUT_FACILITY = "mustBePortHealthCaseWithoutFacility";
 	public static final String MUST_HAVE_CASE_MANAGEMENT_DATA = "mustHaveCaseManagementData";
-	public static final String EXCLUDE_SHARED_CASES = "excludeSharedCases";
 	public static final String WITHOUT_RESPONSIBLE_OFFICER = "withoutResponsibleOfficer";
 	public static final String WITH_EXTENDED_QUARANTINE = "withExtendedQuarantine";
 	public static final String WITH_REDUCED_QUARANTINE = "withReducedQuarantine";
@@ -102,7 +101,6 @@ public class CaseCriteria extends BaseCriteria implements Cloneable {
 	private EntityRelevanceStatus relevanceStatus;
 	private String sourceCaseInfoLike;
 	private Date quarantineTo;
-	public Boolean excludeSharedCases;
 	private Integer birthdateYYYY;
 	private Integer birthdateMM;
 	private Integer birthdateDD;
@@ -472,14 +470,6 @@ public void setQuarantineTo(Date quarantineTo) {
 		this.quarantineTo = quarantineTo;
 	}
 
-	public Boolean getExcludeSharedCases() {
-		return excludeSharedCases;
-	}
-
-	public void setExcludeSharedCases(Boolean excludeSharedCases) {
-		this.excludeSharedCases = excludeSharedCases;
-	}
-
 	public Integer getBirthdateYYYY() {
 		return birthdateYYYY;
 	}

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

@@ -188,7 +188,9 @@ public class CaseDataDto extends PseudonymizableDto {
 	@EmbeddedPersonalData
 	private PersonReferenceDto person;
 	@Outbreaks
-	@HideForCountries()
+	@HideForCountries(countries = {
+		COUNTRY_CODE_GERMANY,
+		COUNTRY_CODE_SWITZERLAND })
 	private String epidNumber;
 	@Outbreaks
 	@Required

sormas-api/src/main/resources/captions_de-CH.properties

@@ -860,7 +860,7 @@ DocumentTemplate.documentTemplateGuide=Dokumentvorlagen-Anleitung
 DocumentTemplate.plural=Dokumentvorlagen
 DocumentTemplate.QuarantineOrder=Isolations-/Quarantänebescheid
 DocumentTemplate.QuarantineOrder.create=Isolations-/Quarantänebescheid erstellen
-DocumentTemplate.QuarantineOrder.templates=Isolations-/Quarantänebescheid Vorlagen
+DocumentTemplate.QuarantineOrder.templates=Isolations-/Quarantänebescheid-Vorlagen
 DocumentTemplate.uploadTemplate=Vorlage hochladen
 DocumentTemplate.exampleTemplateLibreOffice=Beispielvorlage LibreOffice
 DocumentTemplate.exampleTemplateWord=Beispielvorlage Microsoft Word

sormas-api/src/main/resources/captions_de-DE.properties

@@ -858,9 +858,9 @@ EpiData.snakes=Schlangen
 DocumentTemplate=Dokumentvorlage
 DocumentTemplate.documentTemplateGuide=Dokumentvorlagen-Anleitung
 DocumentTemplate.plural=Dokumentvorlagen
-DocumentTemplate.QuarantineOrder=Bescheid
-DocumentTemplate.QuarantineOrder.create=Bescheid erstellen
-DocumentTemplate.QuarantineOrder.templates=Bescheid Vorlagen
+DocumentTemplate.QuarantineOrder=Isolations-/Quarantänebescheid
+DocumentTemplate.QuarantineOrder.create=Isolations-/Quarantänebescheid erstellen
+DocumentTemplate.QuarantineOrder.templates=Isolations-/Quarantänebescheid-Vorlagen
 DocumentTemplate.uploadTemplate=Vorlage hochladen
 DocumentTemplate.exampleTemplateLibreOffice=Beispielvorlage LibreOffice
 DocumentTemplate.exampleTemplateWord=Beispielvorlage Microsoft Word
@@ -1953,4 +1953,4 @@ SurvnetGateway.send=an eigene SurvNet-Instanz senden
 patientDiaryRegistrationError=Person konnte nicht im Symptomtagebuch registriert werden.
 patientDiaryPersonNotExportable=Die Person kann nicht in das Symptomtagebuch exportiert werden. Die Person benötigt ein gültiges Geburtsdatum und entweder eine gültige Telefonnummer oder E-Mail Adresse.
 
-showPlacesOnMap=Anzeigen
+showPlacesOnMap=Anzeigen

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

@@ -65,9 +65,9 @@ descCaseFilterWithExtendedQuarantine = Only list cases whose quarantine period h
 descContactOnlyWithExtendedQuarantine = Only list contacts whose quarantine period has been extended
 descCaseFilterWithReducedQuarantine = Only list cases whose quarantine period has been reduced
 descCaseFilterRelatedToEvent = Only list cases related to events
-descCaseFilterIncludeCasesFromOtherJurisdictions = Include the cases created by you for other jurisdictions
+descCaseFilterIncludeCasesFromOtherJurisdictions = Include all cases from other jurisdictions that you have access to, e.g. because you created them or they have a contact in your jurisdiction
 descContactOnlyWithReducedQuarantine = Only list contacts whose quarantine period has been reduced
-descContactIncludeContactsFromOtherJurisdictions = Include the contacts created by you for other jurisdictions
+descContactIncludeContactsFromOtherJurisdictions = Include all contacts from other jurisdictions that you have access to, e.g. because you created them or their source case is in your jurisdiction
 descGdpr = Reminder: All comments entered must comply with GDPR rules as described during connection.
 
 # EpiData

sormas-api/src/main/resources/strings_de-CH.properties

@@ -196,7 +196,7 @@ entityGathering = Soziale Versammlung
 entityPathogenTests = Erregertests
 entityPrescription = Verschreibung
 entityPrescriptions = Verschreibungen
-entityQuarantineOrder = Bescheid
+entityQuarantineOrder = Isolations-/Quarantänebescheid
 entityRegion = Kanton
 entitySample = Probe
 entitySamples = Proben
@@ -867,4 +867,4 @@ SurvnetGateway.notificationEntrySent = Eintrag wurde gesendet
 SurvnetGateway.notificationEntryNotSent = Eintrag konnte nicht gesendet werden
 SurvnetGateway.notificationErrorSending = Fehler beim Senden des Eintrags
 
-warningDashboardMapTooManyMarkers = There are %d places to display and it is possible that your browser will freeze while displaying them.
+warningDashboardMapTooManyMarkers = There are %d places to display and it is possible that your browser will freeze while displaying them.

sormas-api/src/main/resources/strings_de-DE.properties

@@ -196,7 +196,7 @@ entityGathering = Event/Ereignis
 entityPathogenTests = Erregertests
 entityPrescription = Verschreibung
 entityPrescriptions = Verschreibungen
-entityQuarantineOrder = Bescheid
+entityQuarantineOrder = Isolations-/Quarantänebescheid
 entityRegion = Bundesland
 entitySample = Probe
 entitySamples = Proben
@@ -867,4 +867,4 @@ SurvnetGateway.notificationEntrySent = Eintrag wurde gesendet
 SurvnetGateway.notificationEntryNotSent = Eintrag konnte nicht gesendet werden
 SurvnetGateway.notificationErrorSending = Fehler beim Senden des Eintrags
 
-warningDashboardMapTooManyMarkers = Es gibt %d Orte zum Anzeigen und es ist möglich, dass Ihr Browser während der Anzeige einfriert.
+warningDashboardMapTooManyMarkers = Es gibt %d Orte zum Anzeigen und es ist möglich, dass Ihr Browser während der Anzeige einfriert.

sormas-app/app/src/main/java/de/symeda/sormas/app/caze/edit/CaseNewFragment.java

@@ -188,6 +188,12 @@ public void onLayoutBinding(FragmentCaseNewLayoutBinding contentBinding) {
 		contentBinding.personPresentCondition.initializeSpinner(presentConditionList);
 
 		contentBinding.facilityOrHome.initializeSpinner(facilityOrHomeList);
+		contentBinding.facilityOrHome.addValueChangedListener(e -> {
+			if (e.getValue() == TypeOfPlace.FACILITY) {
+				contentBinding.facilityTypeGroup.setValue(FacilityTypeGroup.MEDICAL_FACILITY);
+				contentBinding.caseDataFacilityType.setValue(FacilityType.HOSPITAL);
+			}
+		});
 		contentBinding.facilityTypeGroup.initializeSpinner(facilityTypeGroupList);
 	}
 
@@ -204,17 +210,19 @@ public void onAfterLayoutBinding(final FragmentCaseNewLayoutBinding contentBindi
 		contentBinding.caseDataDistrict.setRequired(false);
 
 		User user = ConfigProvider.getUser();
+
+		if (user.getPointOfEntry() == null) {
+			contentBinding.facilityOrHome.setValue(TypeOfPlace.FACILITY);
+		}
+
 		if (user.hasUserRole(UserRole.HOSPITAL_INFORMANT) && user.getHealthFacility() != null) {
 			// Hospital Informants are not allowed to create cases in another health facility
 			contentBinding.caseDataCommunity.setEnabled(false);
 			contentBinding.caseDataCommunity.setRequired(false);
 			contentBinding.caseDataHealthFacility.setEnabled(false);
 			contentBinding.caseDataHealthFacility.setRequired(false);
-			contentBinding.facilityOrHome.setValue(TypeOfPlace.FACILITY);
 			contentBinding.facilityOrHome.setEnabled(false);
-			contentBinding.facilityTypeGroup.setValue(FacilityTypeGroup.MEDICAL_FACILITY);
 			contentBinding.facilityTypeGroup.setEnabled(false);
-			contentBinding.caseDataFacilityType.setValue(FacilityType.HOSPITAL);
 			contentBinding.caseDataFacilityType.setEnabled(false);
 		}
 

sormas-app/pom.xml

@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>sormas-base</artifactId>
 		<groupId>de.symeda.sormas</groupId>
-		<version>1.51.1</version>
+		<version>1.52.0-SNAPSHOT</version>
 		<relativePath>../sormas-base</relativePath>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>