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

Commit 3f2123b

Browse files
SORMAS-Foundation#3035 - Fix label width, removed requirement from disabled sex field when creating contacts
1 parent 7ed73f2 commit 3f2123b

3 files changed

Lines changed: 8 additions & 5 deletions

File tree

sormas-backend/src/main/java/de/symeda/sormas/backend/event/EventParticipant.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ public void setPerson(Person person) {
8686
this.person = person;
8787
}
8888

89-
@Column(length = 512, nullable = false)
89+
@Column(length = 512)
9090
public String getInvolvementDescription() {
9191
return involvementDescription;
9292
}

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -488,6 +488,8 @@ public void setPersonDetailsReadOnly() {
488488
PersonDto.PASSPORT_NUMBER,
489489
PersonDto.PHONE,
490490
PersonDto.EMAIL_ADDRESS);
491+
492+
setRequired(false, PersonDto.FIRST_NAME, PersonDto.LAST_NAME, PersonDto.SEX);
491493
}
492494

493495
public void setDiseaseReadOnly() {

sormas-ui/src/main/java/de/symeda/sormas/ui/events/eventLink/EventListEntry.java

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -71,15 +71,16 @@ public EventListEntry(EventIndexDto event) {
7171

7272
Label eventTitleLabel = new Label(DataHelper.toStringNullable(event.getEventTitle()));
7373
CssStyles.style(eventTitleLabel, CssStyles.LABEL_BOLD, CssStyles.LABEL_UPPERCASE);
74+
eventTitleLabel.setWidth(100, Unit.PERCENTAGE);
7475

7576
topLeftLayout.addComponent(eventTitleLabel);
7677

77-
Label materialLabel = new Label(DataHelper.toStringNullable(event.getEventLocation()));
78-
CssStyles.style(materialLabel);
79-
topLeftLayout.addComponent(materialLabel);
78+
Label locationLabel = new Label(DataHelper.toStringNullable(event.getEventLocation()));
79+
locationLabel.setWidth(100, Unit.PERCENTAGE);
80+
topLeftLayout.addComponent(locationLabel);
8081

8182
Language userLanguage = I18nProperties.getUserLanguage();
82-
String eventDate = null;
83+
String eventDate;
8384
if (event.getEndDate() == null) {
8485
eventDate = DateHelper.formatLocalDate(event.getStartDate(), userLanguage);
8586
} else {

0 commit comments

Comments
 (0)