Resolved profession of patients not saving at person fragment

ePareto-Information-System · Dec 11, 2024 · 603e983 · 603e983
1 parent eccdf7b
commit 603e983
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 7 deletions.
diff --git a/sormas-app/app/src/main/java/de/symeda/sormas/app/backend/person/Person.java b/sormas-app/app/src/main/java/de/symeda/sormas/app/backend/person/Person.java
@@ -235,11 +235,10 @@ public class Person extends PseudonymizableAdo {
 	private String qualification;
 	@Transient
 	private Set<Profession> professionOfPatient;
-	@Column(length = CHARACTER_LIMIT_DEFAULT)
+	@Column
 	private String professionOfPatientString;
 	@Column(length = CHARACTER_LIMIT_DEFAULT)
 	private String professionOfPatientOther;
-
 	@Column(length = CHARACTER_LIMIT_DEFAULT)
 	private String otherId;
 	@Column(length = CHARACTER_LIMIT_DEFAULT)

diff --git a/sormas-app/app/src/main/java/de/symeda/sormas/app/backend/person/PersonDtoHelper.java b/sormas-app/app/src/main/java/de/symeda/sormas/app/backend/person/PersonDtoHelper.java
@@ -86,6 +86,7 @@ public void fillInnerFromDto(Person target, PersonDto source) {
 		target.setNameHealthFacility(source.getNameHealthFacility());
 		target.setService(source.getService());
 		target.setQualification(source.getQualification());
+		target.setProfessionOfPatient(source.getProfessionOfPatient());
 		target.setBirthdateDD(source.getBirthdateDD());
 		target.setBirthdateMM(source.getBirthdateMM());
 		target.setBirthdateYYYY(source.getBirthdateYYYY());
@@ -218,6 +219,7 @@ public void fillInnerFromAdo(PersonDto target, Person source) {
 		target.setNameHealthFacility(source.getNameHealthFacility());
 		target.setService(source.getService());
 		target.setQualification(source.getQualification());
+		target.setProfessionOfPatient(source.getProfessionOfPatient());
 		target.setPresentCondition(source.getPresentCondition());
 		target.setDeathDate(source.getDeathDate());
 		target.setDeathPlaceType(source.getDeathPlaceType());

diff --git a/sormas-app/app/src/main/java/de/symeda/sormas/app/person/edit/PersonEditFragment.java b/sormas-app/app/src/main/java/de/symeda/sormas/app/person/edit/PersonEditFragment.java
@@ -291,7 +291,6 @@ private void setUpLayoutBinding(final BaseEditFragment fragment, final Person re
 		contentBinding.personDeathDate.initializeDateField(fragment.getFragmentManager());
 		contentBinding.personBurialDate.initializeDateField(fragment.getFragmentManager());
 		contentBinding.personResidenceSinceWhenInMonths.addValueChangedListener(field -> handlePersonResidenceSinceWhenInMonths(contentBinding));
-		contentBinding.setProfessionClass(Profession.class);
 	}
 
 	public static void setUpControlListeners(
@@ -606,10 +605,6 @@ public void onLayoutBinding(FragmentPersonEditLayoutBinding contentBinding) {
 		contentBinding.setYesNoClass(YesNo.class);
 		PersonValidator.initializePersonValidation(contentBinding);
 
-		if (disease != null) {
-			super.hideFieldsForDisease(disease, contentBinding.mainContent, FormType.PERSON_EDIT);
-		}
-
 		contentBinding.setAddressList(getAddresses());
 		contentBinding.setAddressItemClickCallback(onAddressItemClickListener);
 		getContentBinding().setAddressBindCallback(this::setLocationFieldVisibilitiesAndAccesses);
@@ -620,6 +615,11 @@ public void onLayoutBinding(FragmentPersonEditLayoutBinding contentBinding) {
 		setUpLayoutBinding(this, record, contentBinding);
 		contentBinding.setAttendedByClass(AttendedBy.class);
 		contentBinding.setYesNoUnknownClass(YesNoUnknown.class);
+		contentBinding.setProfessionClass(Profession.class);
+
+		if (disease != null) {
+			super.hideFieldsForDisease(disease, contentBinding.mainContent, FormType.PERSON_EDIT);
+		}
 	}
 
 	@Override