local random commit

code/LanBortalBeans/ejbModule/fi/insomnia/bortal/beans/FoodWaveBean.java

 package fi.insomnia.bortal.beans;
 
+import java.util.List;
+
 import javax.annotation.security.DeclareRoles;
 import javax.annotation.security.RolesAllowed;
 import javax.ejb.EJB;
 import javax.ejb.Stateless;
 
+import fi.insomnia.bortal.facade.FoodWaveFacade;
 import fi.insomnia.bortal.facade.FoodWaveTemplateFacade;
+import fi.insomnia.bortal.model.FoodWave;
 import fi.insomnia.bortal.model.FoodWaveTemplate;
 
 /**
@@ -17,7 +21,10 @@ public class FoodWaveBean implements FoodWaveBeanLocal {
 
 	@EJB
 	private FoodWaveTemplateFacade fwtFacade;
-
+	
+	@EJB
+	private FoodWaveFacade foodWaveFacade;
+	
 	/**
 	 * Default constructor.
 	 */
@@ -36,5 +43,11 @@ public class FoodWaveBean implements FoodWaveBeanLocal {
 	public FoodWaveTemplate saveTemplate(FoodWaveTemplate waveTemplate) {
 		return fwtFacade.merge(waveTemplate);
 	}
+	
+	@Override
+	@RolesAllowed("SHOP/READ")
+	public List<FoodWave> getOpenFoodWaves() {
+		return foodWaveFacade.getOpenFoodWaves();
+	}
 
 }

code/LanBortalBeans/ejbModule/fi/insomnia/bortal/beans/Menubean.java

@@ -108,6 +108,10 @@ public class Menubean implements MenubeanLocal {
 		shopTopmenu.addPage(menuitemfacade.findOrCreate("/checkout/delayed"), null).setVisible(false);
 		shopTopmenu.addPage(menuitemfacade.findOrCreate("/checkout/reject"), null).setVisible(false);
 		shopTopmenu.addPage(menuitemfacade.findOrCreate("/checkout/return"), null).setVisible(false);
+		
+		MenuNavigation foodwaveTopmenu = usernavi.addPage(null, null);
+		foodwaveTopmenu.setKey("topnavi.foodwave");
+		foodwaveTopmenu.addPage(menuitemfacade.findOrCreate("/foodwave/list"), BillPermission.VIEW_OWN);
 
 		MenuNavigation pollTopmenu = usernavi.addPage(null, null);
 		pollTopmenu.setKey("topnavi.poll");

code/LanBortalBeans/ejbModule/fi/insomnia/bortal/facade/FoodWaveFacade.java

 package fi.insomnia.bortal.facade;
 
+import java.util.Calendar;
+import java.util.List;
+
+import javax.ejb.EJB;
 import javax.ejb.LocalBean;
 import javax.ejb.Stateless;
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.Root;
 
+import fi.insomnia.bortal.beans.EventBeanLocal;
 import fi.insomnia.bortal.model.FoodWave;
+import fi.insomnia.bortal.model.FoodWaveTemplate_;
+import fi.insomnia.bortal.model.FoodWave_;
+import fi.insomnia.bortal.model.OrgRole_;
 
 @Stateless
 @LocalBean
 public class FoodWaveFacade extends IntegerPkGenericFacade<FoodWave> {
-
+	@EJB
+	EventBeanLocal eventBean;
+	
+	
 	public FoodWaveFacade() {
-
 		super(FoodWave.class);
 	}
+	
+	
+	public List<FoodWave> getOpenFoodWaves() {
+		
+		CriteriaBuilder cb = getEm().getCriteriaBuilder();
+		CriteriaQuery<FoodWave> cq = cb.createQuery(FoodWave.class);
+		Root<FoodWave> root = cq.from(FoodWave.class);
+		cq.where(cb.greaterThan(root.get(FoodWave_.time), Calendar.getInstance()),
+				cb.isFalse(root.get(FoodWave_.closed)),
+				cb.equal(root.get(FoodWave_.template).get(FoodWaveTemplate_.event), eventBean.getCurrentEvent())
+				);
+		
+		
+		return getEm().createQuery(cq).getResultList();
+	}
 
 }

code/LanBortalBeansClient/ejbModule/fi/insomnia/bortal/beans/FoodWaveBeanLocal.java

 package fi.insomnia.bortal.beans;
+import java.util.List;
+
 import javax.ejb.Local;
 
+import fi.insomnia.bortal.model.FoodWave;
 import fi.insomnia.bortal.model.FoodWaveTemplate;
 
 @Local
@@ -10,5 +13,7 @@ public interface FoodWaveBeanLocal {
 
 
     FoodWaveTemplate saveTemplate(FoodWaveTemplate waveTemplate);
+    
+    List<FoodWave> getOpenFoodWaves();
 
 }

code/LanBortalDatabase/src/fi/insomnia/bortal/model/Product_.java

@@ -7,7 +7,7 @@ import javax.persistence.metamodel.SetAttribute;
 import javax.persistence.metamodel.SingularAttribute;
 import javax.persistence.metamodel.StaticMetamodel;
 
-@Generated(value="Dali", date="2012-10-06T04:04:21.088+0300")
+@Generated(value="Dali", date="2012-10-06T04:12:09.351+0300")
 @StaticMetamodel(Product.class)
 public class Product_ extends GenericEntity_ {
 	public static volatile SingularAttribute<Product, LanEvent> event;
@@ -19,10 +19,10 @@ public class Product_ extends GenericEntity_ {
 	public static volatile SetAttribute<Product, ProductFlag> productFlags;
 	public static volatile SingularAttribute<Product, Role> provides;
 	public static volatile ListAttribute<Product, Place> places;
+	public static volatile ListAttribute<Product, ProductLimitation> productLimits;
 	public static volatile ListAttribute<Product, AccountEvent> accountEvents;
 	public static volatile ListAttribute<Product, Discount> discounts;
 	public static volatile SingularAttribute<Product, BigDecimal> vat;
 	public static volatile SingularAttribute<Product, String> unitName;
 	public static volatile ListAttribute<Product, FoodWaveTemplate> foodWaveTemplates;
-	public static volatile ListAttribute<Product, ProductLimitation> productLimits;
 }

code/LanBortalDatabase/src/fi/insomnia/bortal/model/Reader_.java

@@ -6,9 +6,10 @@ import javax.persistence.metamodel.ListAttribute;
 import javax.persistence.metamodel.SingularAttribute;
 import javax.persistence.metamodel.StaticMetamodel;
 
-@Generated(value="Dali", date="2012-10-06T04:04:21.120+0300")
+@Generated(value="Dali", date="2012-10-06T04:12:09.369+0300")
 @StaticMetamodel(Reader.class)
 public class Reader_ extends GenericEntity_ {
+	public static volatile SingularAttribute<Reader, ReaderType> type;
 	public static volatile SingularAttribute<Reader, LanEvent> event;
 	public static volatile SingularAttribute<Reader, Integer> gamepoints;
 	public static volatile SingularAttribute<Reader, Integer> maxEvents;
@@ -20,5 +21,4 @@ public class Reader_ extends GenericEntity_ {
 	public static volatile SingularAttribute<Reader, Integer> mapX;
 	public static volatile SingularAttribute<Reader, Integer> mapY;
 	public static volatile ListAttribute<Reader, ReaderEvent> events;
-	public static volatile SingularAttribute<Reader, ReaderType> type;
 }