Merge pull request SORMAS-Foundation#3023 from hzi-braunschweig/2959_cases_MED_for_Switzerland

SORMAS-Foundation#2959 added case fields for Switzerland

Author: leventegal-she

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

@@ -17,6 +17,11 @@
  *******************************************************************************/
 package de.symeda.sormas.api.caze;
 
+import static de.symeda.sormas.api.CountryHelper.COUNTRY_CODE_GERMANY;
+import static de.symeda.sormas.api.CountryHelper.COUNTRY_CODE_SWITZERLAND;
+
+import java.util.Date;
+
 import de.symeda.sormas.api.Disease;
 import de.symeda.sormas.api.ImportIgnore;
 import de.symeda.sormas.api.PseudonymizableDto;
@@ -43,15 +48,14 @@
 import de.symeda.sormas.api.utils.DataHelper;
 import de.symeda.sormas.api.utils.Diseases;
 import de.symeda.sormas.api.utils.EmbeddedPersonalData;
+import de.symeda.sormas.api.utils.HideForCountries;
 import de.symeda.sormas.api.utils.HideForCountriesExcept;
 import de.symeda.sormas.api.utils.Outbreaks;
 import de.symeda.sormas.api.utils.PersonalData;
 import de.symeda.sormas.api.utils.Required;
 import de.symeda.sormas.api.utils.SensitiveData;
 import de.symeda.sormas.api.utils.YesNoUnknown;
 
-import java.util.Date;
-
 public class CaseDataDto extends PseudonymizableDto {
 
 	private static final long serialVersionUID = 5007131477733638086L;
@@ -146,6 +150,16 @@ public class CaseDataDto extends PseudonymizableDto {
 	public static final String VISITS = "visits";
 	public static final String FACILITY_TYPE = "facilityType";
 
+	public static final String CASE_ID_ISM = "caseIdIsm";
+	public static final String COVID_TEST_REASON = "covidTestReason";
+	public static final String COVID_TEST_REASON_DETAILS = "covidTestReasonDetails";
+	public static final String CONTACT_TRACING_FIRST_CONTACT_TYPE = "contactTracingFirstContactType";
+	public static final String CONTACT_TRACING_FIRST_CONTACT_DATE = "contactTracingFirstContactDate";
+	public static final String QUARANTINE_REASON_BEFORE_ISOLATION = "quarantineReasonBeforeIsolation";
+	public static final String QUARANTINE_REASON_BEFORE_ISOLATION_DETAILS = "quarantineReasonBeforeIsolationDetails";
+	public static final String END_OF_ISOLATION_REASON = "endOfIsolationReason";
+	public static final String END_OF_ISOLATION_REASON_DETAILS = "endOfIsolationReasonDetails";
+
 	// Fields are declared in the order they should appear in the import template
 
 	@Outbreaks
@@ -169,6 +183,7 @@ public class CaseDataDto extends PseudonymizableDto {
 	@EmbeddedPersonalData
 	private PersonReferenceDto person;
 	@Outbreaks
+	@HideForCountries()
 	private String epidNumber;
 	@Outbreaks
 	@Required
@@ -337,6 +352,7 @@ public class CaseDataDto extends PseudonymizableDto {
 	private String pointOfEntryDetails;
 	@SensitiveData
 	private String additionalDetails;
+	@HideForCountriesExcept
 	private String externalID;
 	private boolean sharedToCountry;
 	private QuarantineType quarantine;
@@ -347,20 +363,20 @@ public class CaseDataDto extends PseudonymizableDto {
 	@SensitiveData
 	private String quarantineHelpNeeded;
 	@HideForCountriesExcept(countries = {
-		"de",
-		"ch" })
+		COUNTRY_CODE_GERMANY,
+		COUNTRY_CODE_SWITZERLAND })
 	private boolean quarantineOrderedVerbally;
 	@HideForCountriesExcept(countries = {
-		"de",
-		"ch" })
+		COUNTRY_CODE_GERMANY,
+		COUNTRY_CODE_SWITZERLAND })
 	private boolean quarantineOrderedOfficialDocument;
 	@HideForCountriesExcept(countries = {
-		"de",
-		"ch" })
+		COUNTRY_CODE_GERMANY,
+		COUNTRY_CODE_SWITZERLAND })
 	private Date quarantineOrderedVerballyDate;
 	@HideForCountriesExcept(countries = {
-		"de",
-		"ch" })
+		COUNTRY_CODE_GERMANY,
+		COUNTRY_CODE_SWITZERLAND })
 	private Date quarantineOrderedOfficialDocumentDate;
 	@HideForCountriesExcept
 	private YesNoUnknown quarantineHomePossible;
@@ -375,12 +391,12 @@ public class CaseDataDto extends PseudonymizableDto {
 	private boolean quarantineExtended;
 	private boolean quarantineReduced;
 	@HideForCountriesExcept(countries = {
-		"de",
-		"ch" })
+		COUNTRY_CODE_GERMANY,
+		COUNTRY_CODE_SWITZERLAND })
 	private boolean quarantineOfficialOrderSent;
 	@HideForCountriesExcept(countries = {
-		"de",
-		"ch" })
+		COUNTRY_CODE_GERMANY,
+		COUNTRY_CODE_SWITZERLAND })
 	private Date quarantineOfficialOrderSentDate;
 	private ReportingType reportingType;
 	private YesNoUnknown postpartum;
@@ -390,6 +406,28 @@ public class CaseDataDto extends PseudonymizableDto {
 	private Date followUpUntil;
 	private boolean overwriteFollowUpUntil;
 
+	@HideForCountriesExcept(countries = COUNTRY_CODE_SWITZERLAND)
+	private Integer caseIdIsm;
+	@HideForCountriesExcept(countries = COUNTRY_CODE_SWITZERLAND)
+	private CovidTestReason covidTestReason;
+	@HideForCountriesExcept(countries = COUNTRY_CODE_SWITZERLAND)
+	@SensitiveData
+	private String covidTestReasonDetails;
+	@HideForCountriesExcept(countries = COUNTRY_CODE_SWITZERLAND)
+	private ContactTracingContactType contactTracingFirstContactType;
+	@HideForCountriesExcept(countries = COUNTRY_CODE_SWITZERLAND)
+	private Date contactTracingFirstContactDate;
+	@HideForCountriesExcept(countries = COUNTRY_CODE_SWITZERLAND)
+	private QuarantineReason quarantineReasonBeforeIsolation;
+	@HideForCountriesExcept(countries = COUNTRY_CODE_SWITZERLAND)
+	@SensitiveData
+	private String quarantineReasonBeforeIsolationDetails;
+	@HideForCountriesExcept(countries = COUNTRY_CODE_SWITZERLAND)
+	private EndOfIsolationReason endOfIsolationReason;
+	@HideForCountriesExcept(countries = COUNTRY_CODE_SWITZERLAND)
+	@SensitiveData
+	private String endOfIsolationReasonDetails;
+
 	public static CaseDataDto build(PersonReferenceDto person, Disease disease) {
 		return build(person, disease, null);
 	}
@@ -1153,4 +1191,76 @@ public FacilityType getFacilityType() {
 	public void setFacilityType(FacilityType facilityType) {
 		this.facilityType = facilityType;
 	}
+
+	public Integer getCaseIdIsm() {
+		return caseIdIsm;
+	}
+
+	public void setCaseIdIsm(Integer caseIdIsm) {
+		this.caseIdIsm = caseIdIsm;
+	}
+
+	public CovidTestReason getCovidTestReason() {
+		return covidTestReason;
+	}
+
+	public void setCovidTestReason(CovidTestReason covidTestReason) {
+		this.covidTestReason = covidTestReason;
+	}
+
+	public String getCovidTestReasonDetails() {
+		return covidTestReasonDetails;
+	}
+
+	public void setCovidTestReasonDetails(String covidTestReasonDetails) {
+		this.covidTestReasonDetails = covidTestReasonDetails;
+	}
+
+	public ContactTracingContactType getContactTracingFirstContactType() {
+		return contactTracingFirstContactType;
+	}
+
+	public void setContactTracingFirstContactType(ContactTracingContactType contactTracingFirstContactType) {
+		this.contactTracingFirstContactType = contactTracingFirstContactType;
+	}
+
+	public Date getContactTracingFirstContactDate() {
+		return contactTracingFirstContactDate;
+	}
+
+	public void setContactTracingFirstContactDate(Date contactTracingFirstContactDate) {
+		this.contactTracingFirstContactDate = contactTracingFirstContactDate;
+	}
+
+	public QuarantineReason getQuarantineReasonBeforeIsolation() {
+		return quarantineReasonBeforeIsolation;
+	}
+
+	public void setQuarantineReasonBeforeIsolation(QuarantineReason quarantineReasonBeforeIsolation) {
+		this.quarantineReasonBeforeIsolation = quarantineReasonBeforeIsolation;
+	}
+
+	public String getQuarantineReasonBeforeIsolationDetails() {
+		return quarantineReasonBeforeIsolationDetails;
+	}
+
+	public void setQuarantineReasonBeforeIsolationDetails(String quarantineReasonBeforeIsolationDetails) {
+		this.quarantineReasonBeforeIsolationDetails = quarantineReasonBeforeIsolationDetails;
+	}
+
+	public EndOfIsolationReason getEndOfIsolationReason() {
+		return endOfIsolationReason;
+	}
+
+	public void setEndOfIsolationReason(EndOfIsolationReason endOfIsolationReason) {
+		this.endOfIsolationReason = endOfIsolationReason;
+	}
+
+	public String getEndOfIsolationReasonDetails() {
+		return endOfIsolationReasonDetails;
+	}
+
+	public void setEndOfIsolationReasonDetails(String endOfIsolationReasonDetails) {
+		this.endOfIsolationReasonDetails = endOfIsolationReasonDetails;
+	}
 }

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

@@ -0,0 +1,29 @@
+/*
+ * 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.caze;
+
+import de.symeda.sormas.api.i18n.I18nProperties;
+
+public enum ContactTracingContactType {
+
+	TELEPHONE,
+	SMS,
+	EMAIL;
+
+	public String toString() {
+		return I18nProperties.getEnumCaption(this);
+	}
+}

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

@@ -0,0 +1,34 @@
+/*
+ * 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.caze;
+
+import de.symeda.sormas.api.i18n.I18nProperties;
+
+public enum CovidTestReason {
+
+	PRESENCE_OF_SYMPTOMS,
+	OUTBREAK_INVESTIGATION_SCREENING,
+	COHORT_SCREENING,
+	REQUIREMENT_OF_EMPLOYER,
+	DURING_QUARANTINE,
+	AFTER_CONTACT_TRACING,
+	SWISS_COVID_APP_NOTIFICATION,
+	OTHER_REASON;
+
+	public String toString() {
+		return I18nProperties.getEnumCaption(this);
+	}
+}

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

@@ -0,0 +1,30 @@
+/*
+ * 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.caze;
+
+import de.symeda.sormas.api.i18n.I18nProperties;
+
+public enum EndOfIsolationReason {
+
+	RECOVERED,
+	DIED,
+	LOST_TO_FOLLOW_UP,
+	OTHER;
+
+	public String toString() {
+		return I18nProperties.getEnumCaption(this);
+	}
+}

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

@@ -0,0 +1,30 @@
+/*
+ * 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.caze;
+
+import de.symeda.sormas.api.i18n.I18nProperties;
+
+public enum QuarantineReason {
+
+	IDENTIFIED_BY_CONTACT_TRACING,
+	ENTRY_FROM_RISK_AREA,
+	SWISS_COVID_APP_NOTIFICATION,
+	OTHER_REASON;
+
+	public String toString() {
+		return I18nProperties.getEnumCaption(this);
+	}
+}

sormas-api/src/main/java/de/symeda/sormas/api/i18n/Captions.java

@@ -162,6 +162,7 @@ public interface Captions {
 	String CaseData = "CaseData";
 	String CaseData_additionalDetails = "CaseData.additionalDetails";
 	String CaseData_caseClassification = "CaseData.caseClassification";
+	String CaseData_caseIdIsm = "CaseData.caseIdIsm";
 	String CaseData_caseOfficer = "CaseData.caseOfficer";
 	String CaseData_caseOrigin = "CaseData.caseOrigin";
 	String CaseData_classificationComment = "CaseData.classificationComment";
@@ -176,11 +177,17 @@ public interface Captions {
 	String CaseData_community = "CaseData.community";
 	String CaseData_completeness = "CaseData.completeness";
 	String CaseData_contactOfficer = "CaseData.contactOfficer";
+	String CaseData_contactTracingFirstContactDate = "CaseData.contactTracingFirstContactDate";
+	String CaseData_contactTracingFirstContactType = "CaseData.contactTracingFirstContactType";
+	String CaseData_covidTestReason = "CaseData.covidTestReason";
+	String CaseData_covidTestReasonDetails = "CaseData.covidTestReasonDetails";
 	String CaseData_dengueFeverType = "CaseData.dengueFeverType";
 	String CaseData_diseaseDetails = "CaseData.diseaseDetails";
 	String CaseData_district = "CaseData.district";
 	String CaseData_districtLevelDate = "CaseData.districtLevelDate";
 	String CaseData_doses = "CaseData.doses";
+	String CaseData_endOfIsolationReason = "CaseData.endOfIsolationReason";
+	String CaseData_endOfIsolationReasonDetails = "CaseData.endOfIsolationReasonDetails";
 	String CaseData_epiData = "CaseData.epiData";
 	String CaseData_epidemiologicalConfirmation = "CaseData.epidemiologicalConfirmation";
 	String CaseData_epidNumber = "CaseData.epidNumber";
@@ -234,6 +241,8 @@ public interface Captions {
 	String CaseData_quarantineOrderedOfficialDocumentDate = "CaseData.quarantineOrderedOfficialDocumentDate";
 	String CaseData_quarantineOrderedVerbally = "CaseData.quarantineOrderedVerbally";
 	String CaseData_quarantineOrderedVerballyDate = "CaseData.quarantineOrderedVerballyDate";
+	String CaseData_quarantineReasonBeforeIsolation = "CaseData.quarantineReasonBeforeIsolation";
+	String CaseData_quarantineReasonBeforeIsolationDetails = "CaseData.quarantineReasonBeforeIsolationDetails";
 	String CaseData_quarantineReduced = "CaseData.quarantineReduced";
 	String CaseData_quarantineTo = "CaseData.quarantineTo";
 	String CaseData_quarantineTypeDetails = "CaseData.quarantineTypeDetails";

sormas-api/src/main/java/de/symeda/sormas/api/i18n/Strings.java

@@ -211,6 +211,7 @@ public interface Strings {
 	String headingContactsInQuarantine = "headingContactsInQuarantine";
 	String headingContactsPerCase = "headingContactsPerCase";
 	String headingContactsPlacedInQuarantine = "headingContactsPlacedInQuarantine";
+	String headingContactTracingFirstContact = "headingContactTracingFirstContact";
 	String headingCreateAdditionalTest = "headingCreateAdditionalTest";
 	String headingCreateCampaignDataForm = "headingCreateCampaignDataForm";
 	String headingCreateEntry = "headingCreateEntry";

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

@@ -355,6 +355,15 @@ CaseData.eventCount=Number of events
 CaseData.latestEventId=Latest event ID
 CaseData.latestEventStatus=Latest event status
 CaseData.latestEventTitle=Latest event title
+CaseData.caseIdIsm=Case-ID ISM
+CaseData.covidTestReason=Reason for COVID-19-Test
+CaseData.covidTestReasonDetails=Other reason
+CaseData.contactTracingFirstContactType=Type of contact
+CaseData.contactTracingFirstContactDate=Date of Contact
+CaseData.quarantineReasonBeforeIsolation=Reason why the case was in quarantine before this isolation
+CaseData.quarantineReasonBeforeIsolationDetails=Other reason
+CaseData.endOfIsolationReason=Reason for end of isolation
+CaseData.endOfIsolationReasonDetails=Other reason
 
 # CaseExport
 CaseExport.address=Address