Skip to content

Antti Väyrynen / Moya

Go to a project
Commit 118a735f by Tuomas Riihimäki
Options

EventMap & Place kikostusta... EI TOIMI PERKELE

1 parent 87b56a89
Inline Side-by-side
Showing with 64 additions and 55 deletions
code/LanBortalBeans/ejbModule/fi/insomnia/bortal/beans/PlaceMapBean.java
...@@ -3,11 +3,15 @@ package fi.insomnia.bortal.beans; ...@@ -3,11 +3,15 @@ package fi.insomnia.bortal.beans;
import java.awt.image.BufferedImage; import java.awt.image.BufferedImage;
import java.io.IOException; import java.io.IOException;
import java.io.OutputStream; import java.io.OutputStream;
import java.util.List;
import javax.ejb.EJB; import javax.ejb.EJB;
import javax.ejb.Stateless; import javax.ejb.Stateless;
import javax.imageio.ImageIO; import javax.imageio.ImageIO;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import fi.insomnia.bortal.facade.EventMapFacade; import fi.insomnia.bortal.facade.EventMapFacade;
import fi.insomnia.bortal.facade.PlaceFacade; import fi.insomnia.bortal.facade.PlaceFacade;
import fi.insomnia.bortal.facade.UserFacade; import fi.insomnia.bortal.facade.UserFacade;
...@@ -24,6 +28,8 @@ import fi.insomnia.bortal.model.User; ...@@ -24,6 +28,8 @@ import fi.insomnia.bortal.model.User;
@Stateless @Stateless
public class PlaceMapBean implements PlaceMapBeanLocal { public class PlaceMapBean implements PlaceMapBeanLocal {
private static final Logger logger = LoggerFactory.getLogger(PlaceMapBean.class);
/** /**
* Default constructor. * Default constructor.
*/ */
...@@ -49,12 +55,14 @@ public class PlaceMapBean implements PlaceMapBeanLocal { ...@@ -49,12 +55,14 @@ public class PlaceMapBean implements PlaceMapBeanLocal {
place = placeFacade.find(eventId, placeId); place = placeFacade.find(eventId, placeId);
} }
logger.info("Got event {}, mapid {}", event, mapId);
if (place != null) { if (place != null) {
map = place.getMap(); map = place.getMap();
} else { } else {
map = eventMapFacade.find(eventId,mapId); map = eventMapFacade.find(eventId, mapId);
} }
List<Place> places = map.getPlaces();
logger.info("Places: from map {}", places.size());
BufferedImage image = map.getMapWithPlaces(); BufferedImage image = map.getMapWithPlaces();
if (userId != null) { if (userId != null) {
......
code/LanBortalBeans/ejbModule/fi/insomnia/bortal/beans/TestDataBean.java
...@@ -40,7 +40,7 @@ public class TestDataBean implements TestDataBeanLocal { ...@@ -40,7 +40,7 @@ public class TestDataBean implements TestDataBeanLocal {
private EventOrganiserFacade eventOrganiserFacade; private EventOrganiserFacade eventOrganiserFacade;
@EJB @EJB
private EventFacade eventFacade; private EventBeanLocal eventBean;
@EJB @EJB
private UserFacade userFacade; private UserFacade userFacade;
@EJB @EJB
...@@ -98,24 +98,6 @@ public class TestDataBean implements TestDataBeanLocal { ...@@ -98,24 +98,6 @@ public class TestDataBean implements TestDataBeanLocal {
/** /**
* Generate all metashit, ex. events. * Generate all metashit, ex. events.
*/ */
public Event generateMetaData() {
EventStatus status = eventStatusBean.findOrCreateDefaultEventStatus();
EventOrganiser settings = new EventOrganiser();
settings.setOrganisation("MUN ORGANISAATIO; EI SUN!");
settings.setAdmin(generateUser());
eventOrganiserFacade.create(settings);
Event event = new Event();
event.setName("testEvent");
event.setOrganiser(settings);
event.setStatus(status);
eventFacade.create(event);
return event;
}
private User generateUser() { private User generateUser() {
User user = new User(); User user = new User();
...@@ -129,18 +111,20 @@ public class TestDataBean implements TestDataBeanLocal { ...@@ -129,18 +111,20 @@ public class TestDataBean implements TestDataBeanLocal {
} }
public void generateTestPlaces(EventMap map) { public void generateTestPlaces(EventMap map) {
logger.info("Adding places to map {}, event {}", map); logger.info("Adding places to map {}, event {}", map);
for (int x = 5; x < 400; x += 50) { for (int x = 5; x < 400; x += 50) {
for (int y = 5; y < 150; y += 50) { for (int y = 5; y < 150; y += 50) {
Place place = new Place(map); Place place = new Place(map);
place.setMap(map);
place.setMapX(x); place.setMapX(x);
place.setMapY(y); place.setMapY(y);
placeFacade.create(place); place.setWidth(50);
place.setHeight(50);
// map.getPlaces().add(place);
placeFacade.create(place);
} }
} }
} }
} }
code/LanBortalBeansClient/ejbModule/fi/insomnia/bortal/beans/TestDataBeanLocal.java
...@@ -9,7 +9,6 @@ public interface TestDataBeanLocal { ...@@ -9,7 +9,6 @@ public interface TestDataBeanLocal {
EventMap generateTestMap(Event event); EventMap generateTestMap(Event event);
Event generateMetaData();
void generateTestPlaces(EventMap map); void generateTestPlaces(EventMap map);
......
code/LanBortalDatabase/.classpath
...@@ -2,16 +2,12 @@ ...@@ -2,16 +2,12 @@
<classpath> <classpath>
<classpathentry kind="src" path="src"/> <classpathentry kind="src" path="src"/>
<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/> <classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/>
<classpathentry kind="con" path="org.eclipse.jst.server.core.container/com.sun.enterprise.jst.server.runtimeTarget/GlassFish v3 Java EE 6"> <classpathentry combineaccessrules="false" exported="true" kind="src" path="/LanBortalUtilities"/>
<attributes> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6">
<attribute name="owner.project.facets" value="jst.utility"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER">
<attributes> <attributes>
<attribute name="owner.project.facets" value="jst.java"/> <attribute name="owner.project.facets" value="java"/>
</attributes> </attributes>
</classpathentry> </classpathentry>
<classpathentry combineaccessrules="false" exported="true" kind="src" path="/LanBortalUtilities"/> <classpathentry kind="con" path="org.eclipse.jst.server.core.container/com.sun.enterprise.jst.server.runtimeTarget/GlassFish v3 Java EE 6"/>
<classpathentry kind="output" path="build/classes"/> <classpathentry kind="output" path="build/classes"/>
</classpath> </classpath>
code/LanBortalDatabase/.settings/org.eclipse.wst.common.project.facet.core.xml
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<faceted-project> <faceted-project>
<runtime name="GlassFish v3 Java EE 6"/>
<fixed facet="jst.utility"/> <fixed facet="jst.utility"/>
<fixed facet="jst.java"/> <fixed facet="jst.java"/>
<fixed facet="jpt.jpa"/> <fixed facet="jpt.jpa"/>
......
code/LanBortalDatabase/src/META-INF/persistence.xml
...@@ -5,6 +5,7 @@ ...@@ -5,6 +5,7 @@
<properties> <properties>
<property name="eclipselink.ddl-generation" value="drop-and-create-tables"/> <property name="eclipselink.ddl-generation" value="drop-and-create-tables"/>
<property name="eclipselink.ddl-generation.output-mode" value="both"/> <property name="eclipselink.ddl-generation.output-mode" value="both"/>
<property name="eclipselink.logging.level" value="ALL"/>
</properties> </properties>
</persistence-unit> </persistence-unit>
</persistence> </persistence>
code/LanBortalDatabase/src/fi/insomnia/bortal/model/EventMap.java
...@@ -7,6 +7,7 @@ package fi.insomnia.bortal.model; ...@@ -7,6 +7,7 @@ package fi.insomnia.bortal.model;
import java.awt.image.BufferedImage; import java.awt.image.BufferedImage;
import java.io.ByteArrayInputStream; import java.io.ByteArrayInputStream;
import java.io.IOException; import java.io.IOException;
import java.util.ArrayList;
import java.util.List; import java.util.List;
import javax.imageio.ImageIO; import javax.imageio.ImageIO;
...@@ -14,6 +15,7 @@ import javax.persistence.CascadeType; ...@@ -14,6 +15,7 @@ import javax.persistence.CascadeType;
import javax.persistence.Column; import javax.persistence.Column;
import javax.persistence.EmbeddedId; import javax.persistence.EmbeddedId;
import javax.persistence.Entity; import javax.persistence.Entity;
import javax.persistence.FetchType;
import javax.persistence.JoinColumn; import javax.persistence.JoinColumn;
import javax.persistence.Lob; import javax.persistence.Lob;
import javax.persistence.ManyToOne; import javax.persistence.ManyToOne;
...@@ -23,6 +25,9 @@ import javax.persistence.OneToMany; ...@@ -23,6 +25,9 @@ import javax.persistence.OneToMany;
import javax.persistence.Table; import javax.persistence.Table;
import javax.persistence.Version; import javax.persistence.Version;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/** /**
* *
*/ */
...@@ -34,6 +39,8 @@ import javax.persistence.Version; ...@@ -34,6 +39,8 @@ import javax.persistence.Version;
@NamedQuery(name = "EventMap.findByName", query = "SELECT e FROM EventMap e WHERE e.name = :name") }) @NamedQuery(name = "EventMap.findByName", query = "SELECT e FROM EventMap e WHERE e.name = :name") })
public class EventMap implements EventChildInterface { public class EventMap implements EventChildInterface {
private static final Logger logger = LoggerFactory.getLogger(EventMap.class);
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@EmbeddedId @EmbeddedId
private EventPk id; private EventPk id;
...@@ -45,8 +52,8 @@ public class EventMap implements EventChildInterface { ...@@ -45,8 +52,8 @@ public class EventMap implements EventChildInterface {
@Column(name = "map_name") @Column(name = "map_name")
private String name; private String name;
@OneToMany(cascade = CascadeType.ALL, mappedBy = "map") @OneToMany(cascade = CascadeType.ALL, mappedBy = "map",fetch=FetchType.EAGER)
private List<Place> places; private List<Place> places = new ArrayList<Place>();
@ManyToOne(optional = false) @ManyToOne(optional = false)
@JoinColumn(name = "event_id", referencedColumnName = "event_id", insertable = false, updatable = false, nullable = false) @JoinColumn(name = "event_id", referencedColumnName = "event_id", insertable = false, updatable = false, nullable = false)
...@@ -168,8 +175,10 @@ public class EventMap implements EventChildInterface { ...@@ -168,8 +175,10 @@ public class EventMap implements EventChildInterface {
public BufferedImage getMapWithPlaces() throws IOException { public BufferedImage getMapWithPlaces() throws IOException {
BufferedImage image = ImageIO.read(new ByteArrayInputStream(getMapData())); BufferedImage image = ImageIO.read(new ByteArrayInputStream(getMapData()));
List<Place> myplaces = getPlaces();
for (Place place : getPlaces()) { logger.info("Getting places in Event map {}, found {}", this, myplaces.size());
for (Place place : myplaces ) {
logger.info("Drawing place {}", place);
place.drawPlace(image); place.drawPlace(image);
} }
......
code/LanBortalDatabase/src/fi/insomnia/bortal/model/Place.java
...@@ -61,25 +61,19 @@ public class Place implements EventChildInterface { ...@@ -61,25 +61,19 @@ public class Place implements EventChildInterface {
@OneToOne(mappedBy = "placeReservation") @OneToOne(mappedBy = "placeReservation")
private GroupMembership placeReserver; private GroupMembership placeReserver;
@SuppressWarnings("unused")
@Column(name = "group_id")
private Integer groupId;
/** /**
* Which group has bought the place * Which group has bought the place
*/ */
@JoinColumns({ @JoinColumns({
@JoinColumn(name = "group_id", referencedColumnName = "id", updatable = false, insertable = false), @JoinColumn(name = "group_id", referencedColumnName = "id", updatable = true, insertable = true),
@JoinColumn(name = "event_id", referencedColumnName = "event_id", nullable = false, updatable = false, insertable = false) }) @JoinColumn(name = "event_id", referencedColumnName = "event_id", nullable = false, updatable = false, insertable = false) })
@ManyToOne @ManyToOne
private PlaceGroup group; private PlaceGroup group;
@SuppressWarnings("unused")
@Column(name = "map_id", nullable = false)
private Integer mapId;
@JoinColumns({ @JoinColumns({
@JoinColumn(name = "map_id", referencedColumnName = "id", nullable = false, updatable = false, insertable = false), @JoinColumn(name = "map_id", referencedColumnName = "id"),
@JoinColumn(name = "event_id", referencedColumnName = "event_id", nullable = false, updatable = false, insertable = false) }) @JoinColumn(name = "event_id", referencedColumnName = "event_id", nullable = false, updatable = false, insertable = false) })
@ManyToOne(optional = false) @ManyToOne(optional = false)
private EventMap map; private EventMap map;
...@@ -108,7 +102,7 @@ public class Place implements EventChildInterface { ...@@ -108,7 +102,7 @@ public class Place implements EventChildInterface {
public Place(EventMap eventMap) { public Place(EventMap eventMap) {
this.id = new EventPk(); this.id = new EventPk();
this.id.setEventId(eventMap.getId().getEventId()); this.id.setEventId(eventMap.getId().getEventId());
this.setMap(eventMap);
} }
public String getDescription() { public String getDescription() {
...@@ -168,7 +162,6 @@ public class Place implements EventChildInterface { ...@@ -168,7 +162,6 @@ public class Place implements EventChildInterface {
throw new RuntimeException("Can not set Group from different Event to Place!"); throw new RuntimeException("Can not set Group from different Event to Place!");
} }
this.group = group; this.group = group;
this.groupId = group.getId().getId();
} }
public EventMap getMap() { public EventMap getMap() {
...@@ -180,7 +173,7 @@ public class Place implements EventChildInterface { ...@@ -180,7 +173,7 @@ public class Place implements EventChildInterface {
throw new RuntimeException("Can not set Map from different Event to Place!"); throw new RuntimeException("Can not set Map from different Event to Place!");
} }
this.map = map; this.map = map;
this.mapId = map.getId().getId(); // this.mapId = map.getId().getId();
} }
public Product getProduct() { public Product getProduct() {
......
code/LanBortalWeb/src/fi/insomnia/bortal/servlet/PlaceMap.java
...@@ -14,6 +14,9 @@ import javax.servlet.http.HttpServlet; ...@@ -14,6 +14,9 @@ import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import fi.insomnia.bortal.HostnameFilter; import fi.insomnia.bortal.HostnameFilter;
import fi.insomnia.bortal.beans.EventBeanLocal; import fi.insomnia.bortal.beans.EventBeanLocal;
import fi.insomnia.bortal.beans.PlaceMapBeanLocal; import fi.insomnia.bortal.beans.PlaceMapBeanLocal;
...@@ -25,6 +28,7 @@ import fi.insomnia.bortal.model.Event; ...@@ -25,6 +28,7 @@ import fi.insomnia.bortal.model.Event;
*/ */
public class PlaceMap extends HttpServlet { public class PlaceMap extends HttpServlet {
private static final Logger logger = LoggerFactory.getLogger(PlaceMap.class);
/** /**
* *
*/ */
...@@ -32,6 +36,7 @@ public class PlaceMap extends HttpServlet { ...@@ -32,6 +36,7 @@ public class PlaceMap extends HttpServlet {
@EJB @EJB
private PlaceMapBeanLocal placemapBean; private PlaceMapBeanLocal placemapBean;
@EJB
private EventBeanLocal eventBean; private EventBeanLocal eventBean;
public static final String PARAMETER_EVENT_MAP_ID = "mapid"; public static final String PARAMETER_EVENT_MAP_ID = "mapid";
...@@ -55,7 +60,7 @@ public class PlaceMap extends HttpServlet { ...@@ -55,7 +60,7 @@ public class PlaceMap extends HttpServlet {
protected void processRequest(HttpServletRequest request, HttpServletResponse response) protected void processRequest(HttpServletRequest request, HttpServletResponse response)
throws ServletException, IOException { throws ServletException, IOException {
response.setContentType("text/html;charset=UTF-8"); response.setContentType("text/html;charset=UTF-8");
// PrintWriter out = response.getWriter(); // PrintWriter out = response.getWriter();
ServletOutputStream ostream = response.getOutputStream(); ServletOutputStream ostream = response.getOutputStream();
try { try {
Integer placeId = getIntegerParameter(request, PARAMETER_SELECTED_PLACE_ID); Integer placeId = getIntegerParameter(request, PARAMETER_SELECTED_PLACE_ID);
......
code/LanBortalWeb/src/fi/insomnia/bortal/view/TestDataView.java
...@@ -6,9 +6,12 @@ package fi.insomnia.bortal.view; ...@@ -6,9 +6,12 @@ package fi.insomnia.bortal.view;
import javax.ejb.EJB; import javax.ejb.EJB;
import javax.faces.bean.ManagedBean; import javax.faces.bean.ManagedBean;
import javax.faces.bean.ManagedProperty;
import javax.faces.bean.RequestScoped; import javax.faces.bean.RequestScoped;
import fi.insomnia.bortal.beans.EventBeanLocal;
import fi.insomnia.bortal.beans.TestDataBeanLocal; import fi.insomnia.bortal.beans.TestDataBeanLocal;
import fi.insomnia.bortal.handler.SessionHandler;
import fi.insomnia.bortal.model.Event; import fi.insomnia.bortal.model.Event;
import fi.insomnia.bortal.model.EventMap; import fi.insomnia.bortal.model.EventMap;
...@@ -24,10 +27,12 @@ public class TestDataView { ...@@ -24,10 +27,12 @@ public class TestDataView {
@EJB @EJB
private TestDataBeanLocal testdatabean; private TestDataBeanLocal testdatabean;
@ManagedProperty("#{sessionHandler}")
private SessionHandler sessionhandler;
public void generateData() { public void generateData() {
Event event = getSessionhandler().getCurrentEvent();
Event event = testdatabean.generateMetaData();
EventMap map = testdatabean.generateTestMap(event); EventMap map = testdatabean.generateTestMap(event);
testdatabean.generateTestPlaces(map); testdatabean.generateTestPlaces(map);
...@@ -38,4 +43,14 @@ public class TestDataView { ...@@ -38,4 +43,14 @@ public class TestDataView {
public TestDataView() { public TestDataView() {
} }
public void setSessionhandler(SessionHandler sessionhandler) {
this.sessionhandler = sessionhandler;
}
public SessionHandler getSessionhandler() {
return sessionhandler;
}
} }
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!