Merge branch 'devel' of codecrew.fi:bortal into devel

code/MoyaBeans/ejbModule/fi/codecrew/moya/facade/PrintedCardFacade.java

@@ -3,6 +3,7 @@ package fi.codecrew.moya.facade;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.List;
 
 import javax.ejb.EJB;
@@ -103,10 +104,9 @@ public class PrintedCardFacade extends IntegerPkGenericFacade<PrintedCard> {
 		CriteriaBuilder cb = getEm().getCriteriaBuilder();
 		CriteriaQuery<PrintedCard> cq = cb.createQuery(PrintedCard.class);
 		Root<PrintedCard> root = cq.from(PrintedCard.class);
-
+		
 		List<Predicate> preds = new ArrayList<Predicate>();
 
-		preds.add(cb.isTrue(root.get(PrintedCard_.enabled)));
 		preds.add(cb.equal(root.get(PrintedCard_.event), eventbean.getCurrentEvent()));
 
 		if (state.length > 0) {
@@ -114,15 +114,15 @@ public class PrintedCardFacade extends IntegerPkGenericFacade<PrintedCard> {
 		}
 
 		cq.where(preds.toArray(new Predicate[preds.size()]));
-		cq.orderBy(cb.asc(root.get(PrintedCard_.template).get(CardTemplate_.power)));
+		cq.orderBy(cb.asc(root.get(PrintedCard_.user)), cb.asc(root.get(PrintedCard_.template).get(CardTemplate_.power)));
 
 		List<PrintedCard> pcl = getEm().createQuery(cq).getResultList();
-
+		
 		HashMap<Integer, PrintedCard> pch = new HashMap<>();
-		for (PrintedCard pc : pcl) {
+		for(PrintedCard pc : pcl) {
 			pch.put(pc.getUser().getId(), pc);
 		}
-
+		
 		return new ArrayList<PrintedCard>(pch.values());
 
 	}

code/MoyaWeb/WebContent/admin/incoming/printCard.xhtml

@@ -23,7 +23,7 @@
 				<h:panelGroup>
 					<h:form>
 						<h:outputLabel value="#{i18n['user.cropUserImage']}:" />
-						<p:imageCropper value="#{userView.croppedImage}" aspectRatio="0.7317073170731707" image="/dydata/userimage/#{userView.user.currentImage.id}.img" />
+						<p:imageCropper value="#{userView.croppedImage}" aspectRatio="0.7317073170731707" image="/dydata/userimage/#{userView.user.currentImage.id}.jpg" />
 						<br />
 						<h:commandButton action="#{userView.crop}" value="#{i18n['user.cropImage']}" />
 					</h:form>

code/MoyaWeb/WebContent/tournaments/admin/view_tournament_single.xhtml

@@ -30,6 +30,14 @@
 						</f:facet>
 						<h:outputText value="#{participant.participator.email}" />
 					</p:column>
+					<p:column>
+						<f:facet name="header">
+							<h:outputText value="#{i18n['tournament.participant_place']}" />
+						</f:facet>
+						<ui:repeat rendered="#{not empty participant.participator.groupMemberships}" var="groupMembership" value="#{participant.participator.groupMemberships}">
+       						<h:outputText value="#{groupMembership.placeReservation.name}" />&nbsp;
+       					</ui:repeat>
+					</p:column>
 	 			</p:dataTable>
  			</h:form>
  			

code/MoyaWeb/WebContent/tournaments/admin/view_tournament_team.xhtml

@@ -43,6 +43,11 @@
 							        				<li>
 							        					<h:outputText value="#{member.eventUser.email}" />
 							        				</li>
+							        				<li>
+							        					<ui:repeat rendered="#{not empty member.eventUser.groupMemberships}" var="groupMembership" value="#{member.eventUser.groupMemberships}">
+							        						<h:outputText value="#{groupMembership.placeReservation.name}" />&nbsp;
+							        					</ui:repeat>
+							        				</li>
 						        				</ul>
 						        			</li>
 						        		</ui:repeat>

code/MoyaWeb/WebContent/user/sendPicture.xhtml

@@ -47,7 +47,7 @@
 			<h2>#{i18n['user.thisIsCurrentImage']}</h2>
 
 			<h:outputText rendered="#{empty userView.user.currentImage}" value="#{i18n['user.noCurrentImage']}" />
-			<img width="300" rendered="#{!empty userView.user.currentImage}"  src="#{request.contextPath}/dydata/userimage/#{userView.user.currentImage.id}.img" alt="image" />
+			<img width="300" rendered="#{!empty userView.user.currentImage}"  src="#{request.contextPath}/dydata/userimage/#{userView.user.currentImage.id}.jpg" alt="image" />
 			
 			
 			<!--  <ui:fragment rendered="#{!empty userView.user.currentImage}">

code/MoyaWeb/WebContent/useradmin/sendPicture.xhtml

@@ -35,10 +35,10 @@
 			<h:outputText rendered="#{empty userView.user.currentImage}" value="#{i18n['user.noCurrentImage']}" />
 			<ui:fragment rendered="#{!empty userView.user.currentImage}">
 				<h:panelGrid columns="2">
-					<img width="300" src="#{request.contextPath}/dydata/userimage/#{userView.user.currentImage.id}.img" alt="image" />
+					<img width="300" src="#{request.contextPath}/dydata/userimage/#{userView.user.currentImage.id}.jpg" alt="image" />
 					<ui:fragment rendered="#{userView.canManage()}">
 						<h:form>
-							<p:imageCropper value="#{userView.croppedImage}" aspectRatio="0.7317073170731707" image="/dydata/userimage/#{userView.user.currentImage.id}.img" />
+							<p:imageCropper value="#{userView.croppedImage}" aspectRatio="0.7317073170731707" image="/dydata/userimage/#{userView.user.currentImage.id}.jpg" />
 							<h:commandButton action="#{userView.crop}" value="#{i18n['user.cropImage']}" />
 						</h:form>
 					</ui:fragment>

code/MoyaWeb/WebContent/useradmin/userCartShow.xhtml

@@ -67,7 +67,7 @@
 			</h:form>
 
 			<h:form>
-				<p:imageCropper value="#{userView.croppedImage}" aspectRatio="0.7317073170731707" image="/dydata/userimage/#{userView.user.currentImage.id}.img" />
+				<p:imageCropper value="#{userView.croppedImage}" aspectRatio="0.7317073170731707" image="/dydata/userimage/#{userView.user.currentImage.id}.jpg" />
 				<h:commandButton action="#{userView.crop}" value="#{i18n['user.cropImage']}" />
 			</h:form>
 		</ui:define>

code/MoyaWeb/src/fi/codecrew/moya/web/cdiview/menu/PrimeMenuView.java

@@ -91,7 +91,8 @@ public class PrimeMenuView extends GenericCDIView {
 		{
 			menuModel = new DefaultMenuModel();
 			MenuNavigation selectedTop = layoutview.getSelectedTopmenu();
-
+			if(selectedTop == null) return null;
+			
 			for (MenuNavigation m : selectedTop.getChildren()) {
 				if (m.getItem() != null && m.getChildren().isEmpty()) {
 					DefaultMenuItem menuitem = mkMenuitem(m);

code/MoyaWeb/src/fi/codecrew/moya/web/helper/LayoutView.java

@@ -75,14 +75,15 @@ public class LayoutView {
 		{
 			selectedSet = new HashSet<>();
 			selectedTop = menubean.findNavigation(getPagepath());
-			if (selectedTop != null) {
-				while (selectedTop.getParent() != null) {
-					logger.info("Traversing to top {}, key {}", selectedTop, selectedTop.getKey());
-					selectedSet.add(selectedTop);
-					selectedTop = selectedTop.getParent();
-				}
+			if(selectedTop == null) return null;
+			
+			while (selectedTop.getParent() != null) {
+				logger.info("Traversing to top {}, key {}", selectedTop, selectedTop.getKey());
 				selectedSet.add(selectedTop);
+				selectedTop = selectedTop.getParent();
 			}
+			selectedSet.add(selectedTop);
+
 			List<MenuNavigation> tops = menubean.getTopmenus();
 
 			if (!tops.contains(selectedTop) && !tops.isEmpty()) {