Skip to content

Linnea Samila / Moya

Go to a project
Commit 0198b6a0 by Tuukka Kivilahti
Options

välikommitti, ny pitäis toimia

1 parent 004f57d0
Inline Side-by-side
Showing with 95 additions and 126 deletions
code/moya-beans/ejbModule/fi/codecrew/moya/facade/GroupMembershipFacade.java
...@@ -160,7 +160,7 @@ public class GroupMembershipFacade extends IntegerPkGenericFacade<GroupMembershi ...@@ -160,7 +160,7 @@ public class GroupMembershipFacade extends IntegerPkGenericFacade<GroupMembershi
); );
return getEm().createQuery(cq).getResultList(); return getEm().createQuery(cq).getResultList();
} }
public Long findGroupMembershipsCount() { public Long findGroupMembershipsCount() {
CriteriaBuilder cb = getEm().getCriteriaBuilder(); CriteriaBuilder cb = getEm().getCriteriaBuilder();
CriteriaQuery<Long> cq = cb.createQuery(Long.class); CriteriaQuery<Long> cq = cb.createQuery(Long.class);
......
code/moya-web/WebContent/info/cardlessIncoming.xhtml
...@@ -9,6 +9,7 @@ ...@@ -9,6 +9,7 @@
<f:metadata> <f:metadata>
<f:viewParam name="userid" value="#{userView.userid}" /> <f:viewParam name="userid" value="#{userView.userid}" />
<f:event type="preRenderView" listener="#{incomingView.initPrintCardView}" />
</f:metadata> </f:metadata>
<ui:define name="content"> <ui:define name="content">
...@@ -16,14 +17,7 @@ ...@@ -16,14 +17,7 @@
<reader:backendReader selectvalue="#{i18n['barcodeReader.readBarcode']}" selectaction="#{cardlessIncomingView.polledRead}" /> <reader:backendReader selectvalue="#{i18n['barcodeReader.readBarcode']}" selectaction="#{cardlessIncomingView.polledRead}" />
<br /><br /> <br /><br />
<h:form> <infoview:usermultisearch />
<p:hotkey bind="enter" actionListener="#{cardlessIncomingView.changeUser}" />
TODO: kato että formi ei lähe entteristä, vaan ajetaan toi pirun listeneri. Mut vaan tässä formissa.
<p:autoComplete styleClass="usermultisearch" id="acsb" value="#{infoView.multiSearchUser}" completeMethod="#{infoView.matchMulti}" converter="#{eventUserConverter}" 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>
<br /> <br />
<h1> <h1>
......
code/moya-web/WebContent/info/foodwave/foodwaveProducts.xhtml
...@@ -3,7 +3,10 @@ ...@@ -3,7 +3,10 @@
"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" xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core" xmlns:foodwave="http://java.sun.com/jsf/composite/cditools/foodwave" xmlns:products="http://java.sun.com/jsf/composite/cditools/products" xmlns:users="http://java.sun.com/jsf/composite/cditools/user" <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:foodwave="http://java.sun.com/jsf/composite/cditools/foodwave" xmlns:products="http://java.sun.com/jsf/composite/cditools/products" xmlns:users="http://java.sun.com/jsf/composite/cditools/user"
xmlns:reader="http://java.sun.com/jsf/composite/cditools/reader" xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:reader="http://java.sun.com/jsf/composite/cditools/reader" xmlns:c="http://java.sun.com/jsp/jstl/core"
xmlns:p="http://primefaces.org/ui"> xmlns:p="http://primefaces.org/ui"
xmlns:infoview="http://java.sun.com/jsf/composite/cditools/infoview"
>
> >
<h:body> <h:body>
<ui:composition template="/resources/templates/#{sessionHandler.infoscreen}/template.xhtml"> <ui:composition template="/resources/templates/#{sessionHandler.infoscreen}/template.xhtml">
...@@ -18,11 +21,8 @@ ...@@ -18,11 +21,8 @@
<ui:define name="content"> <ui:define name="content">
<reader:backendReader selectvalue="#{i18n['barcodeReader.readBarcode']}" selectaction="#{flowFoodwaveView.polledRead}" /> <reader:backendReader selectvalue="#{i18n['barcodeReader.readBarcode']}" selectaction="#{flowFoodwaveView.polledRead}" />
<h:form>
<p:autoComplete id="acsb" value="#{infoView.multiSearchUser}" completeMethod="#{infoView.matchMulti}" converter="#{eventUserConverter}" var="usrx" itemLabel="#{usrx.shortUserDescriptor}" itemValue="#{usrx}"> <infoview:usermultisearch />
<p:ajax event="itemSelect" listener="#{flowFoodwaveView.changeUser}" />
</p:autoComplete>
</h:form>
<br /><br /> <br /><br />
<h1>Shop to user: #{userView.selectedUser.user.nick}</h1> <h1>Shop to user: #{userView.selectedUser.user.nick}</h1>
......
code/moya-web/WebContent/info/foodwave/foodwaveshop.xhtml
...@@ -9,6 +9,7 @@ ...@@ -9,6 +9,7 @@
xmlns:users="http://java.sun.com/jsf/composite/cditools/user" xmlns:users="http://java.sun.com/jsf/composite/cditools/user"
xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:c="http://java.sun.com/jsp/jstl/core"
xmlns:reader="http://java.sun.com/jsf/composite/cditools/reader" xmlns:reader="http://java.sun.com/jsf/composite/cditools/reader"
xmlns:infoview="http://java.sun.com/jsf/composite/cditools/infoview"
xmlns:p="http://primefaces.org/ui"> xmlns:p="http://primefaces.org/ui">
<h:body> <h:body>
<ui:composition <ui:composition
...@@ -22,11 +23,8 @@ ...@@ -22,11 +23,8 @@
<ui:define name="content"> <ui:define name="content">
<reader:backendReader selectvalue="#{i18n['barcodeReader.readBarcode']}" selectaction="#{flowFoodwaveView.polledRead}" /> <reader:backendReader selectvalue="#{i18n['barcodeReader.readBarcode']}" selectaction="#{flowFoodwaveView.polledRead}" />
<h:form>
<p:autoComplete id="acsb" value="#{infoView.multiSearchUser}" completeMethod="#{infoView.matchMulti}" converter="#{eventUserConverter}" var="usrx" itemLabel="#{usrx.shortUserDescriptor}" itemValue="#{usrx}"> <infoview:usermultisearch />
<p:ajax event="itemSelect" listener="#{flowFoodwaveView.changeUser}" />
</p:autoComplete>
</h:form>
<br /><br /> <br /><br />
<h1>Shop to user: #{userView.selectedUser.user.nick}</h1> <h1>Shop to user: #{userView.selectedUser.user.nick}</h1>
<br /><br /> <br /><br />
......
code/moya-web/WebContent/info/incoming.xhtml
...@@ -14,12 +14,8 @@ ...@@ -14,12 +14,8 @@
<h:outputScript library="primefaces" name="jquery/jquery.js" target="head" /> <h:outputScript library="primefaces" name="jquery/jquery.js" target="head" />
<reader:backendReader selectvalue="#{i18n['barcodeReader.readBarcode']}" selectaction="#{incomingView.polledRead}" /> <reader:backendReader selectvalue="#{i18n['barcodeReader.readBarcode']}" selectaction="#{incomingView.polledRead}" />
<h:form> <infoview:usermultisearch />
<p:autoComplete id="acsb" value="#{infoView.multiSearchUser}" completeMethod="#{infoView.matchMulti}" converter="#{eventUserConverter}" var="usrx" itemLabel="#{usrx.shortUserDescriptor}" itemValue="#{usrx}">
<p:ajax event="itemSelect" listener="#{incomingView.changeUser}" />
</p:autoComplete>
</h:form>
<h:form id="attachform"> <h:form id="attachform">
...@@ -314,8 +310,8 @@ ...@@ -314,8 +310,8 @@
<h:outputText value="#{member.placeGroup.creator.firstnames} #{member.placeGroup.creator.lastname} (#{member.placeGroup.creator.nick})" /> <h:outputText value="#{member.placeGroup.creator.firstnames} #{member.placeGroup.creator.lastname} (#{member.placeGroup.creator.nick})" />
</p:column> </p:column>
<p:column> <p:column>
<h:commandButton rendered="#{empty member.enteredEvent}" action="#{incomingView.givePlace}" value="#{i18n['incomingflow.giveplace']}" /> <p:commandButton update=":placelistform" rendered="#{empty member.enteredEvent}" actionListener="#{incomingView.givePlace}" value="#{i18n['incomingflow.giveplace']}" />
<h:commandButton rendered="#{!empty member.enteredEvent}" action="#{incomingView.ungivePlace}" value="#{i18n['incomingflow.ungiveplace']}" /> <p:commandButton update=":placelistform" rendered="#{!empty member.enteredEvent}" actionListener="#{incomingView.ungivePlace}" value="#{i18n['incomingflow.ungiveplace']}" />
</p:column> </p:column>
</p:dataTable> </p:dataTable>
......
code/moya-web/WebContent/info/shop.xhtml
...@@ -16,11 +16,8 @@ ...@@ -16,11 +16,8 @@
<ui:define name="content"> <ui:define name="content">
<reader:backendReader selectvalue="#{i18n['barcodeReader.readBarcode']}" selectaction="#{flowShopView.polledRead}" /> <reader:backendReader selectvalue="#{i18n['barcodeReader.readBarcode']}" selectaction="#{flowShopView.polledRead}" />
<h:form>
<p:autoComplete id="acsb" value="#{infoView.multiSearchUser}" completeMethod="#{infoView.matchMulti}" converter="#{eventUserConverter}" var="usrx" itemLabel="#{usrx.shortUserDescriptor}" itemValue="#{usrx}"> <infoview:usermultisearch />
<p:ajax event="itemSelect" listener="#{flowShopView.changeUser}" />
</p:autoComplete>
</h:form>
<h:form rendered="#{!userView.user.anonymous}"> <h:form rendered="#{!userView.user.anonymous}">
<h1>Shop to user: #{userView.user.user.nick}</h1> <h1>Shop to user: #{userView.user.user.nick}</h1>
......
code/moya-web/WebContent/resources/cditools/infoview/userselector.xhtml
...@@ -20,6 +20,7 @@ ...@@ -20,6 +20,7 @@
<reader:backendReader selectvalue="#{i18n['barcodeReader.readBarcode']}" selectaction="#{incomingView.selectUser}" /> <reader:backendReader selectvalue="#{i18n['barcodeReader.readBarcode']}" selectaction="#{incomingView.selectUser}" />
</composite:implementation> </composite:implementation>
</html> </html>
\ No newline at end of file
code/moya-web/src/main/java/fi/codecrew/moya/handler/SessionHandler.java
...@@ -113,7 +113,7 @@ public class SessionHandler { ...@@ -113,7 +113,7 @@ public class SessionHandler {
} }
public String getInfoscreen() { public String getInfoscreen() {
template = "infoview"; template = "moyav2";
return template; return template;
} }
......
code/moya-web/src/main/java/fi/codecrew/moya/web/converter/EventUserConverter.java
...@@ -31,7 +31,7 @@ import fi.codecrew.moya.utilities.jsf.GenericIntegerEntityConverter; ...@@ -31,7 +31,7 @@ import fi.codecrew.moya.utilities.jsf.GenericIntegerEntityConverter;
@Named @Named
@RequestScoped @RequestScoped
public class EventUserConverter extends GenericEntityFinderConverter<EventUser> { public class EventUserConverter extends GenericIntegerEntityConverter<EventUser> {
@EJB @EJB
private UserBeanLocal userbean; private UserBeanLocal userbean;
...@@ -44,14 +44,4 @@ public class EventUserConverter extends GenericEntityFinderConverter<EventUser> ...@@ -44,14 +44,4 @@ public class EventUserConverter extends GenericEntityFinderConverter<EventUser>
return userbean.findByEventUserId(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/CardlessIncomingView.java
...@@ -73,6 +73,13 @@ public class CardlessIncomingView extends GenericCDIView { ...@@ -73,6 +73,13 @@ public class CardlessIncomingView extends GenericCDIView {
private ListDataModel<GroupMembership> memberlist = null; private ListDataModel<GroupMembership> memberlist = null;
public void initView() {
super.beginConversation();
}
public void polledRead() { public void polledRead() {
ReaderEvent event = readerView.getReaderEvent(); ReaderEvent event = readerView.getReaderEvent();
...@@ -155,12 +162,16 @@ public class CardlessIncomingView extends GenericCDIView { ...@@ -155,12 +162,16 @@ public class CardlessIncomingView extends GenericCDIView {
public void giveEverything() { public void giveEverything() {
List<GroupMembership> memberships = placegroupBean.getMembershipsAndCreations(userview.getSelectedUser()); List<GroupMembership> memberships = placegroupBean.getMembershipsAndCreations(userview.getSelectedUser());
int count = 0;
for(GroupMembership gm : memberships) { for(GroupMembership gm : memberships) {
if(gm.getEnteredEvent() == null) { if(gm.getEnteredEvent() == null) {
placegroupBean.markGrouMembershipEntered(gm); placegroupBean.markGrouMembershipEntered(gm);
count++;
} }
} }
addFaceMessage("incomingflow.allGiven",count);
memberlist = null; memberlist = null;
} }
......
code/moya-web/src/main/java/fi/codecrew/moya/web/flow/FlowFoodwaveView.java
...@@ -102,17 +102,7 @@ public class FlowFoodwaveView extends GenericCDIView { ...@@ -102,17 +102,7 @@ public class FlowFoodwaveView extends GenericCDIView {
this.userId = userId; this.userId = userId;
} }
public void changeUser(SelectEvent event) {
if (infoView.getMultiSearchUser() != null) {
flowUserContainer.setUserId(infoView.getMultiSearchUser().getUser().getId());
// TODO: kauneista nää
super.navihandler.redirectNavigation("/MoyaWeb/info/foodwave/foodwaveshop.jsf?userid=" + infoView.getMultiSearchUser().getUser().getId());
}
}
......
code/moya-web/src/main/java/fi/codecrew/moya/web/flow/IncomingView.java
...@@ -114,28 +114,7 @@ public class IncomingView extends GenericCDIView { ...@@ -114,28 +114,7 @@ public class IncomingView extends GenericCDIView {
private boolean autoGivePlaces = true; private boolean autoGivePlaces = true;
/*
* 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) {
if (infoView.getMultiSearchUser() != null) {
super.navihandler.redirectNavigation("incoming.jsf?userid="
+ infoView.getMultiSearchUser().getUser().getId());
infoView.setMultiSearchUser(null);
}
}
private boolean initialized = false; private boolean initialized = false;
......
code/moya-web/src/main/java/fi/codecrew/moya/web/flow/InfoView.java
...@@ -42,65 +42,74 @@ import fi.codecrew.moya.web.cdiview.user.UserView; ...@@ -42,65 +42,74 @@ import fi.codecrew.moya.web.cdiview.user.UserView;
public class InfoView extends GenericCDIView { public class InfoView extends GenericCDIView {
private static final long serialVersionUID = 802344850073689859L; private static final long serialVersionUID = 802344850073689859L;
private EventUser multiSearchUser = null; private EventUser multiSearchUser = null;
private static final Logger logger = LoggerFactory.getLogger(InfoView.class); private static final Logger logger = LoggerFactory.getLogger(InfoView.class);
@Inject @Inject
private UserView userview; private UserView userview;
@Inject @Inject
private ReaderView readerView; private ReaderView readerView;
@EJB @EJB
private UserBeanLocal userbean; private UserBeanLocal userbean;
public void initView() { private String currentPage;
super.beginConversation();
} public void initView() {
super.beginConversation();
public String saveUser() { }
logger.info("Saving user in incomingView");
userview.saveUser(); public String saveUser() {
logger.info("Saving user in incomingView");
userview.saveUser();
return null;
}
public String selectUser() {
ReaderEvent event = readerView.getReaderEvent();
if (event == null)
return null; return null;
}
public String selectUser() {
ReaderEvent event = readerView.getReaderEvent();
if(event == null)
return null;
EventUser user = event.getUser();
if(user == null) {
return null;
}
userview.setUser(user);
return "general";
}
public List<EventUser> matchMulti(String what) {
UserSearchQuery usq = new UserSearchQuery();
usq.setSearch(what);
SearchResult<EventUser> sr = userbean.getThisEventsUsers(usq); EventUser user = event.getUser();
return sr.getResults(); if (user == null) {
return null;
} }
public EventUser getMultiSearchUser() { userview.setUser(user);
return multiSearchUser;
} return "general";
}
public List<EventUser> matchMulti(String what) {
UserSearchQuery usq = new UserSearchQuery();
usq.setSearch(what);
SearchResult<EventUser> sr = userbean.getThisEventsUsers(usq);
public void setMultiSearchUser(EventUser multiSearchUser) { return sr.getResults();
this.multiSearchUser = multiSearchUser; }
public EventUser getMultiSearchUser() {
return multiSearchUser;
}
public void setMultiSearchUser(EventUser multiSearchUser) {
this.multiSearchUser = multiSearchUser;
if (multiSearchUser != null) {
this.multiSearchUser = null;
super.navihandler.redirectNavigation("?userid=" + multiSearchUser.getUser().getId());
} }
}
} }
code/moya-web/src/main/resources/fi/codecrew/moya/resources/i18n.properties
...@@ -484,3 +484,4 @@ user.birthday= ...@@ -484,3 +484,4 @@ user.birthday=
user.confirmUserToEventAdding= user.confirmUserToEventAdding=
user.invalidLoginCredentials= user.invalidLoginCredentials=
barcodeReader.readBarcode=Lue viivakoodi barcodeReader.readBarcode=Lue viivakoodi
incomingflow.allGiven=Merkitty {} lippu(a) annetuksi.
code/moya-web/src/main/resources/fi/codecrew/moya/resources/i18n_en.properties
...@@ -1699,3 +1699,4 @@ incomingFlow.leftCount=Ungiven ...@@ -1699,3 +1699,4 @@ incomingFlow.leftCount=Ungiven
incomingflow.markEverythingGiven=Give ewerything ungiven stuff incomingflow.markEverythingGiven=Give ewerything ungiven stuff
submenu.info.cardlessIncoming=Incoming submenu.info.cardlessIncoming=Incoming
incomingFlow.count=Count incomingFlow.count=Count
incomingflow.allGiven=Marked {} tickets given.
code/moya-web/src/main/resources/fi/codecrew/moya/resources/i18n_fi.properties
...@@ -1683,3 +1683,4 @@ user.unauthenticated= ...@@ -1683,3 +1683,4 @@ user.unauthenticated=
incomingflow.markEverythingGiven=Anna kaikki antamattomat tuotteet incomingflow.markEverythingGiven=Anna kaikki antamattomat tuotteet
submenu.info.cardlessIncoming=Sis\u00E4\u00E4ntulo submenu.info.cardlessIncoming=Sis\u00E4\u00E4ntulo
incomingFlow.count=M\u00E4\u00E4r\u00E4 incomingFlow.count=M\u00E4\u00E4r\u00E4
incomingflow.allGiven=Merkitty {} lippu(a) annetuksi.
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!