Skip to content

Max Mecklin / Moya

Go to a project
Commit 267cc600 by Tuomas Riihimäki
Options

column -> joincolumn..

1 parent 6645ef86
Inline Side-by-side
Showing with 18 additions and 22 deletions
code/LanBortalDatabase/src/fi/insomnia/bortal/model/OrgRole.java
...@@ -47,10 +47,10 @@ public class OrgRole extends GenericEntity { ...@@ -47,10 +47,10 @@ public class OrgRole extends GenericEntity {
@ManyToMany(mappedBy = "parents") @ManyToMany(mappedBy = "parents")
private List<OrgRole> children = new ArrayList<OrgRole>(); private List<OrgRole> children = new ArrayList<OrgRole>();
@Column(nullable = false) @JoinColumn(nullable = false)
@ManyToOne() @ManyToOne()
private EventOrganiser eventOrganizer; private EventOrganiser eventOrganizer;
@OneToMany @OneToMany
private List<Role> eventRoles; private List<Role> eventRoles;
......
code/LanBortalWeb/src/fi/insomnia/bortal/web/cdiview/voting/VotingCompoAddEntryView.java
package fi.insomnia.bortal.web.cdiview.voting; package fi.insomnia.bortal.web.cdiview.voting;
import java.util.Calendar;
import javax.ejb.EJB; import javax.ejb.EJB;
import javax.enterprise.context.RequestScoped; import javax.enterprise.context.RequestScoped;
import javax.faces.bean.ManagedBean; import javax.faces.bean.ManagedBean;
import javax.validation.constraints.NotNull; import javax.validation.constraints.NotNull;
import javax.validation.constraints.Size;
import org.hibernate.validator.constraints.NotEmpty;
import org.primefaces.model.UploadedFile; import org.primefaces.model.UploadedFile;
import fi.insomnia.bortal.beans.VotingBeanLocal; import fi.insomnia.bortal.beans.VotingBeanLocal;
import fi.insomnia.bortal.model.Compo;
import fi.insomnia.bortal.model.CompoEntry; import fi.insomnia.bortal.model.CompoEntry;
import fi.insomnia.bortal.model.CompoEntryFile; import fi.insomnia.bortal.model.CompoEntryFile;
@ManagedBean @ManagedBean
@RequestScoped @RequestScoped
public class VotingCompoAddEntryView { public class VotingCompoAddEntryView {
@EJB @EJB
VotingBeanLocal votingBean; VotingBeanLocal votingBean;
@NotNull @NotNull
private String name; private String name;
private String notes; private String notes;
private String screenMessage; private String screenMessage;
@NotNull @NotNull
private UploadedFile uploadedFile; private UploadedFile uploadedFile;
private Integer compoId; private Integer compoId;
public UploadedFile getUploadedFile() { public UploadedFile getUploadedFile() {
return uploadedFile; return uploadedFile;
} }
public void setUploadedFile(UploadedFile uploadedFile) { public void setUploadedFile(UploadedFile uploadedFile) {
this.uploadedFile = uploadedFile; this.uploadedFile = uploadedFile;
} }
public String getScreenMessage() { public String getScreenMessage() {
return screenMessage; return screenMessage;
} }
public void setScreenMessage(String screenMessage) { public void setScreenMessage(String screenMessage) {
this.screenMessage = screenMessage; this.screenMessage = screenMessage;
} }
public String getNotes() { public String getNotes() {
return notes; return notes;
} }
public void setNotes(String notes) { public void setNotes(String notes) {
this.notes = notes; this.notes = notes;
} }
public String getName() { public String getName() {
return name; return name;
} }
public void setName(String name) { public void setName(String name) {
this.name = name; this.name = name;
} }
public void send() { public void send() {
CompoEntry compoEntry = new CompoEntry(); CompoEntry compoEntry = new CompoEntry();
compoEntry.setName(name); compoEntry.setName(name);
......
code/LanBortalWeb/src/fi/insomnia/bortal/web/cdiview/voting/VotingCompoListView.java
package fi.insomnia.bortal.web.cdiview.voting; package fi.insomnia.bortal.web.cdiview.voting;
import java.util.List; import java.util.List;
import javax.ejb.EJB; import javax.ejb.EJB;
import javax.faces.bean.ManagedBean; import javax.enterprise.context.RequestScoped;
import javax.faces.bean.RequestScoped;
import javax.inject.Named; import javax.inject.Named;
import fi.insomnia.bortal.beans.VotingBeanLocal; import fi.insomnia.bortal.beans.VotingBeanLocal;
import fi.insomnia.bortal.model.Compo; import fi.insomnia.bortal.model.Compo;
import fi.insomnia.bortal.web.cdiview.GenericCDIView; import fi.insomnia.bortal.web.cdiview.GenericCDIView;
@ManagedBean
@Named @Named
@RequestScoped @RequestScoped
public class VotingCompoListView extends GenericCDIView { public class VotingCompoListView extends GenericCDIView {
/**
*
*/
private static final long serialVersionUID = 4166316634472472472L; private static final long serialVersionUID = 4166316634472472472L;
@EJB @EJB
private VotingBeanLocal votbean; private VotingBeanLocal votbean;
boolean curEntries = false; boolean curEntries = false;
boolean maxParts = false; boolean maxParts = false;
public List<Compo> getCompos() { public List<Compo> getCompos() {
return votbean.getCompoList(); return votbean.getCompoList();
} }
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!