Fixed SORMAS-Foundation#3771

Author: MateStrysewske

sormas-ui/src/main/java/de/symeda/sormas/ui/action/ActionEditForm.java

@@ -25,6 +25,7 @@
 
 import com.vaadin.v7.ui.ComboBox;
 import com.vaadin.v7.ui.Label;
+import com.vaadin.v7.ui.OptionGroup;
 import com.vaadin.v7.ui.RichTextArea;
 import com.vaadin.v7.ui.TextField;
 
@@ -87,7 +88,7 @@ protected void addFields() {
 		DateTimeField date = addDateField(ActionDto.DATE, DateTimeField.class, -1);
 		date.setImmediate(true);
 		addField(ActionDto.PRIORITY, ComboBox.class);
-		addField(ActionDto.ACTION_STATUS, NullableOptionGroup.class);
+		addField(ActionDto.ACTION_STATUS, OptionGroup.class);
 		NullableOptionGroup actionContext = addField(ActionDto.ACTION_CONTEXT, NullableOptionGroup.class);
 		actionContext.setImmediate(true);
 		actionContext.addValueChangeListener(event -> updateByActionContext());
@@ -103,7 +104,7 @@ protected void addFields() {
 		reply.setNullRepresentation("");
 		reply.setImmediate(true);
 
-		setRequired(true, ActionDto.ACTION_CONTEXT, ActionDto.DATE);
+		setRequired(true, ActionDto.ACTION_CONTEXT, ActionDto.DATE, ActionDto.ACTION_STATUS);
 		setReadOnly(true, ActionDto.ACTION_CONTEXT, ActionDto.EVENT);
 	}
 

sormas-ui/src/main/java/de/symeda/sormas/ui/action/ActionListEntry.java

@@ -17,8 +17,6 @@
  *******************************************************************************/
 package de.symeda.sormas.ui.action;
 
-import java.util.Optional;
-
 import static de.symeda.sormas.api.utils.HtmlHelper.cleanHtml;
 
 import com.google.common.base.MoreObjects;
@@ -27,14 +25,14 @@
 import com.vaadin.shared.ui.ContentMode;
 import com.vaadin.ui.Alignment;
 import com.vaadin.ui.Button;
-import com.vaadin.ui.Button.ClickListener;
 import com.vaadin.ui.HorizontalLayout;
 import com.vaadin.ui.Label;
 import com.vaadin.ui.VerticalLayout;
 import com.vaadin.ui.themes.ValoTheme;
 
 import de.symeda.sormas.api.action.ActionDto;
 import de.symeda.sormas.api.action.ActionPriority;
+import de.symeda.sormas.api.action.ActionStatus;
 import de.symeda.sormas.api.i18n.Captions;
 import de.symeda.sormas.api.i18n.I18nProperties;
 import de.symeda.sormas.api.utils.DataHelper;
@@ -158,16 +156,7 @@ public ActionListEntry(ActionDto action) {
 		topLayout.addComponent(topRightLayout);
 		topLayout.setComponentAlignment(topRightLayout, Alignment.TOP_RIGHT);
 
-		String statusStyle;
-		switch (action.getActionStatus()) {
-		case DONE:
-			statusStyle = CssStyles.LABEL_DONE;
-			break;
-		default:
-			statusStyle = null;
-			break;
-		}
-
+		String statusStyle = action.getActionStatus() == ActionStatus.DONE ? CssStyles.LABEL_DONE : null;
 		if (statusStyle != null) {
 			statusLabel.addStyleName(statusStyle);
 			dateLabel.addStyleName(statusStyle);
@@ -182,7 +171,7 @@ public ActionListEntry(ActionDto action) {
 		}
 	}
 
-	public void addEditListener(int rowIndex, ClickListener editClickListener) {
+	public void addEditListener(int rowIndex, Button.ClickListener editClickListener) {
 		if (editButton == null) {
 			editButton = ButtonHelper.createIconButtonWithCaption(
 				"edit-action-" + rowIndex,