Skip to content

Riina Antikainen / Moya

Go to a project
Commit 1aa69f6c by Tuukka Kivilahti
Options

moar of info

1 parent 17b2ebee
Inline Side-by-side
Showing with 307 additions and 203 deletions
code/MoyaBeans/ejbModule/fi/codecrew/moya/beans/CardTemplateBean.java
...@@ -32,6 +32,7 @@ import fi.codecrew.moya.model.CardObjectData; ...@@ -32,6 +32,7 @@ import fi.codecrew.moya.model.CardObjectData;
import fi.codecrew.moya.model.CardTemplate; import fi.codecrew.moya.model.CardTemplate;
import fi.codecrew.moya.model.CardTextData; import fi.codecrew.moya.model.CardTextData;
import fi.codecrew.moya.model.EventUser; import fi.codecrew.moya.model.EventUser;
import fi.codecrew.moya.model.GroupMembership;
import fi.codecrew.moya.model.LanEvent; import fi.codecrew.moya.model.LanEvent;
import fi.codecrew.moya.model.LanEventProperty; import fi.codecrew.moya.model.LanEventProperty;
import fi.codecrew.moya.model.LanEventPropertyKey; import fi.codecrew.moya.model.LanEventPropertyKey;
...@@ -81,10 +82,12 @@ public class CardTemplateBean implements CardTemplateBeanLocal { ...@@ -81,10 +82,12 @@ public class CardTemplateBean implements CardTemplateBeanLocal {
@EJB @EJB
private CardTextDataFacade ctdFacade; private CardTextDataFacade ctdFacade;
@EJB @EJB
private CardObjectDataFacade codFacade; private CardObjectDataFacade codFacade;
// @Override // @Override
// @RolesAllowed("USER_MANAGEMENT/WRITE") // @RolesAllowed("USER_MANAGEMENT/WRITE")
// public List<CardTemplate> findAll() { // public List<CardTemplate> findAll() {
...@@ -109,13 +112,13 @@ public class CardTemplateBean implements CardTemplateBeanLocal { ...@@ -109,13 +112,13 @@ public class CardTemplateBean implements CardTemplateBeanLocal {
public CardTemplate find(Integer id) { public CardTemplate find(Integer id) {
return cdFacade.find(id); return cdFacade.find(id);
} }
@Override @Override
@RolesAllowed(UserPermission.S_WRITE_ROLES) @RolesAllowed(UserPermission.S_WRITE_ROLES)
public CardTextData findTextData(Integer id) { public CardTextData findTextData(Integer id) {
return ctdFacade.find(id); return ctdFacade.find(id);
} }
@Override @Override
@RolesAllowed(UserPermission.S_WRITE_ROLES) @RolesAllowed(UserPermission.S_WRITE_ROLES)
public CardObjectData findObjectData(Integer id) { public CardObjectData findObjectData(Integer id) {
...@@ -195,9 +198,9 @@ public class CardTemplateBean implements CardTemplateBeanLocal { ...@@ -195,9 +198,9 @@ public class CardTemplateBean implements CardTemplateBeanLocal {
msg.setMessage("User ", user.getUser().getLogin(), "has too powerful card!\nCurrent power ", existingPower, ". Should be ", newPower, ". Card replaced with less power.\n\n-- \nLippukauppa"); msg.setMessage("User ", user.getUser().getLogin(), "has too powerful card!\nCurrent power ", existingPower, ". Should be ", newPower, ". Card replaced with less power.\n\n-- \nLippukauppa");
mailbean.sendMail(msg); mailbean.sendMail(msg);
} }
logger.info("User {} has too much power old role {} New role {}, old card revoked.", new Object[] { user.getUser().getLogin(), existingPower, newPower }); logger.info("User {} has too much power old role {} New role {}, old card revoked.", new Object[] { user.getUser().getLogin(), existingPower, newPower });
biggestCard.setEnabled(false); biggestCard.setEnabled(false);
return this.checkPrintedCard(user); return this.checkPrintedCard(user);
} else { } else {
...@@ -248,38 +251,38 @@ public class CardTemplateBean implements CardTemplateBeanLocal { ...@@ -248,38 +251,38 @@ public class CardTemplateBean implements CardTemplateBeanLocal {
public List<CardTextData> findCardTextDatas(CardTemplate template) { public List<CardTextData> findCardTextDatas(CardTemplate template) {
return this.ctdFacade.findAll(template); return this.ctdFacade.findAll(template);
} }
@Override @Override
@RolesAllowed(UserPermission.S_WRITE_ROLES) @RolesAllowed(UserPermission.S_WRITE_ROLES)
public List<CardObjectData> findCardObjectDatas(CardTemplate template) { public List<CardObjectData> findCardObjectDatas(CardTemplate template) {
return this.codFacade.findAll(template); return this.codFacade.findAll(template);
} }
@RolesAllowed(UserPermission.S_WRITE_ROLES) @RolesAllowed(UserPermission.S_WRITE_ROLES)
@Override @Override
public CardTemplate save(CardTemplate card) { public CardTemplate save(CardTemplate card) {
return cdFacade.merge(card); return cdFacade.merge(card);
} }
@RolesAllowed(UserPermission.S_WRITE_ROLES) @RolesAllowed(UserPermission.S_WRITE_ROLES)
@Override @Override
public CardTextData save(CardTextData textData) { public CardTextData save(CardTextData textData) {
if(textData.getId() != null && textData.getId() != 0) if (textData.getId() != null && textData.getId() != 0)
return ctdFacade.merge(textData); return ctdFacade.merge(textData);
else else
return ctdFacade.create(textData); return ctdFacade.create(textData);
} }
@RolesAllowed(UserPermission.S_WRITE_ROLES) @RolesAllowed(UserPermission.S_WRITE_ROLES)
@Override @Override
public CardObjectData save(CardObjectData objectData) { public CardObjectData save(CardObjectData objectData) {
if(objectData.getId() != null && objectData.getId() != 0 ) if (objectData.getId() != null && objectData.getId() != 0)
return codFacade.merge(objectData); return codFacade.merge(objectData);
else else
return codFacade.create(objectData); return codFacade.create(objectData);
} }
@Override @Override
public PrintedCard getCard(Integer id) { public PrintedCard getCard(Integer id) {
return printedcardfacade.find(id); return printedcardfacade.find(id);
...@@ -350,4 +353,25 @@ public class CardTemplateBean implements CardTemplateBeanLocal { ...@@ -350,4 +353,25 @@ public class CardTemplateBean implements CardTemplateBeanLocal {
return card; return card;
} }
@Override
public EventUser giveCard(EventUser user, boolean markUserPlacesDelivered) {
PrintedCard card = checkPrintedCard(user);
if (card.getCardState() != CardState.DELIVERED) {
card.setCardState(CardState.DELIVERED);
card = printedcardfacade.merge(card);
}
if (markUserPlacesDelivered) {
for (GroupMembership membership : gmFacade.findMemberships(user)) {
membership.setEnteredEvent(Calendar.getInstance());
membership = gmFacade.merge(membership);
}
}
return eventUserFacade.reload(user);
}
} }
code/MoyaBeans/ejbModule/fi/codecrew/moya/beans/PlaceGroupBean.java
...@@ -267,7 +267,13 @@ public class PlaceGroupBean implements PlaceGroupBeanLocal { ...@@ -267,7 +267,13 @@ public class PlaceGroupBean implements PlaceGroupBeanLocal {
@Override @Override
@RolesAllowed({ SpecialPermission.S_USER, MapPermission.S_MANAGE_MAPS }) @RolesAllowed({ SpecialPermission.S_USER, MapPermission.S_MANAGE_MAPS })
public void releaseAndGenerateToken(GroupMembership gmem) { public void releaseAndGenerateToken(GroupMembership gmem) {
if(gmem.getEnteredEvent() != null && !permbean.hasPermission(MapPermission.MANAGE_OTHERS)) {
throw new EJBAccessException("Token already entered to event, Not enough rights to release token.");
}
gmem = gmemfacade.reload(gmem); gmem = gmemfacade.reload(gmem);
if (!(permbean.getCurrentUser().getId().equals(gmem.getPlaceGroup().getCreator().getId()) || permbean.hasPermission(MapPermission.MANAGE_OTHERS))) { if (!(permbean.getCurrentUser().getId().equals(gmem.getPlaceGroup().getCreator().getId()) || permbean.hasPermission(MapPermission.MANAGE_OTHERS))) {
loggerbean.logMessage(SecurityLogType.permissionDenied, permbean.getCurrentUser(), "User tried to release and generate group membership: " + gmem); loggerbean.logMessage(SecurityLogType.permissionDenied, permbean.getCurrentUser(), "User tried to release and generate group membership: " + gmem);
throw new EJBAccessException("Not enough rights to release token"); throw new EJBAccessException("Not enough rights to release token");
......
code/MoyaBeans/ejbModule/fi/codecrew/moya/beans/ReaderBean.java
...@@ -173,7 +173,7 @@ public class ReaderBean implements ReaderBeanLocal { ...@@ -173,7 +173,7 @@ public class ReaderBean implements ReaderBeanLocal {
@Override @Override
public ReaderEvent assocCodeToCard(ReaderEvent readerEvent, PrintedCard card) { public ReaderEvent assocCodeToCard(ReaderEvent readerEvent, PrintedCard card) {
CardCode code = new CardCode(card, readerEvent.getReader().getType(), readerEvent.getValue()); CardCode code = new CardCode(card, readerEvent.getReader().getType(), readerEvent.getValue(), eventbean.getCurrentEvent());
code = cardCodeFacade.create(code); code = cardCodeFacade.create(code);
card = cardfacade.reload(card); card = cardfacade.reload(card);
......
code/MoyaBeans/ejbModule/fi/codecrew/moya/beans/UserBean.java
...@@ -46,6 +46,7 @@ import fi.codecrew.moya.facade.FeedbackFacade; ...@@ -46,6 +46,7 @@ import fi.codecrew.moya.facade.FeedbackFacade;
import fi.codecrew.moya.facade.GameIDFacade; import fi.codecrew.moya.facade.GameIDFacade;
import fi.codecrew.moya.facade.GroupMembershipFacade; import fi.codecrew.moya.facade.GroupMembershipFacade;
import fi.codecrew.moya.facade.PlaceGroupFacade; import fi.codecrew.moya.facade.PlaceGroupFacade;
import fi.codecrew.moya.facade.PrintedCardFacade;
import fi.codecrew.moya.facade.ProductFacade; import fi.codecrew.moya.facade.ProductFacade;
import fi.codecrew.moya.facade.RoleFacade; import fi.codecrew.moya.facade.RoleFacade;
import fi.codecrew.moya.facade.UserApprovalFacade; import fi.codecrew.moya.facade.UserApprovalFacade;
...@@ -125,6 +126,10 @@ public class UserBean implements UserBeanLocal { ...@@ -125,6 +126,10 @@ public class UserBean implements UserBeanLocal {
@EJB @EJB
private UserImageFacade imagefacade; private UserImageFacade imagefacade;
// changed bean to this bcause of loop
@EJB
private PrintedCardFacade printedcardfacade;
@EJB @EJB
private LoggingBeanLocal loggerbean; private LoggingBeanLocal loggerbean;
...@@ -150,8 +155,7 @@ public class UserBean implements UserBeanLocal { ...@@ -150,8 +155,7 @@ public class UserBean implements UserBeanLocal {
private EventFacade eventfacade; private EventFacade eventfacade;
@EJB @EJB
private ProductFacade productFacade; private ProductFacade productFacade;
@EJB
private CardTemplateBeanLocal cardTemplateBean;
@Override @Override
@RolesAllowed(UserPermission.S_VIEW_ALL) @RolesAllowed(UserPermission.S_VIEW_ALL)
...@@ -477,7 +481,7 @@ public class UserBean implements UserBeanLocal { ...@@ -477,7 +481,7 @@ public class UserBean implements UserBeanLocal {
if(card != null) { if(card != null) {
card.setCardState(CardState.REJECTED); card.setCardState(CardState.REJECTED);
card = cardTemplateBean.saveCard(card); card = printedcardfacade.merge(card);
logger.info("rejectPrintedCard(): Rejected card {}, state {}", card, card.getCardState() ); logger.info("rejectPrintedCard(): Rejected card {}, state {}", card, card.getCardState() );
User user = null; User user = null;
......
code/MoyaBeansClient/ejbModule/fi/codecrew/moya/beans/CardTemplateBeanLocal.java
...@@ -60,5 +60,7 @@ public interface CardTemplateBeanLocal extends EntityFinderBean<CardTemplate> { ...@@ -60,5 +60,7 @@ public interface CardTemplateBeanLocal extends EntityFinderBean<CardTemplate> {
List<PrintedCard> getCardsByState(CardState... pendingPrint); List<PrintedCard> getCardsByState(CardState... pendingPrint);
PrintedCard setCardState(Integer cardId, CardState printed) throws Exception; PrintedCard setCardState(Integer cardId, CardState printed) throws Exception;
EventUser giveCard(EventUser user, boolean markUserPlacesDelivered);
} }
code/MoyaDatabase/src/fi/codecrew/moya/model/CardCode.java
...@@ -25,10 +25,11 @@ public class CardCode extends GenericEntity { ...@@ -25,10 +25,11 @@ public class CardCode extends GenericEntity {
@JoinColumn(name = "printed_cards_id") @JoinColumn(name = "printed_cards_id")
private PrintedCard printedCard; private PrintedCard printedCard;
public CardCode(PrintedCard card, ReaderType type, String code) { public CardCode(PrintedCard card, ReaderType type, String code, LanEvent event) {
this.printedCard = card; this.printedCard = card;
this.type = type; this.type = type;
this.code = code; this.code = code;
this.event = event;
} }
public CardCode() { public CardCode() {
......
code/MoyaDatabase/src/fi/codecrew/moya/model/GroupMembership.java
...@@ -4,6 +4,7 @@ ...@@ -4,6 +4,7 @@
*/ */
package fi.codecrew.moya.model; package fi.codecrew.moya.model;
import java.beans.Transient;
import java.util.Calendar; import java.util.Calendar;
import javax.persistence.CascadeType; import javax.persistence.CascadeType;
......
code/MoyaUtilities/src/main/java/fi/codecrew/moya/enums/CardState.java
...@@ -9,7 +9,8 @@ public enum CardState { ...@@ -9,7 +9,8 @@ public enum CardState {
REJECTED, REJECTED,
VALIDATED, VALIDATED,
PRINTING_IN_PROGRESS, PRINTING_IN_PROGRESS,
PRINTED; PRINTED,
DELIVERED;
public String toStringLower() { public String toStringLower() {
return this.toString().toLowerCase(); return this.toString().toLowerCase();
......
code/MoyaWeb/WebContent/info/incoming.xhtml
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
<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:c="http://java.sun.com/jsp/jstl/core" xmlns:p="http://primefaces.org/ui" xmlns:shop="http://java.sun.com/jsf/composite/cditools/shop" xmlns:reader="http://java.sun.com/jsf/composite/cditools/reader" <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:c="http://java.sun.com/jsp/jstl/core" xmlns:p="http://primefaces.org/ui" xmlns:shop="http://java.sun.com/jsf/composite/cditools/shop" xmlns:reader="http://java.sun.com/jsf/composite/cditools/reader"
xmlns:tools="http://java.sun.com/jsf/composite/cditools" xmlns:user="http://java.sun.com/jsf/composite/cditools/user" xmlns:infoview="http://java.sun.com/jsf/composite/cditools/infoview"> xmlns:tools="http://java.sun.com/jsf/composite/cditools" xmlns:user="http://java.sun.com/jsf/composite/cditools/user" xmlns:infoview="http://java.sun.com/jsf/composite/cditools/infoview">
<h:body> <h:body>
<ui:composition template="/resources/templates/#{sessionHandler.fullscreen}/template.xhtml"> <ui:composition template="/resources/templates/#{sessionHandler.infoscreen}/template.xhtml">
<f:metadata> <f:metadata>
<f:viewParam name="userid" value="#{userView.userid}" /> <f:viewParam name="userid" value="#{userView.userid}" />
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
</f:metadata> </f:metadata>
<ui:define name="content"> <ui:define name="content">
<!-- <!--
<h1>#{i18n['incomingflow.search']}</h1> <h1>#{i18n['incomingflow.search']}</h1>
<h:form> <h:form>
<h:panelGrid columns="2" > <h:panelGrid columns="2" >
...@@ -31,6 +31,10 @@ ...@@ -31,6 +31,10 @@
yhtäsuurimerkit --> yhtäsuurimerkit -->
<reader:backendReader selectvalue="#{i18n['barcodeReader.readBarcode']}" selectaction="#{incomingView.polledRead}" /> <reader:backendReader selectvalue="#{i18n['barcodeReader.readBarcode']}" selectaction="#{incomingView.polledRead}" />
<h:form> <h:form>
<p:autoComplete id="acsb" value="#{infoView.multiSearchUser}" completeMethod="#{infoView.matchMulti}" converter="#{eventUserConverter}" var="usrx" itemLabel="#{usrx.shortUserDescriptor}" itemValue="#{usrx}"> <p:autoComplete id="acsb" value="#{infoView.multiSearchUser}" completeMethod="#{infoView.matchMulti}" converter="#{eventUserConverter}" var="usrx" itemLabel="#{usrx.shortUserDescriptor}" itemValue="#{usrx}">
...@@ -38,8 +42,21 @@ ...@@ -38,8 +42,21 @@
</p:autoComplete> </p:autoComplete>
</h:form> </h:form>
<h:form>
<p:poll update="attachBarcode" interval="2" ignoreAutoUpdate="true" />
<h:panelGroup id="attachBarcode">
<h:panelGroup rendered="#{incomingView.showAttachDialog}">
<h1>#{i18n['incomingView.attachDialogTitle']}</h1>
<p:commandButton value="#{i18n['incomingView.attach']}" action="#{incomingView.attachCodeToCard}" update="@all" />
<p:commandButton value="#{i18n['incomingView.cancel']}" action="#{incomingView.hideAttachDialog}" update="@all" />
</h:panelGroup>
</h:panelGroup>
</h:form>
<!-- infoviilausta, kauppa infoon --> <!-- infoviilausta, kauppa infoon -->
<h:outputScript library="primefaces" name="jquery/jquery.js" target="head" /> <h:outputScript library="primefaces" name="jquery/jquery.js" target="head" />
<h1>#{i18n['incomingflow.userdetails']}</h1> <h1>#{i18n['incomingflow.userdetails']}</h1>
...@@ -47,20 +64,20 @@ ...@@ -47,20 +64,20 @@
<h:panelGrid id="cropper" columns="3"> <h:panelGrid id="cropper" columns="3">
<h:panelGroup> <h:panelGroup>
<user:edit id="usereditor" commitaction="#{incomingView.saveUser()}" commitvalue="#{i18n['user.save']}" camAlwaysOn="true" /> <user:edit id="usereditor" commitaction="#{incomingView.saveUser()}" commitvalue="#{i18n['user.save']}" camAlwaysOn="true" photocamupdate="@all" />
</h:panelGroup> </h:panelGroup>
<h:panelGroup> <h:panelGroup>
<h:form id="imgCropperForm" rendered="#{!empty userView.user.currentImage}"> <h:form id="imgCropperForm" rendered="#{!empty userView.selectedUser.currentImage}">
<p:commandButton value="#{i18n['user.imageCropRefresh']}" ajax="false" update="imgCropperForm" /> <p:commandButton value="#{i18n['user.imageCropRefresh']}" ajax="false" update="imgCropperForm" />
<h:outputLabel value="#{i18n['user.cropUserImage']}:" /> <h:outputLabel value="#{i18n['user.cropUserImage']}:" />
<p:imageCropper id="imgCropper" value="#{userView.croppedImage}" aspectRatio="0.7317073170731707" image="/dydata/userimage/#{userView.user.currentImage.id}.img" /> <p:imageCropper id="imgCropper" value="#{userView.croppedImage}" aspectRatio="0.7317073170731707" image="/dydata/userimage/#{userView.selectedUser.currentImage.id}.img" />
<br /> <br />
<h:commandButton action="#{userView.crop}" value="#{i18n['user.cropImage']}" /> <h:commandButton action="#{userView.crop}" value="#{i18n['user.cropImage']}" />
</h:form> </h:form>
</h:panelGroup> </h:panelGroup>
<h:panelGroup> <h:panelGroup>
<h:form> <h:form>
<p:graphicImage url="/dydata/usercard/#{userView.user.user.id}.png" width="300" /> <p:graphicImage url="/dydata/usercard/#{userView.selectedUser.user.id}.png" width="300" />
<br /> <br />
<h:commandButton action="#{incomingView.printCard}" value="#{i18n['print']}" /> (status: #{incomingView.printedStatus}) <h:commandButton action="#{incomingView.printCard}" value="#{i18n['print']}" /> (status: #{incomingView.printedStatus})
</h:form> </h:form>
......
code/MoyaWeb/WebContent/info/index.xhtml
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
xmlns:tools="http://java.sun.com/jsf/composite/cditools"> xmlns:tools="http://java.sun.com/jsf/composite/cditools">
<h:body> <h:body>
<ui:composition <ui:composition
template="/resources/templates/#{sessionHandler.fullscreen}/template.xhtml"> template="/resources/templates/#{sessionHandler.infoscreen}/template.xhtml">
<f:metadata> <f:metadata>
<f:event type="preRenderView" listener="#{incomingView.initView}" /> <f:event type="preRenderView" listener="#{incomingView.initView}" />
......
code/MoyaWeb/WebContent/info/shop.xhtml
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
xmlns:shop="http://java.sun.com/jsf/composite/cditools/shop" xmlns:shop="http://java.sun.com/jsf/composite/cditools/shop"
> >
<h:body> <h:body>
<ui:composition template="/resources/templates/#{sessionHandler.fullscreen}/template.xhtml"> <ui:composition template="/resources/templates/#{sessionHandler.infoscreen}/template.xhtml">
<f:metadata> <f:metadata>
<f:viewParam name="userid" value="#{flowShopView.userId}" /> <f:viewParam name="userid" value="#{flowShopView.userId}" />
......
code/MoyaWeb/WebContent/place/myGroups.xhtml
...@@ -49,7 +49,7 @@ ...@@ -49,7 +49,7 @@
</p:column> </p:column>
<p:column> <p:column>
<h:commandButton rendered="#{placeGroupView.canModifyCurrent and placeGroupView.currentMemberUserNotNull}" action="#{placeGroupView.releasePlace()}" value="#{i18n['placegroupview.releasePlace']}" /> <h:commandButton rendered="#{placeGroupView.canModifyCurrent and placeGroupView.currentMemberUserNotNull and placeGroupView.currentReleaseAllowed}" action="#{placeGroupView.releasePlace()}" value="#{i18n['placegroupview.releasePlace']}" />
</p:column> </p:column>
</p:dataTable> </p:dataTable>
......
code/MoyaWeb/WebContent/resources/cditools/reader/backendReader.xhtml
...@@ -25,7 +25,7 @@ xmlns:reader="http://java.sun.com/jsf/composite/cditools/reader" ...@@ -25,7 +25,7 @@ xmlns:reader="http://java.sun.com/jsf/composite/cditools/reader"
<h:form id="autopoller"> <h:form id="autopoller">
<h:panelGroup id="reader_autopoll"> <h:panelGroup id="reader_autopoll">
<p:poll rendered="#{readerView.pollingMode}" interval="1" listener="#{cc.attrs.selectaction}" onerror="location.reload();" /> <p:poll rendered="#{readerView.pollingMode}" interval="2" listener="#{cc.attrs.selectaction}" onerror="location.reload();" />
</h:panelGroup> </h:panelGroup>
......
code/MoyaWeb/WebContent/resources/cditools/user/create.xhtml
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
<h:panelGrid columns="2"> <h:panelGrid columns="2">
<h:panelGroup> <h:panelGroup>
<ui:fragment rendered="#{not empty userView.user.id}"> <ui:fragment rendered="#{not empty userView.selectedUser.id}">
<p:overlayPanel id="chartPanel" for="webcamButton" hideEffect="fade"> <p:overlayPanel id="chartPanel" for="webcamButton" hideEffect="fade">
...@@ -33,9 +33,9 @@ ...@@ -33,9 +33,9 @@
<p:commandButton type="button" value="Capture" onclick="PF('pc').capture()" onerror="location.reload(true);" /> <p:commandButton type="button" value="Capture" onclick="PF('pc').capture()" onerror="location.reload(true);" />
</p:overlayPanel> </p:overlayPanel>
<h:outputText rendered="#{empty userView.user.currentImage}" value="#{i18n['user.noCurrentImage']}" /> <h:outputText rendered="#{empty userView.selectedUser.currentImage}" value="#{i18n['user.noCurrentImage']}" />
<ui:fragment rendered="#{!empty userView.user.currentImage}"> <ui:fragment rendered="#{!empty userView.selectedUser.currentImage}">
<img style="width: 150px;" src="#{request.contextPath}/dydata/userimage/#{userView.user.currentImage.id}.img" alt="image" /> <img style="width: 150px;" src="#{request.contextPath}/dydata/userimage/#{userView.selectedUser.currentImage.id}.img" alt="image" />
</ui:fragment> </ui:fragment>
<br /> <br />
<p:commandButton id="webcamButton" value="#{i18n['userimage.webcam']}" onerror="location.reload(true);" type="button" /> <p:commandButton id="webcamButton" value="#{i18n['userimage.webcam']}" onerror="location.reload(true);" type="button" />
......
code/MoyaWeb/WebContent/resources/cditools/user/edit.xhtml
...@@ -21,16 +21,16 @@ ...@@ -21,16 +21,16 @@
<h:form id="userform" enctype="multipart/form-data"> <h:form id="userform" enctype="multipart/form-data">
<h:panelGroup> <h:panelGroup>
<ui:fragment rendered="#{not empty userView.user.id}"> <ui:fragment rendered="#{not empty userView.selectedUser.id}">
<p:dialog id="chartPanel" for="webcamButton" modal="true" dynamic="true" widgetVar="webcamDialog"> <p:dialog id="chartPanel" for="webcamButton" modal="true" dynamic="true" widgetVar="webcamDialog">
<p:photoCam widgetVar="pc" listener="#{userView.oncapture}" update="@all" /> <p:photoCam widgetVar="pc" listener="#{userView.oncapture}" update="@all" />
<p:commandButton type="button" value="Capture" onclick="PF('pc').capture()" onerror="location.reload(true);"/> <p:commandButton type="button" value="Capture" onclick="PF('pc').capture()" onerror="location.reload(true);"/>
</p:dialog> </p:dialog>
<h:outputText rendered="#{empty userView.user.currentImage}" value="#{i18n['user.noCurrentImage']}" /> <h:outputText rendered="#{empty userView.selectedUser.currentImage}" value="#{i18n['user.noCurrentImage']}" />
<ui:fragment rendered="#{!empty userView.user.currentImage}"> <ui:fragment rendered="#{!empty userView.selectedUser.currentImage}">
<img style="width: 150px;" src="#{request.contextPath}/dydata/userimage/#{userView.user.currentImage.id}.img" alt="image" /> <img style="width: 150px;" src="#{request.contextPath}/dydata/userimage/#{userView.selectedUser.currentImage.id}.img" alt="image" />
</ui:fragment> </ui:fragment>
<br /> <br />
<p:commandButton onerror="location.reload(true);" rendered="#{!cc.attrs.camAlwaysOn}" id="webcamButton" value="#{i18n['userimage.webcam']}" onclick="PF('webcamDialog').show()" type="button" /> <p:commandButton onerror="location.reload(true);" rendered="#{!cc.attrs.camAlwaysOn}" id="webcamButton" value="#{i18n['userimage.webcam']}" onclick="PF('webcamDialog').show()" type="button" />
...@@ -38,9 +38,8 @@ ...@@ -38,9 +38,8 @@
<br /> <br />
<br /> <br />
<ui:fragment rendered="#{cc.attrs.camAlwaysOn}"> <ui:fragment rendered="#{cc.attrs.camAlwaysOn}">
photoupdate: #{cc.attrs.photocamupdate}
<p:photoCam widgetVar="pc" listener="#{userView.oncapture}" update="#{cc.attrs.photocamupdate}" /> <p:photoCam widgetVar="pc" listener="#{userView.oncapture}" update="#{cc.attrs.photocamupdate}" />
<p:commandButton type="button" value="Capture" onclick="PF('pc').capture()" onerror="location.reload(true);" /> <p:commandButton type="button" value="Capture" onclick="PF('pc').capture()" onerror="location.reload(true);" update="#{cc.attrs.photocamupdate}" />
</ui:fragment> </ui:fragment>
<!-- --> <!-- -->
&nbsp; &nbsp;
......
code/MoyaWeb/WebContent/resources/templates/infoview/template.xhtml
...@@ -38,7 +38,7 @@ ...@@ -38,7 +38,7 @@
</h1> </h1>
</ui:fragment> </ui:fragment>
</c:otherwise> </c:otherwise>
</c:choose> </c:choose>
</h:link> </h:link>
<div class="topmenu"> <div class="topmenu">
...@@ -57,14 +57,21 @@ ...@@ -57,14 +57,21 @@
<div class="container top"> <div class="container top">
<ui:insert name="topbar" /> <ui:insert name="topbar" />
<p:messages showDetail="false" autoUpdate="true" /> <h:form id="dialogs">
<p:confirmDialog id="confirmDialog" global="true" showEffect="fade" hideEffect="explode">
<p:commandButton value="Yes" type="button" styleClass="ui-confirmdialog-yes" icon="ui-icon-check" />
<p:commandButton value="No" type="button" styleClass="ui-confirmdialog-no" icon="ui-icon-close" />
</p:confirmDialog>
<p:growl id="growl" showDetail="true" sticky="true" autoUpdate="true" />
</h:form>
</div> </div>
<div class="clearfix"></div> <div class="clearfix"></div>
<div> <div>
<ui:insert name="content" /> <ui:insert name="content" />
</div> </div>
</h:body> </h:body>
......
code/MoyaWeb/src/fi/codecrew/moya/resources/i18n.properties
...@@ -160,7 +160,13 @@ global.save = Save ...@@ -160,7 +160,13 @@ global.save = Save
httpsession.creationTime = Created httpsession.creationTime = Created
incomingflow.giveplace = Merkitse annetuksi incomingflow.alreadyShowingUser.message = Piipattu k\u00E4ytt\u00E4j\u00E4 on jo n\u00E4kyviss\u00E4
incomingflow.alreadyShowingUser.title = Valmiiksi valittu
incomingflow.codeattached.message = Piipattu koodi liitetty n\u00E4ytett\u00E4v\u00E4\u00E4n korttiin
incomingflow.codeattached.title = Koodi liittetty
incomingflow.giveplace = Merkitse annetuksi
incomingflow.invalidbarcode.message = Viivakoodilla ei l\u00F6ytynyt mit\u00E4\u00E4n
incomingflow.invalidbarcode.title = virheellinen koodi
lanEventPrivateProperty.defaultValue = Default value lanEventPrivateProperty.defaultValue = Default value
lanEventPrivateProperty.editProperty = Edit property lanEventPrivateProperty.editProperty = Edit property
...@@ -232,17 +238,17 @@ resetMail.username = Username ...@@ -232,17 +238,17 @@ resetMail.username = Username
resetmailSent.body = Email has been sent containing a link where you can change the password. resetmailSent.body = Email has been sent containing a link where you can change the password.
resetmailSent.header = Email sent resetmailSent.header = Email sent
submenu.NotImplementedYet = Not implemented submenu.NotImplementedYet = Not implemented
submenu.admin.adduser = K\u00E4ytt\u00E4j\u00E4nlis\u00E4ys submenu.admin.adduser = K\u00E4ytt\u00E4j\u00E4nlis\u00E4ys
submenu.admin.adduser.index = K\u00E4ytt\u00E4j\u00E4nlis\u00E4ys submenu.admin.adduser.index = K\u00E4ytt\u00E4j\u00E4nlis\u00E4ys
submenu.frontpage = Frontpage submenu.frontpage = Frontpage
submenu.info.incoming = Incomingview submenu.info.incoming = Incomingview
submenu.info.index = Infon\u00E4kym\u00E4 submenu.info.index = Infon\u00E4kym\u00E4
subnavi.cards = \u0009\u0009 subnavi.cards = \u0009\u0009
subnavi.info = Info subnavi.info = Info
topnavi.license = Lisenssikoodit topnavi.license = Lisenssikoodit
user.cropImage = Crop user.cropImage = Crop
user.imageUpload.imageNotFound = Select image to upload user.imageUpload.imageNotFound = Select image to upload
......
code/MoyaWeb/src/fi/codecrew/moya/resources/i18n_en.properties
...@@ -462,13 +462,19 @@ imagefile.file = Imagefile ...@@ -462,13 +462,19 @@ imagefile.file = Imagefile
importuser.file = File importuser.file = File
importuser.template = Template importuser.template = Template
incomingflow.barcode = Barcode incomingflow.alreadyShowingUser.message = We are already showing selected user
incomingflow.changereader = Change Reader incomingflow.alreadyShowingUser.title = Already selected
incomingflow.giveplace = Mark given incomingflow.barcode = Barcode
incomingflow.multisearch = Multisearch incomingflow.changereader = Change Reader
incomingflow.search = Search incomingflow.codeattached.message = Code attached to current user's card
incomingflow.ungiveplace = Mark not given incomingflow.codeattached.title = Code attached
incomingflow.userdetails = User details incomingflow.giveplace = Mark given
incomingflow.invalidbarcode.message = Nothing found with barcode, you can now add it to the user
incomingflow.invalidbarcode.title = Invalid code
incomingflow.multisearch = Multisearch
incomingflow.search = Search
incomingflow.ungiveplace = Mark not given
incomingflow.userdetails = User details
infoview.back = Back infoview.back = Back
infoview.computerplace = Computer places infoview.computerplace = Computer places
......
code/MoyaWeb/src/fi/codecrew/moya/resources/i18n_fi.properties
...@@ -191,7 +191,20 @@ bortalApplication.user.VITUTTAAKO = Saa avautua ...@@ -191,7 +191,20 @@ bortalApplication.user.VITUTTAAKO = Saa avautua
bortalApplication.user.WRITE_ORGROLES = Saa muokata organisaation rooleja bortalApplication.user.WRITE_ORGROLES = Saa muokata organisaation rooleja
bortalApplication.user.WRITE_ROLES = Saa muokata rooleja bortalApplication.user.WRITE_ROLES = Saa muokata rooleja
card.massprint.title = Tulosta kaikki card.massprint.title = Tulosta kaikki
cardObjectData.create = Liit\u00E4 kuvia
cardObjectData.edit = Muokkaa
cardObjectData.save = Tallenna
cardObjectData.size = Leveys (px)
cardObjectData.type = Tyyppi
cardObjectData.type.CARDS_BARCODE = Kortin viivakoodi
cardObjectData.type.UNKNOWN = Tuntematon
cardObjectData.type.USERS_BARCODE = K\u00E4ytt\u00E4j\u00E4n viivakoodi
cardObjectData.type.USERS_PICTURE = K\u00E4ytt\u00E4j\u00E4n kuva
cardObjectData.x = X koordinaatti
cardObjectData.y = Y koordinaatti
cardObjectData.zindex = Z index
cardTemplate.create = Luo cardTemplate.create = Luo
cardTemplate.edit = Muokkaa cardTemplate.edit = Muokkaa
...@@ -203,51 +216,37 @@ cardTemplate.roles = Yhdistetyt roolit ...@@ -203,51 +216,37 @@ cardTemplate.roles = Yhdistetyt roolit
cardTemplate.save = Tallenna cardTemplate.save = Tallenna
cardTemplate.sendImage = Lataa kuva cardTemplate.sendImage = Lataa kuva
cardTemplateData.list = Ohjeissislln listaus cardTemplateData.list = Ohjeissis\u00E4ll\u00F6n listaus
cardObjectData.create = Liit kuvia cardTextData.create = Liit\u00E4 teksti\u00E4
cardObjectData.save = Tallenna cardTextData.edit = Muokkaa
cardObjectData.edit = Muokkaa cardTextData.fontcolor = Fontin v\u00E4ri
cardObjectData.x = X koordinaatti cardTextData.fontname = Fontin nimi
cardObjectData.y = Y koordinaatti cardTextData.fontstyle = Fontin tyyli
cardObjectData.size = Leveys (px) cardTextData.fontstyle.BOLD = Bold
cardObjectData.zindex = Z index cardTextData.fontstyle.BOLDITALIC = Bold ja Italic
cardObjectData.type = Tyyppi cardTextData.fontstyle.ITALIC = Italic
cardObjectData.type.UNKNOWN = Tuntematon cardTextData.fontstyle.PLAIN = Ei tyylittely\u00E4
cardObjectData.type.USERS_PICTURE = Kyttjn kuva cardTextData.save = Tallenna
cardObjectData.type.USERS_BARCODE = Kyttjn viivakoodi cardTextData.size = Tekstin koko (px)
cardObjectData.type.CARDS_BARCODE = Kortin viivakoodi cardTextData.text = Kiinte\u00E4 teksti
cardTextData.textalignment = Fontin sijoittelu
cardTextData.create = Liit teksti cardTextData.textalignment.CENTER = Keskell\u00E4
cardTextData.save = Tallenna cardTextData.textalignment.LEFT = Vasen
cardTextData.edit = Muokkaa cardTextData.textalignment.RIGHT = Oikea
cardTextData.x = X koordinaatti cardTextData.type = Tyyppi
cardTextData.y = Y koordinaatti cardTextData.type.AGE = Ik\u00E4
cardTextData.size = Tekstin koko (px) cardTextData.type.AUTHCODE = MoyaAuth koodi
cardTextData.zindex = Z index cardTextData.type.FIRSTNAME = Etunimi
cardTextData.fontname = Fontin nimi cardTextData.type.LASTNAME = Sukunimi
cardTextData.fontcolor = Fontin vri cardTextData.type.NICK = Nimimerkki
cardTextData.fontstyle = Fontin tyyli cardTextData.type.ROLE = Rooli
cardTextData.fontstyle.PLAIN = Ei tyylittely cardTextData.type.STATIC = Staattinen
cardTextData.fontstyle.BOLD = Bold cardTextData.type.UNKNOWN = Tuntematon
cardTextData.fontstyle.ITALIC = Italic cardTextData.type.WHOLENAME = Kokonimi
cardTextData.fontstyle.BOLDITALIC = Bold ja Italic cardTextData.x = X koordinaatti
cardTextData.textalignment = Fontin sijoittelu cardTextData.y = Y koordinaatti
cardTextData.textalignment.LEFT = Vasen cardTextData.zindex = Z index
cardTextData.textalignment.CENTER = Keskell
cardTextData.textalignment.RIGHT = Oikea
cardTextData.text = Kiinte teksti
cardTextData.type = Tyyppi
cardTextData.type.UNKNOWN = Tuntematon
cardTextData.type.NICK = Nimimerkki
cardTextData.type.WHOLENAME = Kokonimi
cardTextData.type.FIRSTNAME = Etunimi
cardTextData.type.LASTNAME = Sukunimi
cardTextData.type.STATIC = Staattinen
cardTextData.type.AGE = Ik
cardTextData.type.ROLE = Rooli
cardTextData.type.AUTHCODE = MoyaAuth koodi
cart.item = Tuote cart.item = Tuote
cart.item_quantity = M\u00E4\u00E4r\u00E4 cart.item_quantity = M\u00E4\u00E4r\u00E4
...@@ -471,13 +470,19 @@ imagefile.file = Kuvatiedosto ...@@ -471,13 +470,19 @@ imagefile.file = Kuvatiedosto
importuser.file = Tiedosto importuser.file = Tiedosto
importuser.template = Malli importuser.template = Malli
incomingflow.barcode = Viivakoodi incomingflow.alreadyShowingUser.message = Piipattu k\u00E4ytt\u00E4j\u00E4 on jo n\u00E4kyviss\u00E4
incomingflow.changereader = Vaihda lukijaa incomingflow.alreadyShowingUser.title = Valmiiksi valittu
incomingflow.giveplace = Merkitse annetuksi incomingflow.barcode = Viivakoodi
incomingflow.multisearch = Monihaku incomingflow.changereader = Vaihda lukijaa
incomingflow.search = Etsi incomingflow.codeattached.message = Piipattu koodi liitetty aktiiviseen k\u00E4ytt\u00E4j\u00E4\u00E4n
incomingflow.ungiveplace = Ei olekkaan annettu incomingflow.codeattached.title = Koodi liitetty
incomingflow.userdetails = K\u00E4ytt\u00E4j\u00E4n tiedot incomingflow.giveplace = Merkitse annetuksi
incomingflow.invalidbarcode.message = Piipatulla koodilla ei l\u00F6ytynyt mit\u00E4\u00E4n, voit lis\u00E4t\u00E4 koodin k\u00E4ytt\u00E4j\u00E4\u00E4n
incomingflow.invalidbarcode.title = Virheellinen koodi
incomingflow.multisearch = Monihaku
incomingflow.search = Etsi
incomingflow.ungiveplace = Ei olekkaan annettu
incomingflow.userdetails = K\u00E4ytt\u00E4j\u00E4n tiedot
index.title = Etusivu index.title = Etusivu
...@@ -779,11 +784,11 @@ poll.save = L\u00E4het\u00E4 vastauksesi ...@@ -779,11 +784,11 @@ poll.save = L\u00E4het\u00E4 vastauksesi
print = Tulosta print = Tulosta
printedCard.template = Kortin template printedCard.cardState = Kortin tila
printedCard.cardState = Kortin tila printedCard.cardState.PENDING_VALIDATION = Odottaa hyv\u00E4ksynt\u00E4\u00E4
printedCard.cardState.PENDING_VALIDATION = Odottaa hyvksynt printedCard.cardState.REJECTED = Hyl\u00E4tty
printedCard.cardState.VALIDATED = Hyvksytty printedCard.cardState.VALIDATED = Hyv\u00E4ksytty
printedCard.cardState.REJECTED = Hyltty printedCard.template = Kortin template
product.barcode = Viivakoodi product.barcode = Viivakoodi
product.billed = Laskutettu product.billed = Laskutettu
...@@ -861,15 +866,15 @@ readerview.cards = Kortit ( tulostuslkm ) ...@@ -861,15 +866,15 @@ readerview.cards = Kortit ( tulostuslkm )
registerleaflet.title = Rekisteriseloste registerleaflet.title = Rekisteriseloste
rejectcard.mailSubject = {0} -tapahtuman profiilin kuva hyltty rejectcard.body = Viestin sis\u00E4lt\u00F6
rejectcard.mailBody = {0} -tapahtuman profiiliisi sytetty kuva on hyltty soveltumattomana. Syt uusi kuva vlittmsti. Kuvan saat asetettua profiili-sivulta. Hyvksyttvss kuvassa kasvosi tulee nky selkesti ja kokonaan. Tarkista uuden kuvan lhettmisen jlkeen, ett se on rajautunut oikein ja on oikeassa asennossa. rejectcard.mailBody = {0} -tapahtuman profiiliisi sy\u00F6tetty kuva on hyl\u00E4tty soveltumattomana. Sy\u00F6t\u00E4 uusi kuva v\u00E4litt\u00F6m\u00E4sti. Kuvan saat asetettua profiili-sivulta. Hyv\u00E4ksytt\u00E4v\u00E4ss\u00E4 kuvassa kasvosi tulee n\u00E4ky\u00E4 selke\u00E4sti ja kokonaan. Tarkista uuden kuvan l\u00E4hett\u00E4misen j\u00E4lkeen, ett\u00E4 se on rajautunut oikein ja on oikeassa asennossa.
rejectcard.toAddr = Shkpostiosoite rejectcard.mailSubject = {0} -tapahtuman profiilin kuva hyl\u00E4tty
rejectcard.toName = Nimi rejectcard.reject = Hylk\u00E4\u00E4
rejectcard.body = Viestin sislt rejectcard.sendAndReject = L\u00E4het\u00E4 ja hylk\u00E4\u00E4
rejectcard.subject = Viestin otsikko rejectcard.sendRejectionMail = L\u00E4het\u00E4 s\u00E4hk\u00F6postia
rejectcard.sendRejectionMail = Lhet shkpostia rejectcard.subject = Viestin otsikko
rejectcard.sendAndReject = Lhet ja hylk rejectcard.toAddr = S\u00E4hk\u00F6postiosoite
rejectcard.reject = Hylk rejectcard.toName = Nimi
resetMail.body = Voit vaihtaa unohtuneen salasanan sy\u00F6tt\u00E4m\u00E4ll\u00E4 k\u00E4ytt\u00E4j\u00E4tunnuksesi tai tunnukseen liitetyn s\u00E4hk\u00F6postiosoitteen allaolevaan kentt\u00E4\u00E4n. Tunnukseen liitettyyn s\u00E4hk\u00F6postiosoitteeseen l\u00E4hetet\u00E4\u00E4n kertak\u00E4ytt\u00F6inen osoite jossa voit vaihtaa sy\u00F6tt\u00E4m\u00E4si k\u00E4ytt\u00E4j\u00E4tunnuksen salasanan. resetMail.body = Voit vaihtaa unohtuneen salasanan sy\u00F6tt\u00E4m\u00E4ll\u00E4 k\u00E4ytt\u00E4j\u00E4tunnuksesi tai tunnukseen liitetyn s\u00E4hk\u00F6postiosoitteen allaolevaan kentt\u00E4\u00E4n. Tunnukseen liitettyyn s\u00E4hk\u00F6postiosoitteeseen l\u00E4hetet\u00E4\u00E4n kertak\u00E4ytt\u00F6inen osoite jossa voit vaihtaa sy\u00F6tt\u00E4m\u00E4si k\u00E4ytt\u00E4j\u00E4tunnuksen salasanan.
resetMail.email = S\u00E4hk\u00F6postiosoite resetMail.email = S\u00E4hk\u00F6postiosoite
...@@ -1316,8 +1321,6 @@ user.wholeName = Nimi ...@@ -1316,8 +1321,6 @@ user.wholeName = Nimi
user.wholename = Koko nimi user.wholename = Koko nimi
user.zipCode = Postinumero user.zipCode = Postinumero
userImport.commit = Hyv\u00E4ksy userImport.commit = Hyv\u00E4ksy
userView.image = Kuva userView.image = Kuva
......
code/MoyaWeb/src/fi/codecrew/moya/web/cdiview/map/PlacegroupView.java
...@@ -68,7 +68,16 @@ public class PlacegroupView extends GenericCDIView { ...@@ -68,7 +68,16 @@ public class PlacegroupView extends GenericCDIView {
return true; return true;
return false; return false;
} }
public boolean isCurrentReleaseAllowed() {
GroupMembership row = memberlist.getRowData();
if(row.getEnteredEvent() != null && !permbean.hasPermission(MapPermission.MANAGE_OTHERS))
return false;
return true;
}
public ListDataModel<GroupMembership> getGroupMemberships() { public ListDataModel<GroupMembership> getGroupMemberships() {
memberlist = new ListDataModel<GroupMembership>( memberlist = new ListDataModel<GroupMembership>(
placegroupBean.getMembershipsAndCreations(user)); placegroupBean.getMembershipsAndCreations(user));
...@@ -78,14 +87,13 @@ public class PlacegroupView extends GenericCDIView { ...@@ -78,14 +87,13 @@ public class PlacegroupView extends GenericCDIView {
public String releasePlace() { public String releasePlace() {
GroupMembership row = memberlist.getRowData(); GroupMembership row = memberlist.getRowData();
if (row != null) { if (row != null) {
if (permbean.isCurrentUser(row.getPlaceGroup().getCreator()) if (permbean.isCurrentUser(row.getPlaceGroup().getCreator()) || permbean.hasPermission(MapPermission.MANAGE_OTHERS)) {
|| permbean.hasPermission(MapPermission.MANAGE_OTHERS)) {
placegroupBean.releaseAndGenerateToken(row); placegroupBean.releaseAndGenerateToken(row);
this.addFaceMessage("placegroupview.placeReleased", row
.getPlaceReservation().getName()); this.addFaceMessage("placegroupview.placeReleased", row.getPlaceReservation().getName());
} else { } else {
this.addFaceMessage("placegroupview.placeReleaseFailed", row this.addFaceMessage("placegroupview.placeReleaseFailed", row.getPlaceReservation().getName());
.getPlaceReservation().getName());
} }
} }
......
code/MoyaWeb/src/fi/codecrew/moya/web/flow/IncomingView.java
...@@ -2,6 +2,8 @@ package fi.codecrew.moya.web.flow; ...@@ -2,6 +2,8 @@ package fi.codecrew.moya.web.flow;
import javax.ejb.EJB; import javax.ejb.EJB;
import javax.enterprise.context.ConversationScoped; import javax.enterprise.context.ConversationScoped;
import javax.faces.application.FacesMessage;
import javax.faces.context.FacesContext;
import javax.faces.model.ListDataModel; import javax.faces.model.ListDataModel;
import javax.inject.Inject; import javax.inject.Inject;
import javax.inject.Named; import javax.inject.Named;
...@@ -22,6 +24,7 @@ import fi.codecrew.moya.model.EventUser; ...@@ -22,6 +24,7 @@ import fi.codecrew.moya.model.EventUser;
import fi.codecrew.moya.model.GroupMembership; import fi.codecrew.moya.model.GroupMembership;
import fi.codecrew.moya.model.PrintedCard; import fi.codecrew.moya.model.PrintedCard;
import fi.codecrew.moya.model.ReaderEvent; import fi.codecrew.moya.model.ReaderEvent;
import fi.codecrew.moya.utilities.I18n;
import fi.codecrew.moya.web.cdiview.GenericCDIView; import fi.codecrew.moya.web.cdiview.GenericCDIView;
import fi.codecrew.moya.web.cdiview.reader.ReaderNameContainer; import fi.codecrew.moya.web.cdiview.reader.ReaderNameContainer;
import fi.codecrew.moya.web.cdiview.reader.ReaderView; import fi.codecrew.moya.web.cdiview.reader.ReaderView;
...@@ -33,18 +36,19 @@ public class IncomingView extends GenericCDIView { ...@@ -33,18 +36,19 @@ public class IncomingView extends GenericCDIView {
private static final long serialVersionUID = 802344850073689859L; private static final long serialVersionUID = 802344850073689859L;
private static final Logger logger = LoggerFactory.getLogger(IncomingView.class); private static final Logger logger = LoggerFactory
/* .getLogger(IncomingView.class);
@Inject /*
@SelectedUser * @Inject
private transient EventUser user; *
*/ * @SelectedUser private transient EventUser user;
*/
@Inject @Inject
private UserView userview; private UserView userview;
@Inject @Inject
private ReaderView readerView; private ReaderView readerView;
@Inject @Inject
private InfoView infoView; private InfoView infoView;
...@@ -67,42 +71,40 @@ public class IncomingView extends GenericCDIView { ...@@ -67,42 +71,40 @@ public class IncomingView extends GenericCDIView {
private UserBeanLocal userbean; private UserBeanLocal userbean;
@EJB @EJB
private transient PlaceGroupBeanLocal placegroupBean; private PlaceGroupBeanLocal placegroupBean;
//private String searchBarcode = "";
// private String searchBarcode = "";
private ListDataModel<GroupMembership> memberlist = null; private ListDataModel<GroupMembership> memberlist = null;
public void initView() { public void initView() {
super.beginConversation(); super.beginConversation();
} }
/*
public String getSearchBarcode() {
return searchBarcode;
}
public void setSearchBarcode(String searchBarcode) { private ReaderEvent eventToAttach = null;
this.searchBarcode = searchBarcode; private boolean showAttachDialog = false;
}
public List<String> matchBarcode(String matchWhat) { private boolean autoGivePlaces = true;
List<GroupMembership> gms = placeBean.matchGroupMembershipsByInviteToken(matchWhat);
ArrayList<String> arl = new ArrayList<>();
for (GroupMembership gm : gms) {
arl.add(gm.getInviteToken());
}
return arl; /*
} * public String getSearchBarcode() { return searchBarcode; }
*
* public void setSearchBarcode(String searchBarcode) { this.searchBarcode =
*/ * searchBarcode; }
*
* public List<String> matchBarcode(String matchWhat) {
* List<GroupMembership> gms =
* placeBean.matchGroupMembershipsByInviteToken(matchWhat);
* ArrayList<String> arl = new ArrayList<>(); for (GroupMembership gm : gms)
* { arl.add(gm.getInviteToken()); }
*
* return arl; }
*/
public void changeUser(SelectEvent event) { public void changeUser(SelectEvent event) {
if (infoView.getMultiSearchUser() != null) { if (infoView.getMultiSearchUser() != null) {
super.navihandler.redirectNavigation("incoming.jsf?userid=" + infoView.getMultiSearchUser().getUser().getId()); super.navihandler.redirectNavigation("incoming.jsf?userid="
+ infoView.getMultiSearchUser().getUser().getId());
infoView.setMultiSearchUser(null); infoView.setMultiSearchUser(null);
} }
} }
...@@ -111,13 +113,15 @@ public class IncomingView extends GenericCDIView { ...@@ -111,13 +113,15 @@ public class IncomingView extends GenericCDIView {
public void initPrintCardView() { public void initPrintCardView() {
memberlist = null; memberlist = null;
if (!permbean.hasPermission(UserPermission.MODIFY) || namecontainer.getReaderId() == null || namecontainer.getReaderId() <= 0) { if (!permbean.hasPermission(UserPermission.MODIFY)
|| namecontainer.getReaderId() == null
|| namecontainer.getReaderId() <= 0) {
super.navihandler.redirectNavigation("index.jsf"); super.navihandler.redirectNavigation("index.jsf");
} }
if (!initialized) { if (!initialized) {
logger.debug("INITIALIZING!!!!"); logger.debug("INITIALIZING!!!!");
//initializePoller(); // initializePoller();
initialized = true; initialized = true;
super.beginConversation(); super.beginConversation();
} }
...@@ -135,12 +139,13 @@ public class IncomingView extends GenericCDIView { ...@@ -135,12 +139,13 @@ public class IncomingView extends GenericCDIView {
public void polledRead() { public void polledRead() {
ReaderEvent event = readerView.getReaderEvent(); ReaderEvent event = readerView.getReaderEvent();
if(event == null) if (event == null)
return; return;
FacesContext context = FacesContext.getCurrentInstance();
logger.debug(":got.code:"); logger.debug(":got.code:");
EventUser user = event.getUser(); EventUser user = event.getUser();
...@@ -150,43 +155,63 @@ public class IncomingView extends GenericCDIView { ...@@ -150,43 +155,63 @@ public class IncomingView extends GenericCDIView {
userview.setUser(user); userview.setUser(user);
// userview.prepareCardDownload(); // userview.prepareCardDownload();
// PURKKAAA, sori tästä, koitan refaktoroida kauniiksi ku kerkiän -TKwtf // PURKKAAA, sori tästä, koitan refaktoroida kauniiksi ku
// kerkiän -TKwtf
super.navihandler.redirectNavigation("incoming.jsf?userid=" + user.getUser().getId()); super.navihandler.redirectNavigation("incoming.jsf?userid=" + user.getUser().getId());
} else {
context.addMessage(null, new FacesMessage(I18n.get("incomingflow.alreadyShowingUser.title"), I18n.get("incomingflow.alreadyShowingUser.message")));
} }
} else { } else {
// still there, it must be "clean" barcode // still there, it must be "clean" barcode
if (userview.getUser() != null) { if (userview.getSelectedUser() != null) {
userview.attachCodeToCard(event); eventToAttach = event;
showAttachDialog = true;
context.addMessage(null, new FacesMessage(I18n.get("incomingflow.invalidbarcode.title"), I18n.get("incomingflow.invalidbarcode.message")));
} }
} }
} }
/* public void attachCodeToCard() {
public String selectUser() { if (eventToAttach == null) {
throw new RuntimeException("mitä kettua?");
ReaderEvent event = readerView.getReaderEvent();
if(event == null)
return null;
EventUser user = event.getUser();
memberlist = null;
if (user == null) {
logger.debug("got no user from barcode");
return null;
} }
logger.debug("got user from barcode"); cardBean.giveCard(userview.getCurrentUser(), autoGivePlaces);
userview.attachCodeToCard(eventToAttach);
eventToAttach = null;
showAttachDialog = false;
FacesContext.getCurrentInstance().addMessage(null, new FacesMessage(I18n.get("incomingflow.codeattached.title"), I18n.get("incomingflow.codeattached.message")));
}
userview.setUser(user); public boolean isShowAttachDialog() {
//userview.prepareCardDownload(); return showAttachDialog;
return "incoming"; }
} */
public void hideAttachDialog() {
showAttachDialog = false;
}
/*
* public String selectUser() {
*
* ReaderEvent event = readerView.getReaderEvent();
*
* if(event == null) return null;
*
* EventUser user = event.getUser(); memberlist = null;
*
* if (user == null) { logger.debug("got no user from barcode"); return
* null; }
*
* logger.debug("got user from barcode");
*
* userview.setUser(user); //userview.prepareCardDownload(); return
* "incoming"; }
*/
public CardState getPrintedStatus() { public CardState getPrintedStatus() {
PrintedCard card = cardBean.checkPrintedCard(userview.getUser()); PrintedCard card = cardBean.checkPrintedCard(userview.getUser());
...@@ -204,7 +229,6 @@ public class IncomingView extends GenericCDIView { ...@@ -204,7 +229,6 @@ public class IncomingView extends GenericCDIView {
return null; return null;
} }
public ListDataModel<GroupMembership> getGroupMemberships() { public ListDataModel<GroupMembership> getGroupMemberships() {
memberlist = new ListDataModel<GroupMembership>( memberlist = new ListDataModel<GroupMembership>(
placegroupBean.getMembershipsAndCreations(userview.getUser())); placegroupBean.getMembershipsAndCreations(userview.getUser()));
...@@ -229,9 +253,4 @@ public class IncomingView extends GenericCDIView { ...@@ -229,9 +253,4 @@ public class IncomingView extends GenericCDIView {
return null; return null;
} }
} }
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!