Skip to content

Max Mecklin / Moya

Go to a project
Commit d634511c by Tuukka Kivilahti
Options

eventstatus stuff

1 parent 0bafdf4c
Inline Side-by-side
Showing with 116 additions and 10 deletions
code/LanBortalBeans/ejbModule/fi/insomnia/bortal/beans/EventBean.java
...@@ -28,6 +28,9 @@ public class EventBean implements EventBeanLocal { ...@@ -28,6 +28,9 @@ public class EventBean implements EventBeanLocal {
@EJB @EJB
private UserFacade userFacade; private UserFacade userFacade;
@EJB
private EventStatusBean eventStatusBean;
@Override @Override
public Event getEventByHostname(String hostname) { public Event getEventByHostname(String hostname) {
...@@ -41,11 +44,13 @@ public class EventBean implements EventBeanLocal { ...@@ -41,11 +44,13 @@ public class EventBean implements EventBeanLocal {
public Event findOrCreateDefaultEvent() { public Event findOrCreateDefaultEvent() {
Event ret = eventFacade.findByName(DEFAULT_EVENT_NAME); Event ret = eventFacade.findByName(DEFAULT_EVENT_NAME);
if (ret == null) { if (ret == null) {
ret = new Event(); ret = new Event();
ret.setReferer(""); ret.setReferer("");
ret.setName(DEFAULT_EVENT_NAME); ret.setName(DEFAULT_EVENT_NAME);
ret.setOrganiser(findOrCreateDefaultEventOrganisation()); ret.setOrganiser(findOrCreateDefaultEventOrganisation());
ret.setStatus(eventStatusBean.findOrCreateDefaultEventStatus());
eventFacade.create(ret); eventFacade.create(ret);
} }
return ret; return ret;
......
code/LanBortalBeans/ejbModule/fi/insomnia/bortal/beans/EventStatusBean.java 0 → 100644
/*
* To change this template, choose Tools | Templates
* and open the template in the editor.
*/
package fi.insomnia.bortal.beans;
import fi.insomnia.bortal.facade.EventStatusFacade;
import fi.insomnia.bortal.model.EventOrganiser;
import fi.insomnia.bortal.model.EventStatus;
import fi.insomnia.bortal.model.User;
import javax.ejb.EJB;
import javax.ejb.Stateless;
/**
*
* @author tuukka
*/
@Stateless
public class EventStatusBean implements EventStatusBeanLocal {
@EJB
private EventStatusFacade eventStatusFacade;
public EventStatus findEventStatus(EventStatusEnum eventStatusEnum) {
EventStatus status = eventStatusFacade.findEventStatus(eventStatusEnum);
if(status == null) {
status = new EventStatus(eventStatusEnum.name());
eventStatusFacade.create(status);
}
return status;
}
public EventStatus findOrCreateDefaultEventStatus() {
return findEventStatus(EventStatusEnum.getDefaultEventStatusEnum());
}
}
code/LanBortalBeans/ejbModule/fi/insomnia/bortal/facade/EventStatusFacade.java
package fi.insomnia.bortal.facade; package fi.insomnia.bortal.facade;
import fi.insomnia.bortal.beans.EventStatusEnum;
import javax.ejb.LocalBean; import javax.ejb.LocalBean;
import javax.ejb.Stateless; import javax.ejb.Stateless;
import javax.persistence.EntityManager; import javax.persistence.EntityManager;
import javax.persistence.PersistenceContext; import javax.persistence.PersistenceContext;
import fi.insomnia.bortal.model.EventStatus; import fi.insomnia.bortal.model.EventStatus;
import javax.persistence.NoResultException;
import javax.persistence.Query;
@Stateless @Stateless
@LocalBean @LocalBean
...@@ -21,4 +24,15 @@ public class EventStatusFacade extends GenericFacade<Integer, EventStatus> { ...@@ -21,4 +24,15 @@ public class EventStatusFacade extends GenericFacade<Integer, EventStatus> {
return em; return em;
} }
public EventStatus findEventStatus(EventStatusEnum eventStatusEnum) {
try {
Query q = em.createNamedQuery("EventStatus.findByStatusName");
q.setParameter("name", eventStatusEnum.name());
EventStatus shopSetting = (EventStatus) q.getSingleResult();
return shopSetting;
} catch (NoResultException x) {
return null;
}
}
} }
code/LanBortalBeans/nbproject/build-impl.xml
...@@ -355,6 +355,7 @@ exists or setup the property manually. For example like this: ...@@ -355,6 +355,7 @@ exists or setup the property manually. For example like this:
<copyfiles files="${reference.LanBortalDatabase.jar}" todir="${build.classes.dir}"/> <copyfiles files="${reference.LanBortalDatabase.jar}" todir="${build.classes.dir}"/>
<copyfiles files="${reference.LanBortalBeansClient.jar}" todir="${build.classes.dir}"/> <copyfiles files="${reference.LanBortalBeansClient.jar}" todir="${build.classes.dir}"/>
<copyfiles files="${reference.LanBortalUtilities.jar}" todir="${build.classes.dir}"/> <copyfiles files="${reference.LanBortalUtilities.jar}" todir="${build.classes.dir}"/>
<copyfiles files="${file.reference.PDFjet.jar}" todir="${build.classes.dir}"/>
</target> </target>
<target depends="compile" name="library-inclusion-in-manifest"> <target depends="compile" name="library-inclusion-in-manifest">
<copyfiles files="${file.reference.lucene-queries.jar}" todir="${dist.ear.dir}/lib"/> <copyfiles files="${file.reference.lucene-queries.jar}" todir="${dist.ear.dir}/lib"/>
...@@ -367,6 +368,7 @@ exists or setup the property manually. For example like this: ...@@ -367,6 +368,7 @@ exists or setup the property manually. For example like this:
<copyfiles files="${reference.LanBortalDatabase.jar}" todir="${dist.ear.dir}/lib"/> <copyfiles files="${reference.LanBortalDatabase.jar}" todir="${dist.ear.dir}/lib"/>
<copyfiles files="${reference.LanBortalBeansClient.jar}" todir="${dist.ear.dir}/lib"/> <copyfiles files="${reference.LanBortalBeansClient.jar}" todir="${dist.ear.dir}/lib"/>
<copyfiles files="${reference.LanBortalUtilities.jar}" todir="${dist.ear.dir}/lib"/> <copyfiles files="${reference.LanBortalUtilities.jar}" todir="${dist.ear.dir}/lib"/>
<copyfiles files="${file.reference.PDFjet.jar}" todir="${dist.ear.dir}/lib"/>
<manifest file="${build.ear.classes.dir}/META-INF/MANIFEST.MF" mode="update"/> <manifest file="${build.ear.classes.dir}/META-INF/MANIFEST.MF" mode="update"/>
</target> </target>
<target name="-copy-meta-inf"> <target name="-copy-meta-inf">
......
code/LanBortalBeans/nbproject/genfiles.properties
build.xml.data.CRC32=e08f2e51 build.xml.data.CRC32=10c807d7
build.xml.script.CRC32=5df2cfd1 build.xml.script.CRC32=5df2cfd1
build.xml.stylesheet.CRC32=e5f4c432@1.19.1 build.xml.stylesheet.CRC32=e5f4c432@1.19.1
# This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml. # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
# Do not edit this file. You may delete it but then the IDE will never regenerate such files for you. # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
nbproject/build-impl.xml.data.CRC32=e08f2e51 nbproject/build-impl.xml.data.CRC32=10c807d7
nbproject/build-impl.xml.script.CRC32=46eed4b8 nbproject/build-impl.xml.script.CRC32=c4f343dd
nbproject/build-impl.xml.stylesheet.CRC32=b9c9cfe1@1.19.1 nbproject/build-impl.xml.stylesheet.CRC32=b9c9cfe1@1.19.1
code/LanBortalBeans/nbproject/project.properties
...@@ -24,6 +24,7 @@ file.reference.lucene-highlighter.jar=libs/lucene-highlighter.jar ...@@ -24,6 +24,7 @@ file.reference.lucene-highlighter.jar=libs/lucene-highlighter.jar
file.reference.lucene-queries.jar=libs/lucene-queries.jar file.reference.lucene-queries.jar=libs/lucene-queries.jar
file.reference.lucene-snowball.jar=libs/lucene-snowball.jar file.reference.lucene-snowball.jar=libs/lucene-snowball.jar
file.reference.lucene-spellchecker.jar=libs/lucene-spellchecker.jar file.reference.lucene-spellchecker.jar=libs/lucene-spellchecker.jar
file.reference.PDFjet.jar=libs/PDFjet.jar
includes=** includes=**
j2ee.deploy.on.save=true j2ee.deploy.on.save=true
j2ee.platform=1.6 j2ee.platform=1.6
...@@ -40,7 +41,8 @@ javac.classpath=\ ...@@ -40,7 +41,8 @@ javac.classpath=\
${file.reference.compass-2.3.0-beta1.jar}:\ ${file.reference.compass-2.3.0-beta1.jar}:\
${reference.LanBortalDatabase.jar}:\ ${reference.LanBortalDatabase.jar}:\
${reference.LanBortalBeansClient.jar}:\ ${reference.LanBortalBeansClient.jar}:\
${reference.LanBortalUtilities.jar} ${reference.LanBortalUtilities.jar}:\
${file.reference.PDFjet.jar}
javac.debug=true javac.debug=true
javac.deprecation=false javac.deprecation=false
javac.source=1.5 javac.source=1.5
......
code/LanBortalBeans/nbproject/project.xml
...@@ -15,6 +15,7 @@ ...@@ -15,6 +15,7 @@
<included-library dirs="200">reference.LanBortalDatabase.jar</included-library> <included-library dirs="200">reference.LanBortalDatabase.jar</included-library>
<included-library dirs="200">reference.LanBortalBeansClient.jar</included-library> <included-library dirs="200">reference.LanBortalBeansClient.jar</included-library>
<included-library dirs="200">reference.LanBortalUtilities.jar</included-library> <included-library dirs="200">reference.LanBortalUtilities.jar</included-library>
<included-library dirs="200">file.reference.PDFjet.jar</included-library>
<source-roots> <source-roots>
<root id="src.dir"/> <root id="src.dir"/>
</source-roots> </source-roots>
......
code/LanBortalBeansClient/ejbModule/fi/insomnia/bortal/beans/EventStatusBeanLocal.java 0 → 100644
/*
* To change this template, choose Tools | Templates
* and open the template in the editor.
*/
package fi.insomnia.bortal.beans;
import javax.ejb.Local;
/**
*
* @author tuukka
*/
@Local
public interface EventStatusBeanLocal {
}
code/LanBortalBeansClient/ejbModule/fi/insomnia/bortal/beans/EventStatusEnum.java 0 → 100644
/*
* To change this template, choose Tools | Templates
* and open the template in the editor.
*/
package fi.insomnia.bortal.beans;
/**
*
* @author tuukka
*/
public enum EventStatusEnum {
NOT_STARTED,
SPLITTED;
public static EventStatusEnum getEventStatusEnum(String name) {
return EventStatusEnum.valueOf(name);
}
public static EventStatusEnum getDefaultEventStatusEnum() {
return NOT_STARTED;
}
}
code/LanBortalDatabase/src/fi/insomnia/bortal/model/Bill.java
...@@ -37,7 +37,6 @@ import static javax.persistence.TemporalType.DATE; ...@@ -37,7 +37,6 @@ import static javax.persistence.TemporalType.DATE;
@NamedQuery(name = "Bill.findByDueDate", query = "SELECT b FROM Bill b WHERE b.dueDate = :dueDate"), @NamedQuery(name = "Bill.findByDueDate", query = "SELECT b FROM Bill b WHERE b.dueDate = :dueDate"),
@NamedQuery(name = "Bill.findByPaidDate", query = "SELECT b FROM Bill b WHERE b.paidDate = :paidDate"), @NamedQuery(name = "Bill.findByPaidDate", query = "SELECT b FROM Bill b WHERE b.paidDate = :paidDate"),
@NamedQuery(name = "Bill.findByReferenceNumber", query = "SELECT b FROM Bill b WHERE b.referenceNumber = :referenceNumber"),
@NamedQuery(name = "Bill.findByNotes", query = "SELECT b FROM Bill b WHERE b.notes = :notes") }) @NamedQuery(name = "Bill.findByNotes", query = "SELECT b FROM Bill b WHERE b.notes = :notes") })
public class Bill implements EventChildInterface { public class Bill implements EventChildInterface {
......
code/LanBortalDatabase/src/fi/insomnia/bortal/model/EventOrganiser.java
...@@ -63,13 +63,13 @@ public class EventOrganiser implements ModelInterface<Integer> { ...@@ -63,13 +63,13 @@ public class EventOrganiser implements ModelInterface<Integer> {
@Column(nullable = false,name="bill_address4") @Column(nullable = false,name="bill_address4")
private String billAddress4 = ""; private String billAddress4 = "";
@Column(nullable = false,name="bank_number1") @Column(nullable = false,name="bank_number1")
private String bankNumber1; private String bankNumber1 = "";
@Column(nullable = false,name="bank_number2") @Column(nullable = false,name="bank_number2")
private String bankNumber2; private String bankNumber2 = "";
@Column(nullable = false,name="bank_name1") @Column(nullable = false,name="bank_name1")
private String bankName1; private String bankName1 = "";
@Column(nullable = false,name="bank_name2") @Column(nullable = false,name="bank_name2")
private String bankName2; private String bankName2 = "";
......
code/LanBortalDatabase/src/fi/insomnia/bortal/model/EventStatus.java
...@@ -26,7 +26,6 @@ import javax.persistence.Version; ...@@ -26,7 +26,6 @@ import javax.persistence.Version;
@Table(name = "event_status", uniqueConstraints = { @UniqueConstraint(columnNames = { "status_name" }) }) @Table(name = "event_status", uniqueConstraints = { @UniqueConstraint(columnNames = { "status_name" }) })
@NamedQueries( { @NamedQueries( {
@NamedQuery(name = "EventStatus.findAll", query = "SELECT e FROM EventStatus e"), @NamedQuery(name = "EventStatus.findAll", query = "SELECT e FROM EventStatus e"),
@NamedQuery(name = "EventStatus.findByStatusName", query = "SELECT e FROM EventStatus e WHERE e.name = :name") }) @NamedQuery(name = "EventStatus.findByStatusName", query = "SELECT e FROM EventStatus e WHERE e.name = :name") })
public class EventStatus implements ModelInterface<Integer> { public class EventStatus implements ModelInterface<Integer> {
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!