Skip to content

Antti Väyrynen / Moya

Go to a project
Commit c4047970 by Antti Tonkyra
Options

ActionLogMessage stuff, still needs access checks :)

1 parent 5cf07a09
Inline Side-by-side
Showing with 39 additions and 29 deletions
code/LanBortalBeans/ejbModule/fi/insomnia/bortal/beans/ActionLogBean.java
package fi.insomnia.bortal.beans; package fi.insomnia.bortal.beans;
import java.util.List;
import javax.ejb.EJB;
import javax.ejb.Stateless; import javax.ejb.Stateless;
import fi.insomnia.bortal.facade.ActionLogFacade;
import fi.insomnia.bortal.model.ActionLogMessage;
/** /**
* Session Bean implementation class ActionLogBean * Session Bean implementation class ActionLogBean
* eventin * eventin
...@@ -11,10 +17,11 @@ import javax.ejb.Stateless; ...@@ -11,10 +17,11 @@ import javax.ejb.Stateless;
*/ */
@Stateless @Stateless
public class ActionLogBean implements ActionLogBeanLocal { public class ActionLogBean implements ActionLogBeanLocal {
// TODO: Permissions
@EJB
private ActionLogFacade actionLogFacade;
/**
* Default constructor.
*/
public ActionLogBean() { public ActionLogBean() {
// TODO Auto-generated constructor stub // TODO Auto-generated constructor stub
} }
...@@ -24,6 +31,7 @@ public class ActionLogBean implements ActionLogBeanLocal { ...@@ -24,6 +31,7 @@ public class ActionLogBean implements ActionLogBeanLocal {
} }
public List<ActionLogMessage> getAllActionLogEvents() {
return actionLogFacade.getAllSortedByTimestamp();
}
} }
code/LanBortalBeansClient/ejbModule/fi/insomnia/bortal/beans/ActionLogBeanLocal.java
package fi.insomnia.bortal.beans; package fi.insomnia.bortal.beans;
import java.util.List;
import javax.ejb.Local; import javax.ejb.Local;
import fi.insomnia.bortal.model.ActionLogMessage;
@Local @Local
public interface ActionLogBeanLocal { public interface ActionLogBeanLocal {
public List<ActionLogMessage> getAllActionLogEvents();
} }
code/LanBortalDatabase/src/fi/insomnia/bortal/model/ActionLogMessage.java
...@@ -4,11 +4,15 @@ import java.util.Date; ...@@ -4,11 +4,15 @@ import java.util.Date;
import javax.persistence.Column; import javax.persistence.Column;
import javax.persistence.Entity; import javax.persistence.Entity;
import javax.persistence.EnumType;
import javax.persistence.Enumerated;
import javax.persistence.JoinColumn; import javax.persistence.JoinColumn;
import javax.persistence.Table; import javax.persistence.Table;
import javax.persistence.Temporal; import javax.persistence.Temporal;
import javax.persistence.TemporalType; import javax.persistence.TemporalType;
import fi.insomnia.bortal.enums.ActionLogMessageState;
@Entity @Entity
@Table(name="actionlog_messages") @Table(name="actionlog_messages")
public class ActionLogMessage extends GenericEntity { public class ActionLogMessage extends GenericEntity {
...@@ -18,6 +22,7 @@ public class ActionLogMessage extends GenericEntity { ...@@ -18,6 +22,7 @@ public class ActionLogMessage extends GenericEntity {
@Temporal(TemporalType.TIMESTAMP) @Temporal(TemporalType.TIMESTAMP)
private Date time = new Date(); private Date time = new Date();
@JoinColumn(name="user_id") @JoinColumn(name="user_id")
private User user; private User user;
...@@ -28,7 +33,8 @@ public class ActionLogMessage extends GenericEntity { ...@@ -28,7 +33,8 @@ public class ActionLogMessage extends GenericEntity {
private String message; private String message;
@Column(name="state", nullable=true) @Column(name="state", nullable=true)
private Integer state; @Enumerated(EnumType.STRING)
private ActionLogMessageState state;
public Date getTime() { public Date getTime() {
return time; return time;
...@@ -62,11 +68,11 @@ public class ActionLogMessage extends GenericEntity { ...@@ -62,11 +68,11 @@ public class ActionLogMessage extends GenericEntity {
this.message = message; this.message = message;
} }
public Integer getState() { public ActionLogMessageState getState() {
return state; return state;
} }
public void setState(Integer state) { public void setState(ActionLogMessageState state) {
this.state = state; this.state = state;
} }
......
code/LanBortalWeb/WebContent/actionlog/messagelist.xhtml
...@@ -15,15 +15,15 @@ ...@@ -15,15 +15,15 @@
<h:dataTable styleClass="bordertable" id="message" value="#{actionLogMessageView.messages}" var="message"> <h:dataTable styleClass="bordertable" id="message" value="#{actionLogMessageView.messages}" var="message">
<h:column> <h:column>
<f:facet name="header"> <f:facet name="header">
<h:outputText value="#{i18n['actionlog.timestamp']}" /> <h:outputText value="#{i18n['actionlog.time']}" />
</f:facet> </f:facet>
<h:outputText value="#{message.timestamp}" /> <h:outputText value="#{message.time}" />
</h:column> </h:column>
<h:column> <h:column>
<f:facet name="header"> <f:facet name="header">
<h:outputText value="#{i18n['actionlog.user']}" /> <h:outputText value="#{i18n['actionlog.user']}" />
</f:facet> </f:facet>
<h:outputText value="#{message.user}" /> <h:outputText value="#{message.user.nick}" />
</h:column> </h:column>
<h:column> <h:column>
<f:facet name="header"> <f:facet name="header">
......
code/LanBortalWeb/src/fi/insomnia/bortal/web/cdiview/actionlog/ActionLogMessageView.java
package fi.insomnia.bortal.web.cdiview.actionlog; package fi.insomnia.bortal.web.cdiview.actionlog;
import java.util.ArrayList; import java.util.List;
import javax.ejb.EJB;
import javax.faces.bean.RequestScoped; import javax.faces.bean.RequestScoped;
import javax.inject.Named; import javax.inject.Named;
import fi.insomnia.bortal.web.cdiview.actionlog.ActionMessage; import fi.insomnia.bortal.beans.ActionLogBeanLocal;
import fi.insomnia.bortal.model.ActionLogMessage;
import fi.insomnia.bortal.web.cdiview.GenericCDIView; import fi.insomnia.bortal.web.cdiview.GenericCDIView;
@Named @Named
@RequestScoped @RequestScoped
public class ActionLogMessageView extends GenericCDIView { public class ActionLogMessageView extends GenericCDIView {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
ArrayList<ActionMessage> messages = null;
public ArrayList<ActionMessage> getMessages() { @EJB
if(messages == null) { ActionLogBeanLocal actionLogBean;
messages = new ArrayList<ActionMessage>();
ActionMessage test = new ActionMessage(); public List<ActionLogMessage> getMessages() {
test.setTimestamp("test123"); return actionLogBean.getAllActionLogEvents();
test.setUser("homo");
test.setCrew("oijdsaofdsa");
test.setMessage("pupu on siella");
messages.add(test);
messages.add(test);
messages.add(test);
messages.add(test);
}
return messages;
} }
} }
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!