Skip to content

Codecrew / Moya

Go to a project
Commit 888c50fb by Tuukka Kivilahti, TKffTK
Options

Merge branch 'master' of codecrew.fi:bortal

2 parents a52a96b0 aed31d97
Inline Side-by-side
Showing with 603 additions and 184 deletions
code/LanBortalBeans/ejbModule/fi/insomnia/bortal/beans/ReaderBean.java
......@@ -40,6 +40,8 @@ public class ReaderBean implements ReaderBeanLocal {
private UserBeanLocal userbean;
@EJB
private CardTemplateBean cardTemplateBean;
@EJB
private ProductPBean productPBean;
private static final Logger logger = LoggerFactory.getLogger(ReaderBean.class);
......@@ -62,10 +64,11 @@ public class ReaderBean implements ReaderBeanLocal {
Reader reader = readerfacade.findOrCreateByIdent(readerIdent);
logger.info("reader {}, card {}", reader, card);
// RfidEvent revent = reventcontainer.foundTag(reader, tag);
List<ReaderEvent> lastevents = readerEventFacade.findLastEvents(reader, 1);
ReaderEvent ret = null;
if (!lastevents.isEmpty())
if (!lastevents.isEmpty() && !reader.isAutoproduct())
{
ReaderEvent lastevent = lastevents.get(0);
if (card == null)
......@@ -84,6 +87,12 @@ public class ReaderBean implements ReaderBeanLocal {
if (ret == null)
{
ret = createReaderEvent(reader, card);
if (ret != null && card != null && reader.isAutoproduct())
{
productPBean.createAccountEvent(reader.getAutomaticProduct(), reader.getAutomaticProductCount(), card.getUser(), Calendar.getInstance());
ret.setNotes("Created automatic account event from reader.");
}
} else {
ret.setUpdatetime(Calendar.getInstance());
}
......
code/LanBortalBeans/ejbModule/fi/insomnia/bortal/beans/UserBean.java
......@@ -48,6 +48,7 @@ import fi.insomnia.bortal.utilities.I18n;
import fi.insomnia.bortal.utilities.PasswordFunctions;
import fi.insomnia.bortal.utilities.SearchQuery;
import fi.insomnia.bortal.utilities.SearchResult;
import fi.insomnia.bortal.utilities.UserSearchQuery;
/**
* Session Bean implementation class UserBean
......@@ -502,11 +503,17 @@ public class UserBean implements UserBeanLocal {
public SearchResult<User> getEventUsers(SearchQuery search) {
if (search.getSearch() == null || search.getSearch().isEmpty())
{
return userFacade.searchEventUsers(search);
throw new RuntimeException("You should be using getThisEventsUsers if not searching globally...");
// return userFacade.searchEventUsers(search);
} else {
return userFacade.searchAllUsers(search);
}
}
@Override
public SearchResult<EventUser> getThisEventsUsers(UserSearchQuery searchQuery) {
return eventUserFacade.searchEventUsers(searchQuery);
}
}
\ No newline at end of file
code/LanBortalBeans/ejbModule/fi/insomnia/bortal/facade/EventUserFacade.java
package fi.insomnia.bortal.facade;
import java.util.ArrayList;
import java.util.List;
import javax.ejb.EJB;
import javax.ejb.LocalBean;
import javax.ejb.Stateless;
import javax.persistence.TypedQuery;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.Root;
import fi.insomnia.bortal.beans.EventBeanLocal;
import fi.insomnia.bortal.facade.callbacks.FacadeCallback;
import fi.insomnia.bortal.facade.callbacks.OrderCallback;
import fi.insomnia.bortal.facade.tools.EventLimiter;
import fi.insomnia.bortal.facade.tools.EventUserSearchPredicate;
import fi.insomnia.bortal.model.EventUser;
import fi.insomnia.bortal.model.EventUser_;
import fi.insomnia.bortal.model.PrintedCard;
import fi.insomnia.bortal.model.PrintedCard_;
import fi.insomnia.bortal.model.User;
import fi.insomnia.bortal.model.User_;
import fi.insomnia.bortal.utilities.SearchResult;
import fi.insomnia.bortal.utilities.UserSearchQuery;
/**
* Session Bean implementation class EventUserFacade
......@@ -78,6 +86,36 @@ public class EventUserFacade extends IntegerPkGenericFacade<EventUser> {
}
public SearchResult<EventUser> searchEventUsers(UserSearchQuery query) {
ArrayList<FacadeCallback<EventUser>> callbacks = new ArrayList<FacadeCallback<EventUser>>();
callbacks.add(new OrderCallback<EventUser>(false, EventUser_.id));
callbacks.add(new EventLimiter(eventBean.getCurrentEvent()));
if (query.getSearch() != null && !query.getSearch().isEmpty())
{
callbacks.add(new EventUserSearchPredicate(query.getSearch(), UserFacade.getAttrlist()));
}
CriteriaBuilder cb = getEm().getCriteriaBuilder();
CriteriaQuery<EventUser> listCQuery = cb.createQuery(EventUser.class);
CriteriaQuery<Long> countCQuery = cb.createQuery(Long.class);
Root<EventUser> listRoot = searchCallbacks(listCQuery, callbacks, EventUser.class);
Root<EventUser> countRoot = searchCallbacks(countCQuery, callbacks, EventUser.class);
listCQuery.select(listRoot);
countCQuery.select(cb.count(countRoot));
TypedQuery<Long> countQ = getEm().createQuery(countCQuery);
TypedQuery<EventUser> listQ = getEm().createQuery(listCQuery);
if (query.getPagesize() > 0) {
listQ.setFirstResult(query.getPage() * query.getPagesize());
listQ.setMaxResults(query.getPagesize());
}
return new SearchResult<EventUser>(listQ.getResultList(), countQ.getSingleResult());
}
// public SearchResult<EventUser> searchUser(int page, int pagesize, String
// sort, String search) {
//
......
code/LanBortalBeans/ejbModule/fi/insomnia/bortal/facade/UserFacade.java
......@@ -7,11 +7,8 @@ import java.util.List;
import javax.ejb.EJB;
import javax.ejb.LocalBean;
import javax.ejb.Stateless;
import javax.persistence.TypedQuery;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.Path;
import javax.persistence.criteria.Predicate;
import javax.persistence.criteria.Root;
import javax.persistence.metamodel.SingularAttribute;
......@@ -22,9 +19,6 @@ import fi.insomnia.bortal.beans.EventBeanLocal;
import fi.insomnia.bortal.facade.callbacks.FacadeCallback;
import fi.insomnia.bortal.facade.callbacks.OrderCallback;
import fi.insomnia.bortal.facade.callbacks.StringSearchPredicateCreator;
import fi.insomnia.bortal.model.EventUser;
import fi.insomnia.bortal.model.EventUser_;
import fi.insomnia.bortal.model.LanEvent;
import fi.insomnia.bortal.model.User;
import fi.insomnia.bortal.model.User_;
import fi.insomnia.bortal.utilities.SearchQuery;
......@@ -148,45 +142,35 @@ public class UserFacade extends IntegerPkGenericFacade<User> {
return getEm().createQuery(cq).getResultList();
}
public SearchResult<User> searchEventUsers(SearchQuery query)
{
ArrayList<FacadeCallback<EventUser>> callbacks = new ArrayList<FacadeCallback<EventUser>>();
callbacks.add(new OrderCallback<EventUser>(false, EventUser_.id));
callbacks.add(new Eventlimiter(eventBean.getCurrentEvent()));
CriteriaBuilder cb = getEm().getCriteriaBuilder();
CriteriaQuery<User> listCQuery = cb.createQuery(User.class);
CriteriaQuery<Long> countCQuery = cb.createQuery(Long.class);
Root<EventUser> listRoot = searchCallbacks(listCQuery, callbacks, EventUser.class);
Root<EventUser> countRoot = searchCallbacks(countCQuery, callbacks, EventUser.class);
listCQuery.select(listRoot.join(EventUser_.user));
countCQuery.select(cb.count(countRoot.get(EventUser_.user)));
TypedQuery<Long> countQ = getEm().createQuery(countCQuery);
TypedQuery<User> listQ = getEm().createQuery(listCQuery);
if (query.getPagesize() > 0) {
listQ.setFirstResult(query.getPage() * query.getPagesize());
listQ.setMaxResults(query.getPagesize());
}
return new SearchResult<User>(listQ.getResultList(), countQ.getSingleResult());
}
public class Eventlimiter implements FacadeCallback<EventUser> {
private LanEvent ev;
public Eventlimiter(LanEvent currentEvent) {
ev = currentEvent;
}
@Override
public void exec(CriteriaBuilder cb, CriteriaQuery<?> cq, Path<EventUser> root, List<Predicate> predicates) {
predicates.add(cb.equal(root.get(EventUser_.event), ev));
}
// public SearchResult<User> searchEventUsers(SearchQuery query)
// {
// ArrayList<FacadeCallback<EventUser>> callbacks = new
// ArrayList<FacadeCallback<EventUser>>();
// callbacks.add(new OrderCallback<EventUser>(false, EventUser_.id));
// callbacks.add(new EventLimiter(eventBean.getCurrentEvent()));
//
// CriteriaBuilder cb = getEm().getCriteriaBuilder();
//
// CriteriaQuery<User> listCQuery = cb.createQuery(User.class);
// CriteriaQuery<Long> countCQuery = cb.createQuery(Long.class);
//
// Root<EventUser> listRoot = searchCallbacks(listCQuery, callbacks,
// EventUser.class);
// Root<EventUser> countRoot = searchCallbacks(countCQuery, callbacks,
// EventUser.class);
//
// listCQuery.select(listRoot.join(EventUser_.user));
// countCQuery.select(cb.count(countRoot.get(EventUser_.user)));
//
// TypedQuery<Long> countQ = getEm().createQuery(countCQuery);
// TypedQuery<User> listQ = getEm().createQuery(listCQuery);
//
// if (query.getPagesize() > 0) {
// listQ.setFirstResult(query.getPage() * query.getPagesize());
// listQ.setMaxResults(query.getPagesize());
// }
// return new SearchResult<User>(listQ.getResultList(),
// countQ.getSingleResult());
// }
}
}
code/LanBortalBeans/ejbModule/fi/insomnia/bortal/facade/tools/EventLimiter.java 0 → 100644
package fi.insomnia.bortal.facade.tools;
import java.util.List;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.Path;
import javax.persistence.criteria.Predicate;
import fi.insomnia.bortal.facade.callbacks.FacadeCallback;
import fi.insomnia.bortal.model.EventUser;
import fi.insomnia.bortal.model.EventUser_;
import fi.insomnia.bortal.model.LanEvent;
public class EventLimiter implements FacadeCallback<EventUser> {
private LanEvent ev;
public EventLimiter(LanEvent currentEvent) {
ev = currentEvent;
}
@Override
public void exec(CriteriaBuilder cb, CriteriaQuery<?> cq, Path<EventUser> root, List<Predicate> predicates) {
predicates.add(cb.equal(root.get(EventUser_.event), ev));
}
}
\ No newline at end of file
code/LanBortalBeans/ejbModule/fi/insomnia/bortal/facade/tools/EventUserSearchPredicate.java 0 → 100644
package fi.insomnia.bortal.facade.tools;
import java.util.List;
import javax.persistence.criteria.Path;
import javax.persistence.metamodel.SingularAttribute;
import fi.insomnia.bortal.facade.callbacks.PathStringSearchPredicateCreator;
import fi.insomnia.bortal.model.EventUser;
import fi.insomnia.bortal.model.EventUser_;
import fi.insomnia.bortal.model.User;
public class EventUserSearchPredicate extends PathStringSearchPredicateCreator<EventUser, User> {
public EventUserSearchPredicate(String search, List<SingularAttribute<User, String>> attrs) {
super(search, attrs);
}
@Override
protected Path<User> getPath(Path<EventUser> root) {
return root.get(EventUser_.user);
}
}
code/LanBortalBeansClient/ejbModule/fi/insomnia/bortal/beans/UserBeanLocal.java
......@@ -12,6 +12,7 @@ import fi.insomnia.bortal.model.User;
import fi.insomnia.bortal.model.UserImage;
import fi.insomnia.bortal.utilities.SearchQuery;
import fi.insomnia.bortal.utilities.SearchResult;
import fi.insomnia.bortal.utilities.UserSearchQuery;
@Local
public interface UserBeanLocal {
......@@ -71,4 +72,6 @@ public interface UserBeanLocal {
EventUser getUserByBarcode(String barcode);
SearchResult<EventUser> getThisEventsUsers(UserSearchQuery searchQuery);
}
code/LanBortalCardPrinter/.classpath 0 → 100644
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path="src"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
<classpathentry kind="output" path="bin"/>
</classpath>
code/LanBortalCardPrinter/.project 0 → 100644
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>LanBortalCardPrinter</name>
<comment></comment>
<projects>
</projects>
<buildSpec>
<buildCommand>
<name>org.eclipse.jdt.core.javabuilder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.jdt.core.javanature</nature>
</natures>
</projectDescription>
code/LanBortalCardPrinter/.settings/org.eclipse.jdt.core.prefs 0 → 100644
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
org.eclipse.jdt.core.compiler.compliance=1.6
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.source=1.6
code/LanBortalCardPrinter/src/fi/insomnia/bortal/cardprinter/CardPrinter.java 0 → 100644
package fi.insomnia.bortal.cardprinter;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.InputStream;
import java.util.HashSet;
import java.util.Set;
import javax.print.DocFlavor;
import javax.print.DocPrintJob;
import javax.print.PrintException;
import javax.print.PrintService;
import javax.print.PrintServiceLookup;
import javax.print.SimpleDoc;
public class CardPrinter {
/**
* @param args
*/
protected static final DocFlavor[] IMPLEMENTED_FLAVORS = { DocFlavor.BYTE_ARRAY.PDF, DocFlavor.INPUT_STREAM.PDF };
public static void main(String[] args) {
}
protected Set<DocFlavor> supportedFlavors = new HashSet<DocFlavor>();
protected String printerName;
protected PrintService printService;
// private static final Logger logger =
// LoggerFactory.getLogger(CardPrinter.class);
public void afterPropertiesSet() throws Exception {
// Try to find a PrintService instance with the specified name if any
if (printerName != null && printerName.length() > 0) {
log.info("Looking for a printer named {}", printerName);
// Lookup all services
PrintService[] printServices = PrintServiceLookup.lookupPrintServices(null, null);
for (PrintService ps : printServices) {
if (ps.getName().equalsIgnoreCase(printerName)) {
log.info("Using printer {}", ps.getName());
this.printService = ps;
break;
}
}
if (printService == null) {
log.warn("Could not find printer with name {}. Will try default printer.", printerName);
}
}
// If the printService is null, we weren't configured with a printerName
// or we couldn't
// find one with the specified name
if (printService == null) {
log.info("Using default printer.");
printService = PrintServiceLookup.lookupDefaultPrintService();
}
// If the printService is null, there is no default printer installed.
if (printService == null) {
log.warn("No default printer found. Printing will not be available.");
} else {
// We have a PrintService instance. Extract the supported flavors
// out of our implemented flavors.
for (DocFlavor flavor : IMPLEMENTED_FLAVORS) {
if (printService.isDocFlavorSupported(flavor)) {
supportedFlavors.add(flavor);
}
}
if (supportedFlavors.size() > 0) {
log.info("Printer {} supports PDF printing. Printing will be available.", printService.getName());
} else {
log.warn("Printer {} does not support printing PDF files directly. Printing will not be available.", printService.getName());
printService = null;
}
}
}
public void setPrinterName(String printerName) {
this.printerName = printerName;
}
public boolean supportsByteArray() {
return supportedFlavors.contains(DocFlavor.BYTE_ARRAY.PDF);
}
public boolean supportsInputStream() {
return supportedFlavors.contains(DocFlavor.INPUT_STREAM.PDF);
}
public void printPdf(byte[] pdf) throws PrintException {
if (supportsByteArray()) {
log.debug("Sending PDF to printer as byte array");
print(pdf, DocFlavor.BYTE_ARRAY.PDF);
} else {
// Adapt the byte array if the printer supports input stream
// printing
if (supportsInputStream()) {
printPdf(new ByteArrayInputStream(pdf));
} else {
throw new PrintException("Printer does not support PDF printing");
}
}
}
public void printPdf(InputStream pdf) throws PrintException {
if (supportsInputStream()) {
log.debug("Sending PDF to printer as InputStream");
print(pdf, DocFlavor.INPUT_STREAM.PDF);
} else {
// Adapt the input stream to a byte array if the printer supports
// byte array printing
if (supportsByteArray()) {
ByteArrayOutputStream baos = new ByteArrayOutputStream();
try {
// Streams.copy(pdf, baos);
while (pdf.available() > 0) {
baos.write(pdf.read());
}
} catch (IOException e) {
throw new PrintException(e);
}
printPdf(baos.toByteArray());
} else {
throw new PrintException("Printer does not support PDF printing");
}
}
}
protected void print(Object source, DocFlavor flavor) throws PrintException {
DocPrintJob printJob = printService.createPrintJob();
printJob.print(new SimpleDoc(source, flavor, null), null);
}
}
code/LanBortalDatabase/src/fi/insomnia/bortal/model/Reader.java
......@@ -9,6 +9,7 @@ import static javax.persistence.CascadeType.MERGE;
import static javax.persistence.CascadeType.PERSIST;
import static javax.persistence.CascadeType.REFRESH;
import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.List;
......@@ -53,7 +54,7 @@ public class Reader extends GenericEntity {
@Column(nullable = false, name = "type")
@Enumerated(EnumType.STRING)
private ReaderType type;
private ReaderType type = ReaderType.RFID;
public static final String EVENT_ID_COLUMN = "event_id";
@ManyToOne()
......@@ -68,9 +69,13 @@ public class Reader extends GenericEntity {
@OneToOne(mappedBy = "reader")
private SalesEntity salesEntity;
/**
*
*/
@ManyToOne
@JoinColumn(name = "automatic_product_id")
private Product automaticProduct;
@Column(precision = 25, scale = 4, name = "automatic_product_count")
private BigDecimal automaticProductCount;
private static final long serialVersionUID = 616803985117256035L;
@Column(name = "reader_ident")
......@@ -204,4 +209,33 @@ public class Reader extends GenericEntity {
public void setSalesEntity(SalesEntity salesEntity) {
this.salesEntity = salesEntity;
}
public boolean isAutoproduct() {
return (automaticProduct != null && automaticProductCount != null);
}
public ReaderType getType() {
return type;
}
public void setType(ReaderType type) {
this.type = type;
}
public Product getAutomaticProduct() {
return automaticProduct;
}
public void setAutomaticProduct(Product automaticProduct) {
this.automaticProduct = automaticProduct;
}
public BigDecimal getAutomaticProductCount() {
return automaticProductCount;
}
public void setAutomaticProductCount(BigDecimal automaticProductCount) {
this.automaticProductCount = automaticProductCount;
}
}
code/LanBortalUtilities/src/fi/insomnia/bortal/utilities/UserSearchQuery.java 0 → 100644
package fi.insomnia.bortal.utilities;
import java.util.List;
import javax.management.relation.Role;
public class UserSearchQuery extends SearchQuery {
private static final long serialVersionUID = 1383445517981308383L;
private List<Role> filterRoles;
private boolean onlyThisEvent = true;
public boolean isOnlyThisEvent() {
return onlyThisEvent;
}
public void setOnlyThisEvent(boolean onlyThisEvent) {
this.onlyThisEvent = onlyThisEvent;
}
public List<Role> getFilterRoles() {
return filterRoles;
}
public void setFilterRoles(List<Role> filterRoles) {
this.filterRoles = filterRoles;
}
}
code/LanBortalWeb/WebContent/resources/cditools/user/edit.xhtml
......@@ -16,61 +16,63 @@
<composite:implementation>
<h:outputScript library="primefaces" name="jquery/jquery.js" target="head" />
<h2>
<!-- <h2>
<h:outputText rendered="#{!cc.attrs.creating}" disabled="#{!cc.attrs.creating and !userView.canSave}" id="viewlogin" value="#{userView.selectedUser.login}" />
</h2>
<h:message rendered="#{!cc.attrs.creating}" for="viewlogin" />
<h:message rendered="#{sessionHandler.superadmin}" for="superadmin" />
<h:form id="userform" enctype="multipart/form-data" styleClass="ui-widget">
<h:panelGrid columns="2">
-->
<h:panelGroup >
<h:form id="userform" enctype="multipart/form-data">
<h:panelGrid columns="2">
<h:panelGroup>
<ui:fragment rendered="#{not empty userView.user.id}">
<div id="webcamcontainer" style="display: none;">
<p:overlayPanel id="chartPanel" for="webcamButton" hideEffect="fade">
<p:photoCam widgetVar="pc" listener="#{userView.oncapture}" update="@all" />
<p:commandButton type="button" value="Capture" onclick="pc.capture()" />
</div>
</p:overlayPanel>
<h:outputText rendered="#{empty userView.user.currentImage}" value="#{i18n['user.noCurrentImage']}" />
<ui:fragment rendered="#{!empty userView.user.currentImage}">
<img style="width: 150px;" src="#{request.contextPath}/dydata/userimage/#{userView.user.currentImage.id}.img" alt="image" />
</ui:fragment>
<br />
<button onclick="$('#webcamcontainer').show();$(this).hide();return false;">#{i18n['userimage.webcam']}</button>
<p:commandButton id="webcamButton" value="#{i18n['userimage.webcam']}" type="button" />
<br />
<br />
<p:fileUpload id="uploadfile" required="TRUE" requiredMessage="Required!" invalidSizeMessage="#{i18n['user.imageTooBig']}" sizeLimit="1024" value="#{userView.image}" mode="simple" />
<h:message for="uploadfile" />
<h:commandButton styleClass="ui-button" action="#{userView.sendImage}" value="#{i18n['user.imagesubmit']}" />
<p:message for="uploadfile" />
<p:commandButton action="#{userView.sendImage}" value="#{i18n['user.imagesubmit']}" />
</ui:fragment>
<ui:fragment rendered="#{cc.attrs.creating}">
<h:outputLabel value="#{i18n['user.login']}:" for="login" />
<h:outputLabel value="#{i18n['user.login']}" for="login" />
<br />
<h:inputText styleClass="ui-input" size="25" id="login" disabled="#{!cc.attrs.creating and !userView.canSave}" value="#{userView.selectedUser.login}" />
<h:message for="login" />
<p:inplace emptyLabel="#{i18n['user.insert']}">
<p:inputText size="25" id="login" disabled="#{!cc.attrs.creating and !userView.canSave}" value="#{userView.selectedUser.login}" />
</p:inplace>
<p:message for="login" />
<br />
</ui:fragment>
<br />
<h:outputLabel value="#{i18n['user.email']}:" for="email" />
<br />
<h:inputText styleClass="ui-input" validator="#{userValidator.validateEmail}" size="45" id="email" disabled="#{!cc.attrs.creating and !userView.canSave}" value="#{userView.selectedUser.email}" />
<h:message for="email" />
<h:outputLabel rendered="#{cc.attrs.creating}" value="#{i18n['user.password']}" for="password" />
<br />
<h:outputLabel rendered="#{cc.attrs.creating}" value="#{i18n['user.password']}:" for="password" />
<p:inplace rendered="#{cc.attrs.creating}" emptyLabel="#{i18n['user.insert']}">
<p:password validator="#{userValidator.password}" id="password" value="#{userView.password}" />
</p:inplace>
<p:message rendered="#{cc.attrs.creating}" for="password" />
<br />
<h:inputSecret styleClass="ui-input" validator="#{userValidator.password}" rendered="#{cc.attrs.creating}" id="password" value="#{userView.password}" />
<h:message rendered="#{cc.attrs.creating}" for="password" />
<p:outputLabel rendered="#{cc.attrs.creating}" value="#{i18n['user.passwordcheck']}" for="passwordcheck" />
<br />
<h:outputLabel rendered="#{cc.attrs.creating}" value="#{i18n['user.passwordcheck']}:" for="passwordcheck" />
<br />
<h:inputSecret styleClass="ui-input" validator="#{userValidator.password}" rendered="#{cc.attrs.creating}" id="passwordcheck" value="#{userView.passwordcheck}" />
<h:message rendered="#{cc.attrs.creating}" for="passwordcheck" />
<p:inplace rendered="#{cc.attrs.creating}" emptyLabel="#{i18n['user.insert']}">
<p:password validator="#{userValidator.password}" id="passwordcheck" value="#{userView.passwordcheck}" />
</p:inplace>
<p:message rendered="#{cc.attrs.creating}" for="passwordcheck" />
<br />
</h:panelGroup>
......@@ -79,59 +81,66 @@
<h:panelGroup>
<table>
<tr>
<td colspan="2"><h:outputLabel value="#{i18n['user.nick']}:" for="nick" /> <br /> <h:inputText size="45" id="nick" disabled="#{!cc.attrs.creating and !userView.canSave}"
value="#{userView.selectedUser.nick}" /><br /> <h:message for="nick" /></td>
</tr>
<tr>
<td><h:outputLabel value="#{i18n['user.firstNames']}:" for="firstnames" /></td>
<td><h:outputLabel value="#{i18n['user.lastName']}:" for="lastname" /></td>
</tr>
<tr>
<td><h:inputText styleClass="ui-input" size="22" id="firstnames" disabled="#{!cc.attrs.creating and !userView.canSave}" value="#{userView.selectedUser.firstnames}" /></td>
<td><h:inputText styleClass="ui-input" size="30" id="lastname" disabled="#{!cc.attrs.creating and !userView.canSave}" value="#{userView.selectedUser.lastname}" /></td>
<td colspan="2"><h:outputLabel value="#{i18n['user.nick']}" for="nick" /> <br />
<p:inplace emptyLabel="#{i18n['user.insert']}">
<p:inputText size="45" id="nick" disabled="#{!cc.attrs.creating and !userView.canSave}" value="#{userView.selectedUser.nick}" />
</p:inplace></td>
</tr>
<tr>
<td><h:message for="firstnames" /></td>
<td><h:message for="lastname" /></td>
<td><h:outputLabel value="#{i18n['user.firstNames']}" for="firstnames" /><br />
<p:inplace emptyLabel="#{i18n['user.insert']}">
<p:inputText size="22" id="firstnames" disabled="#{!cc.attrs.creating and !userView.canSave}" value="#{userView.selectedUser.firstnames}" />
</p:inplace></td>
<td><h:outputLabel value="#{i18n['user.lastName']}" for="lastname" /><br />
<p:inplace emptyLabel="#{i18n['user.insert']}">
<p:inputText size="30" id="lastname" disabled="#{!cc.attrs.creating and !userView.canSave}" value="#{userView.selectedUser.lastname}" />
</p:inplace></td>
</tr>
<tr>
<td><h:outputLabel for="birthday" value="#{i18n['user.birthday']}:" /><br /> <p:calendar id="birthday" navigator="true" yearRange="c-80:c-0" locale="fi"
<td><h:outputLabel for="birthday" value="#{i18n['user.birthday']}" /><br /> <p:calendar id="birthday" navigator="true" yearRange="c-80:c-0" locale="fi"
value="#{userView.selectedUser.birthday}" pattern="#{sessionHandler.dateFormat}" timeZone="#{sessionHandler.timezone}" /> <h:message for="birthday" /></td>
<td><h:outputLabel value="#{i18n['user.sex']}:" for="sex" /> <br /> <h:selectOneMenu disabled="#{!cc.attrs.creating and !userView.canSave}" id="sex"
<td><h:outputLabel value="#{i18n['user.sex']}" for="sex" /> <br /> <p:selectOneMenu disabled="#{!cc.attrs.creating and !userView.canSave}" id="sex"
value="#{userView.selectedUser.gender}">
<f:selectItem id="undefined" itemLabel="#{i18n['user.sex.UNDEFINED']}" itemValue="UNDEFINED" />
<f:selectItem id="male" itemLabel="#{i18n['user.sex.MALE']}" itemValue="MALE" />
<f:selectItem id="female" itemLabel="#{i18n['user.sex.FEMALE']}" itemValue="FEMALE" />
</h:selectOneMenu> <h:message for="sex" /></td>
</p:selectOneMenu></td>
</tr>
</table>
<table>
<tr>
<td colspan="2"><h:outputLabel value="#{i18n['user.address']}:" for="address" /><br /> <h:inputText styleClass="ui-input" size="45" id="address" disabled="#{!cc.attrs.creating and !userView.canSave}"
value="#{userView.selectedUser.address}" /> <h:message for="address" /></td>
<td colspan="2"><p:outputLabel value="#{i18n['user.address']}" for="address" /><br />
<p:inplace emptyLabel="#{i18n['user.insert']}">
<p:inputText size="45" id="address" disabled="#{!cc.attrs.creating and !userView.canSave}" value="#{userView.selectedUser.address}" />
</p:inplace></td>
</tr>
<tr>
<td><p:outputLabel value="#{i18n['user.zipCode']}" for="zip" /><br />
<p:inplace emptyLabel="#{i18n['user.insert']}">
<p:inputText styleClass="ui-input" size="7" id="zip" disabled="#{!cc.attrs.creating and !userView.canSave}" value="#{userView.selectedUser.zip}" />
</p:inplace> <p:message for="zip" /></td>
<td><p:outputLabel value="#{i18n['user.town']}" for="town" /><br />
<p:inplace emptyLabel="#{i18n['user.insert']}">
<p:inputText styleClass="ui-input" size="25" id="town" disabled="#{!cc.attrs.creating and !userView.canSave}" value="#{userView.selectedUser.town}" />
</p:inplace> <p:message for="town" /></td>
</tr>
<tr>
<td><h:outputLabel value="#{i18n['user.zipCode']}:" for="zip" /><br /> <h:inputText styleClass="ui-input" size="7" id="zip" disabled="#{!cc.attrs.creating and !userView.canSave}"
value="#{userView.selectedUser.zip}" /> <h:message for="zip" /></td>
<td><h:outputLabel value="#{i18n['user.town']}:" for="town" /><br /> <h:inputText styleClass="ui-input" size="25" id="town" disabled="#{!cc.attrs.creating and !userView.canSave}"
value="#{userView.selectedUser.town}" /> <h:message for="town" /></td>
<td colspan="2"><h:outputLabel value="#{i18n['user.email']}" for="email" /> <br />
<p:inplace emptyLabel="#{i18n['user.insert']}">
<p:inputText validator="#{userValidator.validateEmail}" size="45" id="email" disabled="#{!cc.attrs.creating and !userView.canSave}" value="#{userView.selectedUser.email}" />
</p:inplace></td>
</tr>
</table>
<h:outputLabel rendered="#{sessionHandler.superadmin}" value="#{i18n['user.superadmin']}:" for="superadmin" />
<h:selectBooleanCheckbox disabled="#{!cc.attrs.creating and !userView.canSave}" rendered="#{sessionHandler.superadmin}" id="superadmin" value="#{userView.selectedUser.superadmin}" />
<br />
<br />
<h:commandButton styleClass="ui-button" rendered="#{cc.attrs.creating or userView.canSave}" id="commitbtn" action="#{cc.attrs.commitaction}" value="#{cc.attrs.commitvalue}" />
<p:commandButton rendered="#{cc.attrs.creating or userView.canSave}" id="commitbtn" action="#{cc.attrs.commitaction}" value="#{cc.attrs.commitvalue}" />
</h:panelGroup>
</h:panelGrid>
</h:form>
</composite:implementation>
</html>
code/LanBortalWeb/WebContent/resources/cditools/user/eventuserlist.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:tools="http://java.sun.com/jsf/composite/tools">
<composite:interface>
</composite:interface>
<composite:implementation>
<h:outputScript library="primefaces" name="jquery/jquery.js" target="head" />
<h:dataTable styleClass="bordertable" id="user" value="#{userSearchView.eventUserResults}" var="user">
<h:column>
<f:facet name="header">
<h:link value="#{i18n['user.nick']}" includeViewParams="true">
<f:param name="sort" value="nick" />
<f:param name="page" value="0" />
</h:link>
</f:facet>
<h:outputText styleClass="hoverable" value="#{(empty user.nick)?'----':user.nick}" />
<div class="userdata_popup">
<h:panelGrid columns="2">
<img style="width: 100px;" src="#{request.contextPath}/dydata/userimage/#{user.currentImage.id}.img" alt="image" />
<h:panelGroup>
<h:outputText value="#{user.nick}" />
<br />
<h:outputText value="#{user.firstnames} #{user.lastname}" />
<br />
<hr />
<h:outputText value="#{user.address}" />
<br />
<h:outputText value="#{user.zip} #{user.postalTown}" />
<br />
<br />
<h:outputText value="#{user.phone}" />
<br />
<h:outputText value="#{user.email}" />
<br />
</h:panelGroup>
</h:panelGrid>
</div>
</h:column>
<h:column>
<f:facet name="header">
<h:link value="#{i18n['user.firstNames']}" includeViewParams="true">
<f:param name="sort" value="firstnames" />
<f:param name="page" value="0" />
</h:link>
</f:facet>
<h:outputText value="#{user.firstnames}" />
</h:column>
<h:column>
<f:facet name="header">
<h:link value="#{i18n['user.lastName']}" includeViewParams="true">
<f:param name="sort" value="lastname" />
</h:link>
</f:facet>
<h:outputText value="#{user.lastname}" />
</h:column>
<h:column>
<button onClick="location.replace('#{request.contextPath}/useradmin/edit.jsf?userid=#{user.id}')">#{i18n['user.edit']}</button>
</h:column>
<!-- <h:column>
<h:commandButton action="#{userView.shop()}" value="#{i18n['user.shop']}" />
</h:column> -->
</h:dataTable>
<script>
jQuery(function() {
jQuery(".hoverable").hover(function () {
jQuery(this).next().fadeIn('fast');
},
function () {
jQuery(this).next().fadeOut('fast');
});
});
</script>
</composite:implementation>
</html>
code/LanBortalWeb/WebContent/resources/style/insomnia2/css/general.css
......@@ -5,7 +5,7 @@
.userdata_popup {
position: absolute;
border: 1px solid black;
backgrond: white;
background: white;
border-radius: 3px;
display: none;
......
code/LanBortalWeb/WebContent/shop/shopToUser.xhtml
......@@ -20,31 +20,7 @@
<h:form id="shoppingcartform">
<h:panelGrid columns="2">
<h:panelGroup>
<div id="shopItems">
<ui:repeat value="#{productShopView.shoppingcart}" var="cart">
<div class="shopItem">
<h:commandLink action="#{productShopView.addOne}" value="#{cart.product.name}">
<f:ajax render="@form" />
</h:commandLink>
</div>
</ui:repeat>
</div>
</h:panelGroup>
<h:panelGroup>
<h:dataGrid >
</h:dataGrid>
<h:outputLabel value="#{i18n['shop.readBarcode']}" />
<h:inputText id="barcode" value="#{productShopView.barcode}" />
<h:commandButton action="#{productShopView.readBarcode}" onclick="blip(); return true;" value="#{i18n['productShopView.readBarcode']}">
<f:ajax render="@form" onevent="barcodeReadEvent" execute="@form" />
</h:commandButton>
<h:panelGrid columns="2">
<h:outputLabel value="#{i18n['shop.accountBalance']}" />
<h:outputText value="#{productShopView.accountBalance}">
......@@ -61,36 +37,24 @@
<f:ajax render="@form" event="valueChange" />
<f:convertNumber />
</h:inputText>
</h:panelGroup>
</h:panelGrid>
<h:panelGroup>
<h:outputLabel value="#{i18n['shop.readBarcode']}" />
<h:inputText id="barcode" value="#{productShopView.barcode}" />
<h:commandButton action="#{productShopView.readBarcode}" onclick="blip(); return true;" value="#{i18n['productShopView.readBarcode']}">
<f:ajax render="@form" onevent="barcodeReadEvent" execute="@form" />
</h:commandButton>
</h:panelGroup>
</h:panelGrid>
<h:outputText value="#{i18n['product.shopInstant']}" />
<h:selectBooleanCheckbox value="#{productShopView.payInstant}">
<f:ajax render="@form" execute="@form" />
</h:selectBooleanCheckbox>
<h:outputScript library="primefaces" name="jquery/jquery.js" />
<div style="margin-top: 5px;">
<h:commandButton action="#{cc.attrs.commitaction}" id="commitbutton-top" value="#{cc.attrs.commitValue}" />
</div>
<div>
<h:outputText value="#{i18n['productshop.total']} " />
<h:outputText value="#{productShopView.totalPrice}">
<f:convertNumber maxFractionDigits="2" minFractionDigits="2" />
</h:outputText>
</div>
<h:commandButton action="#{cc.attrs.commitaction}" id="commitbutton-botton" value="#{cc.attrs.commitValue}" />
<products:shop commitaction="#{productShopView.commitShoppingCart()}" items="#{productShopView.shoppingcart}" commitValue="#{i18n['productshop.commit']}" />
</h:form>
<script>
var blipSnd = new Audio(
......@@ -98,7 +62,6 @@
$(function() {
$("#shoppingcartform\\:barcode").focus();
});
function blip() {
......
code/LanBortalWeb/WebContent/useradmin/list.xhtml
<!DOCTYPE html
PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
"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:users="http://java.sun.com/jsf/composite/cditools/user"
xmlns:tools="http://java.sun.com/jsf/composite/cditools" xmlns:f="http://java.sun.com/jsf/core"
>
<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:users="http://java.sun.com/jsf/composite/cditools/user"
xmlns:tools="http://java.sun.com/jsf/composite/cditools" xmlns:f="http://java.sun.com/jsf/core">
<h:body>
<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
<f:metadata>
......@@ -16,18 +14,22 @@
<f:event type="preRenderView" listener="#{userSearchView.initView}" />
</f:metadata>
<ui:param name="thispage" value="page.user.create" />
<ui:define name="content">
<h1>#{i18n['userlist.header']}</h1>
<h:form>
<h:outputLabel for="onlythisevent" value="#{i18n['userlist.onlythisevent']}" />
<h:selectBooleanCheckbox id="onlythisevent" value="#{userSearchView.searchQuery.onlyThisEvent}" />
<br />
<h:inputText value="#{userSearchView.search}" />
<h:commandButton value="#{i18n['userlist.search']}" action="#{userSearchView.newSearch()}" />
</h:form>
<p>
<users:list />
<users:list rendered="#{!userSearchView.searchQuery.onlyThisEvent}" />
<users:eventuserlist rendered="#{userSearchView.searchQuery.onlyThisEvent}" />
</p>
<p>
<tools:paginationHeader view="#{userSearchView}" />
<tools:paginationHeader view="#{userSearchView}" />
</p>
</ui:define>
</ui:composition>
......
code/LanBortalWeb/src/fi/insomnia/bortal/web/cdiview/PaginationView.java
......@@ -34,10 +34,10 @@ public abstract class PaginationView<T extends ModelInterface> extends GenericCD
public String addToPage(Integer count) {
pagechangeCallback();
searchQuery.addPage(count);
getSearchQuery().addPage(count);
if (searchQuery.getPage() >= pagecount) {
searchQuery.setPage(pagecount.intValue() - 1);
if (getSearchQuery().getPage() >= pagecount) {
getSearchQuery().setPage(pagecount.intValue() - 1);
}
return null;
}
......@@ -51,14 +51,14 @@ public abstract class PaginationView<T extends ModelInterface> extends GenericCD
public String gotoFirstpage() {
// logger.info("Setting page to first page");
pagechangeCallback();
searchQuery.setPage(0);
getSearchQuery().setPage(0);
return null;
}
public String gotoLastpage() {
// logger.info("Setting page to last page");
pagechangeCallback();
searchQuery.setPage(pagecount.intValue() - 1);
getSearchQuery().setPage(pagecount.intValue() - 1);
return null;
}
......@@ -72,20 +72,20 @@ public abstract class PaginationView<T extends ModelInterface> extends GenericCD
@Override
public Integer getPage() {
return searchQuery.getPage();
return getSearchQuery().getPage();
}
public void setPage(Integer page) {
searchQuery.setPage(page);
getSearchQuery().setPage(page);
}
@Override
public Integer getPagesize() {
return searchQuery.getPagesize();
return getSearchQuery().getPagesize();
}
public void setPagesize(Integer pagesize) {
searchQuery.setPagesize(pagesize);
getSearchQuery().setPagesize(pagesize);
}
@Override
......@@ -95,7 +95,7 @@ public abstract class PaginationView<T extends ModelInterface> extends GenericCD
public void setResultcount(Long resultcount) {
this.resultcount = resultcount;
pagecount = ((resultcount + searchQuery.getPagesize() - 1) / searchQuery.getPagesize());
pagecount = ((resultcount + getSearchQuery().getPagesize() - 1) / getSearchQuery().getPagesize());
}
@Override
......@@ -108,19 +108,19 @@ public abstract class PaginationView<T extends ModelInterface> extends GenericCD
}
public String getSort() {
return searchQuery.getSort();
return getSearchQuery().getSort();
}
public void setSort(String sort) {
searchQuery.setSort(sort);
getSearchQuery().setSort(sort);
}
public String getSearch() {
return searchQuery.getSearch();
return getSearchQuery().getSearch();
}
public void setSearch(String search) {
searchQuery.setSearch(search);
getSearchQuery().setSearch(search);
}
public String newSearch() {
......
code/LanBortalWeb/src/fi/insomnia/bortal/web/cdiview/organisation/EventPropertyView.java
......@@ -62,24 +62,22 @@ public class EventPropertyView extends GenericCDIView {
public List<LanEventPrivatePropertyKey> getAvailablePrivatePropertyKeys() {
List<LanEventPrivatePropertyKey> ret = null;
if (isPrivatePropertyPermission())
if (isPrivatePropertyPermission() && eventbean.getCurrentEvent().equals(eventorgview.getEvent()))
{
ret = new ArrayList<LanEventPrivatePropertyKey>(Arrays.asList(LanEventPrivatePropertyKey.values()));
if (createPrivateKey != null)
{
ret.remove(createPrivateKey);
}
if (eventorgview.getEvent() != null) {
for (LanEventPrivateProperty p : eventbean.getPrivateProperties()) {
ret.remove(p.getKey());
}
for (LanEventPrivateProperty p : eventbean.getPrivateProperties()) {
ret.remove(p.getKey());
}
}
return ret;
}
public boolean isPrivatePropertyPermission() {
return super.hasPermission(EventPermission.MANAGE_PRIVATE_PROPERTIES);
return super.hasPermission(EventPermission.MANAGE_PRIVATE_PROPERTIES) && eventbean.getCurrentEvent().equals(eventorgview.getEvent());
}
public String editProperty()
......@@ -182,7 +180,7 @@ public class EventPropertyView extends GenericCDIView {
}
public ListDataModel<LanEventPrivateProperty> getPrivateProperties() {
if (privateProperties == null && eventorgview != null && eventorgview.getEvent() != null)
if (privateProperties == null && eventorgview != null && eventbean.getCurrentEvent().equals(eventorgview.getEvent()))
{
privateProperties = new ListDataModel<LanEventPrivateProperty>(eventbean.getPrivateProperties());
}
......
code/LanBortalWeb/src/fi/insomnia/bortal/web/cdiview/user/UserSearchView.java
package fi.insomnia.bortal.web.cdiview.user;
import java.util.List;
import javax.ejb.EJB;
import javax.enterprise.context.RequestScoped;
import javax.inject.Named;
import fi.insomnia.bortal.beans.UserBeanLocal;
import fi.insomnia.bortal.enums.apps.UserPermission;
import fi.insomnia.bortal.model.EventUser;
import fi.insomnia.bortal.model.User;
import fi.insomnia.bortal.utilities.SearchResult;
import fi.insomnia.bortal.utilities.UserSearchQuery;
import fi.insomnia.bortal.web.cdiview.PaginationView;
@Named
......@@ -20,12 +25,37 @@ public class UserSearchView extends PaginationView<User> {
@EJB
private transient UserBeanLocal userbean;
private List<EventUser> eventUserResults;
private UserSearchQuery usersearch = new UserSearchQuery();
public void initView() {
if (requirePermissions(permbean.hasPermission(UserPermission.VIEW_ALL))) {
super.setResult(userbean.getEventUsers(getSearchQuery()));
if (usersearch.isOnlyThisEvent() || usersearch.getSearch() == null || usersearch.getSearch().isEmpty())
{
usersearch.setOnlyThisEvent(true);
SearchResult<EventUser> eventusers = userbean.getThisEventsUsers(getSearchQuery());
this.setResultcount(eventusers.getResultcount());
this.setEventUserResults(eventusers.getResults());
}
else {
super.setResult(userbean.getEventUsers(getSearchQuery()));
}
}
}
@Override
public UserSearchQuery getSearchQuery()
{
return usersearch;
}
public List<EventUser> getEventUserResults() {
return eventUserResults;
}
public void setEventUserResults(List<EventUser> eventUserResults) {
this.eventUserResults = eventUserResults;
}
}
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!