Merge pull request #14120 from SORMAS-Foundation/bugfix-14066-rsv-case-person-issue

Corrected the label and other fields visibilities

Author: KarnaiahPesula

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

@@ -2050,7 +2050,7 @@ Person.birthdateDD=Day of birth
 Person.birthdateMM=Month of birth
 Person.birthdateYYYY=Year of birth
 Person.ageAndBirthDate=Age and birth date
-Person.birthWeight=Birth weight (g)
+Person.birthWeight=Weight if known
 Person.burialConductor=Burial conductor
 Person.burialDate=Date of burial
 Person.burialPlaceDescription=Burial place description
@@ -2115,10 +2115,10 @@ Person.livingStatus=Living Status
 Person.hasGuardian=Person has a legal guardian (i.e. in case of minors or incapacitated persons)
 Person.incapacitated=Incapacitated (i.e. person will have a legal guardian after 18)
 Person.emancipated=Emancipated (i.e. person is under 18 and does not have a guardian by law)
-Person.gestationalAgeCategory=Gestational age category
-Person.birthWeightCategory=Birth weight category
+Person.gestationalAgeCategory=Gestational age
+Person.birthWeightCategory=Birth weight
 Person.birthWeightValue=Birth weight value
-Person.multipleBirth=Multiple birth
+Person.multipleBirth=Multiple pregnancy
 personContactDetailOwner=Owner
 personContactDetailOwnerName=Owner name
 personContactDetailThisPerson=This person

sormas-ui/src/main/java/de/symeda/sormas/ui/person/PersonEditForm.java

@@ -130,8 +130,7 @@ public class PersonEditForm extends AbstractEditForm<PersonDto> {
                             fluidRowLocs(PersonDto.BIRTH_DATE_YYYY, PersonDto.BIRTH_DATE_MM, PersonDto.BIRTH_DATE_DD),
                             fluidRowLocs(PersonDto.APPROXIMATE_AGE, PersonDto.APPROXIMATE_AGE_TYPE, PersonDto.APPROXIMATE_AGE_REFERENCE_DATE)
                     ) +
-                    fluidRowLocs(PersonDto.PLACE_OF_BIRTH_REGION, PersonDto.PLACE_OF_BIRTH_DISTRICT, PersonDto.PLACE_OF_BIRTH_COMMUNITY) +
-                    fluidRowLocs(PersonDto.PLACE_OF_BIRTH_FACILITY_TYPE, PersonDto.PLACE_OF_BIRTH_FACILITY, PersonDto.PLACE_OF_BIRTH_FACILITY_DETAILS) +
+
                     fluidRowLocs(PersonDto.SEX, PersonDto.PRESENT_CONDITION) +
 					fluidRow(
 							oneOfFourCol(PersonDto.DEATH_DATE),
@@ -159,9 +158,11 @@ public class PersonEditForm extends AbstractEditForm<PersonDto> {
 					fluidRowLocs(PersonDto.HAS_COVID_APP, PersonDto.COVID_CODE_DELIVERED) +
 
                     loc(PERINATAL_DETAILS_HEADER) +
-					divsCss(VSPACE_3,fluidRowLocs(PersonDto.GESTATIONAL_AGE_CATEGORY,PersonDto.GESTATION_AGE_AT_BIRTH) +
+					divsCss(VSPACE_3,fluidRowLocs(PersonDto.GESTATIONAL_AGE_CATEGORY,"") +
 					fluidRowLocs(PersonDto.BIRTH_WEIGHT_CATEGORY, PersonDto.BIRTH_WEIGHT) +
                     fluidRowLocs(PersonDto.MULTIPLE_BIRTH,""))+
+					fluidRowLocs(PersonDto.PLACE_OF_BIRTH_REGION, PersonDto.PLACE_OF_BIRTH_DISTRICT, PersonDto.PLACE_OF_BIRTH_COMMUNITY) +
+					fluidRowLocs(PersonDto.PLACE_OF_BIRTH_FACILITY_TYPE, PersonDto.PLACE_OF_BIRTH_FACILITY, PersonDto.PLACE_OF_BIRTH_FACILITY_DETAILS) +
 
                     loc(OCCUPATION_HEADER) +
                     divsCss(VSPACE_3,
@@ -378,6 +379,8 @@ protected void addFields() {
 		TextField tfGestationAgeAtBirth = addField(PersonDto.GESTATION_AGE_AT_BIRTH, TextField.class);
 		tfGestationAgeAtBirth
 			.setConversionError(I18nProperties.getValidationError(Validations.onlyIntegerNumbersAllowed, tfGestationAgeAtBirth.getCaption()));
+		// Gestation Age At Birth is not required to showing. Its not in the requirements
+		tfGestationAgeAtBirth.setVisible(false);
 		TextField tfBirthWeight = addField(PersonDto.BIRTH_WEIGHT, TextField.class);
 		tfBirthWeight.setConversionError(I18nProperties.getValidationError(Validations.onlyIntegerNumbersAllowed, tfBirthWeight.getCaption()));