#182: Implemented feature request for Epidata.

ePareto-Information-System · Nov 22, 2024 · 086e3fc · 086e3fc
1 parent 2e82d1b
commit 086e3fc
Show file tree

Hide file tree

Showing 4 changed files with 217 additions and 1 deletion.
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
@@ -218,7 +218,7 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper {
 
 	// public static final int DATABASE_VERSION = 307;
 	//public static final int DATABASE_VERSION = 343;
-	public static final int DATABASE_VERSION = 405;
+	public static final int DATABASE_VERSION = 406;
 
 	private static DatabaseHelper instance = null;
 
@@ -3969,6 +3969,20 @@ public void onUpgrade(SQLiteDatabase db, ConnectionSource connectionSource, int
 					currentVersion = 404;
 					getDao(Location.class).executeRaw("ALTER TABLE location ADD COLUMN locality varchar(255);");
 
+				case 405:
+					currentVersion = 405;
+					getDao(EpiData.class).executeRaw("ALTER TABLE epidata ADD COLUMN intlTravel varchar(255) ;");
+					getDao(EpiData.class).executeRaw("ALTER TABLE epidata ADD COLUMN specifyCountries varchar(255) ;");
+					getDao(EpiData.class).executeRaw("ALTER TABLE epidata ADD COLUMN dateOfDeparture DATE ;");
+					getDao(EpiData.class).executeRaw("ALTER TABLE epidata ADD COLUMN dateOfArrival DATE ;");
+					getDao(EpiData.class).executeRaw("ALTER TABLE epidata ADD COLUMN domesticTravel varchar(255) ;");
+					getDao(EpiData.class).executeRaw("ALTER TABLE epidata ADD COLUMN specifyLocation varchar(255) ;");
+					getDao(EpiData.class).executeRaw("ALTER TABLE epidata ADD COLUMN dateOfDeparture2 DATE ;");
+					getDao(EpiData.class).executeRaw("ALTER TABLE epidata ADD COLUMN dateOfArrival2 DATE ;");
+					getDao(EpiData.class).executeRaw("ALTER TABLE epidata ADD COLUMN contactIllPerson varchar(255) ;");
+					getDao(EpiData.class).executeRaw("ALTER TABLE epidata ADD COLUMN contactDate DATE ;");
+					getDao(EpiData.class).executeRaw("ALTER TABLE epidata ADD COLUMN specifyIllness varchar(255) ;");
+
 
 					// ATTENTION: break should only be done after last version
 				break;

diff --git a/sormas-app/app/src/main/java/de/symeda/sormas/app/backend/epidata/EpiData.java b/sormas-app/app/src/main/java/de/symeda/sormas/app/backend/epidata/EpiData.java
@@ -231,6 +231,18 @@ public YesNo getExposureDetailsKnown() {
 	private RiskFactorCondition riskFactorsSevereDisease;
 	private String otherSpecify;
 
+	private YesNo intlTravel;
+	private String specifyCountries;
+	private Date dateOfDeparture;
+	private Date dateOfArrival;
+	private YesNo domesticTravel;
+	private String specifyLocation;
+	private Date dateOfDeparture2;
+	private Date dateOfArrival2;
+	private YesNo contactIllPerson;
+	private Date contactDate;
+	private String specifyIllness;
+
 	public void setExposureDetailsKnown(YesNo exposureDetailsKnown) {
 		this.exposureDetailsKnown = exposureDetailsKnown;
 	}
@@ -985,7 +997,93 @@ public void setOtherSpecify(String otherSpecify) {
 		this.otherSpecify = otherSpecify;
 	}
 
+	public YesNo getIntlTravel() {
+		return intlTravel;
+	}
+
+	public void setIntlTravel(YesNo intlTravel) {
+		this.intlTravel = intlTravel;
+	}
+
+	public String getSpecifyCountries() {
+		return specifyCountries;
+	}
+
+	public void setSpecifyCountries(String specifyCountries) {
+		this.specifyCountries = specifyCountries;
+	}
+
+	public Date getDateOfDeparture() {
+		return dateOfDeparture;
+	}
+
+	public void setDateOfDeparture(Date dateOfDeparture) {
+		this.dateOfDeparture = dateOfDeparture;
+	}
+
+	public Date getDateOfArrival() {
+		return dateOfArrival;
+	}
+
+	public void setDateOfArrival(Date dateOfArrival) {
+		this.dateOfArrival = dateOfArrival;
+	}
+
+	public YesNo getDomesticTravel() {
+		return domesticTravel;
+	}
+
+	public void setDomesticTravel(YesNo domesticTravel) {
+		this.domesticTravel = domesticTravel;
+	}
+
+	public String getSpecifyLocation() {
+		return specifyLocation;
+	}
 
+	public void setSpecifyLocation(String specifyLocation) {
+		this.specifyLocation = specifyLocation;
+	}
+
+	public Date getDateOfDeparture2() {
+		return dateOfDeparture2;
+	}
+
+	public void setDateOfDeparture2(Date dateOfDeparture2) {
+		this.dateOfDeparture2 = dateOfDeparture2;
+	}
+
+	public Date getDateOfArrival2() {
+		return dateOfArrival2;
+	}
+
+	public void setDateOfArrival2(Date dateOfArrival2) {
+		this.dateOfArrival2 = dateOfArrival2;
+	}
+
+	public YesNo getContactIllPerson() {
+		return contactIllPerson;
+	}
+
+	public void setContactIllPerson(YesNo contactIllPerson) {
+		this.contactIllPerson = contactIllPerson;
+	}
+
+	public Date getContactDate() {
+		return contactDate;
+	}
+
+	public void setContactDate(Date contactDate) {
+		this.contactDate = contactDate;
+	}
+
+	public String getSpecifyIllness() {
+		return specifyIllness;
+	}
+
+	public void setSpecifyIllness(String specifyIllness) {
+		this.specifyIllness = specifyIllness;
+	}
 
 
 

diff --git a/sormas-app/app/src/main/java/de/symeda/sormas/app/backend/epidata/EpiDataDtoHelper.java b/sormas-app/app/src/main/java/de/symeda/sormas/app/backend/epidata/EpiDataDtoHelper.java
@@ -145,6 +145,17 @@ public void fillInnerFromDto(EpiData target, EpiDataDto source) {
 		target.setPlacesVisitedPastSevenDays(source.getPlacesVisitedPastSevenDays());
 		target.setRiskFactorsSevereDisease(source.getRiskFactorsSevereDisease());
 		target.setOtherSpecify(source.getOtherSpecify());
+		target.setIntlTravel(source.getIntlTravel());
+		target.setSpecifyCountries(source.getSpecifyCountries());
+		target.setDateOfDeparture(source.getDateOfDeparture());
+		target.setDateOfArrival(source.getDateOfArrival());
+		target.setDomesticTravel(source.getDomesticTravel());
+		target.setSpecifyLocation(source.getSpecifyLocation());
+		target.setDateOfDeparture2(source.getDateOfDeparture2());
+		target.setDateOfArrival2(source.getDateOfArrival2());
+		target.setContactIllPerson(source.getContactIllPerson());
+		target.setContactDate(source.getContactDate());
+		target.setSpecifyIllness(source.getSpecifyIllness());
 
 		List<Exposure> exposures = new ArrayList<>();
 		if (!source.getExposures().isEmpty()) {
@@ -286,6 +297,17 @@ public void fillInnerFromAdo(EpiDataDto target, EpiData source) {
 		target.setPlacesVisitedPastSevenDays(source.getPlacesVisitedPastSevenDays());
 		target.setRiskFactorsSevereDisease(source.getRiskFactorsSevereDisease());
 		target.setOtherSpecify(source.getOtherSpecify());
+		target.setIntlTravel(source.getIntlTravel());
+		target.setSpecifyCountries(source.getSpecifyCountries());
+		target.setDateOfDeparture(source.getDateOfDeparture());
+		target.setDateOfArrival(source.getDateOfArrival());
+		target.setDomesticTravel(source.getDomesticTravel());
+		target.setSpecifyLocation(source.getSpecifyLocation());
+		target.setDateOfDeparture2(source.getDateOfDeparture2());
+		target.setDateOfArrival2(source.getDateOfArrival2());
+		target.setContactIllPerson(source.getContactIllPerson());
+		target.setContactDate(source.getContactDate());
+		target.setSpecifyIllness(source.getSpecifyIllness());
 
 		List<ExposureDto> exposureDtos = new ArrayList<>();
 		if (!source.getExposures().isEmpty()) {

diff --git a/sormas-app/app/src/main/res/layout/fragment_edit_epid_layout.xml b/sormas-app/app/src/main/res/layout/fragment_edit_epid_layout.xml
@@ -1110,6 +1110,88 @@
                 app:dependencyParentValue="@{RiskFactorCondition.OTHER}"
                 style="@style/ControlSingleColumnStyle"/>
 
+            <TextView
+                android:id="@+id/exposureHistoryHeading"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@{I18nProperties.getString(Strings.headingExposureHistory)}"
+                style="@style/SubHeadingCompactStyle" />
+
+            <de.symeda.sormas.app.component.controls.ControlSwitchField
+                android:id="@+id/epiData_intlTravel"
+                app:value="@={data.intlTravel}"
+                app:enumClass="@{YesNoClass}"
+                style="@style/ControlSingleColumnStyle"/>
+
+            <de.symeda.sormas.app.component.controls.ControlTextEditField
+                android:id="@+id/epiData_specifyCountries"
+                app:value="@={data.specifyCountries}"
+                app:dependencyParentField="@{epiDataIntlTravel}"
+                app:dependencyParentValue="@{YesNo.YES}"
+                style="@style/ControlSingleColumnStyle"/>
+
+            <de.symeda.sormas.app.component.controls.ControlDateField
+                android:id="@+id/epiData_dateOfDeparture"
+                app:value="@={data.dateOfDeparture}"
+                app:dependencyParentField="@{epiDataIntlTravel}"
+                app:dependencyParentValue="@{YesNo.YES}"
+                style="@style/ControlSingleColumnStyle"/>
+
+            <de.symeda.sormas.app.component.controls.ControlDateField
+                android:id="@+id/epiData_dateOfArrival"
+                app:value="@={data.dateOfArrival}"
+                app:dependencyParentField="@{epiDataIntlTravel}"
+                app:dependencyParentValue="@{YesNo.YES}"
+                style="@style/ControlSingleColumnStyle"/>
+
+
+            <de.symeda.sormas.app.component.controls.ControlSwitchField
+                android:id="@+id/epiData_domesticTravel"
+                app:value="@={data.domesticTravel}"
+                app:enumClass="@{YesNoClass}"
+                style="@style/ControlSingleColumnStyle"/>
+
+            <de.symeda.sormas.app.component.controls.ControlTextEditField
+                android:id="@+id/epiData_specifyLocation"
+                app:value="@={data.specifyLocation}"
+                app:dependencyParentField="@{epiDataDomesticTravel}"
+                app:dependencyParentValue="@{YesNo.YES}"
+                style="@style/ControlSingleColumnStyle"/>
+
+            <de.symeda.sormas.app.component.controls.ControlDateField
+                android:id="@+id/epiData_dateOfDeparture2"
+                app:value="@={data.dateOfDeparture2}"
+                app:dependencyParentField="@{epiDataDomesticTravel}"
+                app:dependencyParentValue="@{YesNo.YES}"
+                style="@style/ControlSingleColumnStyle"/>
+
+            <de.symeda.sormas.app.component.controls.ControlDateField
+                android:id="@+id/epiData_dateOfArrival2"
+                app:value="@={data.dateOfArrival2}"
+                app:dependencyParentField="@{epiDataDomesticTravel}"
+                app:dependencyParentValue="@{YesNo.YES}"
+                style="@style/ControlSingleColumnStyle"/>
+
+            <de.symeda.sormas.app.component.controls.ControlSwitchField
+                android:id="@+id/epiData_contactIllPerson"
+                app:value="@={data.contactIllPerson}"
+                app:enumClass="@{YesNoClass}"
+                style="@style/ControlSingleColumnStyle"/>
+
+            <de.symeda.sormas.app.component.controls.ControlDateField
+                android:id="@+id/epiData_contactDate"
+                app:value="@={data.contactDate}"
+                app:dependencyParentField="@{epiDataContactIllPerson}"
+                app:dependencyParentValue="@{YesNo.YES}"
+                style="@style/ControlSingleColumnStyle"/>
+
+            <de.symeda.sormas.app.component.controls.ControlTextEditField
+                android:id="@+id/epiData_specifyIllness"
+                app:value="@={data.specifyIllness}"
+                app:dependencyParentField="@{epiDataDomesticTravel}"
+                app:dependencyParentValue="@{YesNo.YES}"
+                style="@style/ControlSingleColumnStyle"/>
+
 
             </LinearLayout>