Fixfox

code/LanBortalBeans/ejbModule/fi/insomnia/bortal/beans/ActionLogBean.java

@@ -61,19 +61,18 @@ public class ActionLogBean implements ActionLogBeanLocal {
     	return roleBean.listRoles();
     	return roleBean.listRoles();
     }
     }
     
     
-    public List<ActionLogMessageResponse> getActionLogMessageResponsesByID(Integer id) {
-    	return actionLogFacade.getActionLogMessageResponsesByID(id);
+    public List<ActionLogMessageResponse> getActionLogMessageResponses(ActionLogMessage alm) {
+    	return actionLogFacade.getActionLogMessageResponses(alm);
     }
     }
     
     
-    public void addActionLogMessageResponse(Integer actionLogMessageId, String message, ActionLogMessageState state) {
-    	ActionLogMessage alm = actionLogFacade.find(actionLogMessageId);
-    	if(alm.getState() != state) {
+    public void addActionLogMessageResponse(ActionLogMessage alm, String message, ActionLogMessageState state) {
+    	if(alm.getState() != state && state != null) {
     		alm.setState(state);
     		alm.setState(state);
     	}
     	}
     	
     	
     	ActionLogMessageResponse almr = new ActionLogMessageResponse();
     	ActionLogMessageResponse almr = new ActionLogMessageResponse();
     	almr.setMessage(message);
     	almr.setMessage(message);
-    	almr.setActionLogMessage(actionLogFacade.find(actionLogMessageId));
+    	almr.setActionLogMessage(alm);
     	almr.setStateChange(state);
     	almr.setStateChange(state);
     	almr.setUser(permissionBean.getCurrentUser());
     	almr.setUser(permissionBean.getCurrentUser());
     	
     	

code/LanBortalBeans/ejbModule/fi/insomnia/bortal/facade/ActionLogFacade.java

@@ -59,13 +59,12 @@ public class ActionLogFacade extends GenericFacade<Integer,ActionLogMessage> {
 		em.flush();
 		em.flush();
 	}
 	}
 	
 	
-	public List<ActionLogMessageResponse> getActionLogMessageResponsesByID(Integer id) {
+	public List<ActionLogMessageResponse> getActionLogMessageResponses(ActionLogMessage alm) {
 		CriteriaBuilder cb = getEm().getCriteriaBuilder();
 		CriteriaBuilder cb = getEm().getCriteriaBuilder();
 		CriteriaQuery<ActionLogMessageResponse> cq = cb.createQuery(ActionLogMessageResponse.class);
 		CriteriaQuery<ActionLogMessageResponse> cq = cb.createQuery(ActionLogMessageResponse.class);
 		
 		
 		Root<ActionLogMessageResponse> root = cq.from(ActionLogMessageResponse.class);
 		Root<ActionLogMessageResponse> root = cq.from(ActionLogMessageResponse.class);
-		// TODO TUNK FIX LOL
-		cq.where(cb.equal(root.get(ActionLogMessageResponse_.actionLogMessage), this.find(id)));
+		cq.where(cb.equal(root.get(ActionLogMessageResponse_.actionLogMessage), alm));
 		cq.orderBy(cb.asc(root.get("time")));
 		cq.orderBy(cb.asc(root.get("time")));
 		
 		
 		TypedQuery<ActionLogMessageResponse> tq = em.createQuery(cq);
 		TypedQuery<ActionLogMessageResponse> tq = em.createQuery(cq);

code/LanBortalBeansClient/ejbModule/fi/insomnia/bortal/beans/ActionLogBeanLocal.java

@@ -14,6 +14,6 @@ public interface ActionLogBeanLocal {
     public List<Role> getAssignableRoles();
     public List<Role> getAssignableRoles();
     public void createActionLogEvent(String message, Role crew, boolean isTask);
     public void createActionLogEvent(String message, Role crew, boolean isTask);
 	public ActionLogMessage find(Integer id);
 	public ActionLogMessage find(Integer id);
-	public List<ActionLogMessageResponse> getActionLogMessageResponsesByID(Integer id);
-	public void addActionLogMessageResponse(Integer actionLogMessageId, String message, ActionLogMessageState state);
+	public List<ActionLogMessageResponse> getActionLogMessageResponses(ActionLogMessage id);
+	public void addActionLogMessageResponse(ActionLogMessage alm, String message, ActionLogMessageState state);
 }
 }

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

@@ -35,9 +35,9 @@ public class TaskModificationView extends GenericCDIView {
 	
 	
 	public void createResponse() {
 	public void createResponse() {
 		if(responseStateChange == null || responseStateChange == message.getState()) 
 		if(responseStateChange == null || responseStateChange == message.getState()) 
-			logbean.addActionLogMessageResponse(id, responseMessage, null);
+			logbean.addActionLogMessageResponse(message, responseMessage, null);
 		else {
 		else {
-			logbean.addActionLogMessageResponse(id, responseMessage, responseStateChange);
+			logbean.addActionLogMessageResponse(message, responseMessage, responseStateChange);
 			if(responseStateChange != message.getState()) {
 			if(responseStateChange != message.getState()) {
 				this.message = logbean.find(id);
 				this.message = logbean.find(id);
 			}
 			}
@@ -47,7 +47,7 @@ public class TaskModificationView extends GenericCDIView {
 	}
 	}
 	
 	
 	public List<ActionLogMessageResponse> getResponses() {
 	public List<ActionLogMessageResponse> getResponses() {
-		responses = logbean.getActionLogMessageResponsesByID(id);
+		responses = logbean.getActionLogMessageResponses(message);
 		return responses;
 		return responses;
 	}
 	}