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.SpecialPermission;
 import fi.insomnia.bortal.enums.apps.UserPermission;
 import fi.insomnia.bortal.enums.apps.UserPermission;
 import fi.insomnia.bortal.facade.EventUserFacade;
 import fi.insomnia.bortal.facade.EventUserFacade;
+import fi.insomnia.bortal.facade.FeedbackFacade;
 import fi.insomnia.bortal.facade.GroupMembershipFacade;
 import fi.insomnia.bortal.facade.GroupMembershipFacade;
 import fi.insomnia.bortal.facade.PlaceGroupFacade;
 import fi.insomnia.bortal.facade.PlaceGroupFacade;
 import fi.insomnia.bortal.facade.RoleFacade;
 import fi.insomnia.bortal.facade.RoleFacade;
 import fi.insomnia.bortal.facade.UserFacade;
 import fi.insomnia.bortal.facade.UserFacade;
 import fi.insomnia.bortal.facade.UserImageFacade;
 import fi.insomnia.bortal.facade.UserImageFacade;
 import fi.insomnia.bortal.model.EventUser;
 import fi.insomnia.bortal.model.EventUser;
+import fi.insomnia.bortal.model.Feedback;
 import fi.insomnia.bortal.model.GroupMembership;
 import fi.insomnia.bortal.model.GroupMembership;
 import fi.insomnia.bortal.model.IUser;
 import fi.insomnia.bortal.model.IUser;
 import fi.insomnia.bortal.model.LanEvent;
 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.SearchQuery;
 import fi.insomnia.bortal.utilities.SearchResult;
 import fi.insomnia.bortal.utilities.SearchResult;
 
 
-/**
- * Session Bean implementation class UserBean
- */
 @LocalBean
 @LocalBean
 @Stateless
 @Stateless
 @DeclareRoles({
 @DeclareRoles({
@@ -108,6 +107,8 @@ public class UserBean implements UserBeanLocal {
 	private RoleFacade rolefacade;
 	private RoleFacade rolefacade;
 	@EJB
 	@EJB
 	private PlaceGroupFacade pgfacade;
 	private PlaceGroupFacade pgfacade;
+	@EJB
+	private FeedbackFacade feedbackFacade;
 
 
 	@Override
 	@Override
 	@RolesAllowed(UserPermission.S_VIEW_ALL)
 	@RolesAllowed(UserPermission.S_VIEW_ALL)
@@ -522,8 +523,11 @@ public class UserBean implements UserBeanLocal {
 
 
 	@Override
 	@Override
 	public void submitFeedback(String feedback) {
 	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 java.util.List;
 
 
 import javax.ejb.EJB;
 import javax.ejb.EJB;
+import javax.ejb.LocalBean;
+import javax.ejb.Stateless;
 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;
@@ -12,6 +14,8 @@ import fi.insomnia.bortal.model.EventUser;
 import fi.insomnia.bortal.model.Feedback;
 import fi.insomnia.bortal.model.Feedback;
 import fi.insomnia.bortal.model.Feedback_;
 import fi.insomnia.bortal.model.Feedback_;
 
 
+@Stateless
+@LocalBean
 public class FeedbackFacade extends IntegerPkGenericFacade<Feedback> {
 public class FeedbackFacade extends IntegerPkGenericFacade<Feedback> {
 
 
 	public FeedbackFacade() {
 	public FeedbackFacade() {