#162: Filtered present condition values for CSM. Added vaccine type a…

…nd to render on vaccinated toggle for CSM at case edit.
ePareto-Information-System · Nov 18, 2024 · 01cd992 · 01cd992
1 parent 434f5ff
commit 01cd992
Show file tree

Hide file tree

Showing 6 changed files with 32 additions and 2 deletions.
diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/person/PresentCondition.java b/sormas-api/src/main/java/de/symeda/sormas/api/person/PresentCondition.java
@@ -28,8 +28,9 @@ public enum PresentCondition {
 			Disease.MEASLES }, hide = true)
 	DEAD,
 	@Diseases(value = {
-		Disease.CORONAVIRUS, Disease.MEASLES }, hide = true)
+		Disease.CORONAVIRUS, Disease.MEASLES, Disease.CSM }, hide = true)
 	BURIED,
+	@Diseases(value = {Disease.CSM }, hide = true)
 	UNKNOWN;
 
 	public boolean isDeceased() {

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
@@ -61,6 +61,7 @@
 import de.symeda.sormas.api.infrastructure.facility.FacilityType;
 import de.symeda.sormas.api.utils.CardOrHistory;
 import de.symeda.sormas.api.utils.DataHelper;
+import de.symeda.sormas.api.utils.VaccineTypes;
 import de.symeda.sormas.api.utils.YesNo;
 import de.symeda.sormas.api.utils.YesNoUnknown;
 import de.symeda.sormas.app.backend.caze.maternalhistory.MaternalHistory;
@@ -246,6 +247,8 @@ public class Case extends PseudonymizableAdo {
 	@Enumerated(EnumType.STRING)
 	@DatabaseField(columnName = "vaccinationType")
 	private CardOrHistory vaccinationType;
+	@Enumerated(EnumType.STRING)
+	private VaccineTypes vaccineType;
 	private String numberOfDoses;
 	@DatabaseField(columnName = "vaccinationDate", dataType = DataType.DATE_LONG)
 	private Date vaccinationDate;
@@ -841,6 +844,14 @@ public void setVaccinationType(CardOrHistory vaccinationType) {
 		this.vaccinationType = vaccinationType;
 	}
 
+	public VaccineTypes getVaccineType() {
+		return vaccineType;
+	}
+
+	public void setVaccineType(VaccineTypes vaccineType) {
+		this.vaccineType = vaccineType;
+	}
+
 	public String getNumberOfDoses() {
 		return numberOfDoses;
 	}

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
@@ -159,6 +159,7 @@ public void fillInnerFromDto(Case target, CaseDataDto source) {
 
 		target.setVaccinationStatus(source.getVaccinationStatus());
 		target.setVaccinationType(source.getVaccinationType());
+		target.setVaccineType(source.getVaccineType());
 		target.setNumberOfDoses(source.getNumberOfDoses());
 		target.setVaccinationDate(source.getVaccinationDate());
 		target.setSmallpoxVaccinationScar(source.getSmallpoxVaccinationScar());
@@ -464,6 +465,7 @@ public void fillInnerFromAdo(CaseDataDto target, Case source) {
 		target.setPregnant(source.getPregnant());
 		target.setVaccinationStatus(source.getVaccinationStatus());
 		target.setVaccinationType(source.getVaccinationType());
+		target.setVaccineType(source.getVaccineType());
 		target.setNumberOfDoses(source.getNumberOfDoses());
 		target.setVaccinationDate(source.getVaccinationDate());
 		target.setSmallpoxVaccinationScar(source.getSmallpoxVaccinationScar());

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 = 400;
+	public static final int DATABASE_VERSION = 401;
 
 	private static DatabaseHelper instance = null;
 
@@ -3909,6 +3909,10 @@ public void onUpgrade(SQLiteDatabase db, ConnectionSource connectionSource, int
 					getDao(PathogenTest.class).executeRaw("ALTER TABLE pathogentest ADD COLUMN secondTestedDisease VARCHAR(255);");
 					getDao(PathogenTest.class).executeRaw("ALTER TABLE pathogentest ADD COLUMN testResultForSecondDisease VARCHAR(255);");
 
+				case 400:
+					currentVersion = 400;
+					getDao(Case.class).executeRaw("ALTER TABLE cases ADD COLUMN vaccineType 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/caze/edit/CaseEditFragment.java b/sormas-app/app/src/main/java/de/symeda/sormas/app/caze/edit/CaseEditFragment.java
@@ -71,6 +71,7 @@
 import de.symeda.sormas.api.user.JurisdictionLevel;
 import de.symeda.sormas.api.user.UserRight;
 import de.symeda.sormas.api.utils.CardOrHistory;
+import de.symeda.sormas.api.utils.VaccineTypes;
 import de.symeda.sormas.api.utils.YesNoUnknown;
 import de.symeda.sormas.api.utils.fieldaccess.UiFieldAccessCheckers;
 import de.symeda.sormas.api.utils.fieldvisibility.FieldVisibilityCheckers;
@@ -140,6 +141,7 @@ public class CaseEditFragment extends BaseEditFragment<FragmentCaseEditLayoutBin
 	private boolean differentPlaceOfStayJurisdiction;
 	private List<Item> idsrTypeList;
 	private List<Item> notifyByList;
+	private List<Item> vaccineList;
 
 	// Static methods
 
@@ -426,6 +428,7 @@ record = getActivityRootData();
 		caseConfirmationBasisList = DataUtils.getEnumItems(CaseConfirmationBasis.class, true);
 		idsrTypeList = DataUtils.getEnumItems(IdsrType.class, true);
 		notifyByList = DataUtils.getEnumItems(NotifiedList.class, true);
+		vaccineList = DataUtils.getEnumItems(VaccineTypes.class, true);
 	}
 
 	@Override
@@ -611,6 +614,7 @@ public void onChange(ControlPropertyField field) {
 		contentBinding.setFilteredVaccinationStatusValues(filteredValues);
 		contentBinding.caseDataIdsrDiagnosis.initializeSpinner(idsrTypeList);
 		contentBinding.caseDataNotifiedByList.initializeSpinner(notifyByList);
+		contentBinding.caseDataVaccineType.initializeSpinner(vaccineList);
 
 		contentBinding.caseDataQuarantineTo.addValueChangedListener(new ValueChangeListener() {
 

diff --git a/sormas-app/app/src/main/res/layout/fragment_case_edit_layout.xml b/sormas-app/app/src/main/res/layout/fragment_case_edit_layout.xml
@@ -945,6 +945,14 @@
                     app:dependencyParentVisibility="@{true}"
                     style="@style/ControlSingleColumnStyle" />
 
+                <de.symeda.sormas.app.component.controls.ControlSpinnerField
+                    android:id="@+id/caseData_vaccineType"
+                    app:value="@={data.vaccineType}"
+                    app:dependencyParentField="@{caseDataVaccinationStatus}"
+                    app:dependencyParentValue="@{VaccinationStatus.VACCINATED}"
+                    app:dependencyParentVisibility="@{true}"
+                    style="@style/ControlSingleColumnStyle" />
+
                 <de.symeda.sormas.app.component.controls.ControlTextEditField
                     android:id="@+id/caseData_numberOfDoses"
                     app:value="@={data.numberOfDoses}"