Merge branch 'master' of codecrew.fi:bortal

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

@@ -29,12 +29,14 @@ import org.slf4j.LoggerFactory;
 import fi.insomnia.bortal.enums.apps.SpecialPermission;
 import fi.insomnia.bortal.enums.apps.UserPermission;
 import fi.insomnia.bortal.facade.EventUserFacade;
+import fi.insomnia.bortal.facade.FeedbackFacade;
 import fi.insomnia.bortal.facade.GroupMembershipFacade;
 import fi.insomnia.bortal.facade.PlaceGroupFacade;
 import fi.insomnia.bortal.facade.RoleFacade;
 import fi.insomnia.bortal.facade.UserFacade;
 import fi.insomnia.bortal.facade.UserImageFacade;
 import fi.insomnia.bortal.model.EventUser;
+import fi.insomnia.bortal.model.Feedback;
 import fi.insomnia.bortal.model.GroupMembership;
 import fi.insomnia.bortal.model.IUser;
 import fi.insomnia.bortal.model.LanEvent;
@@ -50,9 +52,6 @@ import fi.insomnia.bortal.utilities.PasswordFunctions;
 import fi.insomnia.bortal.utilities.SearchQuery;
 import fi.insomnia.bortal.utilities.SearchResult;
 
-/**
- * Session Bean implementation class UserBean
- */
 @LocalBean
 @Stateless
 @DeclareRoles({
@@ -108,6 +107,8 @@ public class UserBean implements UserBeanLocal {
 	private RoleFacade rolefacade;
 	@EJB
 	private PlaceGroupFacade pgfacade;
+	@EJB
+	private FeedbackFacade feedbackFacade;
 
 	@Override
 	@RolesAllowed(UserPermission.S_VIEW_ALL)
@@ -522,8 +523,11 @@ public class UserBean implements UserBeanLocal {
 
 	@Override
 	public void submitFeedback(String feedback) {
-		logger.warn("Received feedback {}", feedback);
-		// TODO
+		Feedback fb = new Feedback();
+		fb.setEvent(eventBean.getCurrentEvent());
+		fb.setMessage(feedback);
+		fb.setSender(permbean.getCurrentUser());
+		fb.setTimestamp(Calendar.getInstance());
+		feedbackFacade.create(fb);
 	}
-
 }
\ No newline at end of file

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

@@ -3,6 +3,8 @@ package fi.insomnia.bortal.facade;
 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;
@@ -12,6 +14,8 @@ import fi.insomnia.bortal.model.EventUser;
 import fi.insomnia.bortal.model.Feedback;
 import fi.insomnia.bortal.model.Feedback_;
 
+@Stateless
+@LocalBean
 public class FeedbackFacade extends IntegerPkGenericFacade<Feedback> {
 
 	public FeedbackFacade() {

code/LanBortalWeb/src/fi/insomnia/bortal/web/cdiview/shop/FoodWaveView.java

@@ -67,7 +67,7 @@ public class FoodWaveView extends GenericCDIView {
 
 	private Integer foodWaveId;
 	private ListDataModel<AccountEvent> accountEventLines;
-	private List<FoodWave> foodWaves;
+	private ListDataModel<FoodWave> foodWaves;
 	private static final Logger logger = LoggerFactory.getLogger(FoodWaveView.class);
 
 	public List<Product> getProducts() {
@@ -79,6 +79,11 @@ public class FoodWaveView extends GenericCDIView {
 	public void onEdit() {
 		this.foodWaveBean.saveTemplate(template);
 	}
+	
+	public void onEditFoodWave() {
+		FoodWave fw = foodWaves.getRowData();
+		this.foodWaveBean.merge(fw);
+	}
 
 	public void initTemplateList() {
 		super.requirePermissions(ShopPermission.SHOP_FOODWAVE);
@@ -87,7 +92,11 @@ public class FoodWaveView extends GenericCDIView {
 	public void initFoodwaveManagerList() {
 		if (super.requirePermissions(ShopPermission.MANAGE_FOODWAVES))
 		{
-			foodWaves = foodWaveBean.getEventFoodWaves();
+			if(foodWaves == null) {
+		
+				super.beginConversation();
+				foodWaves = new ListDataModel<FoodWave>(foodWaveBean.getEventFoodWaves());
+			}
 		}
 
 	}
@@ -110,9 +119,9 @@ public class FoodWaveView extends GenericCDIView {
 			if (templateId != null)
 			{
 				template = foodWaveBean.findTemplate(templateId);
-				foodWaves = template.getFoodwaves();
+				foodWaves = new ListDataModel<FoodWave>(template.getFoodwaves());
 			} else {
-				foodWaves = foodWaveBean.getOpenFoodWaves();
+				foodWaves = new ListDataModel<FoodWave>(foodWaveBean.getOpenFoodWaves());
 			}
 			super.beginConversation();
 		}
@@ -236,7 +245,6 @@ public class FoodWaveView extends GenericCDIView {
 		if (getAccountEventLines().isRowAvailable()) {
 			AccountEvent e = getAccountEventLines().getRowData();
 			e = accountEventBean.markDelivered(e, Calendar.getInstance());
-
 			foodWaveId = selectedFoodWave.getId();
 			selectedFoodWave = null;
 			initFoodWaveOrderList();
@@ -334,11 +342,11 @@ public class FoodWaveView extends GenericCDIView {
 		this.billLines = billLines;
 	}
 
-	public void setFoodWaves(List<FoodWave> foodWaves) {
+	public void setFoodWaves(ListDataModel<FoodWave> foodWaves) {
 		this.foodWaves = foodWaves;
 	}
 
-	public List<FoodWave> getFoodWaves() {
+	public ListDataModel<FoodWave> getFoodWaves() {
 		return foodWaves;
 	}