asdf

code/moya-web/src/main/java/fi/codecrew/moya/servlet/PlaceMapServlet.java

@@ -46,6 +46,7 @@ import javax.servlet.http.HttpServletResponse;
 
 
 import fi.codecrew.moya.beans.*;
 import fi.codecrew.moya.beans.*;
 import fi.codecrew.moya.model.User;
 import fi.codecrew.moya.model.User;
+import org.primefaces.component.barcode.Barcode;
 import org.slf4j.Logger;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.slf4j.LoggerFactory;
 
 
@@ -77,6 +78,9 @@ public class PlaceMapServlet extends HttpServlet {
 	@EJB
 	@EJB
 	private UserBeanLocal userBean;
 	private UserBeanLocal userBean;
 
 
+	@EJB
+	private BarcodeBeanLocal barcodeBean;
+
 	private static final String PARAMETER_EVENT_MAP_ID = "mapid";
 	private static final String PARAMETER_EVENT_MAP_ID = "mapid";
 	private static final String PARAMETER_USER_ID = "userid";
 	private static final String PARAMETER_USER_ID = "userid";
 	private static final String PARAMETER_TOKEN = "token";
 	private static final String PARAMETER_TOKEN = "token";
@@ -112,6 +116,8 @@ public class PlaceMapServlet extends HttpServlet {
 
 
 			String userToken = request.getParameter(PARAMETER_TOKEN);
 			String userToken = request.getParameter(PARAMETER_TOKEN);
 
 
+
+
 			EventMap map = placeBean.findMap(mapId);
 			EventMap map = placeBean.findMap(mapId);
 			logger.debug("Mapid: {}", mapId);
 			logger.debug("Mapid: {}", mapId);
 			ostream = response.getOutputStream();
 			ostream = response.getOutputStream();
@@ -131,7 +137,7 @@ public class PlaceMapServlet extends HttpServlet {
 					type = splittype[splittype.length-1];
 					type = splittype[splittype.length-1];
 
 
 				response.setContentType(map.getMimeType());
 				response.setContentType(map.getMimeType());
-				printPlaceMapToStream(ostream, type, map,userId);
+				printPlaceMapToStream(ostream, type, map,userId, userToken);
 				logger.debug("Flushing ostream");
 				logger.debug("Flushing ostream");
 				ostream.flush();
 				ostream.flush();
 			}
 			}
@@ -144,7 +150,7 @@ public class PlaceMapServlet extends HttpServlet {
 			response.setStatus(HttpServletResponse.SC_FORBIDDEN);
 			response.setStatus(HttpServletResponse.SC_FORBIDDEN);
 			ostream = response.getOutputStream();
 			ostream = response.getOutputStream();
 			ostream.print("Error 403 \nPermission denied! Please login before accessing resource");
 			ostream.print("Error 403 \nPermission denied! Please login before accessing resource");
-			e.printStackTrace();
+	//		e.printStackTrace();
 
 
 		} finally {
 		} finally {
 			if (ostream != null) {
 			if (ostream != null) {
@@ -153,13 +159,18 @@ public class PlaceMapServlet extends HttpServlet {
 		}
 		}
 	}
 	}
 
 
-	private void printPlaceMapToStream(OutputStream outputStream, String filetype, EventMap map, Integer userid) throws IOException
+	private void printPlaceMapToStream(OutputStream outputStream, String filetype, EventMap map, Integer userid, String userToken) throws IOException
 	{
 	{
 
 
-		if (!permbean.hasPermission(MapPermission.VIEW))
+
+		EventUser user = null;
+		if(userToken != null)
+			user = barcodeBean.getUserFromLongTextCode(userToken);
+
+
+		if (!permbean.hasPermission(MapPermission.VIEW) && user == null)
 		{
 		{
-			loggerbean.sendMessage(MoyaEventType.USER_INSUFFICIENT_PERMISSIONS, permbean.getCurrentUser(),
-					"User tried to print the placemap to stream without sufficient permissions");
+			loggerbean.sendMessage(MoyaEventType.USER_INSUFFICIENT_PERMISSIONS, permbean.getCurrentUser(), "User tried to print the placemap to stream without sufficient permissions");
 			throw new EJBAccessException("Not enough permissions to print placemap");
 			throw new EJBAccessException("Not enough permissions to print placemap");
 		}
 		}
 		long begin = new Date().getTime();
 		long begin = new Date().getTime();
@@ -183,14 +194,20 @@ public class PlaceMapServlet extends HttpServlet {
 
 
 
 
 		if(userid != null && userid != 0) {
 		if(userid != null && userid != 0) {
-			EventUser user = userBean.findByUserId(userid, false);
+			EventUser placesForUser = userBean.findByUserId(userid, false);
 
 
 			if(user != null) {
 			if(user != null) {
-				userplaces = placeBean.findPlacePrintlistForUser(user);
+				userplaces = placeBean.findPlacePrintlistForUser(placesForUser);
 			}
 			}
 		}
 		}
 
 
-		EventUser user = permbean.getCurrentUser();
+		if(user != null) {
+			userplaces = placeBean.findPlacePrintlistForUser(user);
+		}
+
+
+		if(user == null)
+			user = permbean.getCurrentUser();
 		// List<Place> selectedPlaces = placemapBean.findSelectedPlaces(map);
 		// List<Place> selectedPlaces = placemapBean.findSelectedPlaces(map);
 
 
 		BufferedImage image = ImageIO.read(new ByteArrayInputStream(map.getMapData()));
 		BufferedImage image = ImageIO.read(new ByteArrayInputStream(map.getMapData()));

code/moya-web/src/main/java/fi/codecrew/moya/web/cdiview/shop/FoodWaveFoodView.java

@@ -90,11 +90,10 @@ public class FoodWaveFoodView extends GenericCDIView {
 
 
 			foodWave = foodWaveBean.findFoodwave(getFoodwaveid());
 			foodWave = foodWaveBean.findFoodwave(getFoodwaveid());
 			logger.debug("Foodwave {}", foodWave);
 			logger.debug("Foodwave {}", foodWave);
-			shoppingcart = new ListDataModel<ProductShopItem>(ProductShopItem.productGTList(foodWave.getTemplate().getProducts(),  userview.getUser()));
+			shoppingcart = new ListDataModel<ProductShopItem>(ProductShopItem.productGTList(foodWave.getTemplate().getProducts(),  userview.getSelectedUser()));
 			this.beginConversation();
 			this.beginConversation();
 
 
 		}
 		}
-		logger.info("injected user {}", userview.getUser());
 	}
 	}
 
 
 	public ListDataModel<Product> getProducts() {
 	public ListDataModel<Product> getProducts() {