Merge pull request SORMAS-Foundation#3070 from hzi-braunschweig/2977_case-quarantine-before-isolation

leventegal-she · web-flow · commit 23925fc42023 · 2020-10-06T15:26:55.000+03:00
SORMAS-Foundation#2977 Added "Quarantine before isolation" field on case
diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/caze/CaseDataDto.java b/sormas-api/src/main/java/de/symeda/sormas/api/caze/CaseDataDto.java
@@ -161,6 +161,7 @@ public class CaseDataDto extends PseudonymizableDto {
 	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 WAS_IN_QUARANTINE_BEFORE_ISOLATION = "wasInQuarantineBeforeIsolation";
 	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";
@@ -429,6 +430,8 @@ public class CaseDataDto extends PseudonymizableDto {
 	@HideForCountriesExcept(countries = COUNTRY_CODE_SWITZERLAND)
 	private Date contactTracingFirstContactDate;
 	@HideForCountriesExcept(countries = COUNTRY_CODE_SWITZERLAND)
+	private YesNoUnknown wasInQuarantineBeforeIsolation;
+	@HideForCountriesExcept(countries = COUNTRY_CODE_SWITZERLAND)
 	private QuarantineReason quarantineReasonBeforeIsolation;
 	@HideForCountriesExcept(countries = COUNTRY_CODE_SWITZERLAND)
 	@SensitiveData
@@ -1243,6 +1246,14 @@ public void setContactTracingFirstContactDate(Date contactTracingFirstContactDat
 		this.contactTracingFirstContactDate = contactTracingFirstContactDate;
 	}
 
+	public YesNoUnknown getWasInQuarantineBeforeIsolation() {
+		return wasInQuarantineBeforeIsolation;
+	}
+
+	public void setWasInQuarantineBeforeIsolation(YesNoUnknown wasInQuarantineBeforeIsolation) {
+		this.wasInQuarantineBeforeIsolation = wasInQuarantineBeforeIsolation;
+	}
+
 	public QuarantineReason getQuarantineReasonBeforeIsolation() {
 		return quarantineReasonBeforeIsolation;
 	}
diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/i18n/Captions.java b/sormas-api/src/main/java/de/symeda/sormas/api/i18n/Captions.java
@@ -271,6 +271,7 @@ public interface Captions {
 	String CaseData_vaccinationInfoSource = "CaseData.vaccinationInfoSource";
 	String CaseData_vaccine = "CaseData.vaccine";
 	String CaseData_visits = "CaseData.visits";
+	String CaseData_wasInQuarantineBeforeIsolation = "CaseData.wasInQuarantineBeforeIsolation";
 	String caseDefaultView = "caseDefaultView";
 	String caseDetailedView = "caseDetailedView";
 	String caseEditData = "caseEditData";
diff --git a/sormas-api/src/main/resources/captions.properties b/sormas-api/src/main/resources/captions.properties
@@ -362,6 +362,7 @@ CaseData.covidTestReason=Reason for COVID-19-Test
 CaseData.covidTestReasonDetails=Other reason
 CaseData.contactTracingFirstContactType=Type of contact
 CaseData.contactTracingFirstContactDate=Date of Contact
+CaseData.wasInQuarantineBeforeIsolation=Was the case in quarantine before isolation?
 CaseData.quarantineReasonBeforeIsolation=Reason why the case was in quarantine before this isolation
 CaseData.quarantineReasonBeforeIsolationDetails=Other reason
 CaseData.endOfIsolationReason=Reason for end of isolation
diff --git a/sormas-api/src/main/resources/captions_de-CH.properties b/sormas-api/src/main/resources/captions_de-CH.properties
@@ -355,6 +355,7 @@ CaseData.covidTestReason=Grund für COVID-19-Test
 CaseData.covidTestReasonDetails=Anderer Grund für den COVID-19-Test
 CaseData.contactTracingFirstContactType=Art des Kontaktes
 CaseData.contactTracingFirstContactDate=Datum des Kontaktes
+CaseData.wasInQuarantineBeforeIsolation=War der COVID-19-Fall bereits in Quarantäne vor der Isolation?
 CaseData.quarantineReasonBeforeIsolation=Grund weshalb der COVID-19-Fall vor der Isolation in Quarantäne war
 CaseData.quarantineReasonBeforeIsolationDetails=Anderer Grund
 CaseData.endOfIsolationReason=Grund des Ende der Isolation
diff --git a/sormas-app/app/src/main/java/de/symeda/sormas/app/backend/caze/Case.java b/sormas-app/app/src/main/java/de/symeda/sormas/app/backend/caze/Case.java
@@ -324,6 +324,8 @@ public class Case extends PseudonymizableAdo {
 	@DatabaseField
 	private Date contactTracingFirstContactDate;
 	@Enumerated(EnumType.STRING)
+	private YesNoUnknown wasInQuarantineBeforeIsolation;
+	@Enumerated(EnumType.STRING)
 	private QuarantineReason quarantineReasonBeforeIsolation;
 	@Column(length = COLUMN_LENGTH_DEFAULT)
 	private String quarantineReasonBeforeIsolationDetails;
@@ -1061,6 +1063,14 @@ public void setContactTracingFirstContactDate(Date contactTracingFirstContactDat
 		this.contactTracingFirstContactDate = contactTracingFirstContactDate;
 	}
 
+	public YesNoUnknown getWasInQuarantineBeforeIsolation() {
+		return wasInQuarantineBeforeIsolation;
+	}
+
+	public void setWasInQuarantineBeforeIsolation(YesNoUnknown wasInQuarantineBeforeIsolation) {
+		this.wasInQuarantineBeforeIsolation = wasInQuarantineBeforeIsolation;
+	}
+
 	public QuarantineReason getQuarantineReasonBeforeIsolation() {
 		return quarantineReasonBeforeIsolation;
 	}
diff --git a/sormas-app/app/src/main/java/de/symeda/sormas/app/backend/caze/CaseDtoHelper.java b/sormas-app/app/src/main/java/de/symeda/sormas/app/backend/caze/CaseDtoHelper.java
@@ -191,6 +191,7 @@ public void fillInnerFromDto(Case target, CaseDataDto source) {
 		target.setCovidTestReasonDetails(source.getCovidTestReasonDetails());
 		target.setContactTracingFirstContactType(source.getContactTracingFirstContactType());
 		target.setContactTracingFirstContactDate(source.getContactTracingFirstContactDate());
+		target.setWasInQuarantineBeforeIsolation(source.getWasInQuarantineBeforeIsolation());
 		target.setQuarantineReasonBeforeIsolation(source.getQuarantineReasonBeforeIsolation());
 		target.setQuarantineReasonBeforeIsolationDetails(source.getQuarantineReasonBeforeIsolationDetails());
 		target.setEndOfIsolationReason(source.getEndOfIsolationReason());
@@ -393,6 +394,7 @@ public void fillInnerFromAdo(CaseDataDto target, Case source) {
 		target.setCovidTestReasonDetails(source.getCovidTestReasonDetails());
 		target.setContactTracingFirstContactType(source.getContactTracingFirstContactType());
 		target.setContactTracingFirstContactDate(source.getContactTracingFirstContactDate());
+		target.setWasInQuarantineBeforeIsolation(source.getWasInQuarantineBeforeIsolation());
 		target.setQuarantineReasonBeforeIsolation(source.getQuarantineReasonBeforeIsolation());
 		target.setQuarantineReasonBeforeIsolationDetails(source.getQuarantineReasonBeforeIsolationDetails());
 		target.setEndOfIsolationReason(source.getEndOfIsolationReason());
diff --git a/sormas-app/app/src/main/java/de/symeda/sormas/app/backend/common/DatabaseHelper.java b/sormas-app/app/src/main/java/de/symeda/sormas/app/backend/common/DatabaseHelper.java
@@ -137,7 +137,7 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper {
 	public static final String DATABASE_NAME = "sormas.db";
 	// any time you make changes to your database objects, you may have to increase the database version
 
-	public static final int DATABASE_VERSION = 235;
+	public static final int DATABASE_VERSION = 236;
 
 	private static DatabaseHelper instance = null;
 
@@ -1697,6 +1697,10 @@ public void onUpgrade(SQLiteDatabase db, ConnectionSource connectionSource, int
 					.executeRaw("ALTER TABLE contacts ADD COLUMN sormasToSormasOriginInfo_id bigint REFERENCES sormasToSormasOriginInfo(id);");
 				getDao(Contact.class).executeRaw("ALTER TABLE contacts ADD COLUMN ownershipHandedOver boolean;");
 
+			case 235:
+				currentVersion = 235;
+				getDao(Case.class).executeRaw("ALTER TABLE cases ADD COLUMN wasInQuarantineBeforeIsolation varchar(255);");
+
 				// ATTENTION: break should only be done after last version
 				break;
 			default:
diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/caze/Case.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/caze/Case.java
@@ -307,6 +307,7 @@ public class Case extends CoreAdo {
 	private String covidTestReasonDetails;
 	private ContactTracingContactType contactTracingFirstContactType;
 	private Date contactTracingFirstContactDate;
+	private YesNoUnknown wasInQuarantineBeforeIsolation;
 	private QuarantineReason quarantineReasonBeforeIsolation;
 	private String quarantineReasonBeforeIsolationDetails;
 	private EndOfIsolationReason endOfIsolationReason;
@@ -1289,6 +1290,15 @@ public void setContactTracingFirstContactDate(Date contactTracingContactDate) {
 		this.contactTracingFirstContactDate = contactTracingContactDate;
 	}
 
+	@Enumerated(EnumType.STRING)
+	public YesNoUnknown getWasInQuarantineBeforeIsolation() {
+		return wasInQuarantineBeforeIsolation;
+	}
+
+	public void setWasInQuarantineBeforeIsolation(YesNoUnknown wasInQuarantineBeforeIsolation) {
+		this.wasInQuarantineBeforeIsolation = wasInQuarantineBeforeIsolation;
+	}
+
 	@Enumerated(EnumType.STRING)
 	public QuarantineReason getQuarantineReasonBeforeIsolation() {
 		return quarantineReasonBeforeIsolation;
diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/caze/CaseFacadeEjb.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/caze/CaseFacadeEjb.java
@@ -2120,6 +2120,7 @@ public Case fillOrBuildEntity(@NotNull CaseDataDto source, Case target) {
 		target.setContactTracingFirstContactType(source.getContactTracingFirstContactType());
 		target.setContactTracingFirstContactDate(source.getContactTracingFirstContactDate());
 		target.setQuarantineReasonBeforeIsolation(source.getQuarantineReasonBeforeIsolation());
+		target.setWasInQuarantineBeforeIsolation(source.getWasInQuarantineBeforeIsolation());
 		target.setQuarantineReasonBeforeIsolationDetails(source.getQuarantineReasonBeforeIsolationDetails());
 		target.setEndOfIsolationReason(source.getEndOfIsolationReason());
 		target.setEndOfIsolationReasonDetails(source.getEndOfIsolationReasonDetails());
@@ -2391,6 +2392,7 @@ public static CaseDataDto toDto(Case source) {
 		target.setCovidTestReasonDetails(source.getCovidTestReasonDetails());
 		target.setContactTracingFirstContactType(source.getContactTracingFirstContactType());
 		target.setContactTracingFirstContactDate(source.getContactTracingFirstContactDate());
+		target.setWasInQuarantineBeforeIsolation(source.getWasInQuarantineBeforeIsolation());
 		target.setQuarantineReasonBeforeIsolation(source.getQuarantineReasonBeforeIsolation());
 		target.setQuarantineReasonBeforeIsolationDetails(source.getQuarantineReasonBeforeIsolationDetails());
 		target.setEndOfIsolationReason(source.getEndOfIsolationReason());
diff --git a/sormas-backend/src/main/resources/sql/sormas_schema.sql b/sormas-backend/src/main/resources/sql/sormas_schema.sql
@@ -5461,4 +5461,13 @@ ALTER TABLE sormastosormasshareinfo ADD CONSTRAINT fk_sormastosormasshareinfo_se
 
 INSERT INTO schema_version (version_number, comment) VALUES (264, 'Store Sormas 2 Sormas sharing information #2624');
 
+-- 2020-10-05 Add new field: Quarantine before isolation #2977
+ALTER TABLE cases
+    ADD COLUMN wasInQuarantineBeforeIsolation varchar(255);
+
+ALTER TABLE cases_history
+    ADD COLUMN wasInQuarantineBeforeIsolation varchar(255);
+
+INSERT INTO schema_version (version_number, comment) VALUES (265, 'Add new field: Quarantine before isolation #2977');
+
 -- *** Insert new sql commands BEFORE this line ***
diff --git a/sormas-ui/src/main/java/de/symeda/sormas/ui/caze/CaseController.java b/sormas-ui/src/main/java/de/symeda/sormas/ui/caze/CaseController.java
@@ -79,6 +79,7 @@
 import de.symeda.sormas.api.utils.DateHelper;
 import de.symeda.sormas.api.utils.ValidationRuntimeException;
 import de.symeda.sormas.api.utils.fieldaccess.UiFieldAccessCheckers;
+import de.symeda.sormas.api.utils.YesNoUnknown;
 import de.symeda.sormas.api.visit.VisitDto;
 import de.symeda.sormas.ui.ControllerProvider;
 import de.symeda.sormas.ui.SormasUI;
@@ -422,6 +423,9 @@ public CommitDiscardWrapperComponent<CaseCreateForm> getCaseCreateComponent(
 						gatheringDto.setUuid(DataHelper.createUuid());
 						gatheringDto.getGatheringAddress().setUuid(DataHelper.createUuid());
 					});
+
+					dto.setWasInQuarantineBeforeIsolation(YesNoUnknown.YES);
+
 					saveCase(dto);
 					// retrieve the contact just in case it has been changed during case saving
 					ContactDto updatedContact = FacadeProvider.getContactFacade().getContactByUuid(convertedContact.getUuid());
diff --git a/sormas-ui/src/main/java/de/symeda/sormas/ui/caze/CaseDataForm.java b/sormas-ui/src/main/java/de/symeda/sormas/ui/caze/CaseDataForm.java
@@ -176,6 +176,7 @@ public class CaseDataForm extends AbstractEditForm<CaseDataDto> {
 					fluidRowLocs(CaseDataDto.QUARANTINE_ORDERED_OFFICIAL_DOCUMENT, CaseDataDto.QUARANTINE_ORDERED_OFFICIAL_DOCUMENT_DATE) +
 					fluidRowLocs(CaseDataDto.QUARANTINE_OFFICIAL_ORDER_SENT, CaseDataDto.QUARANTINE_OFFICIAL_ORDER_SENT_DATE) +
 					fluidRowLocs(CaseDataDto.QUARANTINE_HELP_NEEDED) +
+					fluidRowLocs(CaseDataDto.WAS_IN_QUARANTINE_BEFORE_ISOLATION) +
 					fluidRowLocs(CaseDataDto.QUARANTINE_REASON_BEFORE_ISOLATION, CaseDataDto.QUARANTINE_REASON_BEFORE_ISOLATION_DETAILS) +
 					fluidRowLocs(CaseDataDto.END_OF_ISOLATION_REASON, CaseDataDto.END_OF_ISOLATION_REASON_DETAILS) +
 					fluidRowLocs(CaseDataDto.COVID_TEST_REASON, CaseDataDto.COVID_TEST_REASON_DETAILS) +
@@ -601,6 +602,7 @@ protected void addFields() {
 			addFields(CaseDataDto.CONTACT_TRACING_FIRST_CONTACT_TYPE, CaseDataDto.CONTACT_TRACING_FIRST_CONTACT_DATE);
 		}
 
+		addField(CaseDataDto.WAS_IN_QUARANTINE_BEFORE_ISOLATION).setStyleName(ValoTheme.OPTIONGROUP_HORIZONTAL);
 		addFields(CaseDataDto.QUARANTINE_REASON_BEFORE_ISOLATION, CaseDataDto.QUARANTINE_REASON_BEFORE_ISOLATION_DETAILS);
 		FieldHelper.setVisibleWhen(
 			getFieldGroup(),
