Skip to content

Riina Antikainen / Moya

Go to a project
Commit 4e99f3db by Tuukka Kivilahti
Options

Merge branch 'devel' of codecrew.fi:bortal into devel

2 parents ae04efd7 70a195da
Inline Side-by-side
Showing with 50 additions and 30 deletions
code/MoyaWeb/WebContent/place/adminGroups.xhtml
<!DOCTYPE html <!DOCTYPE html
PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> "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" <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:c="http://java.sun.com/jsp/jstl/core"
xmlns:h="http://java.sun.com/jsf/html" xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:users="http://java.sun.com/jsf/composite/cditools/user" xmlns:f="http://java.sun.com/jsf/core">
xmlns:users="http://java.sun.com/jsf/composite/cditools/user" xmlns:f="http://java.sun.com/jsf/core"
>
<h:body> <h:body>
<ui:composition template="#{sessionHandler.template}"> <ui:composition template="#{sessionHandler.template}">
<ui:param name="thispage" value="page.place.mygroups" /> <ui:param name="thispage" value="page.place.mygroups" />
...@@ -12,7 +10,7 @@ ...@@ -12,7 +10,7 @@
<f:viewParam name="userid" value="#{userView.userid}" /> <f:viewParam name="userid" value="#{userView.userid}" />
<f:event type="preRenderView" listener="#{userView.initView}" /> <f:event type="preRenderView" listener="#{userView.initView}" />
</f:metadata> </f:metadata>
<ui:define name="title"> <ui:define name="title">
<h1>#{i18n['placegroupview.header']}</h1> <h1>#{i18n['placegroupview.header']}</h1>
<!-- <users:usertabs tabId="groups" /> --> <!-- <users:usertabs tabId="groups" /> -->
...@@ -20,7 +18,7 @@ ...@@ -20,7 +18,7 @@
<ui:define name="edittab"> <ui:define name="edittab">
<users:usertabs tabId="groups" /> <users:usertabs tabId="groups" />
</ui:define> </ui:define>
<ui:define name="content"> <ui:define name="content">
<h:outputText rendered="#{empty placeGroupView.groupMemberships}" value="#{i18n['placegroupview.noMemberships']}" /> <h:outputText rendered="#{empty placeGroupView.groupMemberships}" value="#{i18n['placegroupview.noMemberships']}" />
<h:form rendered="#{!empty placeGroupView.groupMemberships}" id="placelistform"> <h:form rendered="#{!empty placeGroupView.groupMemberships}" id="placelistform">
...@@ -37,43 +35,38 @@ ...@@ -37,43 +35,38 @@
<h:outputText value="#{i18n['placegroupview.token']}" /> <h:outputText value="#{i18n['placegroupview.token']}" />
</f:facet> </f:facet>
<h:outputText rendered="#{empty member.user}" value="#{member.inviteToken}" /> <h:outputText rendered="#{empty member.user}" value="#{member.inviteToken}" />
<h:outputText rendered="#{!empty member.user}" <h:outputText rendered="#{!empty member.user}" value="#{member.user.firstnames} #{member.user.lastname} (#{member.user.nick})" />
value="#{member.user.firstnames} #{member.user.lastname} (#{member.user.nick})"
/>
</h:column> </h:column>
<h:column> <h:column>
<f:facet name="header"> <f:facet name="header">
<h:outputText value="#{i18n['placegroupview.groupCreator']}" /> <h:outputText value="#{i18n['placegroupview.groupCreator']}" />
</f:facet> </f:facet>
<h:outputText <h:outputText value="#{member.placeGroup.creator.firstnames} #{member.placeGroup.creator.lastname} (#{member.placeGroup.creator.nick})" />
value="#{member.placeGroup.creator.firstnames} #{member.placeGroup.creator.lastname} (#{member.placeGroup.creator.nick})"
/>
</h:column> </h:column>
<h:column> <h:column>
<h:commandButton rendered="#{placeGroupView.canModifyCurrent and placeGroupView.currentMemberUserNotNull}" <h:commandButton rendered="#{placeGroupView.canModifyCurrent and placeGroupView.currentMemberUserNotNull}" action="#{placeGroupView.releasePlace()}"
action="#{placeGroupView.releasePlace()}" value="#{i18n['placegroupview.releasePlace']}" value="#{i18n['placegroupview.releasePlace']}" />
/>
</h:column> </h:column>
</h:dataTable> </h:dataTable>
</h:form> </h:form>
<p> <p>
<input type="button" onclick="location.replace('#{request.contextPath}/PlaceGroupPdf');" value="#{i18n['placegroup.printPdf']}" /> <input type="button" onclick="location.replace('#{request.contextPath}/PlaceGroupPdf?eventuserId=#{placeGroupView.user.id}');" value="#{i18n['placegroup.printPdf']}" />
</p> </p>
<h2>#{i18n['placetoken.pageHeader']}</h2> <h2>#{i18n['placetoken.pageHeader']}</h2>
<p>#{i18n['placetoken.topText']}</p> <p>#{i18n['placetoken.topText']}</p>
<h:form id="placeTokenForm"> <h:form id="placeTokenForm">
<h:outputLabel value="#{i18n['placetoken.token']}:" /> <h:outputLabel value="#{i18n['placetoken.token']}:" />
<h:inputText value="#{tokenView.token}" /> <h:inputText value="#{tokenView.token}" />
<h:commandButton id="commitbtn" action="#{tokenView.saveToken()}" value="#{i18n['placetoken.commit']}" /> <h:commandButton id="commitbtn" action="#{tokenView.saveToken()}" value="#{i18n['placetoken.commit']}" />
</h:form> </h:form>
</ui:define> </ui:define>
</ui:composition> </ui:composition>
......
code/MoyaWeb/src/fi/codecrew/moya/servlet/PlaceGroupPdf.java
...@@ -15,6 +15,9 @@ import org.slf4j.LoggerFactory; ...@@ -15,6 +15,9 @@ import org.slf4j.LoggerFactory;
import fi.codecrew.moya.beans.PermissionBeanLocal; import fi.codecrew.moya.beans.PermissionBeanLocal;
import fi.codecrew.moya.beans.PlaceGroupBeanLocal; import fi.codecrew.moya.beans.PlaceGroupBeanLocal;
import fi.codecrew.moya.beans.UserBeanLocal;
import fi.codecrew.moya.enums.apps.UserPermission;
import fi.codecrew.moya.model.EventUser;
/** /**
* Servlet implementation class PlaceGroupPdf * Servlet implementation class PlaceGroupPdf
...@@ -28,6 +31,8 @@ public class PlaceGroupPdf extends HttpServlet { ...@@ -28,6 +31,8 @@ public class PlaceGroupPdf extends HttpServlet {
@EJB @EJB
private transient PermissionBeanLocal permbean; private transient PermissionBeanLocal permbean;
@EJB
private transient UserBeanLocal userbean;
private static final Logger logger = LoggerFactory.getLogger(PlaceGroupPdf.class); private static final Logger logger = LoggerFactory.getLogger(PlaceGroupPdf.class);
/** /**
...@@ -45,12 +50,34 @@ public class PlaceGroupPdf extends HttpServlet { ...@@ -45,12 +50,34 @@ public class PlaceGroupPdf extends HttpServlet {
private void output(HttpServletRequest request, HttpServletResponse response) { private void output(HttpServletRequest request, HttpServletResponse response) {
try { try {
String uid = request.getParameter("eventuserId");
if (!permbean.isLoggedIn()) {
response.sendError(HttpServletResponse.SC_FORBIDDEN);
return;
}
EventUser user = permbean.getCurrentUser();
if (uid != null)
{
Integer uidInt = new Integer(uid);
if (!user.getId().equals(uidInt))
{
if (!permbean.hasPermission(UserPermission.VIEW_ALL))
{
response.sendError(HttpServletResponse.SC_FORBIDDEN);
return;
}
user = userbean.findByEventUserId(uidInt);
}
}
response.setContentType("application/pdf"); response.setContentType("application/pdf");
response.setHeader("Content-Disposition", "filename=Reservations.pdf"); response.setHeader("Content-Disposition", "filename=Reservations.pdf");
ServletOutputStream ostream = response.getOutputStream(); ServletOutputStream ostream = response.getOutputStream();
pgbean.getGroupMembershipPdf(permbean.getCurrentUser(), ostream); pgbean.getGroupMembershipPdf(user, ostream);
// ByteArrayOutputStream billstream = new ByteArrayOutputStream(); // ByteArrayOutputStream billstream = new ByteArrayOutputStream();
// billentity.getPdfBillStream(bill, billstream); // billentity.getPdfBillStream(bill, billstream);
......
code/MoyaWeb/src/fi/codecrew/moya/servlet/PlaceMap.java
...@@ -251,18 +251,18 @@ public class PlaceMap extends HttpServlet { ...@@ -251,18 +251,18 @@ public class PlaceMap extends HttpServlet {
} }
if (p.isReservedFor(user)) { if (p.isReservedFor(user)) {
logger.debug("Setting place selected {}", p); // logger.debug("Setting place selected {}", p);
color = SELECTED_COLOR; color = SELECTED_COLOR;
} else if (user.equals(p.getCurrentUser()) } else if (user.equals(p.getCurrentUser())
|| (p.getGroup() != null && user.equals(p.getGroup().getCreator())) || (p.getGroup() != null && user.equals(p.getGroup().getCreator()))
|| (p.getPlaceReserver() != null && user.equals(p || (p.getPlaceReserver() != null && user.equals(p
.getPlaceReserver().getUser()))) { .getPlaceReserver().getUser()))) {
color = OWNED_COLOR; color = OWNED_COLOR;
logger.debug("Setting place owned {}", p); // logger.debug("Setting place owned {}", p);
} else if (p.isTaken()) { } else if (p.isTaken()) {
color = RESERVED_COLOR; color = RESERVED_COLOR;
logger.debug("Setting place Reserved {}", p); // logger.debug("Setting place Reserved {}", p);
} else if (p.getProduct().getColor() != null && !p.getProduct().getColor().isEmpty()) { } else if (p.getProduct().getColor() != null && !p.getProduct().getColor().isEmpty()) {
...@@ -281,7 +281,7 @@ public class PlaceMap extends HttpServlet { ...@@ -281,7 +281,7 @@ public class PlaceMap extends HttpServlet {
.getHeight())); .getHeight()));
if (color != null) { if (color != null) {
logger.debug("Setting fill color: {} for p", color, p); //logger.debug("Setting fill color: {} for p", color, p);
g.setColor(color); g.setColor(color);
g.fill(new Rectangle(p.getMapX() + BORDER_WIDTH, p.getMapY() g.fill(new Rectangle(p.getMapX() + BORDER_WIDTH, p.getMapY()
+ BORDER_WIDTH, p.getWidth() - BORDER_WIDTH, p.getHeight() + BORDER_WIDTH, p.getWidth() - BORDER_WIDTH, p.getHeight()
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!