Skip to content

Riina Antikainen / Moya

Go to a project
Commit 58505cc7 by Tuukka Kivilahti
Options

moar of barcodes

1 parent a7172bc6
Inline Side-by-side
Showing with 73 additions and 257 deletions
code/MoyaWeb/WebContent/shop/rfidListener.xhtml deleted 100644 → 0
<!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:ui="http://java.sun.com/jsf/facelets"
xmlns:h="http://java.sun.com/jsf/html" xmlns:tools="http://java.sun.com/jsf/composite/tools"
xmlns:f="http://java.sun.com/jsf/core"
>
<h:head>
<title></title>
</h:head>
<h:body>
<ui:composition template="#{sessionHandler.template}">
<ui:define name="metadata">
<f:metadata>
<f:viewParam name="reader" value="#{rfidView.reader}" />
<f:viewParam name="tag" value="#{rfidView.tag}" />
<f:viewParam name="hash" value="#{rfidView.hash}" />
<f:event type="preRenderView" listener="#{rfidView.readTag}" />
</f:metadata>
</ui:define>
<ui:define name="content">
</ui:define>
</ui:composition>
</h:body>
</html>
\ No newline at end of file
code/MoyaWeb/src/fi/codecrew/moya/rest/ReaderRestView.java
...@@ -76,46 +76,46 @@ public class ReaderRestView { ...@@ -76,46 +76,46 @@ public class ReaderRestView {
// public void createRfidEvent(@PathParam("reader") String reader, @PathParam("tagId") String tagId) { // public void createRfidEvent(@PathParam("reader") String reader, @PathParam("tagId") String tagId) {
// //
// } // }
//
// TBD: WTF! - Tarttis varmaan käydä ajatuksella läpi.. - Tuomari 2014-02-28 // // TBD: WTF! - Tarttis varmaan käydä ajatuksella läpi.. - Tuomari 2014-02-28
@GET // @GET
@Path("/EventRole/{reader}/{tagId}/{roleid}") // @Path("/EventRole/{reader}/{tagId}/{roleid}")
public Response eventRole(@PathParam("reader") String reader, @PathParam("tagId") String tag, @PathParam("roleid") Integer roleId) { // public Response eventRole(@PathParam("reader") String reader, @PathParam("tagId") String tag, @PathParam("roleid") Integer roleId) {
ReaderEvent ret = readerbean.checkTag(reader, tag); // ReaderEvent ret = readerbean.checkTag(reader, tag);
ResponseBuilder builder = null; // ResponseBuilder builder = null;
if (roleId == null || roleId.equals(0)) // if (roleId == null || roleId.equals(0))
{ // {
builder = Response.status(Status.BAD_REQUEST); // builder = Response.status(Status.BAD_REQUEST);
builder.entity("role ID is required!"); // builder.entity("role ID is required!");
builder.type(MediaType.TEXT_PLAIN); // builder.type(MediaType.TEXT_PLAIN);
//
} // }
if (builder == null) // if (builder == null)
{ // {
if (ret == null || ret.getPrintedCard() == null) { // if (ret == null || ret.getPrintedCard() == null) {
builder = Response.status(Status.NOT_ACCEPTABLE); // builder = Response.status(Status.NOT_ACCEPTABLE);
builder.entity("No card found for uid."); // builder.entity("No card found for uid.");
builder.type(MediaType.TEXT_PLAIN); // builder.type(MediaType.TEXT_PLAIN);
} else { // } else {
EventUser user = ret.getPrintedCard().getUser(); // EventUser user = ret.getPrintedCard().getUser();
boolean found = userbean.isUserInRole(user, roleId); // boolean found = userbean.isUserInRole(user, roleId);
if (found) { // if (found) {
builder = Response.status(Status.OK); // builder = Response.status(Status.OK);
} else { // } else {
builder = Response.status(Status.FORBIDDEN); // builder = Response.status(Status.FORBIDDEN);
} // }
builder.entity(new UserPermissionRestPojo(new EventUserRestPojo(user), found)); // builder.entity(new UserPermissionRestPojo(new EventUserRestPojo(user), found));
//
} // }
} // }
//
return builder.build(); // return builder.build();
} // }
//
@GET // @GET
@Path("/EventCard/{reader}/{cardid}") // @Path("/EventCard/{reader}/{cardid}")
public void eventCard(@PathParam("reader") String reader, @PathParam("cardid") String cardId) { // public void eventCard(@PathParam("reader") String reader, @PathParam("cardid") String cardId) {
//
} // }
} }
code/MoyaWeb/src/fi/codecrew/moya/web/cdiview/reader/ReaderView.java
...@@ -37,11 +37,8 @@ public class ReaderView extends GenericCDIView { ...@@ -37,11 +37,8 @@ public class ReaderView extends GenericCDIView {
private static final long serialVersionUID = 802344850073689859L; private static final long serialVersionUID = 802344850073689859L;
private Integer eventid; private String userInsertCode;
private String code;
private Reader reader;
private ReaderEvent event; private ReaderEvent event;
private boolean pollingMode = false; private boolean pollingMode = false;
...@@ -49,6 +46,8 @@ public class ReaderView extends GenericCDIView { ...@@ -49,6 +46,8 @@ public class ReaderView extends GenericCDIView {
private transient ListDataModel<UserCardWrapper> userlist; private transient ListDataModel<UserCardWrapper> userlist;
private ListDataModel<ReaderEvent> readerEventList; private ListDataModel<ReaderEvent> readerEventList;
private Reader editReader = null;
@Inject @Inject
private ReaderNameContainer namecontainer; private ReaderNameContainer namecontainer;
...@@ -56,14 +55,13 @@ public class ReaderView extends GenericCDIView { ...@@ -56,14 +55,13 @@ public class ReaderView extends GenericCDIView {
@EJB @EJB
private transient ReaderBeanLocal readerbean; private transient ReaderBeanLocal readerbean;
@EJB @EJB
private transient UserBeanLocal userbean; private transient UserBeanLocal userbean;
@EJB @EJB
private transient BarcodeBeanLocal barcodebean; private transient BarcodeBeanLocal barcodebean;
private UserCardWrapper neighborUser; // private UserCardWrapper neighborUser;
private static final Logger logger = LoggerFactory.getLogger(ReaderView.class); private static final Logger logger = LoggerFactory.getLogger(ReaderView.class);
...@@ -74,21 +72,14 @@ public class ReaderView extends GenericCDIView { ...@@ -74,21 +72,14 @@ public class ReaderView extends GenericCDIView {
@Inject @Inject
private UserView userview; private UserView userview;
public void initEditReader() { public void initEditReader() {
if (super.requirePermissions(ShopPermission.SHOP_TO_OTHERS) && reader == null) { if (super.requirePermissions(ShopPermission.SHOP_TO_OTHERS) && editReader == null) {
reader = readerbean.getReader(readerid); editReader = readerbean.getReader(readerid);
super.beginConversation(); super.beginConversation();
} }
} }
public String createCardForUser() {
UserCardWrapper usr = userlist.getRowData();
logger.info("Creating card for user {} from event {}", usr, event);
ReaderEvent card = readerbean.createCard(event, usr.getUser());
// super.addFaceMessage("Created card for user with id: " +
// card.getPrintedCard());
return null;
}
public List<Role> getUserRoles(EventUser user) { public List<Role> getUserRoles(EventUser user) {
return userbean.findUsersRoles(user); return userbean.findUsersRoles(user);
...@@ -101,20 +92,20 @@ public class ReaderView extends GenericCDIView { ...@@ -101,20 +92,20 @@ public class ReaderView extends GenericCDIView {
public void initCreateReader() public void initCreateReader()
{ {
if (super.requirePermissions(ShopPermission.SHOP_TO_OTHERS) && reader == null) if (super.requirePermissions(ShopPermission.SHOP_TO_OTHERS) && editReader == null)
{ {
reader = new Reader(); editReader = new Reader();
super.beginConversation(); super.beginConversation();
} }
} }
public String createReader() public String createReader()
{ {
readerbean.createReader(reader); readerbean.createReader(editReader);
namecontainer.setReaderId(reader.getId()); namecontainer.setReaderId(editReader.getId());
return "/shop/showReaderEvents"; return "/shop/showReaderEvents";
} }
/*
public void initUserassocView() { public void initUserassocView() {
if (super.requirePermissions(UserPermission.CREATE_NEW) && event == null) { if (super.requirePermissions(UserPermission.CREATE_NEW) && event == null) {
event = readerbean.getEvent(eventid); event = readerbean.getEvent(eventid);
...@@ -124,12 +115,12 @@ public class ReaderView extends GenericCDIView { ...@@ -124,12 +115,12 @@ public class ReaderView extends GenericCDIView {
} }
super.beginConversation(); super.beginConversation();
} }
} }*/
public boolean isReaderSelected() { public boolean isReaderSelected() {
return this.readerid != null; return this.readerid != null;
} }
/*
public String assocToCard() public String assocToCard()
{ {
...@@ -140,25 +131,9 @@ public class ReaderView extends GenericCDIView { ...@@ -140,25 +131,9 @@ public class ReaderView extends GenericCDIView {
logger.info("re {}", re.getPrintedCard()); logger.info("re {}", re.getPrintedCard());
userview.setUser(re.getPrintedCard().getUser()); userview.setUser(re.getPrintedCard().getUser());
return "/useradmin/edit"; return "/useradmin/edit";
} }*/
public String searchforuser()
{
if (usersearch == null || usersearch.length() < 2) {
super.addFaceMessage("user.tooShortSearch");
} else {
userlist = UserCardWrapper.initWrapper(userbean.getUsers(new SearchQuery(0, 0, null, usersearch, false)).getResults(), userbean);
}
return null;
}
public void initReaderList() {
if (super.requirePermissions(ShopPermission.SHOP_TO_OTHERS)) {
}
}
public List<Product> getAutoProducts() { public List<Product> getAutoProducts() {
List<Product> ret = new ArrayList<Product>(); List<Product> ret = new ArrayList<Product>();
...@@ -182,7 +157,7 @@ public class ReaderView extends GenericCDIView { ...@@ -182,7 +157,7 @@ public class ReaderView extends GenericCDIView {
public String saveReader() public String saveReader()
{ {
reader = readerbean.saveReader(reader); editReader = readerbean.saveReader(editReader);
return null; return null;
} }
...@@ -194,14 +169,6 @@ public class ReaderView extends GenericCDIView { ...@@ -194,14 +169,6 @@ public class ReaderView extends GenericCDIView {
this.namecontainer = namecontainer; this.namecontainer = namecontainer;
} }
public Integer getEventid() {
return eventid;
}
public void setEventid(Integer eventid) {
this.eventid = eventid;
}
public ReaderEvent getEvent() { public ReaderEvent getEvent() {
return event; return event;
} }
...@@ -210,21 +177,6 @@ public class ReaderView extends GenericCDIView { ...@@ -210,21 +177,6 @@ public class ReaderView extends GenericCDIView {
this.event = event; this.event = event;
} }
public String getPlacecode() {
return placecode;
}
public void setPlacecode(String placecode) {
this.placecode = placecode;
}
public String getUsersearch() {
return usersearch;
}
public void setUsersearch(String usersearch) {
this.usersearch = usersearch;
}
public ListDataModel<UserCardWrapper> getUserlist() { public ListDataModel<UserCardWrapper> getUserlist() {
return userlist; return userlist;
...@@ -233,14 +185,14 @@ public class ReaderView extends GenericCDIView { ...@@ -233,14 +185,14 @@ public class ReaderView extends GenericCDIView {
public void setUserlist(ListDataModel<UserCardWrapper> userlist) { public void setUserlist(ListDataModel<UserCardWrapper> userlist) {
this.userlist = userlist; this.userlist = userlist;
} }
/*
public UserCardWrapper getNeighborUser() { public UserCardWrapper getNeighborUser() {
return neighborUser; return neighborUser;
} }
public void setNeighborUser(UserCardWrapper neighborUser) { public void setNeighborUser(UserCardWrapper neighborUser) {
this.neighborUser = neighborUser; this.neighborUser = neighborUser;
} }*/
public Integer getReaderid() { public Integer getReaderid() {
return readerid; return readerid;
...@@ -253,18 +205,10 @@ public class ReaderView extends GenericCDIView { ...@@ -253,18 +205,10 @@ public class ReaderView extends GenericCDIView {
public String setReaderToId(Integer readerid) { public String setReaderToId(Integer readerid) {
this.readerid = readerid; this.readerid = readerid;
this.namecontainer.setReaderId(readerid); this.namecontainer.setReaderId(readerid);
reader = readerbean.getReader(readerid); editReader = readerbean.getReader(readerid);
return "/admin/info/index"; return "/admin/info/index";
} }
public Reader getReader() {
return reader;
}
public void setReader(Reader reader) {
this.reader = reader;
}
public UserView getUserview() { public UserView getUserview() {
return userview; return userview;
} }
...@@ -278,27 +222,7 @@ public class ReaderView extends GenericCDIView { ...@@ -278,27 +222,7 @@ public class ReaderView extends GenericCDIView {
return ReaderType.values(); return ReaderType.values();
} }
public String getBarcode() {
if (pollingMode) {
ReaderEvent event = readerbean.getLastReaderEvent(namecontainer.getReaderId());
if (!event.equals(lastReadEvent)) {
return event.getValue();
}
}
if (readerEventList != null && readerEventList.isRowAvailable()) {
if (readerEventList.getRowData().getReader().getType() == ReaderType.BARCODE || readerEventList.getRowData().getReader().getType() == ReaderType.RFID) {
return readerEventList.getRowData().getValue();
}
}
return barcode;
}
public void setBarcode(String barcode) {
this.barcode = barcode;
}
public ReaderEvent getReaderEvent() { public ReaderEvent getReaderEvent() {
if (readerEventList == null) if (readerEventList == null)
...@@ -311,61 +235,38 @@ public class ReaderView extends GenericCDIView { ...@@ -311,61 +235,38 @@ public class ReaderView extends GenericCDIView {
return null; return null;
} }
/**
* If last barcode or rfid was associated to user, get it
*
* @return
*/
public PrintedCard getPrintedCard() {
PrintedCard card = barcodebean.getPrintedCard(getBarcode());
if (card == null && readerEventList != null && readerEventList.isRowAvailable()) {
card = readerEventList.getRowData().getPrintedCard();
}
return card;
}
public void initializeForPolling() { public void initializeForPolling() {
// on polling mode, we do not use list, we use database and remember last readerEvent // on polling mode, we do not use list, we use database and remember last readerEvent
this.pollingMode = true; this.pollingMode = true;
this.barcode = null;
lastReadEvent = readerbean.getLastReaderEvent(namecontainer.getReaderId()); lastReadEvent = readerbean.getLastReaderEvent(namecontainer.getReaderId());
} }
public void pollingBarcodeHandled() { public void pollingCodeHandled() {
lastReadEvent = readerbean.getLastReaderEvent(namecontainer.getReaderId()); lastReadEvent = readerbean.getLastReaderEvent(namecontainer.getReaderId());
} }
public EventUser getUser() {
PrintedCard card = getPrintedCard();
if (card != null) {
return card.getUser();
}
return userbean.getUserByBarcode(getBarcode());
}
public void clearBarcode() {
this.barcode = null;
}
public String saveUser() { public String saveUser() {
userview.saveUser(); userview.saveUser();
return null; return null;
} }
public boolean isNewBarcodes() { public boolean isNewCodes() {
if (!pollingMode) if (!pollingMode)
return false; return false;
return (!readerbean.getLastReaderEvent(namecontainer.getReaderId()).equals(lastReadEvent)); return (!readerbean.getLastReaderEvent(namecontainer.getReaderId()).equals(lastReadEvent));
} }
public String getUserInsertCode() {
return userInsertCode;
}
public void setUserInsertCode(String userInsertCode) {
this.userInsertCode = userInsertCode;
}
} }
code/MoyaWeb/src/fi/codecrew/moya/web/cdiview/shop/RfidView.java deleted 100644 → 0
package fi.codecrew.moya.web.cdiview.shop;
import javax.ejb.EJB;
import javax.enterprise.context.RequestScoped;
import javax.inject.Named;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import fi.codecrew.moya.beans.ReaderBeanLocal;
import fi.codecrew.moya.model.ReaderEvent;
import fi.codecrew.moya.web.cdiview.GenericCDIView;
@Named
@RequestScoped
public class RfidView extends GenericCDIView {
/**
*
*/
private static final long serialVersionUID = -4013368780039067464L;
private String reader;
private String tag;
private String hash;
@EJB
private transient ReaderBeanLocal readerbean;
private static final Logger logger = LoggerFactory.getLogger(RfidView.class);
public void readTag() {
ReaderEvent revent = readerbean.checkTag(reader, tag);
logger.debug("at view Got readerevent from bean: {}", revent);
}
public String getReader() {
return reader;
}
public void setReader(String reader) {
this.reader = reader;
}
public String getTag() {
return tag;
}
public void setTag(String tag) {
this.tag = tag;
}
public String getHash() {
return hash;
}
public void setHash(String hash) {
this.hash = hash;
}
}
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!