Merge branch 'onlyShowOwn' into 'master'

Only show own

blobbista

See merge request !228

code/moya-beans/ejbModule/fi/codecrew/moya/beans/BarcodeBean.java

@@ -144,7 +144,21 @@ public class BarcodeBean implements BarcodeBeanLocal {
 	}
 
 
+	/**
+	 * TODO: change user code to be totally random, and to be saved into database
+	 *
+	 * This is nice, but this can be broken too easy
+	 *
+	 * @param user
+	 * @param lenght
+	 * @param bytecount
+	 * @return
+	 */
 	private String getUserTextCode(EventUser user, int lenght, int bytecount) {
+		return getUserTextCode(user, lenght, bytecount, 0);
+	}
+
+	private String getUserTextCode(EventUser user, int lenght, int bytecount, int loopcount) {
 
 		int barcodeLenght = 12;
 
@@ -156,10 +170,9 @@ public class BarcodeBean implements BarcodeBeanLocal {
 
 		// add some random -stuff to start of string
 		for (int i = lenght - barcode.length(); i > 0; --i) {
-			barcode = ((int) (Math.random() * 10.0)) + barcode;
+			barcode = ((int) ((Math.random() * 8.9) +1)) + barcode;
 		}
 
-		logger.debug(barcode);
 
 
 		BigInteger intCode;
@@ -176,8 +189,12 @@ public class BarcodeBean implements BarcodeBeanLocal {
 
 
 		if(checkCode.compareTo(intCode) != 0) {
-			logger.error("CheckCode {} : Original {}", checkCode, intCode);
-			return "GenError"; // different error messages, so we can tell where the error was
+			logger.error("CheckCode {} : Original {}, text: {} ", checkCode, intCode, textCode);
+
+			if(loopcount > 10)
+				return "GenError"; // different error messages, so we can tell where the error was
+
+			return getUserTextCode(user, lenght, bytecount, (loopcount +1));
 		}
 
 //		logger.debug("Geneating hexcode for place {} : {}", place.getId(), textCode);
@@ -444,7 +461,9 @@ public class BarcodeBean implements BarcodeBeanLocal {
 		
 		
 		BigInteger numbersLeft = new BigInteger(linearFeedbackShiftRegister(original.toByteArray(),bytecount, TEXTCODE_ROTATE_COUNT)); 
-		
+
+//		logger.debug("numbers afther random {}", numbersLeft);
+
 		String converted = "";
 		BigInteger divnumber = BigInteger.valueOf(TEXTCODE_CHARACTER_MAP.length());
 		

code/moya-beans/ejbModule/fi/codecrew/moya/beans/TicketBean.java

@@ -161,7 +161,7 @@ public class TicketBean implements TicketBeanLocal {
 
 		for(GroupMembership ship : ships) {
 			if(ship.getEnteredEvent() == null && ship.getPlaceReservation() != null) {
-				
+
 				if(ship.getUser() != null) {
 					if(!usersWithTickets.contains(ship.getUser())) {
 						usersWithTickets.add(ship.getUser());

code/moya-beans/ejbModule/fi/codecrew/moya/facade/PlaceFacade.java

@@ -18,6 +18,7 @@
  */
 package fi.codecrew.moya.facade;
 
+import java.util.Arrays;
 import java.util.Calendar;
 import java.util.List;
 
@@ -28,20 +29,12 @@ import javax.persistence.TypedQuery;
 import javax.persistence.criteria.*;
 
 import fi.codecrew.moya.beans.EventBean;
+import fi.codecrew.moya.model.*;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import fi.codecrew.moya.beans.EventBeanLocal;
 import fi.codecrew.moya.beans.LoggingBeanLocal;
-import fi.codecrew.moya.model.EventMap;
-import fi.codecrew.moya.model.EventMap_;
-import fi.codecrew.moya.model.EventUser;
-import fi.codecrew.moya.model.LanEvent;
-import fi.codecrew.moya.model.Place;
-import fi.codecrew.moya.model.PlaceSlot;
-import fi.codecrew.moya.model.Place_;
-import fi.codecrew.moya.model.Product;
-import fi.codecrew.moya.model.Product_;
 import fi.codecrew.moya.utilities.moyamessage.MoyaEventType;
 
 @Stateless
@@ -313,9 +306,18 @@ public class PlaceFacade extends IntegerPkGenericFacade<Place> {
 		subq.where(
 				placeJoin.get(Place_.id).isNotNull(),
 				cb.equal(placeJoin.get(Place_.map).get(EventMap_.event), eventBean.getCurrentEvent())
-				);
+		);
 
-		cq.where(root.get(Product_.id).in(subq));
+
+		ProductFlag[] flags = {ProductFlag.CREATE_NEW_PLACE_WHEN_BOUGHT};
+
+		cq.where(
+				cb.or(
+						root.get(Product_.id).in(subq),
+						root.get(Product_.productFlags).in(Arrays.asList(flags))
+				),
+				cb.equal(root.get(Product_.event), eventBean.getCurrentEvent())
+		);
 
 		cq.orderBy(cb.asc(root.get(Product_.name)));
 

code/moya-web/WebContent/info/cardlessIncoming.xhtml

@@ -33,7 +33,7 @@
 			<h:form id="membershipForm">
 				<p:fieldset id="groupMembershiSummary" legend="#{i18n['incomingflow.placesummary']}" toggleable="true" collapsed="#{fieldsetView.isCollapsed(component.id)}">
 					<p:ajax event="toggle" listener="#{fieldsetView.handleToggle}" />
-					<p:dataTable value="#{cardlessIncomingView.placeSummaries}" var="placeSummary" rowStyleClass="#{(placeSummary.left == 0)? ((placeSummary.count == 0)?'expired':'success'):''}">
+					<p:dataTable value="#{cardlessIncomingView.placeSummaries}" var="placeSummary" rowStyleClass="#{(placeSummary.left == 0)? ((placeSummary.count == 0)?'expired':'greenBackground'):''}">
 						<p:column>
 							<f:facet name="header">
 								<p:outputLabel value="#{i18n['placegroupview.reservationProduct']}" />
@@ -64,7 +64,7 @@
 				<p:fieldset id="groupMembershipList" rendered="#{!empty cardlessIncomingView.groupMemberships}" legend="#{i18n['incomingflow.groupmemberships']}" toggleable="true" collapsed="#{fieldsetView.isCollapsed(component.id)}">
 					<p:ajax event="toggle" listener="#{fieldsetView.handleToggle}" />
 
-					<p:dataTable value="#{cardlessIncomingView.groupMemberships}" var="member" rowStyleClass="#{member.enteredEvent != null ? 'success':''}">
+					<p:dataTable value="#{cardlessIncomingView.groupMemberships}" var="member" rowStyleClass="#{member.enteredEvent != null ? 'greenBackground':''}">
 
 						<p:column>
 							<f:facet name="header">

code/moya-web/WebContent/resources/templates/custom_components.css

@@ -195,6 +195,11 @@ a.shopItem:active {
 	color: #006600;
 }
 
+.greenBackground {
+	background-color: #00AA00;
+	color: #000000;
+}
+
 .lectureCalendar,
 .lectureCalendarParticipating,
 .lectureCalendarDisabled,

code/moya-web/src/main/java/fi/codecrew/moya/web/TestDataView.java

@@ -31,7 +31,10 @@ import javax.inject.Inject;
 import javax.inject.Named;
 
 import fi.codecrew.moya.beans.*;
+import fi.codecrew.moya.enums.apps.EventPermission;
+import fi.codecrew.moya.enums.apps.UserPermission;
 import fi.codecrew.moya.model.*;
+import fi.codecrew.moya.web.cdiview.GenericCDIView;
 import fi.codecrew.moya.web.cdiview.eticket.EticketView;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -42,7 +45,7 @@ import org.slf4j.LoggerFactory;
  */
 @Named("testView")
 @RequestScoped
-public class TestDataView {
+public class TestDataView extends GenericCDIView {
 
 	private static final Logger logger = LoggerFactory
 			.getLogger(TestDataView.class);
@@ -86,7 +89,9 @@ public class TestDataView {
 	}
 
 	public void sendMultibuggageSpam() {
-		ticketBean.sendTicketEmailToAll(eticketView.getTicketUrl());
+		if(super.requirePermissions(EventPermission.MANAGE_PRIVATE_PROPERTIES)) {
+			ticketBean.sendTicketEmailToAll(eticketView.getTicketUrl());
+		}
 	}
 
 	public String makeTestData() {

code/moya-web/src/main/java/fi/codecrew/moya/web/flow/CardlessIncomingView.java

@@ -70,6 +70,9 @@ public class CardlessIncomingView extends GenericCDIView {
 	@EJB
 	private ProductBeanLocal productBean;
 
+	@EJB
+	private TicketBeanLocal ticketBean;
+
 
 	private ListDataModel<GroupMembership> memberlist = null;
 
@@ -102,7 +105,8 @@ public class CardlessIncomingView extends GenericCDIView {
 	}
 
 	public ListDataModel<GroupMembership> getGroupMemberships() {
-		memberlist = new ListDataModel<>(placegroupBean.getMembershipsAndCreations(userview.getSelectedUser()));
+		memberlist = new ListDataModel<>(ticketBean.findMembershipPrintlistForUser(userview.getSelectedUser()));
+
 		return memberlist;
 	}
 
@@ -118,7 +122,7 @@ public class CardlessIncomingView extends GenericCDIView {
 	public List<ProductSummaryWrapper> getPlaceSummaries() {
 		List<Product> allPlaceProducts = productBean.getPlaceProducts();
 
-		List<GroupMembership> groupMemberships = placegroupBean.getMembershipsAndCreations(userview.getSelectedUser());
+		List<GroupMembership> groupMemberships = ticketBean.findMembershipPrintlistForUser(userview.getSelectedUser());
 
 		List<ProductSummaryWrapper> retarray = new ArrayList<>();
 
@@ -160,7 +164,7 @@ public class CardlessIncomingView extends GenericCDIView {
 
 
 	public void giveEverything() {
-		List<GroupMembership> memberships = placegroupBean.getMembershipsAndCreations(userview.getSelectedUser());
+		List<GroupMembership> memberships = ticketBean.findMembershipPrintlistForUser(userview.getSelectedUser());
 
 		int count = 0;
 		for(GroupMembership gm : memberships) {

code/moya-web/src/main/java/fi/codecrew/moya/web/flow/IncomingView.java

@@ -29,15 +29,10 @@ import javax.inject.Inject;
 import javax.inject.Named;
 import javax.json.JsonObject;
 
+import fi.codecrew.moya.beans.*;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import fi.codecrew.moya.beans.BarcodeBeanLocal;
-import fi.codecrew.moya.beans.CardTemplateBeanLocal;
-import fi.codecrew.moya.beans.PermissionBeanLocal;
-import fi.codecrew.moya.beans.PlaceBeanLocal;
-import fi.codecrew.moya.beans.PlaceGroupBeanLocal;
-import fi.codecrew.moya.beans.UserBeanLocal;
 import fi.codecrew.moya.enums.CardState;
 import fi.codecrew.moya.enums.apps.UserPermission;
 import fi.codecrew.moya.model.CardCode;
@@ -99,6 +94,9 @@ public class IncomingView extends GenericCDIView {
 	@EJB
 	private CardTemplateBeanLocal cardTemplateBean;
 
+	@EJB
+	private TicketBeanLocal ticketBean;
+
 	// private String searchBarcode = "";
 
 	private ListDataModel<GroupMembership> memberlist = null;
@@ -274,7 +272,7 @@ public class IncomingView extends GenericCDIView {
 	}
 
 	public ListDataModel<GroupMembership> getGroupMemberships() {
-		memberlist = new ListDataModel<GroupMembership>(placegroupBean.getMembershipsAndCreations(userview.getSelectedUser()));
+		memberlist = new ListDataModel<GroupMembership>(ticketBean.findMembershipPrintlistForUser(userview.getSelectedUser()));
 		return memberlist;
 	}