Skip to content

Riina Antikainen / Moya

Go to a project
Commit 0619344e by Antti Jaakkola
Options

Vituttaako list

1 parent 24e605cb
Inline Side-by-side
Showing with 47 additions and 0 deletions
code/MoyaBeans/ejbModule/fi/codecrew/moya/beans/UserBean.java
...@@ -648,6 +648,12 @@ public class UserBean implements UserBeanLocal { ...@@ -648,6 +648,12 @@ public class UserBean implements UserBeanLocal {
} }
@Override @Override
@RolesAllowed(SpecialPermission.S_SUPERADMIN)
public List<Feedback> getFeedbacks() {
return feedbackFacade.findAll();
}
@Override
public UserApproval setUserApproval(EventUser user, String approvalName, boolean approvalValue, String notes) { public UserApproval setUserApproval(EventUser user, String approvalName, boolean approvalValue, String notes) {
Approval approval = approvalFacade.findOrCreate(approvalName); Approval approval = approvalFacade.findOrCreate(approvalName);
UserApproval ret = userApprovalFacade.findOrCreateApproval(user, approval); UserApproval ret = userApprovalFacade.findOrCreateApproval(user, approval);
......
code/MoyaBeansClient/ejbModule/fi/codecrew/moya/beans/UserBeanLocal.java
...@@ -6,6 +6,7 @@ import java.util.List; ...@@ -6,6 +6,7 @@ import java.util.List;
import javax.ejb.Local; import javax.ejb.Local;
import fi.codecrew.moya.model.EventUser; import fi.codecrew.moya.model.EventUser;
import fi.codecrew.moya.model.Feedback;
import fi.codecrew.moya.model.GroupMembership; import fi.codecrew.moya.model.GroupMembership;
import fi.codecrew.moya.model.Role; import fi.codecrew.moya.model.Role;
import fi.codecrew.moya.model.User; import fi.codecrew.moya.model.User;
...@@ -83,6 +84,8 @@ public interface UserBeanLocal { ...@@ -83,6 +84,8 @@ public interface UserBeanLocal {
SearchResult<EventUser> getThisEventsUsers(UserSearchQuery searchQuery); SearchResult<EventUser> getThisEventsUsers(UserSearchQuery searchQuery);
void submitFeedback(String feedback); void submitFeedback(String feedback);
List<Feedback> getFeedbacks();
UserApproval setUserApproval(EventUser user, String approvalName, boolean approvalValue, String notes); UserApproval setUserApproval(EventUser user, String approvalName, boolean approvalValue, String notes);
......
code/MoyaWeb/WebContent/feedback/list.xhtml 0 → 100644
<!DOCTYPE html
PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core"
xmlns:users="http://java.sun.com/jsf/composite/tools/user" xmlns:p="http://primefaces.org/ui" xmlns:c="http://java.sun.com/jsp/jstl/core">
<h:body>
<ui:composition template="#{sessionHandler.template}">
<ui:param name="thispage" value="page.feedback.list" />
<f:metadata>
<f:event type="preRenderView" listener="#{feedbackView.initFeedback}" />
</f:metadata>
<ui:define name="content">
<h1>Avautumiset:</h1>
<p:dataList value="#{feedbackView.feedbacks}" var="feedback">
#{feedback.message}, #{feedback.sender.user.nick}
</p:dataList>
</ui:define>
</ui:composition>
</h:body>
</html>
\ No newline at end of file
code/MoyaWeb/src/fi/codecrew/moya/web/helper/FeedbackView.java
...@@ -2,11 +2,13 @@ package fi.codecrew.moya.web.helper; ...@@ -2,11 +2,13 @@ package fi.codecrew.moya.web.helper;
import javax.ejb.EJB; import javax.ejb.EJB;
import javax.enterprise.context.ConversationScoped; import javax.enterprise.context.ConversationScoped;
import javax.faces.model.ListDataModel;
import javax.inject.Named; import javax.inject.Named;
import fi.codecrew.moya.beans.PermissionBeanLocal; import fi.codecrew.moya.beans.PermissionBeanLocal;
import fi.codecrew.moya.beans.UserBeanLocal; import fi.codecrew.moya.beans.UserBeanLocal;
import fi.codecrew.moya.enums.apps.UserPermission; import fi.codecrew.moya.enums.apps.UserPermission;
import fi.codecrew.moya.model.Feedback;
import fi.codecrew.moya.web.cdiview.GenericCDIView; import fi.codecrew.moya.web.cdiview.GenericCDIView;
@Named @Named
...@@ -19,6 +21,8 @@ public class FeedbackView extends GenericCDIView { ...@@ -19,6 +21,8 @@ public class FeedbackView extends GenericCDIView {
private String feedback; private String feedback;
private transient ListDataModel<Feedback> feedbacks;
public void initFeedback() { public void initFeedback() {
super.beginConversation(); super.beginConversation();
} }
...@@ -39,6 +43,17 @@ public class FeedbackView extends GenericCDIView { ...@@ -39,6 +43,17 @@ public class FeedbackView extends GenericCDIView {
return null; return null;
} }
public ListDataModel<Feedback> getFeedbacks() {
if (feedbacks == null && permissionBean.getCurrentUser().isSuperadmin())
{
feedbacks = new ListDataModel<Feedback>(userbean.getFeedbacks());
}
else {
feedbacks = new ListDataModel<Feedback>();
}
return feedbacks;
}
public String getFeedback() { public String getFeedback() {
return feedback; return feedback;
} }
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!