Merge branch 'development' of https://github.com/hzi-braunschweig/SORMAS-Project into development

Author: MateStrysewske

sormas-ui/src/main/java/de/symeda/sormas/ui/task/TaskGridFilterForm.java

@@ -6,8 +6,6 @@
 import java.util.Date;
 import java.util.stream.Stream;
 
-import org.apache.commons.lang3.StringUtils;
-
 import com.vaadin.server.Page;
 import com.vaadin.ui.CustomLayout;
 import com.vaadin.ui.HorizontalLayout;
@@ -69,24 +67,27 @@ protected void addFields() {
 		addField(FieldConfiguration.pixelSized(TaskIndexDto.TASK_STATUS, 140));
 
 		final UserDto user = UserProvider.getCurrent().getUser();
-		if (user.getRegion() == null && user.getDistrict() == null) {
-			final ComboBox regionField = addField(FieldConfiguration.pixelSized(TaskIndexDto.REGION, 200));
-			regionField.addItems(FacadeProvider.getRegionFacade().getAllActiveAsReference());
-
-			final ComboBox districtField = addDistrictField();
-			districtField.setEnabled(false);
-
-			regionField.addValueChangeListener(e -> {
-				RegionReferenceDto region = (RegionReferenceDto) e.getProperty().getValue();
-				if (StringUtils.isNotBlank(region.getUuid())) {
-					districtField.setEnabled(true);
-					FieldHelper.updateItems(districtField, FacadeProvider.getDistrictFacade().getAllActiveByRegion(region.getUuid()));
-				} else {
-					districtField.setEnabled(false);
-				}
-			});
-		} else if (user.getDistrict() == null) {
-			FieldHelper.updateItems(addDistrictField(), FacadeProvider.getDistrictFacade().getAllActiveByRegion(user.getRegion().getUuid()));
+		if (user.getDistrict() == null) {
+			if (user.getRegion() == null) {
+				final ComboBox regionField = addField(FieldConfiguration.pixelSized(TaskIndexDto.REGION, 200));
+				regionField.addItems(FacadeProvider.getRegionFacade().getAllActiveAsReference());
+
+				final ComboBox districtField = addDistrictField();
+				districtField.setEnabled(false);
+
+				regionField.addValueChangeListener(e -> {
+					RegionReferenceDto region = (RegionReferenceDto) e.getProperty().getValue();
+					boolean hasRegion = null != region;
+					districtField.setEnabled(hasRegion);
+					if (hasRegion) {
+						FieldHelper.updateItems(districtField, FacadeProvider.getDistrictFacade().getAllActiveByRegion(region.getUuid()));
+					} else {
+						districtField.setValue(null);
+					}
+				});
+			} else {
+				FieldHelper.updateItems(addDistrictField(), FacadeProvider.getDistrictFacade().getAllActiveByRegion(user.getRegion().getUuid()));
+			}
 		}
 
 		addField(FieldConfiguration.withCaptionAndPixelSized(TaskCriteria.FREE_TEXT, I18nProperties.getString(Strings.promptTaskSearchField), 200));

sormas-ui/src/main/java/de/symeda/sormas/ui/task/TaskListEntry.java

@@ -65,9 +65,22 @@ public TaskListEntry(TaskIndexDto task) {
 
 		Label taskTypeLabel = new Label(DataHelper.toStringNullable(task.getTaskType()));
 		CssStyles.style(taskTypeLabel, CssStyles.LABEL_BOLD, CssStyles.LABEL_UPPERCASE);
-		taskTypeLabel.setWidth(50, Unit.PERCENTAGE);
+		taskTypeLabel.setWidth(100, Unit.PERCENTAGE);
 		topLeftLayout.addComponent(taskTypeLabel);
 
+		Label statusLabel = new Label(DataHelper.toStringNullable(task.getTaskStatus()));
+		CssStyles.style(statusLabel, CssStyles.LABEL_BOLD, CssStyles.LABEL_UPPERCASE);
+		topLeftLayout.addComponent(statusLabel);
+
+		Label priorityLabel = new Label(
+			DataHelper.toStringNullable(I18nProperties.getPrefixCaption(TaskDto.I18N_PREFIX, TaskDto.PRIORITY) + ": " + task.getPriority()));
+		if (TaskPriority.HIGH == task.getPriority()) {
+			priorityLabel.addStyleName(CssStyles.LABEL_IMPORTANT);
+		} else if (TaskPriority.NORMAL == task.getPriority()) {
+			priorityLabel.addStyleName(CssStyles.LABEL_NEUTRAL);
+		}
+		topLeftLayout.addComponent(priorityLabel);
+
 		Label suggestedStartLabel = new Label(
 			I18nProperties.getPrefixCaption(TaskDto.I18N_PREFIX, TaskDto.SUGGESTED_START) + ": "
 				+ DateFormatHelper.formatDate(task.getSuggestedStart()));
@@ -83,25 +96,14 @@ public TaskListEntry(TaskIndexDto task) {
 		VerticalLayout topRightLayout = new VerticalLayout();
 
 		topRightLayout.addStyleName(CssStyles.ALIGN_RIGHT);
-		topRightLayout.setMargin(false);
-		topRightLayout.setSpacing(false);
-
-		Label statusLabel = new Label(DataHelper.toStringNullable(task.getTaskStatus()));
-		CssStyles.style(statusLabel, CssStyles.LABEL_BOLD, CssStyles.LABEL_UPPERCASE);
-		topRightLayout.addComponent(statusLabel);
-
-		Label priorityLabel = new Label(
-			DataHelper.toStringNullable(I18nProperties.getPrefixCaption(TaskDto.I18N_PREFIX, TaskDto.PRIORITY) + ": " + task.getPriority()));
-		if (TaskPriority.HIGH == task.getPriority()) {
-			priorityLabel.addStyleName(CssStyles.LABEL_IMPORTANT);
-		} else if (TaskPriority.NORMAL == task.getPriority()) {
-			priorityLabel.addStyleName(CssStyles.LABEL_NEUTRAL);
-		}
-		topRightLayout.addComponent(priorityLabel);
+		/*
+		 * topRightLayout.setMargin(false);
+		 * topRightLayout.setSpacing(false);
+		 */
 
 		Label userLabel =
 			new Label(I18nProperties.getPrefixCaption(TaskDto.I18N_PREFIX, TaskDto.ASSIGNEE_USER) + ": " + task.getAssigneeUser().getCaption());
-		topRightLayout.addComponent(userLabel);
+		topLeftLayout.addComponent(userLabel);
 
 		topLayout.addComponent(topRightLayout);
 		topLayout.setComponentAlignment(topRightLayout, Alignment.TOP_RIGHT);
@@ -143,7 +145,7 @@ public void addEditListener(int rowIndex, ClickListener editClickListener) {
 				CssStyles.BUTTON_COMPACT);
 
 			addComponent(editButton);
-			setComponentAlignment(editButton, Alignment.MIDDLE_RIGHT);
+			setComponentAlignment(editButton, Alignment.TOP_RIGHT);
 			setExpandRatio(editButton, 0);
 		}