Skip to content

Linnea Samila / Moya

Go to a project
Commit 4c198e8b by Antti Tonkyra
Options

ActionLogStuff

1 parent 12b9a122
Inline Side-by-side
Showing with 33 additions and 11 deletions
code/LanBortalBeans/ejbModule/fi/insomnia/bortal/beans/ActionLogBean.java
...@@ -42,7 +42,7 @@ public class ActionLogBean implements ActionLogBeanLocal { ...@@ -42,7 +42,7 @@ public class ActionLogBean implements ActionLogBeanLocal {
ActionLogMessage alm = new ActionLogMessage(); ActionLogMessage alm = new ActionLogMessage();
alm.setCrew(crew); alm.setCrew(crew);
if(isTask) { if(isTask) {
alm.setState(ActionLogMessageState.PENDING); alm.setState(ActionLogMessageState.NEW);
} else { } else {
alm.setState(null); alm.setState(null);
} }
......
code/LanBortalBeans/ejbModule/fi/insomnia/bortal/facade/ActionLogFacade.java
...@@ -15,6 +15,7 @@ import fi.insomnia.bortal.model.AccountEvent; ...@@ -15,6 +15,7 @@ import fi.insomnia.bortal.model.AccountEvent;
import fi.insomnia.bortal.model.AccountEvent_; import fi.insomnia.bortal.model.AccountEvent_;
import fi.insomnia.bortal.model.ActionLogMessage; import fi.insomnia.bortal.model.ActionLogMessage;
import fi.insomnia.bortal.model.ActionLogMessageResponse; import fi.insomnia.bortal.model.ActionLogMessageResponse;
import fi.insomnia.bortal.model.ActionLogMessageResponse_;
import fi.insomnia.bortal.model.Bill; import fi.insomnia.bortal.model.Bill;
import fi.insomnia.bortal.model.Bill_; import fi.insomnia.bortal.model.Bill_;
import fi.insomnia.bortal.model.EventPk; import fi.insomnia.bortal.model.EventPk;
...@@ -63,7 +64,9 @@ public class ActionLogFacade extends GenericFacade<Integer,ActionLogMessage> { ...@@ -63,7 +64,9 @@ public class ActionLogFacade extends GenericFacade<Integer,ActionLogMessage> {
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);
cq.orderBy(cb.desc(root.get("time"))); // TODO TUNK FIX LOL
cq.where(cb.equal(root.get(ActionLogMessageResponse_.actionLogMessage), this.find(id)));
cq.orderBy(cb.asc(root.get("time")));
TypedQuery<ActionLogMessageResponse> tq = em.createQuery(cq); TypedQuery<ActionLogMessageResponse> tq = em.createQuery(cq);
return tq.getResultList(); return tq.getResultList();
......
code/LanBortalWeb/WebContent/actionlog/taskview.xhtml
...@@ -4,6 +4,7 @@ ...@@ -4,6 +4,7 @@
<html xmlns="http://www.w3.org/1999/xhtml" xmlns:ui="http://java.sun.com/jsf/facelets" <html xmlns="http://www.w3.org/1999/xhtml" xmlns:ui="http://java.sun.com/jsf/facelets"
xmlns:h="http://java.sun.com/jsf/html" xmlns:users="http://java.sun.com/jsf/composite/cditools/user" xmlns:h="http://java.sun.com/jsf/html" xmlns:users="http://java.sun.com/jsf/composite/cditools/user"
xmlns:tools="http://java.sun.com/jsf/composite/cditools" xmlns:f="http://java.sun.com/jsf/core" xmlns:tools="http://java.sun.com/jsf/composite/cditools" xmlns:f="http://java.sun.com/jsf/core"
xmlns:p="http://primefaces.org/ui"
> >
<h:body> <h:body>
...@@ -46,7 +47,9 @@ ...@@ -46,7 +47,9 @@
<hr style="width:90%;" /> <hr style="width:90%;" />
<div> <div>
<h:dataTable value="#{taskModificationView.responses}" var="response"> <h:form>
<p:poll interval="1" update="messageresponsetable" />
<h:dataTable id="messageresponsetable" value="#{taskModificationView.responses}" var="response">
<h:column> <h:column>
<f:facet name="header"> <f:facet name="header">
<h:outputText value="Aika" /> <h:outputText value="Aika" />
...@@ -69,11 +72,11 @@ ...@@ -69,11 +72,11 @@
<f:facet name="header"> <f:facet name="header">
<h:outputText value="tilanvaihdos" /> <h:outputText value="tilanvaihdos" />
</f:facet> </f:facet>
<h:outputText value="#{response.statechange}" /> <h:outputText value="#{response.stateChange}" />
</h:column> </h:column>
</h:dataTable> </h:dataTable>
</h:form>
</div> </div>
<div> <div>
...@@ -82,7 +85,7 @@ ...@@ -82,7 +85,7 @@
<h:outputText value="Viestisi: " /> <h:outputText value="Viestisi: " />
<h:inputText value="#{taskModificationView.responseMessage}" size="100" /> <h:inputText value="#{taskModificationView.responseMessage}" size="100" />
<h:outputText value="Tila: " /> <h:outputText value="Tila: " />
<h:selectOneMenu id="stateMenu" title="asdas" value="#{taskModificationView.message.state}"> <h:selectOneMenu id="stateMenu" title="asdas" value="#{taskModificationView.responseStateChange}">
<f:selectItem itemLabel="Ei muutosta" itemValue="#{null}" /> <f:selectItem itemLabel="Ei muutosta" itemValue="#{null}" />
<f:selectItem itemLabel="Uusi" itemValue="NEW" /> <f:selectItem itemLabel="Uusi" itemValue="NEW" />
<f:selectItem itemLabel="Työn alla" itemValue="PENDING" /> <f:selectItem itemLabel="Työn alla" itemValue="PENDING" />
......
code/LanBortalWeb/src/fi/insomnia/bortal/web/cdiview/actionlog/TaskModificationView.java
...@@ -9,6 +9,7 @@ import java.util.ArrayList; ...@@ -9,6 +9,7 @@ import java.util.ArrayList;
import java.util.List; import java.util.List;
import fi.insomnia.bortal.beans.ActionLogBeanLocal; import fi.insomnia.bortal.beans.ActionLogBeanLocal;
import fi.insomnia.bortal.enums.ActionLogMessageState;
import fi.insomnia.bortal.model.ActionLogMessage; import fi.insomnia.bortal.model.ActionLogMessage;
import fi.insomnia.bortal.model.ActionLogMessageResponse; import fi.insomnia.bortal.model.ActionLogMessageResponse;
import fi.insomnia.bortal.web.cdiview.GenericCDIView; import fi.insomnia.bortal.web.cdiview.GenericCDIView;
...@@ -20,25 +21,32 @@ public class TaskModificationView extends GenericCDIView { ...@@ -20,25 +21,32 @@ public class TaskModificationView extends GenericCDIView {
private ActionLogMessage message; private ActionLogMessage message;
private List<ActionLogMessageResponse> responses; private List<ActionLogMessageResponse> responses;
private String responseMessage; private String responseMessage;
private ActionLogMessageState responseStateChange;
@EJB @EJB
private ActionLogBeanLocal logbean; private ActionLogBeanLocal logbean;
public void initView(){ public void initView(){
super.beginConversation();
if(message == null) { if(message == null) {
super.beginConversation();
message = logbean.find(id); message = logbean.find(id);
} }
if(responses == null) {
responses = logbean.getActionLogMessageResponsesByID(id);
}
} }
public void createResponse() { public void createResponse() {
if(responseStateChange == null) logbean.addActionLogMessageResponse(id, responseMessage, message.getState());
else {
logbean.addActionLogMessageResponse(id, responseMessage, responseStateChange);
if(responseStateChange != message.getState()) {
this.message = logbean.find(id);
}
}
responseMessage = "";
responseStateChange = null;
} }
public List<ActionLogMessageResponse> getResponses() { public List<ActionLogMessageResponse> getResponses() {
responses = logbean.getActionLogMessageResponsesByID(id);
return responses; return responses;
} }
...@@ -62,4 +70,12 @@ public class TaskModificationView extends GenericCDIView { ...@@ -62,4 +70,12 @@ public class TaskModificationView extends GenericCDIView {
this.responseMessage = responseMessage; this.responseMessage = responseMessage;
} }
private ActionLogMessageState getResponseStateChange() {
return responseStateChange;
}
private void setResponseStateChange(ActionLogMessageState responseStateChange) {
this.responseStateChange = responseStateChange;
}
} }
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!