Skip to content
This repository was archived by the owner on May 5, 2021. It is now read-only.

Commit 431b647

Browse files
SORMAS-Foundation#2761 - Custom ComboBox fields are buggy when set to required (SORMAS-Foundation#3016)
1 parent 1557c17 commit 431b647

4 files changed

Lines changed: 5 additions & 2 deletions

File tree

sormas-api/src/main/java/de/symeda/sormas/api/i18n/Captions.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1280,6 +1280,7 @@ public interface Captions {
12801280
String sampleSamplesList = "sampleSamplesList";
12811281
String sampleShipped = "sampleShipped";
12821282
String sampleSpecimenNotAdequate = "sampleSpecimenNotAdequate";
1283+
String sex = "sex";
12831284
String singleDayEventDate = "singleDayEventDate";
12841285
String statisticsAddFilter = "statisticsAddFilter";
12851286
String statisticsAttribute = "statisticsAttribute";

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ epiWeekTo=To Epi Week
3030
facilityType=Facility type
3131
facilityTypeGroup=Facility category
3232
firstName=First name
33+
sex=Sex
3334
nationalHealthId=National health ID
3435
passportNumber=Passport number
3536
from=From

sormas-ui/src/main/java/de/symeda/sormas/ui/caze/CaseCreateForm.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -315,12 +315,13 @@ protected void addFields() {
315315
PersonDto.FIRST_NAME,
316316
PersonDto.LAST_NAME,
317317
CaseDataDto.DISEASE,
318+
PersonDto.SEX,
318319
CaseDataDto.REGION,
319320
CaseDataDto.DISTRICT,
320321
FACILITY_OR_HOME_LOC,
321322
FACILITY_TYPE_GROUP_LOC,
322323
CaseDataDto.FACILITY_TYPE);
323-
FieldHelper.addSoftRequiredStyle(plagueType, community, facilityDetails, sex);
324+
FieldHelper.addSoftRequiredStyle(plagueType, community, facilityDetails);
324325

325326
FieldHelper
326327
.setVisibleWhen(getFieldGroup(), Arrays.asList(CaseDataDto.DISEASE_DETAILS), CaseDataDto.DISEASE, Arrays.asList(Disease.OTHER), true);

sormas-ui/src/main/java/de/symeda/sormas/ui/contact/ContactCreateForm.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,7 @@ protected void addFields() {
194194
districtDto != null ? FacadeProvider.getCommunityFacade().getAllActiveByDistrict(districtDto.getUuid()) : null);
195195
});
196196

197-
setRequired(true, PersonDto.FIRST_NAME, PersonDto.LAST_NAME, ContactDto.REPORT_DATE_TIME);
197+
setRequired(true, PersonDto.FIRST_NAME, PersonDto.LAST_NAME, ContactDto.REPORT_DATE_TIME, PersonDto.SEX);
198198
FieldHelper.setVisibleWhen(
199199
getFieldGroup(),
200200
ContactDto.RELATION_DESCRIPTION,

0 commit comments

Comments
 (0)