compolistaan muutoksia

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

@@ -30,7 +30,7 @@ public class CompoFacade extends IntegerPkGenericFacade<Compo> {
 		CriteriaQuery<Compo> cq = cb.createQuery(Compo.class);
 		CriteriaQuery<Compo> cq = cb.createQuery(Compo.class);
 		Root<Compo> root = cq.from(Compo.class);
 		Root<Compo> root = cq.from(Compo.class);
 		cq.where(cb.equal(root.get(Compo_.event), eventbean.getCurrentEvent()));
 		cq.where(cb.equal(root.get(Compo_.event), eventbean.getCurrentEvent()));
-
+		cq.orderBy(cb.desc(root.get(Compo_.startTime)));
 		List<Compo> ret = getEm().createQuery(cq).getResultList();
 		List<Compo> ret = getEm().createQuery(cq).getResultList();
 		return ret;
 		return ret;
 	}
 	}

code/LanBortalWeb/WebContent/voting/compolist.xhtml

@@ -97,7 +97,7 @@
 					<f:facet name="header">
 					<f:facet name="header">
 						<h:outputText value=""  />
 						<h:outputText value=""  />
 					</f:facet>
 					</f:facet>
-					<h:link outcome="addentry">
+					<h:link outcome="addentry" rendered="#{compo.maxParticipantCount gt compo.compoEntries.size()}">
 						<f:param name="compoId" value="#{compo.id}" />
 						<f:param name="compoId" value="#{compo.id}" />
 						#{i18n['voting.allcompos.submitEntry']}
 						#{i18n['voting.allcompos.submitEntry']}
 					</h:link>
 					</h:link>

code/LanBortalWeb/src/fi/insomnia/bortal/resources/i18n_en.properties

@@ -528,7 +528,7 @@ viewexpired.title = Login expired. Please login again.
 
 
 voting.allcompos.curEntries        = # of entries
 voting.allcompos.curEntries        = # of entries
 voting.allcompos.descri            = Description
 voting.allcompos.descri            = Description
-voting.allcompos.description       = List of all compos and NIIDEN information.
+voting.allcompos.description       = List of all compos and theirs information.
 voting.allcompos.endTime           = End time
 voting.allcompos.endTime           = End time
 voting.allcompos.header            = All compos
 voting.allcompos.header            = All compos
 voting.allcompos.maxParts          = Max participants
 voting.allcompos.maxParts          = Max participants