Skip to content

Linnea Samila / Moya

Go to a project
Commit b1c9e79a by Tuomas Riihimäki
Options

Paikkaviilausta.

1 parent 7ac50927
Inline Side-by-side
Showing with 133 additions and 74 deletions
code/LanBortalBeans/ejbModule/fi/insomnia/bortal/beans/EventStatusBean.java
...@@ -4,11 +4,12 @@ ...@@ -4,11 +4,12 @@
*/ */
package fi.insomnia.bortal.beans; package fi.insomnia.bortal.beans;
import javax.ejb.EJB;
import javax.ejb.Stateless;
import fi.insomnia.bortal.enums.EventStatusEnum; import fi.insomnia.bortal.enums.EventStatusEnum;
import fi.insomnia.bortal.facade.EventStatusFacade; import fi.insomnia.bortal.facade.EventStatusFacade;
import fi.insomnia.bortal.model.EventStatus; import fi.insomnia.bortal.model.EventStatus;
import javax.ejb.EJB;
import javax.ejb.Stateless;
/** /**
* *
...@@ -24,13 +25,14 @@ public class EventStatusBean implements EventStatusBeanLocal { ...@@ -24,13 +25,14 @@ public class EventStatusBean implements EventStatusBeanLocal {
EventStatus status = eventStatusFacade.findEventStatus(eventStatusEnum); EventStatus status = eventStatusFacade.findEventStatus(eventStatusEnum);
if (status == null) { if (status == null) {
status = new EventStatus(eventStatusEnum.name()); status = new EventStatus(eventStatusEnum);
eventStatusFacade.create(status); eventStatusFacade.create(status);
} }
return status; return status;
} }
@Override
public EventStatus findOrCreateDefaultEventStatus() { public EventStatus findOrCreateDefaultEventStatus() {
return findEventStatus(EventStatusEnum.getDefaultEventStatusEnum()); return findEventStatus(EventStatusEnum.getDefaultEventStatusEnum());
} }
......
code/LanBortalBeans/ejbModule/fi/insomnia/bortal/beans/PlaceGroupBean.java
...@@ -69,6 +69,7 @@ public class PlaceGroupBean implements PlaceGroupBeanLocal { ...@@ -69,6 +69,7 @@ public class PlaceGroupBean implements PlaceGroupBeanLocal {
@Override @Override
@RolesAllowed("USER") @RolesAllowed("USER")
public List<GroupMembership> getMembershipsAndCreations(User user) { public List<GroupMembership> getMembershipsAndCreations(User user) {
List<GroupMembership> ret = gmemfacade.findMemberOrCreator(user); List<GroupMembership> ret = gmemfacade.findMemberOrCreator(user);
return ret; return ret;
} }
......
code/LanBortalBeans/ejbModule/fi/insomnia/bortal/beans/PlaceMapBean.java
...@@ -3,9 +3,13 @@ package fi.insomnia.bortal.beans; ...@@ -3,9 +3,13 @@ package fi.insomnia.bortal.beans;
import javax.ejb.EJB; import javax.ejb.EJB;
import javax.ejb.Stateless; import javax.ejb.Stateless;
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.model.EventMap; import fi.insomnia.bortal.model.EventMap;
import fi.insomnia.bortal.model.LanEvent;
/** /**
* Session Bean implementation class PlaceMapBean * Session Bean implementation class PlaceMapBean
...@@ -27,6 +31,7 @@ public class PlaceMapBean implements PlaceMapBeanLocal { ...@@ -27,6 +31,7 @@ public class PlaceMapBean implements PlaceMapBeanLocal {
private EventMapFacade eventMapFacade; private EventMapFacade eventMapFacade;
@EJB @EJB
private EventBeanLocal eventbean; private EventBeanLocal eventbean;
private static final Logger logger = LoggerFactory.getLogger(PlaceMapBean.class);
@Override @Override
public Long selectablePlaceCount(EventMap map) { public Long selectablePlaceCount(EventMap map) {
...@@ -43,4 +48,17 @@ public class PlaceMapBean implements PlaceMapBeanLocal { ...@@ -43,4 +48,17 @@ public class PlaceMapBean implements PlaceMapBeanLocal {
public Long availablePlaceCount(EventMap map) { public Long availablePlaceCount(EventMap map) {
return eventMapFacade.countAvailable(map); return eventMapFacade.countAvailable(map);
} }
@Override
public EventMap getActiveMap() {
LanEvent event = eventbean.getCurrentEvent();
logger.info("Current event: {}, maps {}", event, event.getEventMaps());
for (EventMap map : event.getEventMaps()) {
logger.info("Checking active map {}, is active {}", map, map.isActive());
if (map.isActive()) {
return map;
}
}
return null;
}
} }
code/LanBortalBeans/ejbModule/fi/insomnia/bortal/beans/ProductBean.java
...@@ -83,7 +83,7 @@ public class ProductBean implements ProductBeanLocal { ...@@ -83,7 +83,7 @@ public class ProductBean implements ProductBeanLocal {
@Override @Override
public Product findCreditProduct() { public Product findCreditProduct() {
List<Product> ret = productFacade.findProductsByPrice(eventBean.getCurrentEvent(), BigDecimal.ONE.negate()); List<Product> ret = productFacade.findProductsByPrice(BigDecimal.ONE.negate());
Product retProd = null; Product retProd = null;
if (ret == null || ret.isEmpty()) { if (ret == null || ret.isEmpty()) {
retProd = new Product(eventBean.getCurrentEvent()); retProd = new Product(eventBean.getCurrentEvent());
......
code/LanBortalBeans/ejbModule/fi/insomnia/bortal/facade/AccountEventFacade.java
...@@ -2,7 +2,6 @@ package fi.insomnia.bortal.facade; ...@@ -2,7 +2,6 @@ package fi.insomnia.bortal.facade;
import java.util.List; import java.util.List;
import javax.ejb.EJB;
import javax.ejb.LocalBean; import javax.ejb.LocalBean;
import javax.ejb.Stateless; import javax.ejb.Stateless;
import javax.persistence.EntityManager; import javax.persistence.EntityManager;
...@@ -27,9 +26,6 @@ public class AccountEventFacade extends GenericFacade<EventPk, AccountEvent> { ...@@ -27,9 +26,6 @@ public class AccountEventFacade extends GenericFacade<EventPk, AccountEvent> {
@PersistenceContext @PersistenceContext
private EntityManager em; private EntityManager em;
@EJB
private UserFacade userfacade;
public AccountEventFacade() { public AccountEventFacade() {
super(AccountEvent.class); super(AccountEvent.class);
} }
......
code/LanBortalBeans/ejbModule/fi/insomnia/bortal/facade/BillFacade.java
...@@ -5,12 +5,16 @@ import javax.ejb.LocalBean; ...@@ -5,12 +5,16 @@ 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 javax.persistence.TypedQuery; import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.Root;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import fi.insomnia.bortal.beans.EventBeanLocal;
import fi.insomnia.bortal.model.Bill; import fi.insomnia.bortal.model.Bill;
import fi.insomnia.bortal.model.Bill_;
import fi.insomnia.bortal.model.LanEvent; import fi.insomnia.bortal.model.LanEvent;
@Stateless @Stateless
...@@ -22,7 +26,7 @@ public class BillFacade extends EventChildGenericFacade<Bill> { ...@@ -22,7 +26,7 @@ public class BillFacade extends EventChildGenericFacade<Bill> {
private EntityManager em; private EntityManager em;
@EJB @EJB
private UserFacade userfacade; private EventBeanLocal eventbean;
public BillFacade() { public BillFacade() {
super(Bill.class); super(Bill.class);
...@@ -41,9 +45,15 @@ public class BillFacade extends EventChildGenericFacade<Bill> { ...@@ -41,9 +45,15 @@ public class BillFacade extends EventChildGenericFacade<Bill> {
// } // }
public Integer getBiggestBillNumber(LanEvent e) { public Integer getBiggestBillNumber(LanEvent e) {
TypedQuery<Integer> q = getEm().createNamedQuery("Bill.findbiggestBillNumber", Integer.class); // SELECT max(b.billNumber) from Bill b where b.event = :event
q.setParameter("event", e); CriteriaBuilder cb = getEm().getCriteriaBuilder();
return getSingleNullableResult(q); CriteriaQuery<Integer> cq = cb.createQuery(Integer.class);
Root<Bill> root = cq.from(Bill.class);
cq.select(cb.max(root.get(Bill_.billNumber)));
cq.where(cb.equal(root.get(Bill_.event), eventbean.getCurrentEvent()));
return getSingleNullableResult(em.createQuery(cq));
} }
} }
code/LanBortalBeans/ejbModule/fi/insomnia/bortal/facade/BillLineFacade.java
...@@ -5,7 +5,6 @@ import java.util.HashMap; ...@@ -5,7 +5,6 @@ import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import javax.ejb.EJB;
import javax.ejb.LocalBean; import javax.ejb.LocalBean;
import javax.ejb.Stateless; import javax.ejb.Stateless;
import javax.persistence.EntityManager; import javax.persistence.EntityManager;
...@@ -26,8 +25,6 @@ public class BillLineFacade extends EventChildGenericFacade<BillLine> { ...@@ -26,8 +25,6 @@ public class BillLineFacade extends EventChildGenericFacade<BillLine> {
private EntityManager em; private EntityManager em;
private static final Logger logger = LoggerFactory.getLogger(BillLineFacade.class); private static final Logger logger = LoggerFactory.getLogger(BillLineFacade.class);
@EJB
private BillFacade billfacade;
public BillLineFacade() { public BillLineFacade() {
super(BillLine.class); super(BillLine.class);
......
code/LanBortalBeans/ejbModule/fi/insomnia/bortal/facade/EventOrganiserFacade.java
...@@ -4,9 +4,12 @@ import javax.ejb.LocalBean; ...@@ -4,9 +4,12 @@ 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 javax.persistence.TypedQuery; import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.Root;
import fi.insomnia.bortal.model.EventOrganiser; import fi.insomnia.bortal.model.EventOrganiser;
import fi.insomnia.bortal.model.EventOrganiser_;
@Stateless @Stateless
@LocalBean @LocalBean
...@@ -19,14 +22,19 @@ public class EventOrganiserFacade extends GenericFacade<Integer, EventOrganiser> ...@@ -19,14 +22,19 @@ public class EventOrganiserFacade extends GenericFacade<Integer, EventOrganiser>
super(EventOrganiser.class); super(EventOrganiser.class);
} }
@Override
protected EntityManager getEm() { protected EntityManager getEm() {
return em; return em;
} }
public EventOrganiser findByOrganisation(String organisation) { public EventOrganiser findByOrganisation(String organisation) {
TypedQuery<EventOrganiser> q = em.createNamedQuery("EventOrganiser.findByOrganisation", EventOrganiser.class); // @NamedQuery(name = "EventOrganiser.findByOrganisation", query =
q.setParameter("organisation", organisation); // "SELECT e FROM EventOrganiser e WHERE e.organisation = :organisation"),
return getSingleNullableResult(q); CriteriaBuilder cb = em.getCriteriaBuilder();
CriteriaQuery<EventOrganiser> cq = cb.createQuery(EventOrganiser.class);
Root<EventOrganiser> root = cq.from(EventOrganiser.class);
cq.where(cb.equal(root.get(EventOrganiser_.organisation), organisation));
return getSingleNullableResult(em.createQuery(cq));
} }
} }
code/LanBortalBeans/ejbModule/fi/insomnia/bortal/facade/EventStatusFacade.java
...@@ -4,10 +4,13 @@ import javax.ejb.LocalBean; ...@@ -4,10 +4,13 @@ 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 javax.persistence.TypedQuery; import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.Root;
import fi.insomnia.bortal.enums.EventStatusEnum; import fi.insomnia.bortal.enums.EventStatusEnum;
import fi.insomnia.bortal.model.EventStatus; import fi.insomnia.bortal.model.EventStatus;
import fi.insomnia.bortal.model.EventStatus_;
@Stateless @Stateless
@LocalBean @LocalBean
...@@ -20,14 +23,24 @@ public class EventStatusFacade extends GenericFacade<Integer, EventStatus> { ...@@ -20,14 +23,24 @@ public class EventStatusFacade extends GenericFacade<Integer, EventStatus> {
super(EventStatus.class); super(EventStatus.class);
} }
@Override
protected EntityManager getEm() { protected EntityManager getEm() {
return em; return em;
} }
public EventStatus findEventStatus(EventStatusEnum eventStatusEnum) { public EventStatus findEventStatus(EventStatusEnum eventStatusEnum) {
TypedQuery<EventStatus> q = em.createNamedQuery("EventStatus.findByStatusName", EventStatus.class); // @NamedQuery(name = "EventStatus.findByStatusName", query =
q.setParameter("name", eventStatusEnum.name()); // "SELECT e FROM EventStatus e WHERE e.name = :name") })
return getSingleNullableResult(q); CriteriaBuilder cb = em.getCriteriaBuilder();
CriteriaQuery<EventStatus> cq = cb.createQuery(EventStatus.class);
Root<EventStatus> root = cq.from(EventStatus.class);
cq.where(cb.equal(root.get(EventStatus_.name), eventStatusEnum));
// TypedQuery<EventStatus> q =
// em.createNamedQuery("EventStatus.findByStatusName",
// EventStatus.class);
// q.setParameter("name", eventStatusEnum.name());
return getSingleNullableResult(em.createQuery(cq));
} }
} }
code/LanBortalBeans/ejbModule/fi/insomnia/bortal/facade/GroupMembershipFacade.java
...@@ -26,7 +26,7 @@ import fi.insomnia.bortal.utilities.PasswordFunctions; ...@@ -26,7 +26,7 @@ import fi.insomnia.bortal.utilities.PasswordFunctions;
@Stateless @Stateless
@LocalBean @LocalBean
public class GroupMembershipFacade extends GenericFacade<Integer, GroupMembership> { public class GroupMembershipFacade extends IntegerPkGenericFacade<GroupMembership> {
private static final Logger logger = LoggerFactory.getLogger(GroupMembershipFacade.class); private static final Logger logger = LoggerFactory.getLogger(GroupMembershipFacade.class);
@PersistenceContext @PersistenceContext
...@@ -80,7 +80,8 @@ public class GroupMembershipFacade extends GenericFacade<Integer, GroupMembershi ...@@ -80,7 +80,8 @@ public class GroupMembershipFacade extends GenericFacade<Integer, GroupMembershi
Root<GroupMembership> root = cq.from(GroupMembership.class); Root<GroupMembership> root = cq.from(GroupMembership.class);
Path<PlaceGroup> pg = root.get(GroupMembership_.placeGroup); Path<PlaceGroup> pg = root.get(GroupMembership_.placeGroup);
cq.where(cb.or(cb.equal(root.get(GroupMembership_.user), user), cq.where(
cb.or(cb.equal(root.get(GroupMembership_.user), user),
cb.equal(pg.get(PlaceGroup_.creator), user) cb.equal(pg.get(PlaceGroup_.creator), user)
), ),
cb.equal(pg.get(PlaceGroup_.event), eventbean.getCurrentEvent()) cb.equal(pg.get(PlaceGroup_.event), eventbean.getCurrentEvent())
......
code/LanBortalBeans/ejbModule/fi/insomnia/bortal/facade/PlaceFacade.java
...@@ -25,7 +25,7 @@ import fi.insomnia.bortal.model.User; ...@@ -25,7 +25,7 @@ import fi.insomnia.bortal.model.User;
@Stateless @Stateless
@LocalBean @LocalBean
public class PlaceFacade extends GenericFacade<Integer, Place> { public class PlaceFacade extends IntegerPkGenericFacade<Place> {
private static final Logger logger = LoggerFactory.getLogger(PlaceFacade.class); private static final Logger logger = LoggerFactory.getLogger(PlaceFacade.class);
@PersistenceContext @PersistenceContext
......
code/LanBortalBeans/ejbModule/fi/insomnia/bortal/facade/PlaceGroupFacade.java
...@@ -9,7 +9,7 @@ import fi.insomnia.bortal.model.PlaceGroup; ...@@ -9,7 +9,7 @@ import fi.insomnia.bortal.model.PlaceGroup;
@Stateless @Stateless
@LocalBean @LocalBean
public class PlaceGroupFacade extends GenericFacade<Integer, PlaceGroup> { public class PlaceGroupFacade extends IntegerPkGenericFacade<PlaceGroup> {
@PersistenceContext @PersistenceContext
private EntityManager em; private EntityManager em;
......
code/LanBortalBeans/ejbModule/fi/insomnia/bortal/facade/PrintedCardFacade.java
...@@ -24,11 +24,13 @@ public class PrintedCardFacade extends EventChildGenericFacade<PrintedCard> { ...@@ -24,11 +24,13 @@ public class PrintedCardFacade extends EventChildGenericFacade<PrintedCard> {
super(PrintedCard.class); super(PrintedCard.class);
} }
@Override
protected EntityManager getEm() { protected EntityManager getEm() {
return em; return em;
} }
public List<PrintedCard> findForUser(LanEvent event, User user) { public List<PrintedCard> findForUser(LanEvent event, User user) {
ArrayList<PrintedCard> retlist = new ArrayList<PrintedCard>(); ArrayList<PrintedCard> retlist = new ArrayList<PrintedCard>();
for (PrintedCard pc : user.getPrintedCards()) { for (PrintedCard pc : user.getPrintedCards()) {
if (pc.getId().getEventId().equals(event.getId())) { if (pc.getId().getEventId().equals(event.getId())) {
......
code/LanBortalBeans/ejbModule/fi/insomnia/bortal/facade/ProductFacade.java
...@@ -3,26 +3,30 @@ package fi.insomnia.bortal.facade; ...@@ -3,26 +3,30 @@ package fi.insomnia.bortal.facade;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.util.List; import java.util.List;
import javax.ejb.EJB;
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 javax.persistence.TypedQuery;
import javax.persistence.criteria.CriteriaBuilder; import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery; import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.Root; import javax.persistence.criteria.Root;
import fi.insomnia.bortal.beans.EventBeanLocal;
import fi.insomnia.bortal.model.LanEvent; import fi.insomnia.bortal.model.LanEvent;
import fi.insomnia.bortal.model.Product; import fi.insomnia.bortal.model.Product;
import fi.insomnia.bortal.model.Product_; import fi.insomnia.bortal.model.Product_;
@Stateless @Stateless
@LocalBean @LocalBean
public class ProductFacade extends GenericFacade<Integer, Product> { public class ProductFacade extends IntegerPkGenericFacade<Product> {
@PersistenceContext @PersistenceContext
private EntityManager em; private EntityManager em;
@EJB
private EventBeanLocal eventbean;
public ProductFacade() { public ProductFacade() {
super(Product.class); super(Product.class);
} }
...@@ -36,21 +40,26 @@ public class ProductFacade extends GenericFacade<Integer, Product> { ...@@ -36,21 +40,26 @@ public class ProductFacade extends GenericFacade<Integer, Product> {
throw new RuntimeException(); throw new RuntimeException();
} }
public List<Product> findProductsByPrice(LanEvent event, BigDecimal price) { public List<Product> findProductsByPrice(BigDecimal price) {
CriteriaBuilder cb = em.getCriteriaBuilder(); CriteriaBuilder cb = em.getCriteriaBuilder();
CriteriaQuery<Product> cq = cb.createQuery(Product.class); CriteriaQuery<Product> cq = cb.createQuery(Product.class);
Root<Product> root = cq.from(Product.class); Root<Product> root = cq.from(Product.class);
cq.where(cb.equal(root.get(Product_.event), event), cq.where(cb.equal(root.get(Product_.event), eventbean.getCurrentEvent()),
cb.equal(root.get(Product_.price), price)); cb.equal(root.get(Product_.price), price));
return em.createQuery(cq).getResultList(); return em.createQuery(cq).getResultList();
} }
public List<Product> findPrepaidProducts(LanEvent e) { public List<Product> findPrepaidProducts(LanEvent e) {
TypedQuery<Product> q = em.createQuery("select p from Product p where p.id.eventId = :eventid and p.prepaid = true", Product.class); CriteriaBuilder cb = em.getCriteriaBuilder();
q.setParameter("eventid", e.getId()); CriteriaQuery<Product> cq = cb.createQuery(Product.class);
return q.getResultList(); Root<Product> root = cq.from(Product.class);
cq.where(cb.equal(root.get(Product_.event), eventbean.getCurrentEvent()),
cb.isTrue(root.get(Product_.prepaid)));
return em.createQuery(cq).getResultList();
} }
} }
code/LanBortalBeansClient/ejbModule/fi/insomnia/bortal/beans/PlaceMapBeanLocal.java
...@@ -16,6 +16,8 @@ public interface PlaceMapBeanLocal { ...@@ -16,6 +16,8 @@ public interface PlaceMapBeanLocal {
public Long availablePlaceCount(EventMap activeMap); public Long availablePlaceCount(EventMap activeMap);
public EventMap getActiveMap();
// public List<Place> findSelectedPlaces(EventMap map); // public List<Place> findSelectedPlaces(EventMap map);
// public EventMap findMap(int i); // public EventMap findMap(int i);
......
code/LanBortalDatabase/diagrams/LanBortalDatabase.xml
...@@ -123,7 +123,7 @@ ...@@ -123,7 +123,7 @@
<entity> <entity>
<entity-name>fi.insomnia.bortal.model.EventMap</entity-name> <entity-name>fi.insomnia.bortal.model.EventMap</entity-name>
<entity-width>120</entity-width> <entity-width>120</entity-width>
<entity-height>208</entity-height> <entity-height>30</entity-height>
<entity-X-Coordinate>610</entity-X-Coordinate> <entity-X-Coordinate>610</entity-X-Coordinate>
<entity-Y-Coordinate>1595</entity-Y-Coordinate> <entity-Y-Coordinate>1595</entity-Y-Coordinate>
<primary-collapsed>false</primary-collapsed> <primary-collapsed>false</primary-collapsed>
...@@ -178,7 +178,7 @@ ...@@ -178,7 +178,7 @@
<entity> <entity>
<entity-name>fi.insomnia.bortal.model.PlaceGroup</entity-name> <entity-name>fi.insomnia.bortal.model.PlaceGroup</entity-name>
<entity-width>120</entity-width> <entity-width>120</entity-width>
<entity-height>268</entity-height> <entity-height>30</entity-height>
<entity-X-Coordinate>1065</entity-X-Coordinate> <entity-X-Coordinate>1065</entity-X-Coordinate>
<entity-Y-Coordinate>1486</entity-Y-Coordinate> <entity-Y-Coordinate>1486</entity-Y-Coordinate>
<primary-collapsed>false</primary-collapsed> <primary-collapsed>false</primary-collapsed>
...@@ -374,22 +374,22 @@ ...@@ -374,22 +374,22 @@
</entity> </entity>
<entity> <entity>
<entity-name>fi.insomnia.bortal.model.PollAnswer</entity-name> <entity-name>fi.insomnia.bortal.model.User</entity-name>
<entity-width>120</entity-width> <entity-width>120</entity-width>
<entity-height>30</entity-height> <entity-height>30</entity-height>
<entity-X-Coordinate>1315</entity-X-Coordinate> <entity-X-Coordinate>1132</entity-X-Coordinate>
<entity-Y-Coordinate>1423</entity-Y-Coordinate> <entity-Y-Coordinate>994</entity-Y-Coordinate>
<primary-collapsed>false</primary-collapsed> <primary-collapsed>false</primary-collapsed>
<relation-collapsed>false</relation-collapsed> <relation-collapsed>false</relation-collapsed>
<basic-collapsed>false</basic-collapsed> <basic-collapsed>false</basic-collapsed>
</entity> </entity>
<entity> <entity>
<entity-name>fi.insomnia.bortal.model.User</entity-name> <entity-name>fi.insomnia.bortal.model.PollAnswer</entity-name>
<entity-width>120</entity-width> <entity-width>120</entity-width>
<entity-height>30</entity-height> <entity-height>30</entity-height>
<entity-X-Coordinate>1132</entity-X-Coordinate> <entity-X-Coordinate>1315</entity-X-Coordinate>
<entity-Y-Coordinate>994</entity-Y-Coordinate> <entity-Y-Coordinate>1423</entity-Y-Coordinate>
<primary-collapsed>false</primary-collapsed> <primary-collapsed>false</primary-collapsed>
<relation-collapsed>false</relation-collapsed> <relation-collapsed>false</relation-collapsed>
<basic-collapsed>false</basic-collapsed> <basic-collapsed>false</basic-collapsed>
......
code/LanBortalDatabase/src/fi/insomnia/bortal/model/EventOrganiser.java
...@@ -11,8 +11,6 @@ import javax.persistence.Column; ...@@ -11,8 +11,6 @@ import javax.persistence.Column;
import javax.persistence.Entity; import javax.persistence.Entity;
import javax.persistence.JoinColumn; import javax.persistence.JoinColumn;
import javax.persistence.ManyToOne; import javax.persistence.ManyToOne;
import javax.persistence.NamedQueries;
import javax.persistence.NamedQuery;
import javax.persistence.OneToMany; import javax.persistence.OneToMany;
import javax.persistence.OrderBy; import javax.persistence.OrderBy;
import javax.persistence.Table; import javax.persistence.Table;
...@@ -22,10 +20,6 @@ import javax.persistence.Table; ...@@ -22,10 +20,6 @@ import javax.persistence.Table;
*/ */
@Entity @Entity
@Table(name = "event_organiser") @Table(name = "event_organiser")
@NamedQueries({
@NamedQuery(name = "EventOrganiser.findAll", query = "SELECT e FROM EventOrganiser e"),
@NamedQuery(name = "EventOrganiser.findByOrganisation", query = "SELECT e FROM EventOrganiser e WHERE e.organisation = :organisation"),
@NamedQuery(name = "EventOrganiser.findByBundleCountry", query = "SELECT e FROM EventOrganiser e WHERE e.bundleCountry = :bundleCountry") })
public class EventOrganiser extends GenericEntity { public class EventOrganiser extends GenericEntity {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
......
code/LanBortalDatabase/src/fi/insomnia/bortal/model/EventStatus.java
...@@ -9,25 +9,31 @@ import java.util.List; ...@@ -9,25 +9,31 @@ import java.util.List;
import javax.persistence.CascadeType; import javax.persistence.CascadeType;
import javax.persistence.Column; import javax.persistence.Column;
import javax.persistence.Entity; import javax.persistence.Entity;
import javax.persistence.NamedQueries; import javax.persistence.EnumType;
import javax.persistence.NamedQuery; import javax.persistence.Enumerated;
import javax.persistence.OneToMany; import javax.persistence.OneToMany;
import javax.persistence.Table; import javax.persistence.Table;
import fi.insomnia.bortal.enums.EventStatusEnum;
/** /**
* *
*/ */
@Entity @Entity
@Table(name = "event_status") @Table(name = "event_status")
// , uniqueConstraints = { @UniqueConstraint(columnNames = { "status_name" }) }) // , uniqueConstraints = { @UniqueConstraint(columnNames = { "status_name" }) })
@NamedQueries({ // @NamedQueries({
@NamedQuery(name = "EventStatus.findAll", query = "SELECT e FROM EventStatus e"), // @NamedQuery(name = "EventStatus.findAll", query =
@NamedQuery(name = "EventStatus.findByStatusName", query = "SELECT e FROM EventStatus e WHERE e.name = :name") }) // "SELECT e FROM EventStatus e"),
// @NamedQuery(name = "EventStatus.findByStatusName", query =
// "SELECT e FROM EventStatus e WHERE e.name = :name") })
public class EventStatus extends GenericEntity { public class EventStatus extends GenericEntity {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@Column(name = "status_name", nullable = false, unique = true) @Column(name = "status_name", nullable = false, unique = true)
private String name; @Enumerated(EnumType.STRING)
private EventStatusEnum name;
@OneToMany(cascade = CascadeType.ALL, mappedBy = "status") @OneToMany(cascade = CascadeType.ALL, mappedBy = "status")
private List<LanEvent> events; private List<LanEvent> events;
...@@ -36,16 +42,16 @@ public class EventStatus extends GenericEntity { ...@@ -36,16 +42,16 @@ public class EventStatus extends GenericEntity {
super(); super();
}; };
public EventStatus(String name) { public EventStatus(EventStatusEnum name) {
super(); super();
this.name = name; this.name = name;
} }
public String getName() { public EventStatusEnum getName() {
return name; return name;
} }
public void setName(String statusName) { public void setName(EventStatusEnum statusName) {
this.name = statusName; this.name = statusName;
} }
......
code/LanBortalWeb/WebContent/place/edit.xhtml
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
<h1>edit:</h1> <h1>edit:</h1>
<h:form id="placeEdit"> <h:form id="placeEdit">
<h:inputHidden value="#{placeView.place.id.id}" /> <h:inputHidden value="#{placeView.place.id}" />
<h:panelGrid columns="2"> <h:panelGrid columns="2">
<h:outputLabel value="#{i18n['place.name']}:" /> <h:outputLabel value="#{i18n['place.name']}:" />
<h:inputText value="#{placeView.place.name}" /> <h:inputText value="#{placeView.place.name}" />
...@@ -140,15 +140,16 @@ ...@@ -140,15 +140,16 @@
<h:column> <h:column>
<f:facet name="header"> <f:facet name="header">
<h:outputText value="${i18n['place.name']}" /> <h:outputText value="${i18n['placegroup.placename']}" />
</f:facet> </f:facet>
<h:link outcome="/place/edit" value="#{place.name}"> <h:link outcome="/place/edit" value="#{place.name}">
<f:param name="placeid" value="#{place.id.id}" /> <f:param name="placeid" value="#{place.id}" />
</h:link> </h:link>
</h:column> </h:column>
<h:column> <h:column>
<h:link outcome="/user/edit"> <h:outputText rendered="#{empty place.placeReserver.user}" value="#{i18n['place.noReserver']}" />
<h:link rendered="#{!empty place.placeReserver.user}" outcome="/user/edit">
<h:outputText value="#{place.placeReserver.user.wholeName}" /> <h:outputText value="#{place.placeReserver.user.wholeName}" />
(<h:outputText value="#{place.placeReserver.user.nick}" />) (<h:outputText value="#{place.placeReserver.user.nick}" />)
<f:param name="userid" value="#{place.placeReserver.user.id}" /> <f:param name="userid" value="#{place.placeReserver.user.id}" />
......
code/LanBortalWeb/WebContent/place/editGroup.xhtml
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
<h1>#{i18n['editplacegroup.header']}</h1> <h1>#{i18n['editplacegroup.header']}</h1>
<h:form id="placegroupform"> <h:form id="placegroupform">
<h:inputHidden value="#{placegroupView.group.id.id}" /> <h:inputHidden value="#{placegroupView.group.id}" />
<h:panelGrid columns="2"> <h:panelGrid columns="2">
<h:outputLabel value="#{i18n['placegroup.name']}:" /> <h:outputLabel value="#{i18n['placegroup.name']}:" />
...@@ -67,7 +67,7 @@ ...@@ -67,7 +67,7 @@
<h:panelGroup rendered="#{!empty placegroupView.place}"> <h:panelGroup rendered="#{!empty placegroupView.place}">
<h2>#{i18n['placegroupView.editplace']}</h2> <h2>#{i18n['placegroupView.editplace']}</h2>
<h:form id="placeEdit"> <h:form id="placeEdit">
<h:inputHidden value="#{placegroupView.place.id.id}" /> <h:inputHidden value="#{placegroupView.place.id}" />
<h:panelGrid columns="2"> <h:panelGrid columns="2">
<h:outputLabel value="#{i18n['place.name']}:" /> <h:outputLabel value="#{i18n['place.name']}:" />
<h:inputText value="#{placegroupView.place.name}" /> <h:inputText value="#{placegroupView.place.name}" />
......
code/LanBortalWeb/WebContent/resources/cditools/map/listPlaces.xhtml
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
<f:facet name="header"> <f:facet name="header">
<h:outputText value="#{i18n['place.id']}" /> <h:outputText value="#{i18n['place.id']}" />
</f:facet> </f:facet>
<h:outputText value="#{place.id.id}" /> <h:outputText value="#{place.id}" />
</h:column> </h:column>
<h:column> <h:column>
<f:facet name="header"> <f:facet name="header">
......
code/LanBortalWeb/src/fi/insomnia/bortal/resources/i18n_fi.properties
...@@ -122,6 +122,8 @@ place.name=Nimi ...@@ -122,6 +122,8 @@ place.name=Nimi
place.product=Tuote place.product=Tuote
place.releasetime=Vapautusaika place.releasetime=Vapautusaika
place.width=Leveys place.width=Leveys
place.groupremove=Poista paikka paikkaryhmst
place.noReserver=Ei liitetty kyttjn
place.membership=Yhdistetty k\u00e4ytt\u00e4j\u00e4 place.membership=Yhdistetty k\u00e4ytt\u00e4j\u00e4
placeSelect.legend.blue=Oma valittu paikka placeSelect.legend.blue=Oma valittu paikka
placeSelect.legend.green=Oma ostettu paikka placeSelect.legend.green=Oma ostettu paikka
......
code/LanBortalWeb/src/fi/insomnia/bortal/web/cdiview/map/MapView.java
...@@ -17,7 +17,6 @@ import fi.insomnia.bortal.beans.PlaceBeanLocal; ...@@ -17,7 +17,6 @@ import fi.insomnia.bortal.beans.PlaceBeanLocal;
import fi.insomnia.bortal.beans.PlaceMapBeanLocal; import fi.insomnia.bortal.beans.PlaceMapBeanLocal;
import fi.insomnia.bortal.enums.apps.MapPermission; import fi.insomnia.bortal.enums.apps.MapPermission;
import fi.insomnia.bortal.model.EventMap; import fi.insomnia.bortal.model.EventMap;
import fi.insomnia.bortal.model.LanEvent;
import fi.insomnia.bortal.model.User; import fi.insomnia.bortal.model.User;
import fi.insomnia.bortal.web.annotations.SelectedUser; import fi.insomnia.bortal.web.annotations.SelectedUser;
import fi.insomnia.bortal.web.cdiview.GenericCDIView; import fi.insomnia.bortal.web.cdiview.GenericCDIView;
...@@ -78,14 +77,11 @@ public class MapView extends GenericCDIView { ...@@ -78,14 +77,11 @@ public class MapView extends GenericCDIView {
@Produces @Produces
public EventMap getActiveMap() { public EventMap getActiveMap() {
if (activeMap == null) { if (activeMap == null) {
LanEvent event = eventBean.getCurrentEvent();
for (EventMap map : event.getEventMaps()) { activeMap = placeMapBean.getActiveMap();
if (map.isActive()) {
activeMap = map;
break;
}
}
} }
return activeMap; return activeMap;
} }
......
code/LanBortalWeb/src/fi/insomnia/bortal/web/cdiview/map/PlaceView.java
...@@ -46,6 +46,7 @@ public class PlaceView extends GenericCDIView { ...@@ -46,6 +46,7 @@ public class PlaceView extends GenericCDIView {
@Inject @Inject
@SelectedUser @SelectedUser
private User user; private User user;
@Inject @Inject
private EventMap currentMap; private EventMap currentMap;
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!