SORMAS-Foundation#2923 - do not show info of case update when task is opened from task grid / contact or event views

Author: barnabartha

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

@@ -50,7 +50,7 @@ public TaskController() {
 
 	public void create(TaskContext context, ReferenceDto entityRef, Runnable callback) {
 
-		TaskEditForm createForm = new TaskEditForm(true);
+		TaskEditForm createForm = new TaskEditForm(true, false);
 		createForm.setValue(createNewTask(context, entityRef));
 		final CommitDiscardWrapperComponent<TaskEditForm> editView = new CommitDiscardWrapperComponent<TaskEditForm>(
 			createForm,
@@ -74,7 +74,7 @@ public void onCommit() {
 
 	public void createSampleCollectionTask(TaskContext context, ReferenceDto entityRef, SampleDto sample) {
 
-		TaskEditForm createForm = new TaskEditForm(true);
+		TaskEditForm createForm = new TaskEditForm(true, false);
 		TaskDto taskDto = createNewTask(context, entityRef);
 		taskDto.setTaskType(TaskType.SAMPLE_COLLECTION);
 		taskDto.setCreatorComment(sample.getNoTestPossibleReason());
@@ -99,12 +99,12 @@ public void onCommit() {
 		VaadinUiUtil.showModalPopupWindow(createView, I18nProperties.getString(Strings.headingCreateNewTask));
 	}
 
-	public void edit(TaskIndexDto dto, Runnable callback, boolean fromCase) {
+	public void edit(TaskIndexDto dto, Runnable callback, boolean editedFromTaskGrid) {
 
 		// get fresh data
 		TaskDto newDto = FacadeProvider.getTaskFacade().getByUuid(dto.getUuid());
 
-		TaskEditForm form = new TaskEditForm(false);
+		TaskEditForm form = new TaskEditForm(false, editedFromTaskGrid);
 		form.setValue(newDto);
 		final CommitDiscardWrapperComponent<TaskEditForm> editView =
 			new CommitDiscardWrapperComponent<TaskEditForm>(form, UserProvider.getCurrent().hasUserRight(UserRight.TASK_EDIT), form.getFieldGroup());
@@ -119,7 +119,7 @@ public void onCommit() {
 					TaskDto dto = form.getValue();
 					FacadeProvider.getTaskFacade().saveTask(dto);
 
-					if (fromCase && dto.getCaze() != null) {
+					if (!editedFromTaskGrid && dto.getCaze() != null) {
 						ControllerProvider.getCaseController().navigateToCase(dto.getCaze().getUuid());
 					}
 

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

@@ -82,11 +82,15 @@ public class TaskEditForm extends AbstractEditForm<TaskDto> {
 	//@formatter:off
 
 	private UserRight editOrCreateUserRight;
+	private boolean editedFromTaskGrid;
 
-	public TaskEditForm(boolean create) {
+	public TaskEditForm(boolean create, boolean editedFromTaskGrid) {
 
 		super(TaskDto.class, TaskDto.I18N_PREFIX);
+
+		this.editedFromTaskGrid = editedFromTaskGrid;	
 		this.editOrCreateUserRight = editOrCreateUserRight;
+
 		addValueChangeListener(e -> {
 			updateByTaskContext();
 			updateByCreatingAndAssignee();
@@ -114,14 +118,6 @@ 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);
@@ -152,6 +148,16 @@ protected void addFields() {
 					new TaskStatusValidator(
 						taskDto.getCaze().getUuid(),
 						I18nProperties.getValidationError(Validations.investigationStatusUnclassifiedCase)));
+
+				if (!editedFromTaskGrid) {
+					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);
+				}
 			}
 
 			DistrictReferenceDto district = null;

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

@@ -72,7 +72,7 @@ public TaskGrid(TaskCriteria criteria) {
 			setCriteria(criteria);
 		}
 
-		addEditColumn(e -> ControllerProvider.getTaskController().edit(e, this::reload, false));
+		addEditColumn(e -> ControllerProvider.getTaskController().edit(e, this::reload, true));
 
 		setStyleGenerator(item -> {
 			if (item != null && item.getTaskStatus() != null) {

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

@@ -87,7 +87,7 @@ protected void drawDisplayedEntries() {
 			if (UserProvider.getCurrent().hasUserRight(UserRight.TASK_EDIT)) {
 				listEntry.addEditListener(
 					i,
-					(ClickListener) event -> ControllerProvider.getTaskController().edit(listEntry.getTask(), TaskList.this::reload, true));
+					(ClickListener) event -> ControllerProvider.getTaskController().edit(listEntry.getTask(), TaskList.this::reload, false));
 			}
 			listLayout.addComponent(listEntry);
 		}