RandFix

code/LanBortalDatabase/src/fi/insomnia/bortal/model/ActionLogMessage.java

@@ -9,9 +9,11 @@ import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Entity;
 import javax.persistence.EnumType;
 import javax.persistence.EnumType;
 import javax.persistence.Enumerated;
 import javax.persistence.Enumerated;
+import javax.persistence.FetchType;
 import javax.persistence.JoinColumn;
 import javax.persistence.JoinColumn;
 import javax.persistence.ManyToOne;
 import javax.persistence.ManyToOne;
 import javax.persistence.OneToMany;
 import javax.persistence.OneToMany;
+import javax.persistence.OrderBy;
 import javax.persistence.Table;
 import javax.persistence.Table;
 import javax.persistence.Temporal;
 import javax.persistence.Temporal;
 import javax.persistence.TemporalType;
 import javax.persistence.TemporalType;
@@ -43,7 +45,8 @@ public class ActionLogMessage extends GenericEntity {
     
     
     @OneToMany(mappedBy = "actionLogMessage", cascade = CascadeType.ALL)
     @OneToMany(mappedBy = "actionLogMessage", cascade = CascadeType.ALL)
     @PrivateOwned
     @PrivateOwned
-    private List<ActionLogMessageResponse> actionlogMessageResponses = new ArrayList<ActionLogMessageResponse>();
+    @OrderBy("id")
+    private List<ActionLogMessageResponse> actionLogMessageResponses = new ArrayList<ActionLogMessageResponse>();
 
 
     @Column(name = "state", nullable = true)
     @Column(name = "state", nullable = true)
     @Enumerated(EnumType.STRING)
     @Enumerated(EnumType.STRING)
@@ -89,4 +92,12 @@ public class ActionLogMessage extends GenericEntity {
         this.state = state;
         this.state = state;
     }
     }
 
 
+    public List<ActionLogMessageResponse> getActionLogMessageResponses() {
+        return actionLogMessageResponses;
+    }
+
+    public void setActionLogMessageResponses(List<ActionLogMessageResponse> actionLogMessageResponses) {
+        this.actionLogMessageResponses = actionLogMessageResponses;
+    }
+
 }
 }

code/LanBortalWeb/src/fi/insomnia/bortal/web/cdiview/actionlog/ActionLogCreateView.java

 package fi.insomnia.bortal.web.cdiview.actionlog;
 package fi.insomnia.bortal.web.cdiview.actionlog;
 
 
-import java.util.ArrayList;
 import java.util.List;
 import java.util.List;
 
 
 import javax.ejb.EJB;
 import javax.ejb.EJB;
@@ -9,7 +8,6 @@ import javax.inject.Named;
 import javax.validation.constraints.Size;
 import javax.validation.constraints.Size;
 
 
 import fi.insomnia.bortal.beans.ActionLogBeanLocal;
 import fi.insomnia.bortal.beans.ActionLogBeanLocal;
-import fi.insomnia.bortal.beans.RoleBeanLocal;
 import fi.insomnia.bortal.model.Role;
 import fi.insomnia.bortal.model.Role;
 import fi.insomnia.bortal.web.cdiview.GenericCDIView;
 import fi.insomnia.bortal.web.cdiview.GenericCDIView;
 
 

code/LanBortalWeb/src/fi/insomnia/bortal/web/cdiview/actionlog/TaskModificationView.java

@@ -4,8 +4,6 @@ import javax.ejb.EJB;
 import javax.enterprise.context.ConversationScoped;
 import javax.enterprise.context.ConversationScoped;
 import javax.inject.Named;
 import javax.inject.Named;
 
 
-import java.sql.Date;
-import java.util.ArrayList;
 import java.util.List;
 import java.util.List;
 
 
 import fi.insomnia.bortal.beans.ActionLogBeanLocal;
 import fi.insomnia.bortal.beans.ActionLogBeanLocal;
@@ -18,6 +16,10 @@ import fi.insomnia.bortal.web.cdiview.GenericCDIView;
 @Named
 @Named
 @ConversationScoped
 @ConversationScoped
 public class TaskModificationView extends GenericCDIView {
 public class TaskModificationView extends GenericCDIView {
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 938879097893244897L;
 	private Integer id;
 	private Integer id;
 	private ActionLogMessage message;
 	private ActionLogMessage message;
 	private List<ActionLogMessageResponse> responses;
 	private List<ActionLogMessageResponse> responses;
@@ -72,11 +74,11 @@ public class TaskModificationView extends GenericCDIView {
 		this.responseMessage = responseMessage;
 		this.responseMessage = responseMessage;
 	}
 	}
 
 
-	private ActionLogMessageState getResponseStateChange() {
+	public ActionLogMessageState getResponseStateChange() {
 		return responseStateChange;
 		return responseStateChange;
 	}
 	}
 
 
-	private void setResponseStateChange(ActionLogMessageState responseStateChange) {
+	public void setResponseStateChange(ActionLogMessageState responseStateChange) {
 		this.responseStateChange = responseStateChange;
 		this.responseStateChange = responseStateChange;
 	}
 	}
 
 

code/LanBortalWeb/src/fi/insomnia/bortal/web/cdiview/user/UserCardView.java

@@ -15,6 +15,8 @@ import fi.insomnia.bortal.web.cdiview.GenericCDIView;
 @Named
 @Named
 @ConversationScoped
 @ConversationScoped
 public class UserCardView extends GenericCDIView {
 public class UserCardView extends GenericCDIView {
+	private static final long serialVersionUID = -7316229268164228981L;
+
 	@EJB
 	@EJB
 	private CardTemplateBeanLocal cardBean;
 	private CardTemplateBeanLocal cardBean;