SORMAS-Foundation#2923 - reload case view after editing a task + add info to task edit form

Author: barnabartha

sormas-api/src/main/java/de/symeda/sormas/api/i18n/Strings.java

@@ -460,6 +460,7 @@ public interface Strings {
 	String infoSampleAdditionalTesting = "infoSampleAdditionalTesting";
 	String infoSampleExport = "infoSampleExport";
 	String infoSamplePathogenTesting = "infoSamplePathogenTesting";
+	String infoSaveOfTask = "infoSaveOfTask";
 	String infoSearchCaseForContact = "infoSearchCaseForContact";
 	String infoSelectOrCreateContact = "infoSelectOrCreateContact";
 	String infoSelectOrCreateContactImport = "infoSelectOrCreateContactImport";

sormas-api/src/main/resources/strings.properties

@@ -530,6 +530,7 @@ infoDeveloperOptions = You can use the controls below to generate dummy cases an
 infoCreateNewSampleDiscardsChanges = Creating a new sample will discard all unsaved changes made to this case
 infoCreateNewSampleDiscardsChangesEventParticipant = Creating a new sample will discard all unsaved changes made to this event participant
 infoUsageOfEditableCampaignGrids = You can edit the campaign data and dashboard definitions by clicking inside one of the cells in the grid, and you can reorder the dashboard elements by dragging and dropping the grid rows
+infoSaveOfTask = Saving this task will discard any unsaved changes made to the case.
 
 # Messages
 messageActivateAccount = Account has to be activated

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

@@ -33,6 +33,7 @@
 import de.symeda.sormas.api.task.TaskType;
 import de.symeda.sormas.api.user.UserRight;
 import de.symeda.sormas.api.user.UserRole;
+import de.symeda.sormas.ui.ControllerProvider;
 import de.symeda.sormas.ui.UserProvider;
 import de.symeda.sormas.ui.utils.CommitDiscardWrapperComponent;
 import de.symeda.sormas.ui.utils.CommitDiscardWrapperComponent.CommitListener;
@@ -117,6 +118,11 @@ public void onCommit() {
 				if (!form.getFieldGroup().isModified()) {
 					TaskDto dto = form.getValue();
 					FacadeProvider.getTaskFacade().saveTask(dto);
+
+					if (dto.getCaze() != null) {
+						ControllerProvider.getCaseController().navigateToCase(dto.getCaze().getUuid());
+					}
+
 					popupWindow.close();
 					callback.run();
 				}

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

@@ -17,16 +17,33 @@
  *******************************************************************************/
 package de.symeda.sormas.ui.task;
 
+import static de.symeda.sormas.ui.utils.LayoutUtil.fluidRow;
+import static de.symeda.sormas.ui.utils.LayoutUtil.fluidRowLocs;
+import static de.symeda.sormas.ui.utils.LayoutUtil.loc;
+import static de.symeda.sormas.ui.utils.LayoutUtil.locs;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+import com.vaadin.icons.VaadinIcons;
+import com.vaadin.shared.ui.ContentMode;
+import com.vaadin.shared.ui.MarginInfo;
+import com.vaadin.ui.HorizontalLayout;
+import com.vaadin.ui.Label;
 import com.vaadin.v7.ui.AbstractSelect.ItemCaptionMode;
 import com.vaadin.v7.ui.ComboBox;
 import com.vaadin.v7.ui.OptionGroup;
 import com.vaadin.v7.ui.TextArea;
+
 import de.symeda.sormas.api.FacadeProvider;
 import de.symeda.sormas.api.ReferenceDto;
 import de.symeda.sormas.api.caze.CaseDataDto;
 import de.symeda.sormas.api.contact.ContactDto;
 import de.symeda.sormas.api.event.EventDto;
 import de.symeda.sormas.api.i18n.I18nProperties;
+import de.symeda.sormas.api.i18n.Strings;
 import de.symeda.sormas.api.i18n.Validations;
 import de.symeda.sormas.api.region.DistrictReferenceDto;
 import de.symeda.sormas.api.region.RegionReferenceDto;
@@ -44,20 +61,12 @@
 import de.symeda.sormas.ui.utils.FieldHelper;
 import de.symeda.sormas.ui.utils.TaskStatusValidator;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-
-import static de.symeda.sormas.ui.utils.LayoutUtil.fluidRow;
-import static de.symeda.sormas.ui.utils.LayoutUtil.fluidRowLocs;
-import static de.symeda.sormas.ui.utils.LayoutUtil.loc;
-import static de.symeda.sormas.ui.utils.LayoutUtil.locs;
-
 public class TaskEditForm extends AbstractEditForm<TaskDto> {
 
 	private static final long serialVersionUID = 1L;
 
+	private static final String SAVE_INFO = "saveInfo";
+
 	//@formatter:off
 	private static final String HTML_LAYOUT = 
 			fluidRow(
@@ -68,7 +77,8 @@ public class TaskEditForm extends AbstractEditForm<TaskDto> {
 			fluidRowLocs(TaskDto.ASSIGNEE_USER, TaskDto.PRIORITY) +
 			fluidRowLocs(TaskDto.CREATOR_COMMENT) +
 			fluidRowLocs(TaskDto.ASSIGNEE_REPLY) +
-			fluidRowLocs(TaskDto.TASK_STATUS);
+			fluidRowLocs(TaskDto.TASK_STATUS) +
+			fluidRowLocs(SAVE_INFO);
 	//@formatter:off
 
 	private UserRight editOrCreateUserRight;
@@ -104,6 +114,14 @@ protected void addFields() {
 		taskContext.setImmediate(true);
 		taskContext.addValueChangeListener(event -> updateByTaskContext());
 
+		final HorizontalLayout saveInfoLayout = new HorizontalLayout(
+				new Label(
+						VaadinIcons.INFO_CIRCLE.getHtml() + " " + I18nProperties.getString(Strings.infoSaveOfTask),
+						ContentMode.HTML));
+		saveInfoLayout.setSpacing(true);
+		saveInfoLayout.setMargin(new MarginInfo(true, false, true, false));
+		getContent().addComponent(saveInfoLayout, SAVE_INFO);
+
 		ComboBox taskTypeField = addField(TaskDto.TASK_TYPE, ComboBox.class);
 		taskTypeField.setItemCaptionMode(ItemCaptionMode.ID_TOSTRING);
 		taskTypeField.setImmediate(true);