Commit e22e4f0b by Tuukka Kivilahti

more stuff

1 parent 2b15f284
...@@ -75,6 +75,10 @@ public class Compo implements ModelInterface { ...@@ -75,6 +75,10 @@ public class Compo implements ModelInterface {
@Column(name = "description") @Column(name = "description")
private String description; private String description;
@Column(name = "max_participant_count")
private int maxParticipantCount;
@Column(name = "hold_voting", nullable = false, columnDefinition = "boolean default true") @Column(name = "hold_voting", nullable = false, columnDefinition = "boolean default true")
private boolean holdVoting; private boolean holdVoting;
...@@ -229,4 +233,18 @@ public class Compo implements ModelInterface { ...@@ -229,4 +233,18 @@ public class Compo implements ModelInterface {
return description; return description;
} }
/**
* @return the maxParticipantCount
*/
public int getMaxParticipantCount() {
return maxParticipantCount;
}
/**
* @param maxParticipantCount the maxParticipantCount to set
*/
public void setMaxParticipantCount(int maxParticipantCount) {
this.maxParticipantCount = maxParticipantCount;
}
} }
...@@ -5,6 +5,7 @@ ...@@ -5,6 +5,7 @@
package fi.insomnia.bortal.model; package fi.insomnia.bortal.model;
import java.util.Calendar;
import javax.persistence.Column; import javax.persistence.Column;
import javax.persistence.Entity; import javax.persistence.Entity;
import javax.persistence.GeneratedValue; import javax.persistence.GeneratedValue;
...@@ -15,6 +16,8 @@ import javax.persistence.ManyToOne; ...@@ -15,6 +16,8 @@ import javax.persistence.ManyToOne;
import javax.persistence.NamedQueries; import javax.persistence.NamedQueries;
import javax.persistence.NamedQuery; import javax.persistence.NamedQuery;
import javax.persistence.Table; import javax.persistence.Table;
import javax.persistence.Temporal;
import javax.persistence.TemporalType;
import javax.persistence.Version; import javax.persistence.Version;
/** /**
...@@ -37,6 +40,14 @@ public class CompoEntryParticipant implements ModelInterface { ...@@ -37,6 +40,14 @@ public class CompoEntryParticipant implements ModelInterface {
@Column(name = "role") @Column(name = "role")
private String role; private String role;
@Column(name = "nick")
private String nick;
@Column(name = "confirmed")
@Temporal(TemporalType.TIMESTAMP)
private Calendar confirmed;
@JoinColumn(name = "entries_id", referencedColumnName = "entries_id", nullable = false) @JoinColumn(name = "entries_id", referencedColumnName = "entries_id", nullable = false)
@ManyToOne(optional = false) @ManyToOne(optional = false)
private CompoEntry entry; private CompoEntry entry;
...@@ -144,4 +155,32 @@ public class CompoEntryParticipant implements ModelInterface { ...@@ -144,4 +155,32 @@ public class CompoEntryParticipant implements ModelInterface {
return jpaVersionField; return jpaVersionField;
} }
/**
* @return the nick
*/
public String getNick() {
return nick;
}
/**
* @param nick the nick to set
*/
public void setNick(String nick) {
this.nick = nick;
}
/**
* @return the confirmed
*/
public Calendar getConfirmed() {
return confirmed;
}
/**
* @param confirmed the confirmed to set
*/
public void setConfirmed(Calendar confirmed) {
this.confirmed = confirmed;
}
} }
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!