Merge pull request #13942 from SORMAS-Foundation/13887-exposure-form-redesign

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

Author: obinna-h-n

sormas-ui/src/main/java/de/symeda/sormas/ui/exposure/ExposureForm.java

@@ -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;
@@ -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;
@@ -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);
 
@@ -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);
 

sormas-ui/src/main/java/de/symeda/sormas/ui/exposure/ExposuresField.java

@@ -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,
@@ -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) -> {