pieniaKorjailuja

code/moya-beans/ejbModule/fi/codecrew/moya/facade/PlaceFacade.java

@@ -18,6 +18,7 @@
  */
  */
 package fi.codecrew.moya.facade;
 package fi.codecrew.moya.facade;
 
 
+import java.util.Arrays;
 import java.util.Calendar;
 import java.util.Calendar;
 import java.util.List;
 import java.util.List;
 
 
@@ -28,20 +29,12 @@ import javax.persistence.TypedQuery;
 import javax.persistence.criteria.*;
 import javax.persistence.criteria.*;
 
 
 import fi.codecrew.moya.beans.EventBean;
 import fi.codecrew.moya.beans.EventBean;
+import fi.codecrew.moya.model.*;
 import org.slf4j.Logger;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.slf4j.LoggerFactory;
 
 
 import fi.codecrew.moya.beans.EventBeanLocal;
 import fi.codecrew.moya.beans.EventBeanLocal;
 import fi.codecrew.moya.beans.LoggingBeanLocal;
 import fi.codecrew.moya.beans.LoggingBeanLocal;
-import fi.codecrew.moya.model.EventMap;
-import fi.codecrew.moya.model.EventMap_;
-import fi.codecrew.moya.model.EventUser;
-import fi.codecrew.moya.model.LanEvent;
-import fi.codecrew.moya.model.Place;
-import fi.codecrew.moya.model.PlaceSlot;
-import fi.codecrew.moya.model.Place_;
-import fi.codecrew.moya.model.Product;
-import fi.codecrew.moya.model.Product_;
 import fi.codecrew.moya.utilities.moyamessage.MoyaEventType;
 import fi.codecrew.moya.utilities.moyamessage.MoyaEventType;
 
 
 @Stateless
 @Stateless
@@ -315,7 +308,16 @@ public class PlaceFacade extends IntegerPkGenericFacade<Place> {
 				cb.equal(placeJoin.get(Place_.map).get(EventMap_.event), eventBean.getCurrentEvent())
 				cb.equal(placeJoin.get(Place_.map).get(EventMap_.event), eventBean.getCurrentEvent())
 		);
 		);
 
 
-		cq.where(root.get(Product_.id).in(subq));
+
+		ProductFlag[] flags = {ProductFlag.CREATE_NEW_PLACE_WHEN_BOUGHT};
+
+		cq.where(
+				cb.or(
+						root.get(Product_.id).in(subq),
+						root.get(Product_.productFlags).in(Arrays.asList(flags))
+				),
+				cb.equal(root.get(Product_.event), eventBean.getCurrentEvent())
+		);
 
 
 		cq.orderBy(cb.asc(root.get(Product_.name)));
 		cq.orderBy(cb.asc(root.get(Product_.name)));
 
 

code/moya-web/WebContent/resources/templates/custom_components.css

@@ -196,7 +196,8 @@ a.shopItem:active {
 }
 }
 
 
 .greenBackground {
 .greenBackground {
-	background-color: #006600;
+	background-color: #00AA00;
+	color: #000000;
 }
 }
 
 
 .lectureCalendar,
 .lectureCalendar,