Commit d1c474a8 by Tuukka Kivilahti

dunno what

1 parent 24f2ee08
package fi.codecrew.moya.model; package fi.codecrew.moya.model;
import java.beans.Transient; import java.beans.Transient;
import java.util.Calendar;
import java.util.Date; 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.Lob; import javax.persistence.Lob;
import javax.persistence.ManyToOne; import javax.persistence.ManyToOne;
...@@ -42,7 +43,7 @@ public class ReaderEvent extends GenericEntity { ...@@ -42,7 +43,7 @@ public class ReaderEvent extends GenericEntity {
private String notes; private String notes;
@JoinColumn(name = "printed_cards_id", referencedColumnName = "id", nullable = true, updatable = false) @JoinColumn(name = "printed_cards_id", referencedColumnName = "id", nullable = true, updatable = false)
@ManyToOne(optional = false) @ManyToOne()
private PrintedCard printedCard; private PrintedCard printedCard;
@JoinColumn(name = "readers_id", referencedColumnName = "id", nullable = false, updatable = false) @JoinColumn(name = "readers_id", referencedColumnName = "id", nullable = false, updatable = false)
...@@ -50,17 +51,18 @@ public class ReaderEvent extends GenericEntity { ...@@ -50,17 +51,18 @@ public class ReaderEvent extends GenericEntity {
private Reader reader; private Reader reader;
@JoinColumn(name = "event_users_id", referencedColumnName = "id", nullable = true, updatable = false) @JoinColumn(name = "event_users_id", referencedColumnName = "id", nullable = true, updatable = false)
@ManyToOne(optional = false) @ManyToOne()
private EventUser user; private EventUser user;
@JoinColumn(name = "places_id", referencedColumnName = "id", nullable = true, updatable = false) @JoinColumn(name = "places_id", referencedColumnName = "id", nullable = true, updatable = false)
@ManyToOne(optional = false) @ManyToOne()
private Place place; private Place place;
@JoinColumn(name = "products_id", referencedColumnName = "id", nullable = true, updatable = false) @JoinColumn(name = "products_id", referencedColumnName = "id", nullable = true, updatable = false)
@ManyToOne(optional = false) @ManyToOne()
private Product product; private Product product;
@Enumerated(EnumType.STRING)
private ReaderEventType type; private ReaderEventType type;
public ReaderEvent(Date eventTime, Reader reader, String value) { public ReaderEvent(Date eventTime, Reader reader, String value) {
......
...@@ -187,6 +187,9 @@ public class IncomingView extends GenericCDIView { ...@@ -187,6 +187,9 @@ public class IncomingView extends GenericCDIView {
ReaderEvent event = readerView.getReaderEvent(); ReaderEvent event = readerView.getReaderEvent();
if(event == null)
return null;
EventUser user = event.getUser(); EventUser user = event.getUser();
memberlist = null; memberlist = null;
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!