Skip to content

Linnea Samila / Moya

Go to a project
Commit 1cc321e8 by Tuukka Kivilahti
Options

PORRNOA!

1 parent 0198b6a0
Inline Side-by-side
Showing with 132 additions and 12 deletions
code/moya-web/WebContent/info/cardlessIncoming.xhtml
......@@ -9,7 +9,7 @@
<f:metadata>
<f:viewParam name="userid" value="#{userView.userid}" />
<f:event type="preRenderView" listener="#{incomingView.initPrintCardView}" />
<f:event type="preRenderView" listener="#{cardlessIncomingView.initView}" />
</f:metadata>
<ui:define name="content">
......
code/moya-web/WebContent/info/foodwave/foodwaveProducts.xhtml
......@@ -10,6 +10,8 @@
>
<h:body>
<ui:composition template="/resources/templates/#{sessionHandler.infoscreen}/template.xhtml">
<ui:param name="ignorenavigationleft" value="true" />
<f:metadata>
<f:viewParam name="foodwaveid" value="#{foodWaveFoodView.foodwaveid}" />
<f:viewParam name="userid" value="#{flowFoodwaveView.userId}" />
......
code/moya-web/WebContent/info/foodwave/foodwaveshop.xhtml
......@@ -14,6 +14,8 @@
<h:body>
<ui:composition
template="/resources/templates/#{sessionHandler.infoscreen}/template.xhtml">
<ui:param name="ignorenavigationleft" value="true" />
<f:metadata>
<f:viewParam name="userid" value="#{flowFoodwaveView.userId}" />
<f:viewParam name="templateid" value="#{foodWaveView.templateId}" />
......
code/moya-web/WebContent/info/incoming.xhtml
......@@ -5,7 +5,7 @@
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>
<ui:composition template="/resources/templates/#{sessionHandler.infoscreen}/template.xhtml">
<ui:param name="ignorenavigationleft" value="true" />
<f:metadata>
<f:viewParam name="userid" value="#{userView.userid}" />
<f:event type="preRenderView" listener="#{incomingView.initPrintCardView}" />
......
code/moya-web/WebContent/info/index.xhtml
......@@ -14,7 +14,7 @@
<h:body>
<ui:composition
template="/resources/templates/#{sessionHandler.infoscreen}/template.xhtml">
<ui:param name="ignorenavigationleft" value="true" />
<f:metadata>
<f:event type="preRenderView" listener="#{incomingView.initView}" />
</f:metadata>
......
code/moya-web/WebContent/info/shop.xhtml
......@@ -8,6 +8,7 @@
>
<h:body>
<ui:composition template="/resources/templates/#{sessionHandler.infoscreen}/template.xhtml">
<ui:param name="ignorenavigationleft" value="true" />
<f:metadata>
<f:viewParam name="userid" value="#{flowShopView.userId}" />
......
code/moya-web/WebContent/resources/cditools/infoview/usermultisearch.xhtml 0 → 100644
<?xml version='1.0' encoding='UTF-8' ?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html
xmlns="http://www.w3.org/1999/xhtml"
xmlns:h="http://java.sun.com/jsf/html"
xmlns:f="http://java.sun.com/jsf/core"
xmlns:composite="http://java.sun.com/jsf/composite"
xmlns:ui="http://java.sun.com/jsf/facelets"
xmlns:c="http://java.sun.com/jsp/jstl/core"
xmlns:p="http://primefaces.org/ui"
xmlns:reader="http://java.sun.com/jsf/composite/cditools/reader"
>
<composite:interface>
</composite:interface>
<composite:implementation>
<h:form>
<h:outputScript>
$(document).ready(function() {
$(".usermultisearch .ui-autocomplete-input").focus();
});
</h:outputScript>
<p:autoComplete immediate="true" widgetVar="usermultisearch" styleClass="usermultisearch" id="acsb" value="#{infoView.multiSearchUser}" completeMethod="#{infoView.matchMulti}" converter="#{eventUserCodeFinderConverter}" var="usrx" itemLabel="#{usrx.shortUserDescriptor}" itemValue="#{usrx}">
<p:ajax event="itemSelect" listener="#{cardlessIncomingView.changeUser}" />
</p:autoComplete>
<p:watermark for="acsb" value="#{i18n['infoview.multisearch']}" />
</h:form>
</composite:implementation>
</html>
\ No newline at end of file
code/moya-web/WebContent/resources/cditools/reader/backendReader.xhtml
......@@ -48,6 +48,8 @@ xmlns:reader="http://java.sun.com/jsf/composite/cditools/reader"
-->
<p:outputLabel rendered="#{empty readerNameContainer.readerId}" value="#{i18n['reader.noReader']}" />
<p:outputLabel rendered="#{!empty readerNameContainer.readerId}" value="#{i18n['reader.autopoll']}" />
<p:inputSwitch rendered="#{!empty readerNameContainer.readerId}" offLabel="#{i18n['off']}" onLabel="#{i18n['on']}" value="#{readerView.pollingMode}" immediate="true" style="width: 81px;">
......
code/moya-web/src/main/java/fi/codecrew/moya/handler/NavigationHandler.java
......@@ -58,6 +58,22 @@ public class NavigationHandler implements Serializable {
this.destNavi = pageid;
}
/**
* Reloads current page with custom parameters, parameters must include leading '?'.
*
* This should be used if you want to ie. load current page with "userid=234" -parameter etc.
*
* @param parameter
*/
public void reloadWithParameter(String parameter) {
FacesContext fcont = FacesContext.getCurrentInstance();
HttpServletRequest req = (HttpServletRequest) fcont.getExternalContext().getRequest();
String redirectPath = req.getRequestURI() + parameter;
redirectNavigation(redirectPath);
}
public void redirectToSaved() {
if (destNavi == null || destNavi.isEmpty()) {
HttpServletRequest req = (HttpServletRequest) FacesContext.getCurrentInstance().getExternalContext().getRequest();
......
code/moya-web/src/main/java/fi/codecrew/moya/handler/SessionHandler.java
......@@ -113,7 +113,7 @@ public class SessionHandler {
}
public String getInfoscreen() {
template = "moyav2";
template = "infoview";
return template;
}
......
code/moya-web/src/main/java/fi/codecrew/moya/web/converter/EventUserCodeFinderConverter.java 0 → 100644
/*
* Copyright Codecrew Ry
*
* All rights reserved.
*
* This license applies to any software containing a notice placed by the
* copyright holder. Such software is herein referred to as the Software.
* This license covers modification, distribution and use of the Software.
*
* Any distribution and use in source and binary forms, with or without
* modification is not permitted without explicit written permission from the
* copyright owner.
*
* A non-exclusive royalty-free right is granted to the copyright owner of the
* Software to use, modify and distribute all modifications to the Software in
* future versions of the Software.
*
*/
package fi.codecrew.moya.web.converter;
import fi.codecrew.moya.beans.ReaderBeanLocal;
import fi.codecrew.moya.beans.UserBeanLocal;
import fi.codecrew.moya.model.EventUser;
import fi.codecrew.moya.model.ReaderEvent;
import fi.codecrew.moya.utilities.jsf.GenericEntityFinderConverter;
import javax.ejb.EJB;
import javax.enterprise.context.RequestScoped;
import javax.inject.Named;
@Named
@RequestScoped
public class EventUserCodeFinderConverter extends GenericEntityFinderConverter<EventUser> {
@EJB
private UserBeanLocal userbean;
@EJB
private ReaderBeanLocal readerBean;
@Override
protected EventUser find(Integer id) {
return userbean.findByEventUserId(id);
}
@Override
protected EventUser find(String searchString) {
ReaderEvent event = readerBean.checkCode(searchString);
if(event == null)
return null;
return event.getUser();
}
}
code/moya-web/src/main/java/fi/codecrew/moya/web/flow/IncomingView.java
......@@ -120,9 +120,7 @@ public class IncomingView extends GenericCDIView {
public void initPrintCardView() {
memberlist = null;
if (!permbean.hasPermission(UserPermission.MODIFY)
|| namecontainer.getReaderId() == null
|| namecontainer.getReaderId() <= 0) {
if (!permbean.hasPermission(UserPermission.MODIFY)) {
super.navihandler.redirectNavigation("index.jsf");
}
......
code/moya-web/src/main/java/fi/codecrew/moya/web/flow/InfoView.java
......@@ -22,8 +22,10 @@ import java.util.List;
import javax.ejb.EJB;
import javax.enterprise.context.ConversationScoped;
import javax.faces.context.FacesContext;
import javax.inject.Inject;
import javax.inject.Named;
import javax.servlet.http.HttpServletRequest;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
......@@ -53,6 +55,7 @@ public class InfoView extends GenericCDIView {
@Inject
private ReaderView readerView;
@EJB
private UserBeanLocal userbean;
......@@ -105,8 +108,7 @@ public class InfoView extends GenericCDIView {
if (multiSearchUser != null) {
this.multiSearchUser = null;
super.navihandler.redirectNavigation("?userid=" + multiSearchUser.getUser().getId());
super.navihandler.reloadWithParameter("?userid=" + multiSearchUser.getUser().getId());
}
......
code/moya-web/src/main/resources/fi/codecrew/moya/resources/i18n.properties
......@@ -484,4 +484,5 @@ user.birthday=
user.confirmUserToEventAdding=
user.invalidLoginCredentials=
barcodeReader.readBarcode=Lue viivakoodi
incomingflow.allGiven=Merkitty {} lippu(a) annetuksi.
incomingflow.allGiven=Merkitty {0} lippu(a) annetuksi.
reader.noReader=Ei valittua lukijaa
code/moya-web/src/main/resources/fi/codecrew/moya/resources/i18n_en.properties
......@@ -1699,4 +1699,5 @@ incomingFlow.leftCount=Ungiven
incomingflow.markEverythingGiven=Give ewerything ungiven stuff
submenu.info.cardlessIncoming=Incoming
incomingFlow.count=Count
incomingflow.allGiven=Marked {} tickets given.
incomingflow.allGiven=Marked {0} tickets given.
reader.noReader=No selected reader
code/moya-web/src/main/resources/fi/codecrew/moya/resources/i18n_fi.properties
......@@ -1683,4 +1683,5 @@ user.unauthenticated=
incomingflow.markEverythingGiven=Anna kaikki antamattomat tuotteet
submenu.info.cardlessIncoming=Sis\u00E4\u00E4ntulo
incomingFlow.count=M\u00E4\u00E4r\u00E4
incomingflow.allGiven=Merkitty {} lippu(a) annetuksi.
incomingflow.allGiven=Merkitty {0} lippu(a) annetuksi.
reader.noReader=Ei valittua lukijaa
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!