Skip to content

exposure form - remove time picker from exposure date, reformat date on table, remove prophylaxis column from table. #13942

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
obinna-h-n merged 1 commit into from
May 25, 2026
+6 −7
Merged

exposure form - remove time picker from exposure date, reformat date on table, remove prophylaxis column from table. #13942

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions sormas-ui/src/main/java/de/symeda/sormas/ui/exposure/ExposureForm.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@
import com.vaadin.v7.data.util.converter.Converter;
import com.vaadin.v7.ui.AbstractSelect.ItemCaptionMode;
import com.vaadin.v7.ui.ComboBox;
import com.vaadin.v7.ui.DateField;
import com.vaadin.v7.ui.OptionGroup;
import com.vaadin.v7.ui.TextArea;
import com.vaadin.v7.ui.TextField;
Expand Down Expand Up @@ -82,7 +83,6 @@
import de.symeda.sormas.ui.utils.AbstractEditForm;
import de.symeda.sormas.ui.utils.CssStyles;
import de.symeda.sormas.ui.utils.DateComparisonValidator;
import de.symeda.sormas.ui.utils.DateTimeField;
import de.symeda.sormas.ui.utils.FieldHelper;
import de.symeda.sormas.ui.utils.NullableOptionGroup;
import de.symeda.sormas.ui.utils.components.CustomizableFieldsGroup;
Expand All @@ -105,7 +105,7 @@ public class ExposureForm extends AbstractEditForm<ExposureDto> {

//@formatter:off
private static final String GENERAL_DETAILS_LAYOUT =
fluidRowLocs(ExposureDto.START_DATE, ExposureDto.END_DATE) +
fluidRowLocs(ExposureDto.START_DATE, ExposureDto.END_DATE, "", "") +
fluidRowLocs(ExposureDto.EXPOSURE_TYPE, ExposureDto.EXPOSURE_TYPE_DETAILS) +
loc(ExposureDto.DESCRIPTION);

Expand Down Expand Up @@ -312,8 +312,8 @@ private void addHeadingsAndInfoTexts() {
private void addBasicFields() {
addFields(ExposureDto.UUID, ExposureDto.REPORTING_USER, ExposureDto.PROBABLE_INFECTION_ENVIRONMENT);

DateTimeField startDate = addField(generalDetailsLayout, ExposureDto.START_DATE, DateTimeField.class);
DateTimeField endDate = addField(generalDetailsLayout, ExposureDto.END_DATE, DateTimeField.class);
DateField startDate = addField(generalDetailsLayout, ExposureDto.START_DATE, DateField.class);
DateField endDate = addField(generalDetailsLayout, ExposureDto.END_DATE, DateField.class);

DateComparisonValidator.addStartEndValidators(startDate, endDate, false);

Expand Down
5 changes: 2 additions & 3 deletions sormas-ui/src/main/java/de/symeda/sormas/ui/exposure/ExposuresField.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,8 +107,7 @@ protected void updateColumns() {
COLUMN_LOCATION_COUNTRY,
COLUMN_DATE,
COLUMN_EXPOSURE_CATEGORY,
COLUMN_DESCRIPTION,
COLUMN_PROPHYLAXIS_ADHERENCE);
COLUMN_DESCRIPTION);
} else {
table.setVisibleColumns(
ACTION_COLUMN_ID,
Expand Down Expand Up @@ -149,7 +148,7 @@ private void addGeneratedColumns(Table table) {

table.addGeneratedColumn(COLUMN_DATE, (Table.ColumnGenerator) (source, itemId, columnId) -> {
ExposureDto exposure = (ExposureDto) itemId;
return DateFormatHelper.buildPeriodDateTimeString(exposure.getStartDate(), exposure.getEndDate());
return DateFormatHelper.buildPeriodString(exposure.getStartDate(), exposure.getEndDate());
});

table.addGeneratedColumn(COLUMN_DESCRIPTION, (Table.ColumnGenerator) (source, itemId, columnId) -> {
Expand Down
Loading