Add Action title (SORMAS-Foundation#2924)

* Issue SORMAS-Foundation#2905 Adds field title in Action in database

- sql script
- Entity
- DTO

* Issue SORMAS-Foundation#2905 Adds field title in Action in UI

- edit form
- list entry
- captions

Author: xavier-calland

sormas-api/src/main/java/de/symeda/sormas/api/action/ActionDto.java

@@ -29,9 +29,11 @@
 import de.symeda.sormas.api.utils.Required;
 
 public class ActionDto extends EntityDto {
+
 	private static final long serialVersionUID = 2439546041916003652L;
 
 	public static final String I18N_PREFIX = "Action";
+	public static final String TITLE = "title";
 	public static final String DESCRIPTION = "description";
 	public static final String REPLY = "reply";
 	public static final String PRIORITY = "priority";
@@ -51,6 +53,7 @@ public class ActionDto extends EntityDto {
 	private Date statusChangeDate;
 
 	private UserReferenceDto creatorUser;
+	private String title;
 	private String description;
 	private String reply;
 	private UserReferenceDto replyingUser;
@@ -119,6 +122,14 @@ public void setCreatorUser(UserReferenceDto creatorUser) {
 		this.creatorUser = creatorUser;
 	}
 
+	public String getTitle() {
+		return title;
+	}
+
+	public void setTitle(String title) {
+		this.title = title;
+	}
+
 	public String getDescription() {
 		return description;
 	}

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

@@ -26,6 +26,7 @@ public interface Captions {
 	String Action_event = "Action.event";
 	String Action_priority = "Action.priority";
 	String Action_reply = "Action.reply";
+	String Action_title = "Action.title";
 	String actionApplyDateFilter = "actionApplyDateFilter";
 	String actionApplyFilters = "actionApplyFilters";
 	String actionArchive = "actionArchive";

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

@@ -66,6 +66,7 @@ actionCreatingLabel=Created at %s by %s
 actionReplyingLabel=Updated at %s by %s
 actionStatusChangeDate=updated at %s
 Action=Action
+Action.title=Title
 Action.description=Description
 Action.reply=Comments on execution
 Action.creatorUser=Created by

sormas-api/src/main/resources/captions_fr-FR.properties

@@ -66,6 +66,7 @@ actionCreatingLabel=Créé à %s par %s
 actionReplyingLabel=Mis à jour à %s par %s
 actionStatusChangeDate=mis à jour à %s
 Action=Action
+Action.title=Titre
 Action.description=Description
 Action.reply=Commentaires sur l'exécution
 Action.creatorUser=Créé par

sormas-backend/src/main/java/de/symeda/sormas/backend/action/Action.java

@@ -18,6 +18,7 @@
 package de.symeda.sormas.backend.action;
 
 import static de.symeda.sormas.api.EntityDto.COLUMN_LENGTH_BIG;
+import static de.symeda.sormas.api.EntityDto.COLUMN_LENGTH_DEFAULT;
 
 import java.util.Date;
 
@@ -40,9 +41,11 @@
 @Entity
 @Audited
 public class Action extends AbstractDomainObject {
+
 	private static final long serialVersionUID = -4754578341242164661L;
 
 	public static final String TABLE_NAME = "action";
+	public static final String TITLE = "title";
 	public static final String DESCRIPTION = "description";
 	public static final String REPLY = "reply";
 	public static final String REPLYING_USER = "replyingUser";
@@ -63,6 +66,7 @@ public class Action extends AbstractDomainObject {
 	private Date statusChangeDate;
 
 	private User creatorUser;
+	private String title;
 	private String description;
 	private String reply;
 	private User replyingUser;
@@ -130,6 +134,15 @@ public void setPriority(ActionPriority priority) {
 		this.priority = priority;
 	}
 
+	@Column(length = COLUMN_LENGTH_DEFAULT)
+	public String getTitle() {
+		return title;
+	}
+
+	public void setTitle(String title) {
+		this.title = title;
+	}
+
 	@Column(length = COLUMN_LENGTH_BIG)
 	public String getDescription() {
 		return description;

sormas-backend/src/main/java/de/symeda/sormas/backend/action/ActionFacadeEjb.java

@@ -76,6 +76,7 @@ public Action fromDto(ActionDto source) {
 		target.setReplyingUser(userService.getByReferenceDto(source.getReplyingUser()));
 		target.setReply(source.getReply());
 		target.setCreatorUser(userService.getByReferenceDto(source.getCreatorUser()));
+		target.setTitle(source.getTitle());
 		target.setDescription(source.getDescription());
 		target.setPriority(source.getPriority());
 		target.setDate(source.getDate());
@@ -116,6 +117,7 @@ public ActionDto toDto(Action action) {
 		target.setUuid(source.getUuid());
 
 		target.setCreatorUser(UserFacadeEjb.toReferenceDto(source.getCreatorUser()));
+		target.setTitle(source.getTitle());
 		target.setDescription(source.getDescription());
 		target.setReply(source.getReply());
 		target.setReplyingUser(UserFacadeEjb.toReferenceDto(source.getReplyingUser()));

sormas-backend/src/main/resources/sql/sormas_schema.sql

@@ -5323,4 +5323,10 @@ ALTER TABLE person_history ADD COLUMN externalid varchar(255);
 
 INSERT INTO schema_version (version_number, comment) VALUES (254, 'Add new field externalId as per feature #2670');
 
+-- 2020-09-18 Add action title
+ALTER TABLE action ADD COLUMN title character varying(512);
+ALTER TABLE action_history ADD COLUMN title character varying(512);
+
+INSERT INTO schema_version (version_number, comment) VALUES (255, 'Add action.title');
+
 -- *** Insert new sql commands BEFORE this line ***

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

@@ -17,6 +17,7 @@
  *******************************************************************************/
 package de.symeda.sormas.ui.action;
 
+import static de.symeda.sormas.ui.utils.CssStyles.SOFT_REQUIRED;
 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;
@@ -26,6 +27,7 @@
 import com.vaadin.v7.ui.Label;
 import com.vaadin.v7.ui.OptionGroup;
 import com.vaadin.v7.ui.RichTextArea;
+import com.vaadin.v7.ui.TextField;
 
 import de.symeda.sormas.api.action.ActionContext;
 import de.symeda.sormas.api.action.ActionDto;
@@ -54,6 +56,7 @@ public class ActionEditForm extends AbstractEditForm<ActionDto> {
 					locs(ActionDto.EVENT)) +
 			fluidRowLocs(ActionDto.DATE, ActionDto.PRIORITY) +
 			loc(CREATING_LABEL_LOC) +
+			fluidRowLocs(ActionDto.TITLE) +
 			fluidRowLocs(ActionDto.DESCRIPTION) +
 			loc(REPLYING_LABEL_LOC) +
 			fluidRowLocs(ActionDto.REPLY) +
@@ -91,6 +94,8 @@ protected void addFields() {
 		// XXX: set visible when other contexts will be managed
 		actionContext.setVisible(false);
 
+		TextField title = addField(ActionDto.TITLE, TextField.class);
+		title.addStyleName(SOFT_REQUIRED);
 		RichTextArea description = addField(ActionDto.DESCRIPTION, RichTextArea.class);
 		description.setNullRepresentation("");
 		description.setImmediate(true);
@@ -148,7 +153,7 @@ private void updateByCreating() {
 				updateCreationInfo();
 			}
 
-			setReadOnly(!creator, ActionDto.DESCRIPTION);
+			setReadOnly(!creator, ActionDto.DESCRIPTION, ActionDto.TITLE);
 		}
 	}
 

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

@@ -17,6 +17,7 @@
  *******************************************************************************/
 package de.symeda.sormas.ui.action;
 
+import com.google.common.base.MoreObjects;
 import com.google.common.base.Strings;
 import com.vaadin.icons.VaadinIcons;
 import com.vaadin.shared.ui.ContentMode;
@@ -59,6 +60,10 @@ public ActionListEntry(ActionDto action) {
 		addComponent(withContentLayout);
 		setExpandRatio(withContentLayout, 1);
 
+		Label title = new Label(MoreObjects.firstNonNull(Strings.emptyToNull(action.getTitle()), "-"));
+		title.addStyleName(CssStyles.H3);
+		withContentLayout.addComponent(title);
+
 		HorizontalLayout topLayout = new HorizontalLayout();
 		topLayout.setMargin(false);
 		topLayout.setSpacing(false);