Fiksejä

code/LanBortalBeans/ejbModule/fi/insomnia/bortal/facade/EventUserFacade.java

@@ -13,6 +13,7 @@ import javax.persistence.criteria.From;
 import javax.persistence.criteria.Root;
 
 import fi.insomnia.bortal.beans.EventBeanLocal;
+import fi.insomnia.bortal.enums.DatabaseHasCompare;
 import fi.insomnia.bortal.enums.DatabaseValueCompare;
 import fi.insomnia.bortal.facade.callbacks.EventLimiter;
 import fi.insomnia.bortal.facade.callbacks.EventUserAccountSaldoPredicate;
@@ -112,17 +113,18 @@ public class EventUserFacade extends IntegerPkGenericFacade<EventUser> {
 		{
 			callbacks.add(new EventUserAccountSaldoPredicate(query.getAccountSaldo(), query.getAccountSaldoCompare()));
 		}
+		if (query.getRequireImage() != null && !query.getRequireImage().equals(DatabaseHasCompare.NONE))
+		{
+
+		}
 
 		CriteriaBuilder cb = getEm().getCriteriaBuilder();
 
 		CriteriaQuery<EventUser> listCQuery = cb.createQuery(EventUser.class);
 		CriteriaQuery<Long> countCQuery = cb.createQuery(Long.class);
 
-		From<?, EventUser> listRoot = null;
-		From<?, EventUser> countRoot = null;
-
-		listRoot = searchCallbacks(listCQuery, callbacks, EventUser.class);
-		countRoot = searchCallbacks(countCQuery, callbacks, EventUser.class);
+		From<?, EventUser> listRoot = searchCallbacks(listCQuery, callbacks, EventUser.class);
+		From<?, EventUser> countRoot = searchCallbacks(countCQuery, callbacks, EventUser.class);
 
 		listCQuery.select(listRoot);
 		countCQuery.select(cb.count(countRoot));

code/LanBortalBeansClient/ejbModule/fi/insomnia/bortal/util/UserSearchQuery.java

@@ -4,6 +4,7 @@ import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.List;
 
+import fi.insomnia.bortal.enums.DatabaseHasCompare;
 import fi.insomnia.bortal.enums.DatabaseValueCompare;
 import fi.insomnia.bortal.model.Role;
 import fi.insomnia.bortal.utilities.SearchQuery;
@@ -15,6 +16,7 @@ public class UserSearchQuery extends SearchQuery {
 	private List<Role> filterRoles = new ArrayList<Role>();
 	private boolean onlyThisEvent = true;
 	private boolean placeAssoc = false;
+	private DatabaseHasCompare requireImage = DatabaseHasCompare.NONE;
 
 	private BigDecimal accountSaldo;
 	private DatabaseValueCompare accountSaldoCompare = DatabaseValueCompare.NONE;
@@ -64,4 +66,12 @@ public class UserSearchQuery extends SearchQuery {
 		this.placeAssoc = placeAssoc;
 	}
 
+	public DatabaseHasCompare getRequireImage() {
+		return requireImage;
+	}
+
+	public void setRequireImage(DatabaseHasCompare requireImage) {
+		this.requireImage = requireImage;
+	}
+
 }

code/LanBortalWeb/WebContent/resources/cditools/user/edit.xhtml

@@ -21,13 +21,11 @@
 	</h2>
 	  -->
 
-	<h:form id="userform" enctype="multipart/form-data">
 		<h:panelGrid columns="2">
 
 			<h:panelGroup>
+		      <h:form id="userform" enctype="multipart/form-data">
 				<ui:fragment rendered="#{not empty userView.user.id}">
-
-
 					<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()" />
@@ -47,7 +45,7 @@
 					<p:message for="uploadfile" />
 					<p:commandButton action="#{userView.sendImage}" ajax="false" value="#{i18n['user.imagesubmit']}" />
 				</ui:fragment>
-
+			</h:form>
 				<ui:fragment rendered="#{cc.attrs.creating}">
 					<h:outputLabel value="#{i18n['user.login']}" for="mklogin" />
 					<br />
@@ -77,6 +75,7 @@
 
 			</h:panelGroup>
 
+			<h:form>
 
 			<h:panelGroup>
 				<table>
@@ -136,9 +135,9 @@
 				<p:commandButton rendered="#{cc.attrs.creating or userView.canSave}" id="commitbtn" action="#{cc.attrs.commitaction}" ajax="false" value="#{cc.attrs.commitvalue}" />
 
 			</h:panelGroup>
+	</h:form>
 
 		</h:panelGrid>
-	</h:form>
 </composite:implementation>
 </html>
 

code/LanBortalWeb/src/fi/insomnia/bortal/web/cdiview/shop/ReaderListDataView.java

@@ -31,20 +31,15 @@ public class ReaderListDataView extends GenericCDIView {
 	private static final Logger logger = LoggerFactory.getLogger(ReaderListDataView.class);
 
 	public void initView() {
-
 		super.requirePermissions(ShopPermission.SHOP_TO_OTHERS);
-
 	}
 
 	public ListDataModel<Reader> getReaders()
 	{
-
-		if (readers == null)
-		{
+		if (readers == null) {
 			readers = new ListDataModel<Reader>(readerbean.getReaders());
 		}
 		return readers;
-
 	}
 
 }