Commit 699596dd by Tuomas Riihimäki

hurr.

1 parent 71ad2c55
...@@ -10,31 +10,33 @@ ...@@ -10,31 +10,33 @@
<f:viewParam name="userid" value="#{userView.userid}" /> <f:viewParam name="userid" value="#{userView.userid}" />
<f:event type="preRenderView" listener="#{incomingView.initPrintCardView}" /> <f:event type="preRenderView" listener="#{incomingView.initPrintCardView}" />
</f:metadata> </f:metadata>
<ui:define name="content"> <ui:define name="content">
<h:outputScript library="primefaces" name="jquery/jquery.js" target="head" /> <h:outputScript library="primefaces" name="jquery/jquery.js" target="head" />
<h:form> <h:form>
<p:poll interval="1" listener="#{incomingView.polledRead}" onerror="location.reload();" /> <p:poll interval="1" listener="#{incomingView.polledRead}" onerror="location.reload();" />
</h:form> </h:form>
<h1>#{i18n['incomingflow.userdetails']} (RFID-lukija: #{incomingView.readerId})</h1> <h1>#{i18n['incomingflow.userdetails']} (RFID-lukija: #{incomingView.readerId})</h1>
<h:panelGrid columns="3"> <h:panelGrid id="cropper" columns="3">
<h:panelGroup> <h:panelGroup>
<user:edit commitaction="#{incomingView.saveUser()}" commitvalue="#{i18n['user.save']}" camAlwaysOn="true" /> <user:edit id="usereditor" commitaction="#{incomingView.saveUser()}" commitvalue="#{i18n['user.save']}" camAlwaysOn="true" />
</h:panelGroup> </h:panelGroup>
<h:panelGroup> <h:panelGroup>
<h:form> <h:form id="imgCropperForm" rendered="#{!empty userView.user.currentImage}">
<p:commandButton value="#{i18n['user.imageCropRefresh']}" ajax="false" update="imgCropperForm" />
<h:outputLabel value="#{i18n['user.cropUserImage']}:" /> <h:outputLabel value="#{i18n['user.cropUserImage']}:" />
<p:imageCropper value="#{userView.croppedImage}" aspectRatio="0.7317073170731707" image="/dydata/userimage/#{userView.user.currentImage.id}.jpg" /> <p:imageCropper id="imgCropper" value="#{userView.croppedImage}" aspectRatio="0.7317073170731707" image="/dydata/userimage/#{userView.user.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" /><br /> <p:graphicImage url="/dydata/usercard/#{userView.user.user.id}.png" width="300" /><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>
</h:panelGroup> </h:panelGroup>
</h:panelGrid> </h:panelGrid>
......
...@@ -6,6 +6,7 @@ ...@@ -6,6 +6,7 @@
<composite:interface> <composite:interface>
<composite:attribute name="photocamupdate" required="false" default="userform" />
<composite:attribute name="creating" required="false" default="false" /> <composite:attribute name="creating" required="false" default="false" />
<composite:attribute name="commitaction" required="true" method-signature="java.lang.String action()" /> <composite:attribute name="commitaction" required="true" method-signature="java.lang.String action()" />
<composite:attribute name="camAlwaysOn" required="false" default="false" /> <composite:attribute name="camAlwaysOn" required="false" default="false" />
...@@ -37,10 +38,12 @@ ...@@ -37,10 +38,12 @@
<br /> <br />
<br /> <br />
<ui:fragment rendered="#{cc.attrs.camAlwaysOn}"> <ui:fragment rendered="#{cc.attrs.camAlwaysOn}">
<p:photoCam widgetVar="pc" listener="#{userView.oncapture}" update="@all" /> photoupdate: #{cc.attrs.photocamupdate}
<p:photoCam widgetVar="pc" listener="#{userView.oncapture}" update="#{cc.attrs.photocamupdate}" />
<p:commandButton type="button" value="Capture" onclick="PF('pc').capture()" /> <p:commandButton type="button" value="Capture" onclick="PF('pc').capture()" />
</ui:fragment> </ui:fragment>
<!-- --> <!-- -->
&nbsp;
<p:fileUpload id="uploadfile" value="#{userView.image}" mode="simple" required="true" requiredMessage="Required!" invalidSizeMessage="#{i18n['user.imageTooBig']}" sizeLimit="1024" /> <p:fileUpload id="uploadfile" value="#{userView.image}" mode="simple" required="true" requiredMessage="Required!" invalidSizeMessage="#{i18n['user.imageTooBig']}" sizeLimit="1024" />
<p:message for="uploadfile" /> <p:message for="uploadfile" />
......
...@@ -47,7 +47,7 @@ ...@@ -47,7 +47,7 @@
<h2>#{i18n['user.thisIsCurrentImage']}</h2> <h2>#{i18n['user.thisIsCurrentImage']}</h2>
<h:outputText rendered="#{empty userView.user.currentImage}" value="#{i18n['user.noCurrentImage']}" /> <h:outputText rendered="#{empty userView.user.currentImage}" value="#{i18n['user.noCurrentImage']}" />
<img width="300" rendered="#{!empty userView.user.currentImage}" src="#{request.contextPath}/dydata/userimage/#{userView.user.currentImage.id}.jpg" alt="image" /> <img width="300" rendered="#{!empty userView.user.currentImage}" src="#{request.contextPath}/dydata/userimage/#{userView.user.currentImage.id}.img" alt="image" />
<!-- <ui:fragment rendered="#{!empty userView.user.currentImage}"> <!-- <ui:fragment rendered="#{!empty userView.user.currentImage}">
......
...@@ -35,10 +35,10 @@ ...@@ -35,10 +35,10 @@
<h:outputText rendered="#{empty userView.user.currentImage}" value="#{i18n['user.noCurrentImage']}" /> <h:outputText rendered="#{empty userView.user.currentImage}" value="#{i18n['user.noCurrentImage']}" />
<ui:fragment rendered="#{!empty userView.user.currentImage}"> <ui:fragment rendered="#{!empty userView.user.currentImage}">
<h:panelGrid columns="2"> <h:panelGrid columns="2">
<img width="300" src="#{request.contextPath}/dydata/userimage/#{userView.user.currentImage.id}.jpg" alt="image" /> <img width="300" src="#{request.contextPath}/dydata/userimage/#{userView.user.currentImage.id}.img" alt="image" />
<ui:fragment rendered="#{userView.canManage()}"> <ui:fragment rendered="#{userView.canManage()}">
<h:form> <h:form>
<p:imageCropper value="#{userView.croppedImage}" aspectRatio="0.7317073170731707" image="/dydata/userimage/#{userView.user.currentImage.id}.jpg" /> <p:imageCropper value="#{userView.croppedImage}" aspectRatio="0.7317073170731707" image="/dydata/userimage/#{userView.user.currentImage.id}.img" />
<h:commandButton action="#{userView.crop}" value="#{i18n['user.cropImage']}" /> <h:commandButton action="#{userView.crop}" value="#{i18n['user.cropImage']}" />
</h:form> </h:form>
</ui:fragment> </ui:fragment>
......
...@@ -67,7 +67,7 @@ ...@@ -67,7 +67,7 @@
</h:form> </h:form>
<h:form> <h:form>
<p:imageCropper value="#{userView.croppedImage}" aspectRatio="0.7317073170731707" image="/dydata/userimage/#{userView.user.currentImage.id}.jpg" /> <p:imageCropper value="#{userView.croppedImage}" aspectRatio="0.7317073170731707" image="/dydata/userimage/#{userView.user.currentImage.id}.img" />
<h:commandButton action="#{userView.crop}" value="#{i18n['user.cropImage']}" /> <h:commandButton action="#{userView.crop}" value="#{i18n['user.cropImage']}" />
</h:form> </h:form>
</ui:define> </ui:define>
......
...@@ -1159,6 +1159,7 @@ user.game.manage = Manage ...@@ -1159,6 +1159,7 @@ user.game.manage = Manage
user.game.remove_gameid = Remove user.game.remove_gameid = Remove
user.hasImage = Image user.hasImage = Image
user.image = Image user.image = Image
user.imageCropRefresh = Refresh page
user.imageTooBig = Image is too big user.imageTooBig = Image is too big
user.imagelist = Saved images user.imagelist = Saved images
user.imagesubmit = Send image user.imagesubmit = Send image
......
...@@ -1143,6 +1143,7 @@ user.game.gameid_removed = Peli-ID poistettu ...@@ -1143,6 +1143,7 @@ user.game.gameid_removed = Peli-ID poistettu
user.game.manage = Hallitse user.game.manage = Hallitse
user.game.remove_gameid = Poista user.game.remove_gameid = Poista
user.hasImage = Kuva user.hasImage = Kuva
user.imageCropRefresh = P\u00E4ivit\u00E4
user.imageTooBig = Kuva on liian suuri user.imageTooBig = Kuva on liian suuri
user.imageUpload.imageNotFound = Valitse ensin kuva jonka haluat l\u00E4hett\u00E4\u00E4 user.imageUpload.imageNotFound = Valitse ensin kuva jonka haluat l\u00E4hett\u00E4\u00E4
user.imageUploaded = Kuva l\u00E4hetetty. user.imageUploaded = Kuva l\u00E4hetetty.
......
...@@ -33,7 +33,7 @@ public class AccountEventView extends GenericCDIView { ...@@ -33,7 +33,7 @@ public class AccountEventView extends GenericCDIView {
public void initView() { public void initView() {
accountevent = accounteventbean.find(getAccountid()); accountevent = accounteventbean.find(getAccountid());
if (requirePermissions(permbean.isCurrentUser(accountevent.getUser()) || permbean.hasPermission(UserPermission.VIEW_ACCOUNTEVENTS))) { if (accountevent != null && requirePermissions(permbean.isCurrentUser(accountevent.getUser()) || permbean.hasPermission(UserPermission.VIEW_ACCOUNTEVENTS))) {
userview.setUser(accountevent.getUser()); userview.setUser(accountevent.getUser());
beginConversation(); beginConversation();
setCanSave(permbean.hasPermission(UserPermission.MODIFY_ACCOUNTEVENTS)); setCanSave(permbean.hasPermission(UserPermission.MODIFY_ACCOUNTEVENTS));
......
...@@ -43,6 +43,7 @@ import fi.codecrew.moya.web.annotations.LoggedIn; ...@@ -43,6 +43,7 @@ import fi.codecrew.moya.web.annotations.LoggedIn;
import fi.codecrew.moya.web.annotations.SelectedUser; import fi.codecrew.moya.web.annotations.SelectedUser;
import fi.codecrew.moya.web.cdiview.GenericCDIView; import fi.codecrew.moya.web.cdiview.GenericCDIView;
import fi.codecrew.moya.web.cdiview.reader.ReaderView; import fi.codecrew.moya.web.cdiview.reader.ReaderView;
import fi.codecrew.moya.web.helper.LayoutView;
@Named() @Named()
@ConversationScoped @ConversationScoped
...@@ -105,6 +106,8 @@ public class UserView extends GenericCDIView { ...@@ -105,6 +106,8 @@ public class UserView extends GenericCDIView {
private boolean waitForAcceptance = false; private boolean waitForAcceptance = false;
private String captureForwardUrl = ""; private String captureForwardUrl = "";
private PrintedCard printedCard; private PrintedCard printedCard;
@Inject
private LayoutView layoutview;
public PrintedCard getPrintedCard() { public PrintedCard getPrintedCard() {
if (printedCard == null) { if (printedCard == null) {
...@@ -139,8 +142,9 @@ public class UserView extends GenericCDIView { ...@@ -139,8 +142,9 @@ public class UserView extends GenericCDIView {
UserImage img = userbean.uploadImage(user, "image/png", data, "userimage.png", "Uploaded image"); UserImage img = userbean.uploadImage(user, "image/png", data, "userimage.png", "Uploaded image");
user = userbean.getEventUser(img.getUser()); user = userbean.getEventUser(img.getUser());
// super.navihandler.forward("/admin/adduser/capturesuccess"); // super.navihandler.forward("/admin/adduser/capturesuccess");
if (getCaptureForwardUrl().equals("")) if (getCaptureForwardUrl() != null && !getCaptureForwardUrl().isEmpty())
super.navihandler.forward(getCaptureForwardUrl()); super.navihandler.forward(getCaptureForwardUrl());
} }
@Produces @Produces
...@@ -360,7 +364,7 @@ public class UserView extends GenericCDIView { ...@@ -360,7 +364,7 @@ public class UserView extends GenericCDIView {
//super.addFaceMessage("usercard.associated"); //super.addFaceMessage("usercard.associated");
MessageHelper.info("usercard.associated"); MessageHelper.info("usercard.associated");
logger.debug("barcode {} to card {} ", readerView.getBarcode(), card.getUser().getNick()); logger.debug("barcode {} to card {} ", readerView.getBarcode(), card.getUser().getNick());
cardBean.saveCard(card); cardBean.saveCard(card);
} else if (readerView.getReaderEvent() != null) { } else if (readerView.getReaderEvent() != null) {
...@@ -486,4 +490,12 @@ public class UserView extends GenericCDIView { ...@@ -486,4 +490,12 @@ public class UserView extends GenericCDIView {
{ {
return CardState.values(); return CardState.values();
} }
public LayoutView getLayoutview() {
return layoutview;
}
public void setLayoutview(LayoutView layoutview) {
this.layoutview = layoutview;
}
} }
...@@ -16,7 +16,6 @@ import fi.codecrew.moya.beans.BarcodeBeanLocal; ...@@ -16,7 +16,6 @@ import fi.codecrew.moya.beans.BarcodeBeanLocal;
import fi.codecrew.moya.beans.CardTemplateBeanLocal; import fi.codecrew.moya.beans.CardTemplateBeanLocal;
import fi.codecrew.moya.beans.PermissionBeanLocal; import fi.codecrew.moya.beans.PermissionBeanLocal;
import fi.codecrew.moya.beans.PlaceBeanLocal; import fi.codecrew.moya.beans.PlaceBeanLocal;
import fi.codecrew.moya.beans.ReaderBeanLocal;
import fi.codecrew.moya.beans.UserBeanLocal; import fi.codecrew.moya.beans.UserBeanLocal;
import fi.codecrew.moya.enums.CardState; import fi.codecrew.moya.enums.CardState;
import fi.codecrew.moya.enums.apps.UserPermission; import fi.codecrew.moya.enums.apps.UserPermission;
...@@ -25,7 +24,6 @@ import fi.codecrew.moya.model.GroupMembership; ...@@ -25,7 +24,6 @@ import fi.codecrew.moya.model.GroupMembership;
import fi.codecrew.moya.model.PrintedCard; import fi.codecrew.moya.model.PrintedCard;
import fi.codecrew.moya.util.UserSearchQuery; import fi.codecrew.moya.util.UserSearchQuery;
import fi.codecrew.moya.utilities.SearchResult; import fi.codecrew.moya.utilities.SearchResult;
import fi.codecrew.moya.utilities.jsf.MessageHelper;
import fi.codecrew.moya.web.annotations.SelectedUser; import fi.codecrew.moya.web.annotations.SelectedUser;
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;
...@@ -48,33 +46,33 @@ public class IncomingView extends GenericCDIView { ...@@ -48,33 +46,33 @@ public class IncomingView extends GenericCDIView {
@Inject @Inject
private ReaderView readerView; private ReaderView readerView;
@Inject @Inject
private ReaderNameContainer namecontainer; private ReaderNameContainer namecontainer;
@EJB @EJB
private BarcodeBeanLocal barcodeBean; private BarcodeBeanLocal barcodeBean;
@EJB @EJB
private CardTemplateBeanLocal cardBean; private CardTemplateBeanLocal cardBean;
@EJB @EJB
private PermissionBeanLocal permBean; private PermissionBeanLocal permBean;
@EJB @EJB
private PlaceBeanLocal placeBean; private PlaceBeanLocal placeBean;
@EJB @EJB
private UserBeanLocal userbean; private UserBeanLocal userbean;
private String searchBarcode = ""; private String searchBarcode = "";
private EventUser searchMulti = null; private EventUser searchMulti = null;
public void initView() { public void initView() {
super.beginConversation(); super.beginConversation();
} }
public String getSearchBarcode() { public String getSearchBarcode() {
return searchBarcode; return searchBarcode;
} }
...@@ -82,35 +80,35 @@ public class IncomingView extends GenericCDIView { ...@@ -82,35 +80,35 @@ public class IncomingView extends GenericCDIView {
public void setSearchBarcode(String searchBarcode) { public void setSearchBarcode(String searchBarcode) {
this.searchBarcode = searchBarcode; this.searchBarcode = searchBarcode;
} }
public List<String> matchBarcode(String matchWhat) { public List<String> matchBarcode(String matchWhat) {
List<GroupMembership> gms = placeBean.matchGroupMembershipsByInviteToken(matchWhat); List<GroupMembership> gms = placeBean.matchGroupMembershipsByInviteToken(matchWhat);
ArrayList<String> arl = new ArrayList<>(); ArrayList<String> arl = new ArrayList<>();
for(GroupMembership gm : gms) { for (GroupMembership gm : gms) {
arl.add(gm.getInviteToken()); arl.add(gm.getInviteToken());
} }
return arl; return arl;
} }
public List<EventUser> matchMulti(String what) { public List<EventUser> matchMulti(String what) {
UserSearchQuery usq = new UserSearchQuery(); UserSearchQuery usq = new UserSearchQuery();
usq.setSearch(what); usq.setSearch(what);
SearchResult<EventUser> sr = userbean.getThisEventsUsers(usq); SearchResult<EventUser> sr = userbean.getThisEventsUsers(usq);
return sr.getResults(); return sr.getResults();
} }
public void changeUser(SelectEvent event) { public void changeUser(SelectEvent event) {
if(!searchBarcode.equals("")) { if (!searchBarcode.equals("")) {
// TODO: if user barcode is place code thingy, do this, otherwise do other.. // TODO: if user barcode is place code thingy, do this, otherwise do other..
GroupMembership gm = placeBean.findGroupMembershipsByToken(this.searchBarcode); GroupMembership gm = placeBean.findGroupMembershipsByToken(this.searchBarcode);
if(gm != null) { if (gm != null) {
super.navihandler.redirectNavigation("printCard.jsf?userid="+gm.getUser().getUser().getId()); super.navihandler.redirectNavigation("printCard.jsf?userid=" + gm.getUser().getUser().getId());
} }
} else if(searchMulti != null) { } else if (searchMulti != null) {
super.navihandler.redirectNavigation("printCard.jsf?userid="+searchMulti.getUser().getId()); super.navihandler.redirectNavigation("printCard.jsf?userid=" + searchMulti.getUser().getId());
searchMulti = null; searchMulti = null;
} }
} }
...@@ -118,10 +116,10 @@ public class IncomingView extends GenericCDIView { ...@@ -118,10 +116,10 @@ public class IncomingView extends GenericCDIView {
private boolean initialized = false; private boolean initialized = false;
public void initPrintCardView() { public void initPrintCardView() {
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();
...@@ -133,7 +131,7 @@ public class IncomingView extends GenericCDIView { ...@@ -133,7 +131,7 @@ public class IncomingView extends GenericCDIView {
public Integer getReaderId() { public Integer getReaderId() {
return namecontainer.getReaderId(); return namecontainer.getReaderId();
} }
public String saveUser() { public String saveUser() {
logger.info("Saving user in incomingView"); logger.info("Saving user in incomingView");
userview.saveUser(); userview.saveUser();
...@@ -143,10 +141,10 @@ public class IncomingView extends GenericCDIView { ...@@ -143,10 +141,10 @@ public class IncomingView extends GenericCDIView {
public void initializePoller() { public void initializePoller() {
readerView.initializeForPolling(); readerView.initializeForPolling();
} }
public String changeToIncomingView() { public String changeToIncomingView() {
//super.navihandler.redirectNavigation("printCard.jsf?userid="+user.getUser().getId()); //super.navihandler.redirectNavigation("printCard.jsf?userid="+user.getUser().getId());
return "printCard.jsf?userid="+user.getUser().getId(); return "printCard.jsf?userid=" + user.getUser().getId();
} }
public void polledRead() { public void polledRead() {
...@@ -154,9 +152,9 @@ public class IncomingView extends GenericCDIView { ...@@ -154,9 +152,9 @@ public class IncomingView extends GenericCDIView {
if (!readerView.isNewBarcodes()) { if (!readerView.isNewBarcodes()) {
return; return;
} }
logger.debug(":Barcode:"); logger.debug(":Barcode:");
EventUser user = readerView.getUser(); EventUser user = readerView.getUser();
if (user != null) { if (user != null) {
if (!user.equals(userview.getUser())) { if (!user.equals(userview.getUser())) {
...@@ -164,15 +162,15 @@ public class IncomingView extends GenericCDIView { ...@@ -164,15 +162,15 @@ 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("printCard.jsf?userid="+user.getUser().getId()); super.navihandler.redirectNavigation("printCard.jsf?userid=" + user.getUser().getId());
} }
} else { } else {
// still there, it must be "clean" barcode // still there, it must be "clean" barcode
if (userview.getUser() != null) { if (userview.getUser() != null) {
userview.attachBarcodeToCard(); userview.attachBarcodeToCard();
} }
} }
...@@ -193,13 +191,16 @@ public class IncomingView extends GenericCDIView { ...@@ -193,13 +191,16 @@ public class IncomingView extends GenericCDIView {
//userview.prepareCardDownload(); //userview.prepareCardDownload();
return "printCard"; return "printCard";
} }
public CardState getPrintedStatus() { public CardState getPrintedStatus() {
PrintedCard card = cardBean.checkPrintedCard(user); PrintedCard card = cardBean.checkPrintedCard(user);
return card.getCardState(); CardState ret = null;
if (card != null) {
ret = card.getCardState();
}
return ret;
} }
public String printCard() { public String printCard() {
PrintedCard card = cardBean.checkPrintedCard(user); PrintedCard card = cardBean.checkPrintedCard(user);
card.setCardState(CardState.VALIDATED); card.setCardState(CardState.VALIDATED);
...@@ -216,11 +217,3 @@ public class IncomingView extends GenericCDIView { ...@@ -216,11 +217,3 @@ public class IncomingView extends GenericCDIView {
} }
} }
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!